diff --git a/hosts/chmura/programs.nix b/hosts/chmura/programs.nix index 8e165e4..5c262d2 100644 --- a/hosts/chmura/programs.nix +++ b/hosts/chmura/programs.nix @@ -8,39 +8,37 @@ inherit (lib.attrsets) attrValues; in { - home-manager.users.${username} = { - home.packages = attrValues { - inherit (pkgs) - eza - ripgrep - unzip - trash-cli - dig - xdg-ninja - gnupg - age - fd - asciinema - asciinema-agg - du-dust - file - magic-wormhole - uutils-coreutils - imagemagick - psmisc - jq - fq - progress - parallel - p7zip - xxd - lshw - tree - smartmontools - curl - fastfetch - wireguard-tools - ; - }; + users.users.${username}.packages = attrValues { + inherit (pkgs) + eza + ripgrep + unzip + trash-cli + dig + xdg-ninja + gnupg + age + fd + asciinema + asciinema-agg + du-dust + file + magic-wormhole + uutils-coreutils + imagemagick + psmisc + jq + fq + progress + parallel + p7zip + xxd + lshw + tree + smartmontools + curl + fastfetch + wireguard-tools + ; }; } diff --git a/hosts/common/optional/steam.nix b/hosts/common/optional/steam.nix index 1ca9c99..d328d11 100644 --- a/hosts/common/optional/steam.nix +++ b/hosts/common/optional/steam.nix @@ -10,10 +10,8 @@ in { programs.steam.enable = true; - home-manager.users.${username} = { - home.packages = attrValues { - inherit (pkgs.steamPackages) steamcmd; - inherit (pkgs) steam-tui; - }; + users.users.${username}.packages = attrValues { + inherit (pkgs.steamPackages) steamcmd; + inherit (pkgs) steam-tui; }; } diff --git a/hosts/del/programs.nix b/hosts/del/programs.nix index f84a023..0cf05e3 100644 --- a/hosts/del/programs.nix +++ b/hosts/del/programs.nix @@ -8,120 +8,118 @@ inherit (lib.attrsets) attrValues; in { - home-manager.users.${username} = { - home.packages = attrValues { - inherit (pkgs) - keepassxc - eza - ripgrep - signal-desktop-beta - element-desktop - obs-studio - heroic - ungoogled-chromium - tor-browser-bundle-bin - mullvad-browser - thunderbird - gimp - easyeffects - libreoffice-fresh - prismlauncher - qbittorrent - zellij - caprine-bin - trash-cli - xdg-utils - pamixer - brightnessctl - dig - imv - pcmanfm - xdg-ninja - gnupg - age - rage - fd - udisks - ffmpeg_6-full - yt-dlp - filelight - asciinema - asciinema-agg - du-dust - appimage-run - file - fastfetch - uutils-coreutils - anki - alsa-utils - ezquake - imagemagick - psmisc - mesa-demos - #aseprite-unfree - jq - fq - progress - parallel - p7zip - xxd - mpc-cli - playerctl - xdg-user-dirs - lshw - tree - exiv2 - krita - usbutils - kiwix - inkscape - gomuks - twitch-tui - ytfzf - mat2 - simplex-chat-desktop - libsixel - lsix - qmk - enigma - superTuxKart - solaar - httpie - mangohud - nix-index - heaptrack - magic-wormhole - modemmanager - usb-modeswitch - usb-modeswitch-data - mobile-broadband-provider-info - modem-manager-gui - webcamoid - fswebcam - pciutils - rnote - inxi - pcsc-tools - libnfc - nix-tree - duf - bat - hw-probe - zed-editor - osu-lazer-bin - delta - scrcpy - godot_4 - libnotify - radicle-node - ; - inherit (pkgs.libsForQt5) - kdenlive - ; - inherit (config.boot.kernelPackages) - cpupower - perf - ; - }; + users.users.${username}.packages = attrValues { + inherit (pkgs) + keepassxc + eza + ripgrep + signal-desktop-beta + element-desktop + obs-studio + heroic + ungoogled-chromium + tor-browser-bundle-bin + mullvad-browser + thunderbird + gimp + easyeffects + libreoffice-fresh + prismlauncher + qbittorrent + zellij + caprine-bin + trash-cli + xdg-utils + pamixer + brightnessctl + dig + imv + pcmanfm + xdg-ninja + gnupg + age + rage + fd + udisks + ffmpeg_6-full + yt-dlp + filelight + asciinema + asciinema-agg + du-dust + appimage-run + file + fastfetch + uutils-coreutils + anki + alsa-utils + ezquake + imagemagick + psmisc + mesa-demos + #aseprite-unfree + jq + fq + progress + parallel + p7zip + xxd + mpc-cli + playerctl + xdg-user-dirs + lshw + tree + exiv2 + krita + usbutils + kiwix + inkscape + gomuks + twitch-tui + ytfzf + mat2 + simplex-chat-desktop + libsixel + lsix + qmk + enigma + superTuxKart + solaar + httpie + mangohud + nix-index + heaptrack + magic-wormhole + modemmanager + usb-modeswitch + usb-modeswitch-data + mobile-broadband-provider-info + modem-manager-gui + webcamoid + fswebcam + pciutils + rnote + inxi + pcsc-tools + libnfc + nix-tree + duf + bat + hw-probe + zed-editor + osu-lazer-bin + delta + scrcpy + godot_4 + libnotify + radicle-node + ; + inherit (pkgs.libsForQt5) + kdenlive + ; + inherit (config.boot.kernelPackages) + cpupower + perf + ; }; } diff --git a/hosts/hape/programs.nix b/hosts/hape/programs.nix index 8ece0dc..68959d0 100644 --- a/hosts/hape/programs.nix +++ b/hosts/hape/programs.nix @@ -8,74 +8,72 @@ inherit (lib.attrsets) attrValues; in { - home-manager.users.${username} = { - home.packages = attrValues { - inherit (pkgs) - keepassxc - eza - ripgrep - signal-desktop-beta - element-desktop - obs-studio - heroic - ungoogled-chromium - tor-browser-bundle-bin - mullvad-browser - thunderbird - gimp - easyeffects - libreoffice-fresh - qbittorrent - zellij - unzip - caprine-bin - trash-cli - networkmanagerapplet - xdg-utils - pamixer - brightnessctl - dig - imv - pcmanfm - xdg-ninja - gnupg - age - rage - fd - udisks - ffmpeg_6-full - yt-dlp - filelight - asciinema - asciinema-agg - du-dust - appimage-run - file - fastfetch - magic-wormhole - alsa-utils - imagemagick - psmisc - mesa-demos - jq - fq - progress - parallel - p7zip - xxd - mpc-cli - playerctl - xdg-user-dirs - lshw - tree - exiv2 - libnotify - radicle-node - ; - inherit (config.boot.kernelPackages) - cpupower - perf - ; - }; + users.users.${username}.packages = attrValues { + inherit (pkgs) + keepassxc + eza + ripgrep + signal-desktop-beta + element-desktop + obs-studio + heroic + ungoogled-chromium + tor-browser-bundle-bin + mullvad-browser + thunderbird + gimp + easyeffects + libreoffice-fresh + qbittorrent + zellij + unzip + caprine-bin + trash-cli + networkmanagerapplet + xdg-utils + pamixer + brightnessctl + dig + imv + pcmanfm + xdg-ninja + gnupg + age + rage + fd + udisks + ffmpeg_6-full + yt-dlp + filelight + asciinema + asciinema-agg + du-dust + appimage-run + file + fastfetch + magic-wormhole + alsa-utils + imagemagick + psmisc + mesa-demos + jq + fq + progress + parallel + p7zip + xxd + mpc-cli + playerctl + xdg-user-dirs + lshw + tree + exiv2 + libnotify + radicle-node + ; + inherit (config.boot.kernelPackages) + cpupower + perf + ; }; } diff --git a/hosts/niks/programs.nix b/hosts/niks/programs.nix index 0e80d1f..10c6532 100644 --- a/hosts/niks/programs.nix +++ b/hosts/niks/programs.nix @@ -8,112 +8,110 @@ inherit (lib.attrsets) attrValues; in { - home-manager.users.${username} = { - home.packages = attrValues { - inherit (pkgs) - keepassxc - eza - ripgrep - signal-desktop-beta - element-desktop - obs-studio - heroic - ungoogled-chromium - tor-browser-bundle-bin - mullvad-browser - thunderbird - gimp - easyeffects - libreoffice-fresh - prismlauncher - qbittorrent - zellij - caprine-bin - trash-cli - xdg-utils - pamixer - brightnessctl - dig - imv - pcmanfm - xdg-ninja - gnupg - age - rage - fd - udisks - ffmpeg_6-full - yt-dlp - filelight - asciinema - asciinema-agg - du-dust - appimage-run - file - fastfetch - uutils-coreutils - anki - alsa-utils - ezquake - imagemagick - psmisc - mesa-demos - aseprite-unfree - jq - fq - progress - parallel - p7zip - xxd - mpc-cli - playerctl - xdg-user-dirs - lshw - tree - exiv2 - krita - usbutils - kiwix - inkscape - gomuks - twitch-tui - ytfzf - mat2 - simplex-chat-desktop - libsixel - lsix - qmk - enigma - superTuxKart - solaar - httpie - mangohud - nix-index - heaptrack - magic-wormhole - sherlock - inxi - nix-tree - pciutils - duf - bat - rnote - hw-probe - zed-editor - osu-lazer-bin - delta - scrcpy - godot_4 - libnotify - radicle-node - ; - inherit (pkgs.libsForQt5) - kdenlive - ; - inherit (config.boot.kernelPackages) - cpupower - perf - ; - }; + users.users.${username}.packages = attrValues { + inherit (pkgs) + keepassxc + eza + ripgrep + signal-desktop-beta + element-desktop + obs-studio + heroic + ungoogled-chromium + tor-browser-bundle-bin + mullvad-browser + thunderbird + gimp + easyeffects + libreoffice-fresh + prismlauncher + qbittorrent + zellij + caprine-bin + trash-cli + xdg-utils + pamixer + brightnessctl + dig + imv + pcmanfm + xdg-ninja + gnupg + age + rage + fd + udisks + ffmpeg_6-full + yt-dlp + filelight + asciinema + asciinema-agg + du-dust + appimage-run + file + fastfetch + uutils-coreutils + anki + alsa-utils + ezquake + imagemagick + psmisc + mesa-demos + aseprite-unfree + jq + fq + progress + parallel + p7zip + xxd + mpc-cli + playerctl + xdg-user-dirs + lshw + tree + exiv2 + krita + usbutils + kiwix + inkscape + gomuks + twitch-tui + ytfzf + mat2 + simplex-chat-desktop + libsixel + lsix + qmk + enigma + superTuxKart + solaar + httpie + mangohud + nix-index + heaptrack + magic-wormhole + sherlock + inxi + nix-tree + pciutils + duf + bat + rnote + hw-probe + zed-editor + osu-lazer-bin + delta + scrcpy + godot_4 + libnotify + radicle-node + ; + inherit (pkgs.libsForQt5) + kdenlive + ; + inherit (config.boot.kernelPackages) + cpupower + perf + ; }; } diff --git a/hosts/work/programs.nix b/hosts/work/programs.nix index 4a6903b..b680da3 100644 --- a/hosts/work/programs.nix +++ b/hosts/work/programs.nix @@ -8,94 +8,92 @@ inherit (lib.attrsets) attrValues; in { - home-manager.users.${username} = { - home.packages = attrValues { - inherit (pkgs) - keepassxc - eza - ripgrep - obs-studio - ungoogled-chromium - tor-browser-bundle-bin - mullvad-browser - thunderbird - gimp - helvum - easyeffects - libreoffice-fresh - qbittorrent - zellij - trash-cli - xdg-utils - pamixer - brightnessctl - dig - imv - pcmanfm - xdg-ninja - gnupg - age - rage - fd - udisks - ffmpeg_6-full - yt-dlp - filelight - asciinema - asciinema-agg - du-dust - appimage-run - file - fastfetch - uutils-coreutils - alsa-utils - imagemagick - psmisc - mesa-demos - jq - fq - progress - parallel - p7zip - xxd - playerctl - xdg-user-dirs - lshw - tree - exiv2 - usbutils - ytfzf - mat2 - libsixel - lsix - qmk - httpie - mangohud - nix-index - heaptrack - magic-wormhole - webcamoid - fswebcam - pciutils - inxi - pcsc-tools - libnfc - nix-tree - duf - bat - hw-probe - delta - scrcpy - teams-for-linux - openconnect - vpn-slice - sshfs - libnotify - ; - inherit (config.boot.kernelPackages) - cpupower - perf - ; - }; + users.users.${username}.packages = attrValues { + inherit (pkgs) + keepassxc + eza + ripgrep + obs-studio + ungoogled-chromium + tor-browser-bundle-bin + mullvad-browser + thunderbird + gimp + helvum + easyeffects + libreoffice-fresh + qbittorrent + zellij + trash-cli + xdg-utils + pamixer + brightnessctl + dig + imv + pcmanfm + xdg-ninja + gnupg + age + rage + fd + udisks + ffmpeg_6-full + yt-dlp + filelight + asciinema + asciinema-agg + du-dust + appimage-run + file + fastfetch + uutils-coreutils + alsa-utils + imagemagick + psmisc + mesa-demos + jq + fq + progress + parallel + p7zip + xxd + playerctl + xdg-user-dirs + lshw + tree + exiv2 + usbutils + ytfzf + mat2 + libsixel + lsix + qmk + httpie + mangohud + nix-index + heaptrack + magic-wormhole + webcamoid + fswebcam + pciutils + inxi + pcsc-tools + libnfc + nix-tree + duf + bat + hw-probe + delta + scrcpy + teams-for-linux + openconnect + vpn-slice + sshfs + libnotify + ; + inherit (config.boot.kernelPackages) + cpupower + perf + ; }; } diff --git a/modules/cli/zsh.nix b/modules/cli/zsh.nix index f1eabe3..7a6ef8b 100644 --- a/modules/cli/zsh.nix +++ b/modules/cli/zsh.nix @@ -28,7 +28,11 @@ in { config = mkIf cfg.enable { programs.zsh.enable = true; - users.users.${username}.shell = pkgs.zsh; + users.users.${username} = { + shell = pkgs.zsh; + # for fzf-tab + packages = [ pkgs.fzf ]; + }; environment = { shells = [ pkgs.zsh ]; @@ -36,8 +40,6 @@ in { }; home-manager.users.${username} = { - # for fzf-tab - home.packages = [ pkgs.fzf ]; programs.zsh = { enable = true; shellAliases = { diff --git a/modules/gui/gtklock.nix b/modules/gui/gtklock.nix index eee8b82..4651ee2 100644 --- a/modules/gui/gtklock.nix +++ b/modules/gui/gtklock.nix @@ -16,9 +16,9 @@ in { # https://github.com/NixOS/nixpkgs/issues/158025 security.pam.services.gtklock.text = "auth include login"; - home-manager.users.${username} = { - home.packages = [ pkgs.gtklock ]; + users.users.${username}.packages = [ pkgs.gtklock ]; + home-manager.users.${username} = { xdg.configFile."gtklock/config.ini".text = '' [main] gtk-theme=${config.poz.themes.gtk.name} diff --git a/modules/gui/hypr/land.nix b/modules/gui/hypr/land.nix index 5834d60..9affcf1 100644 --- a/modules/gui/hypr/land.nix +++ b/modules/gui/hypr/land.nix @@ -162,23 +162,23 @@ in { 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} = { 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 = { enable = true; package = hyprland; diff --git a/modules/gui/quickshell/default.nix b/modules/gui/quickshell/default.nix index ff9b055..1037b82 100644 --- a/modules/gui/quickshell/default.nix +++ b/modules/gui/quickshell/default.nix @@ -37,13 +37,13 @@ in { }; config = mkIf cfg.enable { - home-manager.users.${username} = { - home.packages = [ - inputs.quickshell.packages.${pkgs.system}.default - # for da poz - pkgs.qt6.qtsvg - ]; + users.users.${username}.packages = [ + inputs.quickshell.packages.${pkgs.system}.default + # for da poz + pkgs.qt6.qtsvg + ]; + home-manager.users.${username} = { xdg.configFile."quickshell/manifest.conf".text = '' ${concatStrings (mapAttrsToList (name: value: '' ${name} = ${value} diff --git a/modules/gui/vesktop/default.nix b/modules/gui/vesktop/default.nix index f027463..cf1286a 100644 --- a/modules/gui/vesktop/default.nix +++ b/modules/gui/vesktop/default.nix @@ -16,35 +16,35 @@ in { }; config = mkIf cfg.enable { - home-manager.users.${username} = { - home.packages = [ - (pkgs.vesktop.overrideAttrs (old: { - patches = (old.patches or []) ++ [ ./readonlyFix.patch ]; - # thanks aleph :3 - # https://github.com/AlephNought0/Faery/blob/main/modules/home/programs/graphical/vesktop/patchedvesktop.patch - postFixup = concatStrings [ - old.postFixup - '' - wrapProgram $out/bin/vesktop \ - --add-flags "--ozone-platform=wayland \ - --enable-zero-copy \ - --use-gl=angle \ - --use-vulkan \ - --enable-oop-rasterization \ - --enable-raw-draw \ - --enable-gpu-rasterization \ - --enable-gpu-compositing \ - --enable-native-gpu-memory-buffers \ - --enable-accelerated-2d-canvas \ - --enable-accelerated-video-decode \ - --enable-accelerated-mjpeg-decode \ - --disable-gpu-vsync \ - --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport" - '' - ]; - })) - ]; + users.users.${username}.packages = [ + (pkgs.vesktop.overrideAttrs (old: { + patches = (old.patches or []) ++ [ ./readonlyFix.patch ]; + # thanks aleph :3 + # https://github.com/AlephNought0/Faery/blob/main/modules/home/programs/graphical/vesktop/patchedvesktop.patch + postFixup = concatStrings [ + old.postFixup + '' + wrapProgram $out/bin/vesktop \ + --add-flags "--ozone-platform=wayland \ + --enable-zero-copy \ + --use-gl=angle \ + --use-vulkan \ + --enable-oop-rasterization \ + --enable-raw-draw \ + --enable-gpu-rasterization \ + --enable-gpu-compositing \ + --enable-native-gpu-memory-buffers \ + --enable-accelerated-2d-canvas \ + --enable-accelerated-video-decode \ + --enable-accelerated-mjpeg-decode \ + --disable-gpu-vsync \ + --enable-features=Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,PlatformHEVCDecoderSupport" + '' + ]; + })) + ]; + home-manager.users.${username} = { xdg.configFile."vesktop/settings.json".text = builtins.toJSON { discordBranch = "ptb"; firstLaunch = false;