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

66
hosts/chmura/programs.nix
View file

@ -8,39 +8,37 @@
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 unzip
unzip trash-cli
trash-cli dig
dig xdg-ninja
xdg-ninja gnupg
gnupg age
age fd
fd asciinema
asciinema asciinema-agg
asciinema-agg du-dust
du-dust file
file magic-wormhole
magic-wormhole uutils-coreutils
uutils-coreutils imagemagick
imagemagick psmisc
psmisc jq
jq fq
fq progress
progress parallel
parallel p7zip
p7zip xxd
xxd lshw
lshw tree
tree smartmontools
smartmontools curl
curl fastfetch
fastfetch wireguard-tools
wireguard-tools ;
;
};
}; };
} }

8
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;
};
}; };
} }

228
hosts/del/programs.nix
View file

@ -8,120 +8,118 @@
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 ripgrep
ripgrep signal-desktop-beta
signal-desktop-beta element-desktop
element-desktop obs-studio
obs-studio heroic
heroic ungoogled-chromium
ungoogled-chromium tor-browser-bundle-bin
tor-browser-bundle-bin mullvad-browser
mullvad-browser thunderbird
thunderbird gimp
gimp easyeffects
easyeffects libreoffice-fresh
libreoffice-fresh prismlauncher
prismlauncher qbittorrent
qbittorrent zellij
zellij caprine-bin
caprine-bin trash-cli
trash-cli xdg-utils
xdg-utils pamixer
pamixer brightnessctl
brightnessctl dig
dig imv
imv pcmanfm
pcmanfm xdg-ninja
xdg-ninja gnupg
gnupg age
age rage
rage fd
fd udisks
udisks ffmpeg_6-full
ffmpeg_6-full yt-dlp
yt-dlp filelight
filelight asciinema
asciinema asciinema-agg
asciinema-agg du-dust
du-dust appimage-run
appimage-run file
file fastfetch
fastfetch uutils-coreutils
uutils-coreutils anki
anki alsa-utils
alsa-utils ezquake
ezquake imagemagick
imagemagick psmisc
psmisc mesa-demos
mesa-demos #aseprite-unfree
#aseprite-unfree jq
jq fq
fq progress
progress parallel
parallel p7zip
p7zip xxd
xxd mpc-cli
mpc-cli playerctl
playerctl xdg-user-dirs
xdg-user-dirs lshw
lshw tree
tree exiv2
exiv2 krita
krita usbutils
usbutils kiwix
kiwix inkscape
inkscape gomuks
gomuks twitch-tui
twitch-tui ytfzf
ytfzf mat2
mat2 simplex-chat-desktop
simplex-chat-desktop libsixel
libsixel lsix
lsix qmk
qmk enigma
enigma superTuxKart
superTuxKart solaar
solaar httpie
httpie mangohud
mangohud nix-index
nix-index heaptrack
heaptrack magic-wormhole
magic-wormhole modemmanager
modemmanager usb-modeswitch
usb-modeswitch usb-modeswitch-data
usb-modeswitch-data mobile-broadband-provider-info
mobile-broadband-provider-info modem-manager-gui
modem-manager-gui webcamoid
webcamoid fswebcam
fswebcam pciutils
pciutils rnote
rnote inxi
inxi pcsc-tools
pcsc-tools libnfc
libnfc nix-tree
nix-tree duf
duf bat
bat hw-probe
hw-probe zed-editor
zed-editor osu-lazer-bin
osu-lazer-bin delta
delta scrcpy
scrcpy godot_4
godot_4 libnotify
libnotify radicle-node
radicle-node ;
; inherit (pkgs.libsForQt5)
inherit (pkgs.libsForQt5) kdenlive
kdenlive ;
; inherit (config.boot.kernelPackages)
inherit (config.boot.kernelPackages) cpupower
cpupower perf
perf ;
;
};
}; };
} }

136
hosts/hape/programs.nix
View file

@ -8,74 +8,72 @@
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 ripgrep
ripgrep signal-desktop-beta
signal-desktop-beta element-desktop
element-desktop obs-studio
obs-studio heroic
heroic ungoogled-chromium
ungoogled-chromium tor-browser-bundle-bin
tor-browser-bundle-bin mullvad-browser
mullvad-browser thunderbird
thunderbird gimp
gimp easyeffects
easyeffects libreoffice-fresh
libreoffice-fresh qbittorrent
qbittorrent zellij
zellij unzip
unzip caprine-bin
caprine-bin trash-cli
trash-cli networkmanagerapplet
networkmanagerapplet xdg-utils
xdg-utils pamixer
pamixer brightnessctl
brightnessctl dig
dig imv
imv pcmanfm
pcmanfm xdg-ninja
xdg-ninja gnupg
gnupg age
age rage
rage fd
fd udisks
udisks ffmpeg_6-full
ffmpeg_6-full yt-dlp
yt-dlp filelight
filelight asciinema
asciinema asciinema-agg
asciinema-agg du-dust
du-dust appimage-run
appimage-run file
file fastfetch
fastfetch magic-wormhole
magic-wormhole alsa-utils
alsa-utils imagemagick
imagemagick psmisc
psmisc mesa-demos
mesa-demos jq
jq fq
fq progress
progress parallel
parallel p7zip
p7zip xxd
xxd mpc-cli
mpc-cli playerctl
playerctl xdg-user-dirs
xdg-user-dirs lshw
lshw tree
tree exiv2
exiv2 libnotify
libnotify radicle-node
radicle-node ;
; inherit (config.boot.kernelPackages)
inherit (config.boot.kernelPackages) cpupower
cpupower perf
perf ;
;
};
}; };
} }

212
hosts/niks/programs.nix
View file

@ -8,112 +8,110 @@
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 ripgrep
ripgrep signal-desktop-beta
signal-desktop-beta element-desktop
element-desktop obs-studio
obs-studio heroic
heroic ungoogled-chromium
ungoogled-chromium tor-browser-bundle-bin
tor-browser-bundle-bin mullvad-browser
mullvad-browser thunderbird
thunderbird gimp
gimp easyeffects
easyeffects libreoffice-fresh
libreoffice-fresh prismlauncher
prismlauncher qbittorrent
qbittorrent zellij
zellij caprine-bin
caprine-bin trash-cli
trash-cli xdg-utils
xdg-utils pamixer
pamixer brightnessctl
brightnessctl dig
dig imv
imv pcmanfm
pcmanfm xdg-ninja
xdg-ninja gnupg
gnupg age
age rage
rage fd
fd udisks
udisks ffmpeg_6-full
ffmpeg_6-full yt-dlp
yt-dlp filelight
filelight asciinema
asciinema asciinema-agg
asciinema-agg du-dust
du-dust appimage-run
appimage-run file
file fastfetch
fastfetch uutils-coreutils
uutils-coreutils anki
anki alsa-utils
alsa-utils ezquake
ezquake imagemagick
imagemagick psmisc
psmisc mesa-demos
mesa-demos aseprite-unfree
aseprite-unfree jq
jq fq
fq progress
progress parallel
parallel p7zip
p7zip xxd
xxd mpc-cli
mpc-cli playerctl
playerctl xdg-user-dirs
xdg-user-dirs lshw
lshw tree
tree exiv2
exiv2 krita
krita usbutils
usbutils kiwix
kiwix inkscape
inkscape gomuks
gomuks twitch-tui
twitch-tui ytfzf
ytfzf mat2
mat2 simplex-chat-desktop
simplex-chat-desktop libsixel
libsixel lsix
lsix qmk
qmk enigma
enigma superTuxKart
superTuxKart solaar
solaar httpie
httpie mangohud
mangohud nix-index
nix-index heaptrack
heaptrack magic-wormhole
magic-wormhole sherlock
sherlock inxi
inxi nix-tree
nix-tree pciutils
pciutils duf
duf bat
bat rnote
rnote hw-probe
hw-probe zed-editor
zed-editor osu-lazer-bin
osu-lazer-bin delta
delta scrcpy
scrcpy godot_4
godot_4 libnotify
libnotify radicle-node
radicle-node ;
; inherit (pkgs.libsForQt5)
inherit (pkgs.libsForQt5) kdenlive
kdenlive ;
; inherit (config.boot.kernelPackages)
inherit (config.boot.kernelPackages) cpupower
cpupower perf
perf ;
;
};
}; };
} }

176
hosts/work/programs.nix
View file

@ -8,94 +8,92 @@
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 ripgrep
ripgrep obs-studio
obs-studio ungoogled-chromium
ungoogled-chromium tor-browser-bundle-bin
tor-browser-bundle-bin mullvad-browser
mullvad-browser thunderbird
thunderbird gimp
gimp helvum
helvum easyeffects
easyeffects libreoffice-fresh
libreoffice-fresh qbittorrent
qbittorrent zellij
zellij trash-cli
trash-cli xdg-utils
xdg-utils pamixer
pamixer brightnessctl
brightnessctl dig
dig imv
imv pcmanfm
pcmanfm xdg-ninja
xdg-ninja gnupg
gnupg age
age rage
rage fd
fd udisks
udisks ffmpeg_6-full
ffmpeg_6-full yt-dlp
yt-dlp filelight
filelight asciinema
asciinema asciinema-agg
asciinema-agg du-dust
du-dust appimage-run
appimage-run file
file fastfetch
fastfetch uutils-coreutils
uutils-coreutils alsa-utils
alsa-utils imagemagick
imagemagick psmisc
psmisc mesa-demos
mesa-demos jq
jq fq
fq progress
progress parallel
parallel p7zip
p7zip xxd
xxd playerctl
playerctl xdg-user-dirs
xdg-user-dirs lshw
lshw tree
tree exiv2
exiv2 usbutils
usbutils ytfzf
ytfzf mat2
mat2 libsixel
libsixel lsix
lsix qmk
qmk httpie
httpie mangohud
mangohud nix-index
nix-index heaptrack
heaptrack magic-wormhole
magic-wormhole webcamoid
webcamoid fswebcam
fswebcam pciutils
pciutils inxi
inxi pcsc-tools
pcsc-tools libnfc
libnfc nix-tree
nix-tree duf
duf bat
bat hw-probe
hw-probe delta
delta scrcpy
scrcpy teams-for-linux
teams-for-linux openconnect
openconnect vpn-slice
vpn-slice sshfs
sshfs libnotify
libnotify ;
; inherit (config.boot.kernelPackages)
inherit (config.boot.kernelPackages) cpupower
cpupower 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}

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

@ -162,23 +162,23 @@ in {
portalPackage = xdg-desktop-portal-hyprland; portalPackage = xdg-desktop-portal-hyprland;
}; };
users.users.${username}.packages = attrValues {
inherit (pkgs)
cliphist
wl-clipboard
hyprpicker
ydotool
wev
;
inherit (inputs.hyprcontrib.packages.${pkgs.system})
hyprprop
grimblast
;
};
home-manager.users.${username} = { home-manager.users.${username} = {
xdg.dataFile = mkIf (cfg.startupSound != null) { "hypr/startup_sound".source = cfg.startupSound; }; xdg.dataFile = mkIf (cfg.startupSound != null) { "hypr/startup_sound".source = cfg.startupSound; };
home.packages = attrValues {
inherit (pkgs)
cliphist
wl-clipboard
hyprpicker
ydotool
wev
;
inherit (inputs.hyprcontrib.packages.${pkgs.system})
hyprprop
grimblast
;
};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = hyprland; package = hyprland;

12
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}

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

@ -16,35 +16,35 @@ 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 # https://github.com/AlephNought0/Faery/blob/main/modules/home/programs/graphical/vesktop/patchedvesktop.patch
# https://github.com/AlephNought0/Faery/blob/main/modules/home/programs/graphical/vesktop/patchedvesktop.patch postFixup = concatStrings [
postFixup = concatStrings [ old.postFixup
old.postFixup ''
'' wrapProgram $out/bin/vesktop \
wrapProgram $out/bin/vesktop \ --add-flags "--ozone-platform=wayland \
--add-flags "--ozone-platform=wayland \ --enable-zero-copy \
--enable-zero-copy \ --use-gl=angle \
--use-gl=angle \ --use-vulkan \
--use-vulkan \ --enable-oop-rasterization \
--enable-oop-rasterization \ --enable-raw-draw \
--enable-raw-draw \ --enable-gpu-rasterization \
--enable-gpu-rasterization \ --enable-gpu-compositing \
--enable-gpu-compositing \ --enable-native-gpu-memory-buffers \
--enable-native-gpu-memory-buffers \ --enable-accelerated-2d-canvas \
--enable-accelerated-2d-canvas \ --enable-accelerated-video-decode \
--enable-accelerated-video-decode \ --enable-accelerated-mjpeg-decode \
--enable-accelerated-mjpeg-decode \ --disable-gpu-vsync \
--disable-gpu-vsync \ --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport"
--enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport" ''
'' ];
]; }))
})) ];
];
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;