chris/sneeuwvlok
chris/sneeuwvlok
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix package imports

Browse source
This commit is contained in:
Chris Kruining 2025-03-19 07:48:50 +01:00
parent 65e0b4932e
commit 635b33eb97
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
21 changed files with 60 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home/desktop/applications/communication.nix
View file

@ -14,7 +14,7 @@ in
config = mkIf cfg.enable config = mkIf cfg.enable
{ {
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) vesktop teamspeak_client; inherit (pkgs) vesktop teamspeak_client;
}; };
}; };

12
modules/home/desktop/applications/email.nix
View file

@ -14,15 +14,16 @@ in
config = mkIf cfg.enable config = mkIf cfg.enable
{ {
# user.packages = attrValues {
# inherit (pkgs) thunderbird;
# };
programs.thunderbird = { programs.thunderbird = {
enable = true; enable = true;
}; };
home-manager.users.${user}.accounts.email.accounts = { home-manager.users.${user} = {
home.packages = attrValues {
inherit (pkgs) thunderbird;
};
accounts.email.accounts = {
kruining = { kruining = {
primary = true; primary = true;
address = "chris@kruinin.eu"; address = "chris@kruinin.eu";
@ -48,4 +49,5 @@ in
}; };
}; };
}; };
};
} }

2
modules/home/desktop/applications/office.nix
View file

@ -14,7 +14,7 @@ in
config = mkIf cfg.enable config = mkIf cfg.enable
{ {
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) onlyoffice-bin; inherit (pkgs) onlyoffice-bin;
}; };

2
modules/home/desktop/applications/passwords.nix
View file

@ -14,7 +14,7 @@ in
config = mkIf cfg.enable config = mkIf cfg.enable
{ {
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) bitwarden-desktop; inherit (pkgs) bitwarden-desktop;
}; };
}; };

2
modules/home/desktop/applications/recording.nix
View file

@ -26,7 +26,7 @@ in
security.polkit.enable = true; security.polkit.enable = true;
user.packages = with pkgs; [ home-manager.users.${user}.home.packages = with pkgs; [
obs-studio obs-studio
obs-studio-plugins.wlrobs obs-studio-plugins.wlrobs
obs-studio-plugins.obs-backgroundremoval obs-studio-plugins.obs-backgroundremoval

2
modules/home/desktop/browsers/chrome.nix
View file

@ -16,7 +16,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = with pkgs; [ home-manager.users.${user}.home.packages = with pkgs; [
(ungoogled-chromium.override { (ungoogled-chromium.override {
commandLineArgs = [ commandLineArgs = [
"--enable-features=AcceleratedVideoEncoder" "--enable-features=AcceleratedVideoEncoder"

4
modules/home/desktop/browsers/firefox.nix
View file

@ -33,7 +33,7 @@ in {
}) })
(mkIf cfg.enable { (mkIf cfg.enable {
user.packages = let home-manager.users.${user}.home.packages = let
inherit (pkgs) makeDesktopItem; inherit (pkgs) makeDesktopItem;
inherit (inputs.firefox.packages.${pkgs.system}) firefox-nightly-bin; inherit (inputs.firefox.packages.${pkgs.system}) firefox-nightly-bin;
in [ in [
@ -223,7 +223,7 @@ in {
}) })
(mkIf cfg.privacy.enable { (mkIf cfg.privacy.enable {
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) librewolf; inherit (pkgs) librewolf;
}; };
}) })

2
modules/home/desktop/browsers/zen.nix
View file

@ -32,7 +32,7 @@ in {
}) })
(mkIf cfg.enable { (mkIf cfg.enable {
user.packages = let home-manager.users.${user}.home.packages = let
inherit (pkgs) makeDesktopItem; inherit (pkgs) makeDesktopItem;
inherit (inputs.zen.packages.${pkgs.system}.specific) zen; inherit (inputs.zen.packages.${pkgs.system}.specific) zen;
in [ in [

2
modules/home/desktop/editors/default.nix
View file

@ -30,7 +30,7 @@ in {
}) })
(mkIf (cfg.default == "nvim") { (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) imagemagick editorconfig-core-c sqlite deno pandoc nuspell;
inherit (pkgs.hunspellDicts) en_GB nl_NL; inherit (pkgs.hunspellDicts) en_GB nl_NL;
}; };

4
modules/home/desktop/editors/kate.nix
View file

@ -8,7 +8,9 @@ in
{ {
options.modules.${user}.desktop.editors.kate = let options.modules.${user}.desktop.editors.kate = let
inherit (lib.options) mkEnableOption; inherit (lib.options) mkEnableOption;
in { enable = mkEnableOption "kate"; }; in {
enable = mkEnableOption "kate";
};
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${user}.programs.kate.enable = true; home-manager.users.${user}.programs.kate.enable = true;

2
modules/home/desktop/editors/nano.nix
View file

@ -11,7 +11,7 @@ in
in { enable = mkEnableOption "nano"; }; in { enable = mkEnableOption "nano"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = with pkgs; [ home-manager.users.${user}.home.packages = with pkgs; [
nano nano
]; ];

2
modules/home/desktop/editors/vscodium.nix
View file

@ -12,7 +12,7 @@ in
in { enable = mkEnableOption "vscodium"; }; in { enable = mkEnableOption "vscodium"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) vscodium; inherit (pkgs) vscodium;
}; };
}; };

6
modules/home/desktop/editors/zed.nix
View file

@ -9,11 +9,12 @@ in {
in {enable = mkEnableOption "zed";}; in {enable = mkEnableOption "zed";};
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = with pkgs; [ home-manager.users.${user} = {
home.packages = with pkgs; [
zed-editor zed-editor
]; ];
home-manager.users.${user}.programs.zed-editor = { programs.zed-editor = {
enable = true; enable = true;
extraPackages = with pkgs; [ nixd nil alejandra ]; extraPackages = with pkgs; [ nixd nil alejandra ];
@ -58,4 +59,5 @@ in {
}; };
}; };
}; };
};
} }

2
modules/home/desktop/games/minecraft.nix
View file

@ -16,7 +16,7 @@ in
# environment.systemPackages = [ # environment.systemPackages = [
# pkgs.minecract # pkgs.minecract
# ]; # ];
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) modrinth-app prismlauncher; inherit (pkgs) modrinth-app prismlauncher;
}; };
}; };

2
modules/home/develop/dotnet.nix
View file

@ -11,7 +11,7 @@ in
}; };
config = mkIf config.modules.${user}.develop.dotnet.enable { config = mkIf config.modules.${user}.develop.dotnet.enable {
user.packages = attrValues { home-manager.users.${user}.home.packages = attrValues {
inherit (pkgs) dotnet-sdk_8; inherit (pkgs) dotnet-sdk_8;
}; };
}; };

2
modules/home/develop/js.nix
View file

@ -12,7 +12,7 @@ in
config = mkMerge [ config = mkMerge [
(mkIf config.modules.${user}.develop.js.enable { (mkIf config.modules.${user}.develop.js.enable {
user.packages = with pkgs; [ home-manager.users.${user}.home.packages = with pkgs; [
bun bun
nodejs nodejs
nodePackages_latest.typescript-language-server nodePackages_latest.typescript-language-server

4
modules/home/develop/rust.nix
View file

@ -15,7 +15,7 @@ in
# (mkIf config.modules.${user}.develop.rust.enable { # (mkIf config.modules.${user}.develop.rust.enable {
# # nixpkgs.overlays = [inputs.rust.overlays.default]; # # nixpkgs.overlays = [inputs.rust.overlays.default];
# #
# user.packages = attrValues { # home-manager.users.${user}.home.packages = attrValues {
# # rust-package = pkgs.rust-bin.stable.latest.default; # # rust-package = pkgs.rust-bin.stable.latest.default;
# # inherit (pkgs) rust-analyzer rust-script; # # inherit (pkgs) rust-analyzer rust-script;
# }; # };
@ -27,7 +27,7 @@ in
# }) # })
# #
# (mkIf config.module.${user}s.develop.xdg.enable { # (mkIf config.module.${user}s.develop.xdg.enable {
# home = { # home-manager.users.${user}.home = {
# sessionVariables.CARGO_HOME = "$XDG_DATA_HOME/cargo"; # sessionVariables.CARGO_HOME = "$XDG_DATA_HOME/cargo";
# sessionPath = ["$CARGO_HOME/bin"]; # sessionPath = ["$CARGO_HOME/bin"];
# }; # };

6
modules/home/shell/default.nix
View file

@ -33,14 +33,15 @@ in
tmux.enable = true; tmux.enable = true;
}; };
user.packages = attrValues { home-manager.users.${user} = {
home.packages = attrValues {
inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi; inherit (pkgs) any-nix-shell pwgen yt-dlp ripdrag yazi;
inherit (pkgs) bat fd zoxide; inherit (pkgs) bat fd zoxide;
rgFull = pkgs.ripgrep.override {withPCRE2 = true;}; rgFull = pkgs.ripgrep.override {withPCRE2 = true;};
}; };
home-manager.users.${user}.programs = { programs = {
direnv = { direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
@ -52,6 +53,7 @@ in
fzf.enable = true; fzf.enable = true;
zoxide.enable = true; zoxide.enable = true;
}; };
};
}) })
]; ];
} }

19
modules/home/shell/toolset/git.nix
View file

@ -1,7 +1,7 @@
{ config, options, lib, pkgs, user, ... }: { config, options, lib, pkgs, user, ... }:
let let
inherit (builtins) readFile; inherit (builtins) readFile;
inherit (lib.attrsets) attrValues optionalAttrs; inherit (lib.attrsets) attrValues;
inherit (lib.modules) mkIf; inherit (lib.modules) mkIf;
in in
{ {
@ -10,17 +10,15 @@ in
in { enable = mkEnableOption "version-control system"; }; in { enable = mkEnableOption "version-control system"; };
config = mkIf config.modules.${user}.shell.toolset.git.enable { 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)"; 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 = '' zsh.initExtra = ''
# -------===[ Helpful Git Fn's ]===------- # # -------===[ Helpful Git Fn's ]===------- #
gitignore() { gitignore() {
@ -114,4 +112,5 @@ in
}; };
}; };
}; };
};
} }

4
modules/home/shell/toolset/starship.nix
View file

@ -5,7 +5,9 @@ in
{ {
options.modules.${user}.shell.toolset.starship = let options.modules.${user}.shell.toolset.starship = let
inherit (lib.options) mkEnableOption; 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 { config = mkIf config.modules.${user}.shell.toolset.starship.enable {
home-manager.users.${user}.programs.starship = { home-manager.users.${user}.programs.starship = {

2
modules/system/system/audio.nix
View file

@ -14,7 +14,7 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
user.packages = attrValues { environment.systemPackages = attrValues {
inherit (pkgs) easyeffects; inherit (pkgs) easyeffects;
}; };