poz/niksos
poz/niksos
1
3
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

move all home.packages to users.users.${username}.packages

Browse source
This commit is contained in:
jacekpoz 2024-10-02 16:55:18 +02:00
parent 76a2eeda57
commit 1a83ef8613
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8
11 changed files with 462 additions and 472 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosts/chmura/programs.nix
View file

@ -8,8 +8,7 @@
inherit (lib.attrsets) attrValues; inherit (lib.attrsets) attrValues;
in { in {
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
home.packages = attrValues {
inherit (pkgs) inherit (pkgs)
eza eza
ripgrep ripgrep
@ -42,5 +41,4 @@ in {
wireguard-tools wireguard-tools
; ;
}; };
};
} }

4
hosts/common/optional/steam.nix
View file

@ -10,10 +10,8 @@
in { in {
programs.steam.enable = true; programs.steam.enable = true;
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
home.packages = attrValues {
inherit (pkgs.steamPackages) steamcmd; inherit (pkgs.steamPackages) steamcmd;
inherit (pkgs) steam-tui; inherit (pkgs) steam-tui;
}; };
};
} }

4
hosts/del/programs.nix
View file

@ -8,8 +8,7 @@
inherit (lib.attrsets) attrValues; inherit (lib.attrsets) attrValues;
in { in {
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
home.packages = attrValues {
inherit (pkgs) inherit (pkgs)
keepassxc keepassxc
eza eza
@ -123,5 +122,4 @@ in {
perf perf
; ;
}; };
};
} }

4
hosts/hape/programs.nix
View file

@ -8,8 +8,7 @@
inherit (lib.attrsets) attrValues; inherit (lib.attrsets) attrValues;
in { in {
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
home.packages = attrValues {
inherit (pkgs) inherit (pkgs)
keepassxc keepassxc
eza eza
@ -77,5 +76,4 @@ in {
perf perf
; ;
}; };
};
} }

4
hosts/niks/programs.nix
View file

@ -8,8 +8,7 @@
inherit (lib.attrsets) attrValues; inherit (lib.attrsets) attrValues;
in { in {
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
home.packages = attrValues {
inherit (pkgs) inherit (pkgs)
keepassxc keepassxc
eza eza
@ -115,5 +114,4 @@ in {
perf perf
; ;
}; };
};
} }

4
hosts/work/programs.nix
View file

@ -8,8 +8,7 @@
inherit (lib.attrsets) attrValues; inherit (lib.attrsets) attrValues;
in { in {
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
home.packages = attrValues {
inherit (pkgs) inherit (pkgs)
keepassxc keepassxc
eza eza
@ -97,5 +96,4 @@ in {
perf perf
; ;
}; };
};
} }

8
modules/cli/zsh.nix
View file

@ -28,7 +28,11 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.zsh.enable = true; programs.zsh.enable = true;
users.users.${username}.shell = pkgs.zsh; users.users.${username} = {
shell = pkgs.zsh;
# for fzf-tab
packages = [ pkgs.fzf ];
};
environment = { environment = {
shells = [ pkgs.zsh ]; shells = [ pkgs.zsh ];
@ -36,8 +40,6 @@ in {
}; };
home-manager.users.${username} = { home-manager.users.${username} = {
# for fzf-tab
home.packages = [ pkgs.fzf ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
shellAliases = { shellAliases = {

4
modules/gui/gtklock.nix
View file

@ -16,9 +16,9 @@ in {
# https://github.com/NixOS/nixpkgs/issues/158025 # https://github.com/NixOS/nixpkgs/issues/158025
security.pam.services.gtklock.text = "auth include login"; security.pam.services.gtklock.text = "auth include login";
home-manager.users.${username} = { users.users.${username}.packages = [ pkgs.gtklock ];
home.packages = [ pkgs.gtklock ];
home-manager.users.${username} = {
xdg.configFile."gtklock/config.ini".text = '' xdg.configFile."gtklock/config.ini".text = ''
[main] [main]
gtk-theme=${config.poz.themes.gtk.name} gtk-theme=${config.poz.themes.gtk.name}

8
modules/gui/hypr/land.nix
View file

@ -162,10 +162,7 @@ in {
portalPackage = xdg-desktop-portal-hyprland; portalPackage = xdg-desktop-portal-hyprland;
}; };
home-manager.users.${username} = { users.users.${username}.packages = attrValues {
xdg.dataFile = mkIf (cfg.startupSound != null) { "hypr/startup_sound".source = cfg.startupSound; };
home.packages = attrValues {
inherit (pkgs) inherit (pkgs)
cliphist cliphist
wl-clipboard wl-clipboard
@ -179,6 +176,9 @@ in {
; ;
}; };
home-manager.users.${username} = {
xdg.dataFile = mkIf (cfg.startupSound != null) { "hypr/startup_sound".source = cfg.startupSound; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = hyprland; package = hyprland;

4
modules/gui/quickshell/default.nix
View file

@ -37,13 +37,13 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${username} = { users.users.${username}.packages = [
home.packages = [
inputs.quickshell.packages.${pkgs.system}.default inputs.quickshell.packages.${pkgs.system}.default
# for da poz # for da poz
pkgs.qt6.qtsvg pkgs.qt6.qtsvg
]; ];
home-manager.users.${username} = {
xdg.configFile."quickshell/manifest.conf".text = '' xdg.configFile."quickshell/manifest.conf".text = ''
${concatStrings (mapAttrsToList (name: value: '' ${concatStrings (mapAttrsToList (name: value: ''
${name} = ${value} ${name} = ${value}

4
modules/gui/vesktop/default.nix
View file

@ -16,8 +16,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${username} = { users.users.${username}.packages = [
home.packages = [
(pkgs.vesktop.overrideAttrs (old: { (pkgs.vesktop.overrideAttrs (old: {
patches = (old.patches or []) ++ [ ./readonlyFix.patch ]; patches = (old.patches or []) ++ [ ./readonlyFix.patch ];
# thanks aleph :3 # thanks aleph :3
@ -45,6 +44,7 @@ in {
})) }))
]; ];
home-manager.users.${username} = {
xdg.configFile."vesktop/settings.json".text = builtins.toJSON { xdg.configFile."vesktop/settings.json".text = builtins.toJSON {
discordBranch = "ptb"; discordBranch = "ptb";
firstLaunch = false; firstLaunch = false;