Skip to content

Commit d696a9a

Browse files
authored
Merge pull request #56 from tsandrini/updates
Periodic updates
2 parents bce9798 + 9ce635e commit d696a9a

File tree

30 files changed

+1166
-415
lines changed

30 files changed

+1166
-415
lines changed

flake-parts/hosts/default.nix

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,13 @@ in
8686
extraOverlays = with inputs; [
8787
nix-topology.overlays.default
8888
emacs-overlay.overlays.default
89-
nur.overlay
89+
nur.overlays.default
9090
# neovim-nightly-overlay.overlays.default
9191
# (final: _prev: { nur = import inputs.nur { pkgs = final; }; })
9292
];
9393
extraModules = with inputs; [
94-
nur.nixosModules.nur
94+
nur.modules.nixos.default
9595
nix-topology.nixosModules.default
96-
# TODO remove when available https://github.com/NixOS/nixpkgs/pull/334638
97-
{ nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; }
9896
];
9997
}
10098
);
@@ -104,14 +102,12 @@ in
104102
withHomeManager = true;
105103
extraOverlays = with inputs; [
106104
nix-topology.overlays.default
107-
# nur.overlay
105+
# nur.overlays.default
108106
# neovim-nightly-overlay.overlays.default
109107
];
110108
extraModules = with inputs; [
111109
nix-topology.nixosModules.default
112-
# nur.nixosModules.nur
113-
# TODO remove when available https://github.com/NixOS/nixpkgs/pull/334638
114-
{ nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; }
110+
# nur.modules.nixos.default
115111
];
116112
}
117113
);
@@ -122,15 +118,13 @@ in
122118
extraOverlays = with inputs; [
123119
nix-topology.overlays.default
124120
emacs-overlay.overlays.default
125-
nur.overlay
121+
nur.overlays.default
126122
# neovim-nightly-overlay.overlays.default
127123
# (final: _prev: { nur = import inputs.nur { pkgs = final; }; })
128124
];
129125
extraModules = with inputs; [
130-
nur.nixosModules.nur
126+
nur.modules.nixos.default
131127
nix-topology.nixosModules.default
132-
# TODO remove when available https://github.com/NixOS/nixpkgs/pull/334638
133-
{ nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; }
134128
];
135129
}
136130
);

flake-parts/hosts/jetbundle/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@
195195

196196
slack # Desktop client for Slack
197197
signal-desktop # Private, simple, and secure messenger
198+
# github-desktop # GitHub Desktop
199+
obsidian # A knowledge base that works on top of a local folder of plain text Markdown files
198200

199201
vscode-fhs # Wrapped variant of vscode which launches in a FHS compatible environment.
200202

flake-parts/modules/home-manager/profiles/graphical-plasma/rc2nix.nix

Lines changed: 126 additions & 63 deletions
Large diffs are not rendered by default.

flake-parts/modules/home-manager/programs/browsers/firefox/default.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,20 @@ in
340340
"browser.download.panel.shown" = _ true;
341341
"browser.theme.content-theme" = _ 0;
342342
"browser.theme.toolbar-theme" = _ 0;
343+
# Vertical tabs
344+
"sidebar.verticalTabs" = _ true;
345+
"sidebar.revamp" = _ true;
346+
"browser.tabs.closeTabByDblclick" = _ true;
347+
348+
"browser.newtabpage.activity-stream.feeds.section.highlights" = _ true;
349+
"browser.newtabpage.activity-stream.feeds.section.topstories" = _ true;
350+
"browser.newtabpage.activity-stream.feeds.telemetry" = _ false;
351+
"browser.newtabpage.activity-stream.feeds.topsites" = _ true;
352+
"browser.newtabpage.activity-stream.section.highlights.rows" = _ 2;
353+
"browser.newtabpage.activity-stream.showSponsored" = _ false;
354+
"browser.newtabpage.activity-stream.showSponsoredTopSites" = _ false;
355+
"browser.newtabpage.activity-stream.telemetry" = _ false;
356+
"browser.startup.page" = _ 3;
343357

344358
# ~ General settings
345359
"extensions.ui.locale.hidden" = _ true;

flake-parts/modules/home-manager/programs/editors/emacs-doom.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ in
121121

122122
# fonts
123123
emacs-all-the-icons-fonts
124-
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
124+
nerd-fonts.symbols-only
125125
pandoc
126126
discount # Implementation of Markdown markup language in C
127127

@@ -182,7 +182,7 @@ in
182182
fsharp # A functional CLI language
183183

184184
## :lang julia
185-
julia-bin
185+
# julia-bin
186186

187187
## :lang julia
188188
lua-language-server # A language server that offers Lua language support
@@ -204,7 +204,7 @@ in
204204
pyflakes
205205
isort
206206
pipenv
207-
nose
207+
# nose # NOTE deprecated and unsupported
208208
pytest
209209
inputs.self.packages.${system}.my_cookies
210210
]

flake-parts/modules/home-manager/programs/shells/fish.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,8 @@ in
139139
end
140140
141141
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
142+
143+
${getExe pkgs.microfetch}
142144
'';
143145
plugins =
144146
(optional cfg.withFzf {
@@ -160,7 +162,7 @@ in
160162

161163
home.shellAliases = mkMerge [
162164
{
163-
fetch = _ "${getExe pkgs.nitch}";
165+
fetch = _ "${getExe pkgs.microfetch}";
164166
g = _ "${getExe config.programs.git.package}";
165167
}
166168
(mkIf cfg.shellAliases.lsToEza {
@@ -180,7 +182,6 @@ in
180182
grep = _ "${getExe pkgs.ripgrep}";
181183
list-todos = _ "${getExe pkgs.ripgrep} -g '!{.git,node_modules,result,build,dist,.idea,out,.DS_Store}' --no-follow 'TODO|FIXME' ";
182184
})
183-
{ fetch = _ "${getExe pkgs.nitch}"; }
184185
];
185186
}
186187
# |----------------------------------------------------------------------| #

flake-parts/modules/home-manager/programs/shells/zsh/default.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ in
211211
file = cfg.p10k.cfgFile;
212212
})
213213
];
214-
loginExtra = _ "${pkgs.nitch}/bin/nitch";
214+
loginExtra = _ "${getExe pkgs.nitch}";
215215
};
216216

217217
home.shellAliases = mkMerge [
218218
{
219-
fetch = _ "${getExe pkgs.nitch}";
219+
fetch = _ "${getExe pkgs.microfetch}";
220220
g = _ "${getExe config.programs.git.package}";
221221
}
222222
(mkIf cfg.shellAliases.lsToEza {
@@ -236,7 +236,6 @@ in
236236
grep = _ "${getExe pkgs.ripgrep}";
237237
list-todos = _ "${getExe pkgs.ripgrep} -g '!{.git,node_modules,result,build,dist,.idea,out,.DS_Store}' --no-follow 'TODO|FIXME' ";
238238
})
239-
{ fetch = _ "${getExe pkgs.nitch}"; }
240239
];
241240
}
242241
# |----------------------------------------------------------------------| #

flake-parts/modules/home-manager/services/dunst.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ in
5353
home.packages = with pkgs; [
5454
iosevka
5555
libnotify
56-
(nerdfonts.override { fonts = [ "Iosevka" ]; })
56+
# (nerdfonts.override { fonts = [ "Iosevka" ]; })
57+
nerd-fonts.iosevka
5758
];
5859

5960
systemd.user.tmpfiles.rules = [

flake-parts/modules/home-manager/services/x11/window-managers/xmonad/default.nix

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,14 @@ in
184184
haskellPackages.xmobar
185185
i3lock-fancy-rapid
186186
ubuntu_font_family
187-
(nerdfonts.override {
188-
fonts = [
189-
"Ubuntu"
190-
"UbuntuMono"
191-
];
192-
})
187+
# (nerdfonts.override {
188+
# fonts = [
189+
# "Ubuntu"
190+
# "UbuntuMono"
191+
# ];
192+
# })
193+
nerd-fonts.ubuntu
194+
nerd-fonts.ubuntu-mono
193195
ubuntu_font_family
194196
feh
195197
trayer

flake-parts/modules/nixvim/default.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,17 @@ in
5252
inherit localFlake;
5353
};
5454

55+
plugins_editor_indent-blankline = importApply ./plugins/editor/indent-blankline.nix {
56+
inherit localFlake;
57+
};
58+
plugins_editor_image = importApply ./plugins/editor/image.nix { inherit localFlake; };
59+
plugins_editor_nvim-ufo = importApply ./plugins/editor/nvim-ufo.nix { inherit localFlake; };
60+
plugins_editor_leetcode = importApply ./plugins/editor/leetcode.nix { inherit localFlake; };
61+
plugins_editor_obsidian = importApply ./plugins/editor/obsidian.nix { inherit localFlake; };
5562
plugins_editor_bufferline = importApply ./plugins/editor/bufferline.nix { inherit localFlake; };
63+
plugins_editor_buffer-manager = importApply ./plugins/editor/buffer-manager.nix {
64+
inherit localFlake;
65+
};
5666
plugins_editor_spectre = importApply ./plugins/editor/spectre.nix { inherit localFlake; };
5767
plugins_editor_copilot-lua = importApply ./plugins/editor/copilot-lua.nix { inherit localFlake; };
5868
plugins_editor_neo-tree = importApply ./plugins/editor/neo-tree.nix { inherit localFlake; };
@@ -68,6 +78,7 @@ in
6878
plugins_cmp_schemastore = importApply ./plugins/cmp/schemastore.nix { inherit localFlake; };
6979

7080
plugins_lsp_conform = importApply ./plugins/lsp/conform.nix { inherit localFlake; };
81+
plugins_lsp_sniprun = importApply ./plugins/lsp/sniprun.nix { inherit localFlake; };
7182
plugins_lsp_fidget = importApply ./plugins/lsp/fidget.nix { inherit localFlake; };
7283
plugins_lsp_lsp = importApply ./plugins/lsp/lsp.nix { inherit localFlake; };
7384
plugins_lsp_lspsaga = importApply ./plugins/lsp/lspsaga.nix { inherit localFlake; };

0 commit comments

Comments
 (0)