From 635b33eb977f7cfbb747b78e5e8496f2721f2c14 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Wed, 19 Mar 2025 07:48:50 +0100 Subject: [PATCH] fix package imports --- .../desktop/applications/communication.nix | 2 +- modules/home/desktop/applications/email.nix | 12 ++++--- modules/home/desktop/applications/office.nix | 2 +- .../home/desktop/applications/passwords.nix | 2 +- .../home/desktop/applications/recording.nix | 2 +- modules/home/desktop/browsers/chrome.nix | 2 +- modules/home/desktop/browsers/firefox.nix | 4 +-- modules/home/desktop/browsers/zen.nix | 2 +- modules/home/desktop/editors/default.nix | 2 +- modules/home/desktop/editors/kate.nix | 4 ++- modules/home/desktop/editors/nano.nix | 2 +- modules/home/desktop/editors/vscodium.nix | 2 +- modules/home/desktop/editors/zed.nix | 6 ++-- modules/home/desktop/games/minecraft.nix | 2 +- modules/home/develop/dotnet.nix | 2 +- modules/home/develop/js.nix | 2 +- modules/home/develop/rust.nix | 4 +-- modules/home/shell/default.nix | 32 ++++++++++--------- modules/home/shell/toolset/git.nix | 19 ++++++----- modules/home/shell/toolset/starship.nix | 4 ++- modules/system/system/audio.nix | 2 +- 21 files changed, 60 insertions(+), 51 deletions(-) diff --git a/modules/home/desktop/applications/communication.nix b/modules/home/desktop/applications/communication.nix index 3afd523..280c4f3 100644 --- a/modules/home/desktop/applications/communication.nix +++ b/modules/home/desktop/applications/communication.nix @@ -14,7 +14,7 @@ in config = mkIf cfg.enable { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) vesktop teamspeak_client; }; }; diff --git a/modules/home/desktop/applications/email.nix b/modules/home/desktop/applications/email.nix index 1435e1f..7fb8fd3 100644 --- a/modules/home/desktop/applications/email.nix +++ b/modules/home/desktop/applications/email.nix @@ -14,15 +14,16 @@ in config = mkIf cfg.enable { -# user.packages = attrValues { -# inherit (pkgs) thunderbird; -# }; - programs.thunderbird = { enable = true; }; - home-manager.users.${user}.accounts.email.accounts = { + home-manager.users.${user} = { + home.packages = attrValues { + inherit (pkgs) thunderbird; + }; + + accounts.email.accounts = { kruining = { primary = true; address = "chris@kruinin.eu"; @@ -47,5 +48,6 @@ in }; }; }; + }; }; } diff --git a/modules/home/desktop/applications/office.nix b/modules/home/desktop/applications/office.nix index 4e6478d..9965144 100644 --- a/modules/home/desktop/applications/office.nix +++ b/modules/home/desktop/applications/office.nix @@ -14,7 +14,7 @@ in config = mkIf cfg.enable { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) onlyoffice-bin; }; diff --git a/modules/home/desktop/applications/passwords.nix b/modules/home/desktop/applications/passwords.nix index 7dae703..9a07bb4 100644 --- a/modules/home/desktop/applications/passwords.nix +++ b/modules/home/desktop/applications/passwords.nix @@ -14,7 +14,7 @@ in config = mkIf cfg.enable { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) bitwarden-desktop; }; }; diff --git a/modules/home/desktop/applications/recording.nix b/modules/home/desktop/applications/recording.nix index 858729c..b8ba73b 100644 --- a/modules/home/desktop/applications/recording.nix +++ b/modules/home/desktop/applications/recording.nix @@ -26,7 +26,7 @@ in security.polkit.enable = true; - user.packages = with pkgs; [ + home-manager.users.${user}.home.packages = with pkgs; [ obs-studio obs-studio-plugins.wlrobs obs-studio-plugins.obs-backgroundremoval diff --git a/modules/home/desktop/browsers/chrome.nix b/modules/home/desktop/browsers/chrome.nix index 4171ca9..60848ad 100644 --- a/modules/home/desktop/browsers/chrome.nix +++ b/modules/home/desktop/browsers/chrome.nix @@ -16,7 +16,7 @@ in { }; config = mkIf cfg.enable { - user.packages = with pkgs; [ + home-manager.users.${user}.home.packages = with pkgs; [ (ungoogled-chromium.override { commandLineArgs = [ "--enable-features=AcceleratedVideoEncoder" diff --git a/modules/home/desktop/browsers/firefox.nix b/modules/home/desktop/browsers/firefox.nix index 8be1e9d..29870df 100644 --- a/modules/home/desktop/browsers/firefox.nix +++ b/modules/home/desktop/browsers/firefox.nix @@ -33,7 +33,7 @@ in { }) (mkIf cfg.enable { - user.packages = let + home-manager.users.${user}.home.packages = let inherit (pkgs) makeDesktopItem; inherit (inputs.firefox.packages.${pkgs.system}) firefox-nightly-bin; in [ @@ -223,7 +223,7 @@ in { }) (mkIf cfg.privacy.enable { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) librewolf; }; }) diff --git a/modules/home/desktop/browsers/zen.nix b/modules/home/desktop/browsers/zen.nix index b53e23b..cf70760 100644 --- a/modules/home/desktop/browsers/zen.nix +++ b/modules/home/desktop/browsers/zen.nix @@ -32,7 +32,7 @@ in { }) (mkIf cfg.enable { - user.packages = let + home-manager.users.${user}.home.packages = let inherit (pkgs) makeDesktopItem; inherit (inputs.zen.packages.${pkgs.system}.specific) zen; in [ diff --git a/modules/home/desktop/editors/default.nix b/modules/home/desktop/editors/default.nix index 0bc4871..7e52920 100644 --- a/modules/home/desktop/editors/default.nix +++ b/modules/home/desktop/editors/default.nix @@ -30,7 +30,7 @@ in { }) (mkIf (cfg.default == "nvim") { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) imagemagick editorconfig-core-c sqlite deno pandoc nuspell; inherit (pkgs.hunspellDicts) en_GB nl_NL; }; diff --git a/modules/home/desktop/editors/kate.nix b/modules/home/desktop/editors/kate.nix index 8f4704c..9e030e5 100644 --- a/modules/home/desktop/editors/kate.nix +++ b/modules/home/desktop/editors/kate.nix @@ -8,7 +8,9 @@ in { options.modules.${user}.desktop.editors.kate = let inherit (lib.options) mkEnableOption; - in { enable = mkEnableOption "kate"; }; + in { + enable = mkEnableOption "kate"; + }; config = mkIf cfg.enable { home-manager.users.${user}.programs.kate.enable = true; diff --git a/modules/home/desktop/editors/nano.nix b/modules/home/desktop/editors/nano.nix index 969f104..ff39996 100644 --- a/modules/home/desktop/editors/nano.nix +++ b/modules/home/desktop/editors/nano.nix @@ -11,7 +11,7 @@ in in { enable = mkEnableOption "nano"; }; config = mkIf cfg.enable { - user.packages = with pkgs; [ + home-manager.users.${user}.home.packages = with pkgs; [ nano ]; diff --git a/modules/home/desktop/editors/vscodium.nix b/modules/home/desktop/editors/vscodium.nix index fa96352..3bbc0c2 100644 --- a/modules/home/desktop/editors/vscodium.nix +++ b/modules/home/desktop/editors/vscodium.nix @@ -12,7 +12,7 @@ in in { enable = mkEnableOption "vscodium"; }; config = mkIf cfg.enable { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) vscodium; }; }; diff --git a/modules/home/desktop/editors/zed.nix b/modules/home/desktop/editors/zed.nix index 1d30d11..347c8e8 100644 --- a/modules/home/desktop/editors/zed.nix +++ b/modules/home/desktop/editors/zed.nix @@ -9,11 +9,12 @@ in { in {enable = mkEnableOption "zed";}; config = mkIf cfg.enable { - user.packages = with pkgs; [ + home-manager.users.${user} = { + home.packages = with pkgs; [ zed-editor ]; - home-manager.users.${user}.programs.zed-editor = { + programs.zed-editor = { enable = true; extraPackages = with pkgs; [ nixd nil alejandra ]; @@ -57,5 +58,6 @@ in { }; }; }; + }; }; } diff --git a/modules/home/desktop/games/minecraft.nix b/modules/home/desktop/games/minecraft.nix index 8eab646..2f58e47 100644 --- a/modules/home/desktop/games/minecraft.nix +++ b/modules/home/desktop/games/minecraft.nix @@ -16,7 +16,7 @@ in # environment.systemPackages = [ # pkgs.minecract # ]; - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) modrinth-app prismlauncher; }; }; diff --git a/modules/home/develop/dotnet.nix b/modules/home/develop/dotnet.nix index 5ce6dcc..386d0a0 100644 --- a/modules/home/develop/dotnet.nix +++ b/modules/home/develop/dotnet.nix @@ -11,7 +11,7 @@ in }; config = mkIf config.modules.${user}.develop.dotnet.enable { - user.packages = attrValues { + home-manager.users.${user}.home.packages = attrValues { inherit (pkgs) dotnet-sdk_8; }; }; diff --git a/modules/home/develop/js.nix b/modules/home/develop/js.nix index cb0b81c..80ced1b 100644 --- a/modules/home/develop/js.nix +++ b/modules/home/develop/js.nix @@ -12,7 +12,7 @@ in config = mkMerge [ (mkIf config.modules.${user}.develop.js.enable { - user.packages = with pkgs; [ + home-manager.users.${user}.home.packages = with pkgs; [ bun nodejs nodePackages_latest.typescript-language-server diff --git a/modules/home/develop/rust.nix b/modules/home/develop/rust.nix index 70b2ee8..a194ab6 100644 --- a/modules/home/develop/rust.nix +++ b/modules/home/develop/rust.nix @@ -15,7 +15,7 @@ in # (mkIf config.modules.${user}.develop.rust.enable { # # nixpkgs.overlays = [inputs.rust.overlays.default]; # -# user.packages = attrValues { +# home-manager.users.${user}.home.packages = attrValues { # # rust-package = pkgs.rust-bin.stable.latest.default; # # inherit (pkgs) rust-analyzer rust-script; # }; @@ -27,7 +27,7 @@ in # }) # # (mkIf config.module.${user}s.develop.xdg.enable { -# home = { +# home-manager.users.${user}.home = { # sessionVariables.CARGO_HOME = "$XDG_DATA_HOME/cargo"; # sessionPath = ["$CARGO_HOME/bin"]; # }; diff --git a/modules/home/shell/default.nix b/modules/home/shell/default.nix index a795498..6fc8c56 100644 --- a/modules/home/shell/default.nix +++ b/modules/home/shell/default.nix @@ -33,24 +33,26 @@ in tmux.enable = true; }; - user.packages = attrValues { - inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi; - inherit (pkgs) bat fd zoxide; + home-manager.users.${user} = { + home.packages = attrValues { + inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi; + inherit (pkgs) bat fd zoxide; - rgFull = pkgs.ripgrep.override {withPCRE2 = true;}; - }; - - home-manager.users.${user}.programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - config.whitelist.prefix = ["/home"]; + rgFull = pkgs.ripgrep.override {withPCRE2 = true;}; }; - bat.enable = true; - eza.enable = true; - fzf.enable = true; - zoxide.enable = true; + programs = { + direnv = { + enable = true; + nix-direnv.enable = true; + config.whitelist.prefix = ["/home"]; + }; + + bat.enable = true; + eza.enable = true; + fzf.enable = true; + zoxide.enable = true; + }; }; }) ]; diff --git a/modules/home/shell/toolset/git.nix b/modules/home/shell/toolset/git.nix index 9f70a7a..13ca66e 100644 --- a/modules/home/shell/toolset/git.nix +++ b/modules/home/shell/toolset/git.nix @@ -1,7 +1,7 @@ { config, options, lib, pkgs, user, ... }: let inherit (builtins) readFile; - inherit (lib.attrsets) attrValues optionalAttrs; + inherit (lib.attrsets) attrValues; inherit (lib.modules) mkIf; in { @@ -10,17 +10,15 @@ in in { enable = mkEnableOption "version-control system"; }; config = mkIf config.modules.${user}.shell.toolset.git.enable { - user.packages = attrValues ({ - inherit (pkgs) act dura lazygit; - inherit (pkgs.gitAndTools) gh git-open; - } - // optionalAttrs config.modules.${user}.shell.toolset.gnupg.enable { - inherit (pkgs.gitAndTools) git-crypt; - }); - environment.sessionVariables.GITHUB_TOKEN = "$(cat /run/agenix/tokenGH)"; - home-manager.users.${user}.programs = { + home-manager.users.${user} = { + home.packages = attrValues { + inherit (pkgs) act dura lazygit; + inherit (pkgs.gitAndTools) gh git-open git-crypt; + }; + + programs = { zsh.initExtra = '' # -------===[ Helpful Git Fn's ]===------- # gitignore() { @@ -113,5 +111,6 @@ in }; }; }; + }; }; } diff --git a/modules/home/shell/toolset/starship.nix b/modules/home/shell/toolset/starship.nix index 8907bff..6aa3f19 100644 --- a/modules/home/shell/toolset/starship.nix +++ b/modules/home/shell/toolset/starship.nix @@ -5,7 +5,9 @@ in { options.modules.${user}.shell.toolset.starship = let inherit (lib.options) mkEnableOption; - in { enable = mkEnableOption "minimal shell ricing"; }; + in { + enable = mkEnableOption "minimal shell ricing"; + }; config = mkIf config.modules.${user}.shell.toolset.starship.enable { home-manager.users.${user}.programs.starship = { diff --git a/modules/system/system/audio.nix b/modules/system/system/audio.nix index 4891981..c2dcae7 100644 --- a/modules/system/system/audio.nix +++ b/modules/system/system/audio.nix @@ -14,7 +14,7 @@ in }; config = mkIf cfg.enable { - user.packages = attrValues { + environment.systemPackages = attrValues { inherit (pkgs) easyeffects; };