diff --git a/home/package-sets/dev.nix b/home/package-sets/dev.nix index 116fc56..ead2fd7 100644 --- a/home/package-sets/dev.nix +++ b/home/package-sets/dev.nix @@ -7,8 +7,13 @@ in enable = lib.mkEnableOption "development package set"; }; config = lib.mkIf cfg.enable { + programs.neovim = { + enable = true; + withPython3 = true; + withNodeJs = true; + withRuby = true; + }; home.packages = with pkgs; [ - neovim ripgrep fd bat diff --git a/home/profile/base.nix b/home/profile/base.nix index 53f9dc6..2bef181 100644 --- a/home/profile/base.nix +++ b/home/profile/base.nix @@ -48,8 +48,23 @@ in home.file.".icons".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.dataHome}/icons"; home.file.".themes".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.dataHome}/themes"; - home.packages = with pkgs; [ + # some packages defined here may be redundant with packages on a non-NixOS + # home-manager setup, but it's better to have a consistent environment at + # the cost of slightly more space + programs.neovim = { + enable = lib.mkDefault true; + vimAlias = lib.mkDefault true; + withPython3 = lib.mkDefault true; + defaultEditor = lib.mkDefault true; + }; + + home.packages = with pkgs; let + neofetch-hyfetch-shim = writeShellScriptBin "neofetch" '' + exec "${pkgs.hyfetch}/bin/neowofetch" "$@" + ''; + in [ btop + htop fzf zoxide tmux @@ -57,9 +72,26 @@ in rclone rmlint pv + ncdu + rmlint + + git + git-lfs + stow + curl + + ripgrep + fd + bat + moreutils + grc # for icat on all systems kitty.kitten + + # pretty + hyfetch + neofetch-hyfetch-shim ]; }; } diff --git a/system/profile/base.nix b/system/profile/base.nix index 31dfca2..5e83e55 100644 --- a/system/profile/base.nix +++ b/system/profile/base.nix @@ -50,7 +50,11 @@ in # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; let + neofetch-hyfetch-shim = writeShellScriptBin "neofetch" '' + exec "${hyfetch}/bin/neowofetch" "$@" + ''; + in [ neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. tmux wget @@ -102,7 +106,8 @@ in sops # etc - neofetch + hyfetch + neofetch-hyfetch-shim atool-wrapped restic rclone