authorgravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-08-22 11:53:52-07:00
committergravatar for git@paperclover.netclover caruso <git@paperclover.net> 2025-08-22 11:53:52-07:00
log6685dd8e70c72853ef29acb217082ade33ab5ae0
tree399be5cff9bbc9e529075fd8048a375466f3f1a2
parentae43ca83248e7afaaa6738a3092aff26e2db88ba

chore: move shell settings into default

5 files changed, 24 insertions(+), 22 deletions(-)

modules/home/default.nix+11-7
...@@ -120,16 +120,20 @@ in...@@ -120,16 +120,20 @@ in
120 inherit (pkgs.fishPlugins.bang-bang) src;120 inherit (pkgs.fishPlugins.bang-bang) src;
121 }121 }
122 ];122 ];
123 shellAliases = {
124 }
125 // lib.optionalAttrs (!host.darwin) {
126 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
127 };
128 shellInit = ''123 shellInit = ''
129 batman --export-env | source124 if type -q batman
130 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true125 batman --export-env | source
126 end
127 test -r "$HOME"'/.opam/opam-init/init.fish' && source "$HOME"'/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
131 '';128 '';
132 };129 };
130 zsh = {
131 enableCompletion = true;
132 autosuggestion.enable = true;
133 syntaxHighlighting.enable = true;
134 autocd = true;
135 history.size = 10000;
136 };
133137
134 ghostty.settings.custom-shader = lib.mkIf (138 ghostty.settings.custom-shader = lib.mkIf (
135 cfg.ghostty.shader != null139 cfg.ghostty.shader != null
modules/neovim/blink-cmp.nix+2-1
...@@ -1,4 +1,4 @@...@@ -1,4 +1,4 @@
1{ ... }:1{ lib, ... }:
2{2{
3 vim.autocomplete.blink-cmp = {3 vim.autocomplete.blink-cmp = {
4 enable = true;4 enable = true;
...@@ -14,6 +14,7 @@...@@ -14,6 +14,7 @@
14 setupOpts = {14 setupOpts = {
15 keymap = {15 keymap = {
16 preset = "super-tab";16 preset = "super-tab";
17 "<C-.>" = [ "show" ];
17 };18 };
18 completion = {19 completion = {
19 ghost_text.enabled = false;20 ghost_text.enabled = false;
modules/neovim/default.nix+2
...@@ -125,10 +125,12 @@...@@ -125,10 +125,12 @@
125 enable_cursor_hijack = true;125 enable_cursor_hijack = true;
126 git_status_async = true;126 git_status_async = true;
127 close_if_last_window = true;127 close_if_last_window = true;
128 window.width = 30;
128 filesystem.filtered_items = {129 filesystem.filtered_items = {
129 # dotfiles are often used for project configuration130 # dotfiles are often used for project configuration
130 hide_dotfiles = false;131 hide_dotfiles = false;
131 never_show = [132 never_show = [
133 ".git"
132 ".DS_Store" # macOS134 ".DS_Store" # macOS
133 "thumbs.db" # Windows135 "thumbs.db" # Windows
134 ];136 ];
users/clover/home.nix-7
...@@ -52,7 +52,6 @@ in...@@ -52,7 +52,6 @@ in
52 theme = "light:catppuccin-latte,dark:catppuccin-macchiato";52 theme = "light:catppuccin-latte,dark:catppuccin-macchiato";
53 font-family = "AT Name Mono";53 font-family = "AT Name Mono";
54 adjust-cursor-thickness = 1;54 adjust-cursor-thickness = 1;
55 minimum-contrast = 1.1;
56 background-opacity = 0.9;55 background-opacity = 0.9;
57 background-blur = true;56 background-blur = true;
58 };57 };
...@@ -61,12 +60,6 @@ in...@@ -61,12 +60,6 @@ in
61 # zsh is the shell i use60 # zsh is the shell i use
62 zsh = {61 zsh = {
63 enable = true;62 enable = true;
64 enableCompletion = true;
65 autosuggestion.enable = true;
66 syntaxHighlighting.enable = true;
67
68 history.size = 10000;
69
70 shellAliases = {63 shellAliases = {
71 switch = "nh darwin switch ~/config";64 switch = "nh darwin switch ~/config";
72 gg = "lazygit";65 gg = "lazygit";
users/natalie/home.nix+9-7
...@@ -1,11 +1,5 @@...@@ -1,11 +1,5 @@
1{ lib, host, ... }@args:
1{2{
2 pkgs,
3 lib,
4 options,
5 ...
6}@args:
7{
8
9 programs = {3 programs = {
10 # sort-lines:start4 # sort-lines:start
11 atuin.enable = true;5 atuin.enable = true;
...@@ -17,6 +11,14 @@...@@ -17,6 +11,14 @@
17 lsd.enable = true;11 lsd.enable = true;
18 android-sdk.enable = true;12 android-sdk.enable = true;
19 # sort-lines:end13 # sort-lines:end
14
15 fish = {
16 shellAliases =
17 { }
18 // lib.optionalAttrs (!host.darwin) {
19 reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
20 };
21 };
20 };22 };
2123
22 home.packages = import ./packages.nix args;24 home.packages = import ./packages.nix args;