diff --git a/home-manager/default.nix b/home-manager/default.nix index 9a9a4fb..5a3416c 100755 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -65,69 +65,91 @@ let in { flake.homeModules = { desktop = { - imports = with modules; [ - brave - firefox - misc-android - misc-desktop - misc-internet - qbittorrent - vscode - ]; + imports = builtins.attrValues { + inherit + (modules) + brave + firefox + misc-android + misc-desktop + misc-internet + qbittorrent + vscode + ; + }; }; entertainment = { - imports = with modules; [ - freetube - misc-entertainment - mpv - steam - ]; + imports = builtins.attrValues { + inherit + (modules) + freetube + misc-entertainment + mpv + steam + ; + }; }; productionArt = { - imports = with modules; [ - misc-productionArt - ]; + imports = builtins.attrValues { + inherit + (modules) + misc-productionArt + ; + }; }; productionAudio = { - imports = with modules; [ - misc-productionAudio - ]; + imports = builtins.attrValues { + inherit + (modules) + misc-productionAudio + ; + }; }; productionVideo = { - imports = with modules; [ - misc-productionVideo - obs-studio - ]; + imports = builtins.attrValues { + inherit + (modules) + misc-productionVideo + obs-studio + ; + }; }; productionWriting = { - imports = with modules; [ - misc-productionWriting - ]; + imports = builtins.attrValues { + inherit + (modules) + misc-productionWriting + ; + }; }; shared = { - imports = with modules; [ - bat - bottom - direnv - git - helix - home-manager - lazygit - misc-commandLine - misc-virtualization - nushell - starship - wezterm - # yazi - zellij - zoxide - ]; + imports = builtins.attrValues { + inherit + (modules) + bat + bottom + direnv + git + helix + home-manager + lazygit + misc-commandLine + misc-virtualization + nushell + starship + wezterm + # yazi + + zellij + zoxide + ; + }; }; }; } diff --git a/home-manager/modules/obs-studio/default.nix b/home-manager/modules/obs-studio/default.nix index 899c5de..646df6f 100755 --- a/home-manager/modules/obs-studio/default.nix +++ b/home-manager/modules/obs-studio/default.nix @@ -2,11 +2,14 @@ programs = { obs-studio = { enable = true; - plugins = with pkgs.obs-studio-plugins; [ - obs-tuna - obs-vkcapture - obs-multi-rtmp - ]; + plugins = builtins.attrValues { + inherit + (pkgs.obs-studio-plugins) + obs-tuna + obs-vkcapture + obs-multi-rtmp + ; + }; }; }; home = { diff --git a/home-manager/modules/vscode.nix b/home-manager/modules/vscode.nix index 3e95033..8d3c85f 100755 --- a/home-manager/modules/vscode.nix +++ b/home-manager/modules/vscode.nix @@ -14,20 +14,20 @@ # when = "textInputFocus"; # } # ]; - extensions = with pkgs.vscode-extensions; [ - eamodio.gitlens - catppuccin.catppuccin-vsc - james-yu.latex-workshop - jnoortheen.nix-ide - kamadorueda.alejandra - mkhl.direnv - pkief.material-icon-theme - streetsidesoftware.code-spell-checker - tamasfe.even-better-toml - esbenp.prettier-vscode - mattn.lisp - haskell.haskell - ]; + extensions = builtins.attrValues { + inherit (pkgs.vscode-extensions.catppuccin) catppuccin-vsc; + inherit (pkgs.vscode-extensions.eamodio) gitlens; + inherit (pkgs.vscode-extensions.esbenp) prettier-vscode; + inherit (pkgs.vscode-extensions.haskell) haskell; + inherit (pkgs.vscode-extensions.james-yu) latex-workshop; + inherit (pkgs.vscode-extensions.jnoortheen) nix-ide; + inherit (pkgs.vscode-extensions.kamadorueda) alejandra; + inherit (pkgs.vscode-extensions.mattn) lisp; + inherit (pkgs.vscode-extensions.mkhl) direnv; + inherit (pkgs.vscode-extensions.pkief) material-icon-theme; + inherit (pkgs.vscode-extensions.streetsidesoftware) code-spell-checker; + inherit (pkgs.vscode-extensions.tamasfe) even-better-toml; + }; userSettings = { "git.confirmSync" = false; "editor.insertSpaces" = false; diff --git a/nixos/default.nix b/nixos/default.nix index 8b7c612..87aa51c 100755 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -58,54 +58,67 @@ let in { flake.nixosModules = { personal = { - imports = with modules; [ - android - audio - bluetooth - corectrl - dconf - disks - firejail - flatpak - fonts - nur - plasma - printing - sddm - steam - sysstat - virtualization - ]; + imports = builtins.attrValues { + inherit + (modules) + android + audio + bluetooth + corectrl + dconf + disks + firejail + flatpak + fonts + nur + plasma + printing + sddm + steam + sysstat + virtualization + ; + }; }; desktop = { - imports = with modules; [ - syncthing - # ollama - ]; + imports = builtins.attrValues { + inherit + (modules) + syncthing + # ollama + + ; + }; }; server = { - imports = with modules; [ - services - ]; + imports = builtins.attrValues { + inherit + (modules) + services + ; + }; }; shared = { - imports = with modules; [ - accounts - doas - environment - gvfs - home-manager - locale - nix - rsyncd - sops - ssh - system - xserver - ]; + imports = builtins.attrValues { + inherit + (modules) + accounts + doas + environment + gvfs + home-manager + locale + nix + rsyncd + sops + ssh + system + xserver + ; + }; }; }; } diff --git a/nixos/modules/android.nix b/nixos/modules/android.nix index 8dc8f99..ad39cb6 100755 --- a/nixos/modules/android.nix +++ b/nixos/modules/android.nix @@ -1,6 +1,9 @@ {pkgs, ...}: { programs.adb.enable = true; - services.udev.packages = with pkgs; [ - android-udev-rules - ]; + services.udev.packages = builtins.attrValues { + inherit + (pkgs) + android-udev-rules + ; + }; } diff --git a/nixos/modules/fonts.nix b/nixos/modules/fonts.nix index 2f27aee..f318963 100755 --- a/nixos/modules/fonts.nix +++ b/nixos/modules/fonts.nix @@ -1,9 +1,12 @@ {pkgs, ...}: { fonts = { fontconfig.defaultFonts.emoji = ["Noto Fonts Color Emoji"]; - packages = with pkgs; [ - noto-fonts-color-emoji - open-dyslexic - ]; + packages = builtins.attrValues { + inherit + (pkgs) + noto-fonts-color-emoji + open-dyslexic + ; + }; }; } diff --git a/nixos/modules/gnome.nix b/nixos/modules/gnome.nix index 134248c..0598a95 100755 --- a/nixos/modules/gnome.nix +++ b/nixos/modules/gnome.nix @@ -14,17 +14,21 @@ games.enable = false; gnome-online-accounts.enable = true; }; - udev.packages = with pkgs; [ - gnome.gnome-settings-daemon - ]; + udev.packages = builtins.attrValues { + inherit + (pkgs.gnome) + gnome-settings-daemon + ; + }; }; environment = { variables = { # WEBKIT_FORCE_SANDBOX = "0"; # WEBKIT_DISABLE_COMPOSITING_MODE = "1"; }; - gnome.excludePackages = - (with pkgs; [ + gnome.excludePackages = builtins.attrValues { + inherit + (pkgs) gnome-photos gnome-tour epiphany # web browser @@ -34,8 +38,9 @@ totem # video player yelp # help viewer gnome-calendar - ]) - ++ (with pkgs.gnome; [ + ; + inherit + (pkgs.gnome) gnome-music tali # poker game iagno # go game @@ -46,6 +51,7 @@ gnome-maps gnome-contacts gnome-characters - ]); + ; + }; }; } diff --git a/nixos/modules/plasma.nix b/nixos/modules/plasma.nix index cb04e82..dc86c87 100755 --- a/nixos/modules/plasma.nix +++ b/nixos/modules/plasma.nix @@ -2,12 +2,15 @@ services = { desktopManager.plasma6.enable = true; }; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ - plasma-browser-integration - konsole - kate - spectacle - kdeconnect-kde - khelpcenter - ]; + environment.plasma6.excludePackages = builtins.attrValues { + inherit + (pkgs.kdePackages) + plasma-browser-integration + konsole + kate + spectacle + kdeconnect-kde + khelpcenter + ; + }; } diff --git a/nixos/modules/services/peertube.nix b/nixos/modules/services/peertube.nix index 77ee99f..04aa1e6 100755 --- a/nixos/modules/services/peertube.nix +++ b/nixos/modules/services/peertube.nix @@ -23,12 +23,15 @@ in { user = service.name; plugins = { enable = true; - plugins = with pkgs; [ - peertube-plugin-livechat - peertube-plugin-matomo - peertube-plugin-transcoding-custom-quality - peertube-theme-dark - ]; + plugins = builtins.attrValues { + inherit + (pkgs) + peertube-plugin-livechat + peertube-plugin-matomo + peertube-plugin-transcoding-custom-quality + peertube-theme-dark + ; + }; }; secrets = { diff --git a/systems/desktop/graphics.nix b/systems/desktop/graphics.nix index 04c4f5c..83a4740 100755 --- a/systems/desktop/graphics.nix +++ b/systems/desktop/graphics.nix @@ -2,13 +2,22 @@ hardware = { graphics = { enable = true; - extraPackages = with pkgs; [ - rocmPackages.clr.icd - amdvlk - ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + extraPackages = builtins.attrValues { + inherit + (pkgs) + amdvlk + ; + inherit + (pkgs.rocmPackages.clr) + icd + ; + }; + extraPackages32 = builtins.attrValues { + inherit + (pkgs.driversi686Linux) + amdvlk + ; + }; }; }; boot.initrd.kernelModules = ["amdgpu"]; diff --git a/systems/laptop/graphics.nix b/systems/laptop/graphics.nix index 04c4f5c..83a4740 100755 --- a/systems/laptop/graphics.nix +++ b/systems/laptop/graphics.nix @@ -2,13 +2,22 @@ hardware = { graphics = { enable = true; - extraPackages = with pkgs; [ - rocmPackages.clr.icd - amdvlk - ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + extraPackages = builtins.attrValues { + inherit + (pkgs) + amdvlk + ; + inherit + (pkgs.rocmPackages.clr) + icd + ; + }; + extraPackages32 = builtins.attrValues { + inherit + (pkgs.driversi686Linux) + amdvlk + ; + }; }; }; boot.initrd.kernelModules = ["amdgpu"]; diff --git a/systems/server/graphics.nix b/systems/server/graphics.nix index 04c4f5c..83a4740 100755 --- a/systems/server/graphics.nix +++ b/systems/server/graphics.nix @@ -2,13 +2,22 @@ hardware = { graphics = { enable = true; - extraPackages = with pkgs; [ - rocmPackages.clr.icd - amdvlk - ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + extraPackages = builtins.attrValues { + inherit + (pkgs) + amdvlk + ; + inherit + (pkgs.rocmPackages.clr) + icd + ; + }; + extraPackages32 = builtins.attrValues { + inherit + (pkgs.driversi686Linux) + amdvlk + ; + }; }; }; boot.initrd.kernelModules = ["amdgpu"];