diff --git a/modules/home/default.nix b/modules/home/default.nix index bc3a5eb..09ddaee 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -120,16 +120,20 @@ in inherit (pkgs.fishPlugins.bang-bang) src; } ]; - shellAliases = { - } - // lib.optionalAttrs (!host.darwin) { - reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; - }; shellInit = '' - batman --export-env | source - 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 true + if type -q batman + batman --export-env | source + end + test -r "$HOME"'/.opam/opam-init/init.fish' && source "$HOME"'/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true ''; }; + zsh = { + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + autocd = true; + history.size = 10000; + }; ghostty.settings.custom-shader = lib.mkIf ( cfg.ghostty.shader != null diff --git a/modules/neovim/blink-cmp.nix b/modules/neovim/blink-cmp.nix index 1b186a4..6a3d3fa 100644 --- a/modules/neovim/blink-cmp.nix +++ b/modules/neovim/blink-cmp.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { vim.autocomplete.blink-cmp = { enable = true; @@ -14,6 +14,7 @@ setupOpts = { keymap = { preset = "super-tab"; + "" = [ "show" ]; }; completion = { ghost_text.enabled = false; diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 5b77121..f982fab 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -125,10 +125,12 @@ enable_cursor_hijack = true; git_status_async = true; close_if_last_window = true; + window.width = 30; filesystem.filtered_items = { # dotfiles are often used for project configuration hide_dotfiles = false; never_show = [ + ".git" ".DS_Store" # macOS "thumbs.db" # Windows ]; diff --git a/users/clover/home.nix b/users/clover/home.nix index bc04b2a..d256187 100644 --- a/users/clover/home.nix +++ b/users/clover/home.nix @@ -52,7 +52,6 @@ in theme = "light:catppuccin-latte,dark:catppuccin-macchiato"; font-family = "AT Name Mono"; adjust-cursor-thickness = 1; - minimum-contrast = 1.1; background-opacity = 0.9; background-blur = true; }; @@ -61,12 +60,6 @@ in # zsh is the shell i use zsh = { enable = true; - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - - history.size = 10000; - shellAliases = { switch = "nh darwin switch ~/config"; gg = "lazygit"; diff --git a/users/natalie/home.nix b/users/natalie/home.nix index eba3253..9ebe9cb 100644 --- a/users/natalie/home.nix +++ b/users/natalie/home.nix @@ -1,11 +1,5 @@ +{ lib, host, ... }@args: { - pkgs, - lib, - options, - ... -}@args: -{ - programs = { # sort-lines:start atuin.enable = true; @@ -17,6 +11,14 @@ lsd.enable = true; android-sdk.enable = true; # sort-lines:end + + fish = { + shellAliases = + { } + // lib.optionalAttrs (!host.darwin) { + reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; + }; + }; }; home.packages = import ./packages.nix args;