From 93b0ccf178cf89377f4e82c4bdc56a429e110d87 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Wed, 15 Feb 2023 10:41:52 +0100 Subject: [PATCH] Remove with antipatter and aggregate google-chrome override --- baldur/configuration.nix | 3 +- baldur/hm.nix | 2 +- custom/default.nix | 14 +++--- flake.nix | 3 ++ freya/configuration.nix | 49 +----------------- freya/hm.nix | 16 ++---- hm_modules/__basic.nix | 22 ++------ hm_modules/biblio.nix | 4 +- hm_modules/blender.nix | 2 +- hm_modules/blender_nvidia.nix | 2 +- hm_modules/bottom.nix | 2 +- hm_modules/bspwm.nix | 2 +- hm_modules/development/cpp.nix | 16 +++--- hm_modules/development/data.nix | 17 +++---- hm_modules/development/docker.nix | 9 ++-- hm_modules/development/go.nix | 5 +- hm_modules/development/javascript.nix | 13 +++-- hm_modules/development/kubernetes.nix | 5 +- hm_modules/development/latex.nix | 17 +++---- hm_modules/development/nix.nix | 10 ++-- hm_modules/development/pycharm.nix | 8 +-- hm_modules/development/python.nix | 20 +++----- hm_modules/development/rust.nix | 50 +++++++------------ hm_modules/dunst.nix | 5 +- hm_modules/fonts.nix | 15 +++--- hm_modules/git.nix | 3 +- hm_modules/helix.nix | 8 +-- hm_modules/kakoune.nix | 60 +++++++++++----------- hm_modules/kicad.nix | 2 +- hm_modules/nautilus.nix | 2 +- hm_modules/office.nix | 12 ++--- hm_modules/polybar.nix | 10 ++-- hm_modules/pro_audio.nix | 49 +++++++----------- hm_modules/research.nix | 11 ++-- hm_modules/rofi.nix | 11 ++-- hm_modules/security.nix | 28 +++++------ hm_modules/sxhkd.nix | 15 +++--- hm_modules/terminator.nix | 2 +- hm_modules/zsh.nix | 3 +- loki/configuration.nix | 13 ++--- nixos_modules/big_data.nix | 2 +- nixos_modules/pentablet.nix | 2 +- odin/common_configuration.nix | 25 ++++------ odin/hm.nix | 69 +++++++------------------ thor/configuration.nix | 6 +-- thor/hm.nix | 72 +++++++-------------------- 46 files changed, 264 insertions(+), 452 deletions(-) diff --git a/baldur/configuration.nix b/baldur/configuration.nix index 2b682b7..64086ee 100644 --- a/baldur/configuration.nix +++ b/baldur/configuration.nix @@ -20,7 +20,8 @@ with lib; { environment = { pathsToLink = [ "/share/zsh" ]; - systemPackages = with pkgs; [ helix kitty tmux vim ]; + systemPackages = + builtins.attrValues { inherit (pkgs) helix kitty tmux vim; }; }; i18n.defaultLocale = "it_IT.UTF-8"; diff --git a/baldur/hm.nix b/baldur/hm.nix index 9b53210..2d8400d 100644 --- a/baldur/hm.nix +++ b/baldur/hm.nix @@ -5,7 +5,7 @@ layout = "it"; options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; }; - packages = with pkgs; [ nix-prefetch-scripts ]; + packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; }; }; imports = [ ../hm_modules/__basic.nix diff --git a/custom/default.nix b/custom/default.nix index 25def88..dfa695e 100644 --- a/custom/default.nix +++ b/custom/default.nix @@ -1,11 +1,11 @@ { pkgs ? import { inherit system; }, system ? builtins.currentSystem }: let - self = with pkgs; { - clipedit = callPackage ./clipedit { }; - cocktail-bar-cli = callPackage ./cocktail-bar-cli { }; - lockscreen = callPackage ./lockscreen { }; - sddm-theme-clairvoyance = callPackage ./sddm-theme-clairvoyance { }; - update-background = callPackage ./update-background { }; - vital-synth = callPackage ./vital-synth { }; + self = { + clipedit = pkgs.callPackage ./clipedit { }; + cocktail-bar-cli = pkgs.callPackage ./cocktail-bar-cli { }; + lockscreen = pkgs.callPackage ./lockscreen { }; + sddm-theme-clairvoyance = pkgs.callPackage ./sddm-theme-clairvoyance { }; + update-background = pkgs.callPackage ./update-background { }; + vital-synth = pkgs.callPackage ./vital-synth { }; }; in self diff --git a/flake.nix b/flake.nix index 13c95f0..f510bc2 100644 --- a/flake.nix +++ b/flake.nix @@ -87,6 +87,9 @@ self.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/comfy_waves.jpg; }; + google-chrome = self.google-chrome.override { + commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; + }; }) ]; diff --git a/freya/configuration.nix b/freya/configuration.nix index 87c9e92..cd97163 100644 --- a/freya/configuration.nix +++ b/freya/configuration.nix @@ -15,7 +15,7 @@ with lib; { environment = { pathsToLink = [ "/share/zsh" ]; - systemPackages = with pkgs; [ kakoune tmux vim ]; + systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; }; }; i18n.defaultLocale = "it_IT.UTF-8"; @@ -59,7 +59,7 @@ with lib; { }; # bazarr = { enable = true; openFirewall = true; group = "users"; }; # blueman.enable = true; - dbus.packages = with pkgs; [ dconf ]; + dbus.packages = [ pkgs.dconf ]; # fail2ban = { enable = true; bantime-increment.enable = true; }; gnome.gnome-keyring.enable = true; # gvfs = { enable = true; package = mkForce pkgs.gnome3.gvfs; }; @@ -235,51 +235,6 @@ with lib; { # }; # }; - # systemd.packages = with pkgs; [ syncthing ]; - # systemd.services = - # let - # common = { - # documentation = [ "man:syncthing(1)" ]; - # startLimitIntervalSec = 60; - # startLimitBurst = 4; - # after = [ "network.target" ]; - # environment = { STNORESTART = "yes"; STNOUPGRADE = "yes"; }; - # wantedBy = [ "default.target" ]; - # serviceConfig = { - # Restart = "on-failure"; - # RestartSec = 1; - # SuccessExitStatus = "3 4"; - # RestartForceExitStatus = "3 4"; - - # Group = config.ids.gids.users; - # MemoryDenyWriteExecute = true; - # NoNewPrivileges = true; - # PrivateDevices = true; - # PrivateMounts = true; - # PrivateTmp = true; - # PrivateUsers = true; - # ProtectControlGroups = true; - # ProtectHostname = true; - # ProtectKernelModules = true; - # ProtectKernelTunables = true; - # RestrictNamespaces = true; - # RestrictRealtime = true; - # RestrictSUIDSGID = true; - # CapabilityBoundingSet = [ "~CAP_SYS_PTRACE" "~CAP_SYS_ADMIN" "~CAP_SETGID" "~CAP_SETUID" "~CAP_SETPCAP" "~CAP_SYS_TIME" "~CAP_KILL" ]; - # }; - # }; - # in - # { - # syncthing-bertof = recursiveUpdate common { - # description = "Syncthing service bertof"; - # serviceConfig = { User = "bertof"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8384 -home=/mnt/raid0/bertof/Syncthing/.config"; }; - # }; - # syncthing-tiziano = recursiveUpdate common { - # description = "Syncthing service tiziano"; - # serviceConfig = { User = "tiziano"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -gui-address=0.0.0.0:8385 -home=/mnt/raid0/tiziano/Syncthing/.config"; }; - # }; - # }; - security.sudo.extraConfig = '' Defaults pwfeedback ''; diff --git a/freya/hm.nix b/freya/hm.nix index bb03061..6de1636 100644 --- a/freya/hm.nix +++ b/freya/hm.nix @@ -24,22 +24,16 @@ layout = "it"; options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ]; }; - packages = with pkgs; [ - file - htop - neofetch - nix-prefetch-scripts - ripgrep - wget - xclip - yq - ]; + packages = builtins.attrValues { + inherit (pkgs) + file htop neofetch nix-prefetch-scripts ripgrep wget xclip yq; + }; }; imports = [ ../hm_modules/__basic.nix ../hm_modules/configurations.nix - ../hm_modules/fonts.nix + # ../hm_modules/fonts.nix ../hm_modules/bash.nix ../hm_modules/bat.nix ../hm_modules/bottom.nix diff --git a/hm_modules/__basic.nix b/hm_modules/__basic.nix index b6a0a42..399a5b5 100644 --- a/hm_modules/__basic.nix +++ b/hm_modules/__basic.nix @@ -1,23 +1,11 @@ { pkgs, ... }: { home = { language.base = "it_IT.UTF-8"; - packages = with pkgs; [ - fd - file - htop - lf - mmv-go - neofetch - nixos-option - pv - ripgrep - unrar - unzip - wget - xclip - yq - zip - ]; + packages = builtins.attrValues { + inherit (pkgs) + fd file htop lf mmv-go neofetch nixos-option pv ripgrep unrar unzip wget + xclip yq zip; + }; }; imports = [ diff --git a/hm_modules/biblio.nix b/hm_modules/biblio.nix index 3fb1372..b63fb6e 100644 --- a/hm_modules/biblio.nix +++ b/hm_modules/biblio.nix @@ -1 +1,3 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ calibre mangal ]; } +{ pkgs, ... }: { + home.packages = builtins.attrValues { inherit (pkgs) calibre mangal; }; +} diff --git a/hm_modules/blender.nix b/hm_modules/blender.nix index 28da2b6..10ed55d 100644 --- a/hm_modules/blender.nix +++ b/hm_modules/blender.nix @@ -1 +1 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ blender ]; } +{ pkgs, ... }: { home.packages = [ pkgs.blender ]; } diff --git a/hm_modules/blender_nvidia.nix b/hm_modules/blender_nvidia.nix index a789632..2511389 100644 --- a/hm_modules/blender_nvidia.nix +++ b/hm_modules/blender_nvidia.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - home.packages = with pkgs; [ (blender.override { cudaSupport = true; }) ]; + home.packages = [ (pkgs.blender.override { cudaSupport = true; }) ]; } diff --git a/hm_modules/bottom.nix b/hm_modules/bottom.nix index f44a88a..d5a2b97 100644 --- a/hm_modules/bottom.nix +++ b/hm_modules/bottom.nix @@ -1,7 +1,7 @@ { pkgs, ... }: let tomlGenerate = (pkgs.formats.toml { }).generate "bottom-toml"; in { - home.packages = with pkgs; [ bottom ]; + home.packages = [ pkgs.bottom ]; xdg.configFile."bottom/bottom.toml".source = tomlGenerate { "flags" = { "left_legend" = true; diff --git a/hm_modules/bspwm.nix b/hm_modules/bspwm.nix index a663cc8..6eda653 100644 --- a/hm_modules/bspwm.nix +++ b/hm_modules/bspwm.nix @@ -43,5 +43,5 @@ in { network-manager-applet.enable = true; blueman-applet.enable = true; }; - home.packages = with pkgs; [ blueman ]; + home.packages = [ pkgs.blueman ]; } diff --git a/hm_modules/development/cpp.nix b/hm_modules/development/cpp.nix index be6d580..35be769 100644 --- a/hm_modules/development/cpp.nix +++ b/hm_modules/development/cpp.nix @@ -1,12 +1,8 @@ { pkgs, config, lib, ... }: { - home.packages = with pkgs; - [ - - ] ++ lib.optionals config.programs.helix.enable [ - clang-tools # C, CPP - cmake-language-server # CMAKE - ] ++ lib.optionals config.programs.kakoune.enable [ - clang-tools # C, CPP - cmake-language-server # CMAKE - ]; + home.packages = + lib.optionals config.programs.helix.enable builtins.attrValues { + inherit (pkgs) clang-tools cmake-language-server; + } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues { + inherit (pkgs) clang-tools cmake-language-server; + }; } diff --git a/hm_modules/development/data.nix b/hm_modules/development/data.nix index 5e96fda..929f90f 100644 --- a/hm_modules/development/data.nix +++ b/hm_modules/development/data.nix @@ -1,11 +1,10 @@ { config, pkgs, lib, ... }: { - home.packages = with pkgs; - lib.optionals config.programs.helix.enable [ - nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS - yaml-language-server # YAML - taplo-cli # TOML - ] ++ lib.optionals config.programs.kakoune.enable [ - nodePackages.vscode-langservers-extracted # CSS, HTML, JSON, SCSS - yaml-language-server # YAML - ]; + home.packages = + lib.optionals config.programs.helix.enable builtins.attrValues { + inherit (pkgs) yaml-language-server taplo-cli; + inherit (pkgs.nodePackages) vscode-langservers-extracted; + } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues { + inherit (pkgs) yaml-language-server; + inherit (pkgs.nodePackages) vscode-langservers-extracted; + }; } diff --git a/hm_modules/development/docker.nix b/hm_modules/development/docker.nix index bcdf8de..61c3143 100644 --- a/hm_modules/development/docker.nix +++ b/hm_modules/development/docker.nix @@ -1,8 +1,9 @@ { pkgs, config, lib, ... }: { - home.packages = with pkgs; - [ docker-compose docker-machine ] - ++ lib.optionals config.programs.helix.enable - [ nodePackages.dockerfile-language-server-nodejs ]; + home.packages = + builtins.attrValues { inherit (pkgs) docker-compose docker-machine; } + ++ lib.optionals config.programs.helix.enable builtins.attrValues { + inherit (pkgs.nodePackages) dockerfile-language-server-nodejs; + }; home.shellAliases = { "dkcd" = "docker-compose down"; "dkc" = "docker-compose"; diff --git a/hm_modules/development/go.nix b/hm_modules/development/go.nix index 6d3d47b..d99d767 100644 --- a/hm_modules/development/go.nix +++ b/hm_modules/development/go.nix @@ -4,7 +4,6 @@ goPath = ".go"; }; - home.packages = with pkgs; - lib.optionals config.programs.helix.enable [ gopls ] - ++ (lib.optionals config.programs.kakoune.enable [ gopls ]); + home.packages = lib.optionals config.programs.helix.enable [ pkgs.gopls ] + ++ (lib.optionals config.programs.kakoune.enable [ pkgs.gopls ]); } diff --git a/hm_modules/development/javascript.nix b/hm_modules/development/javascript.nix index 5c87769..cc31aa4 100644 --- a/hm_modules/development/javascript.nix +++ b/hm_modules/development/javascript.nix @@ -1,11 +1,10 @@ { pkgs, lib, config, ... }: { - home.packages = with pkgs; - [ - - ] ++ lib.optionals config.programs.helix.enable - [ nodePackages.typescript-language-server ] - ++ lib.optionals config.programs.kakoune.enable - [ nodePackages.typescript-language-server ]; + home.packages = + lib.optionals config.programs.helix.enable builtins.attrValues { + inherit (pkgs.nodePackages) typescript-language-server; + } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues { + inherit (pkgs.nodePackages) typescript-language-server; + }; programs.neovim.withNodeJs = true; } diff --git a/hm_modules/development/kubernetes.nix b/hm_modules/development/kubernetes.nix index 9f33e5a..f3bcf89 100644 --- a/hm_modules/development/kubernetes.nix +++ b/hm_modules/development/kubernetes.nix @@ -1 +1,4 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ kubectl kubernetes-helm lens ]; } +{ pkgs, ... }: { + home.packages = + builtins.attrValues { inherit (pkgs) kubectl kubernetes-helm lens; }; +} diff --git a/hm_modules/development/latex.nix b/hm_modules/development/latex.nix index d31c6f6..783a85c 100644 --- a/hm_modules/development/latex.nix +++ b/hm_modules/development/latex.nix @@ -1,13 +1,8 @@ { pkgs, config, lib, ... }: { - home.packages = with pkgs; - [ bibtool texlive.combined.scheme-medium ] - ++ lib.optionals config.programs.helix.enable [ texlab ] - ++ lib.optionals config.programs.kakoune.enable [ - texlab - aspell - aspellDicts.en - aspellDicts.en-computers - aspellDicts.en-science - aspellDicts.it - ]; + home.packages = [ pkgs.bibtool pkgs.texlive.combined.scheme-medium ] + ++ lib.optionals config.programs.helix.enable [ pkgs.texlab ] + ++ lib.optionals config.programs.kakoune.enable (builtins.attrValues { + inherit (pkgs) texlab aspell; + inherit (pkgs.aspellDicts) en en-computers en-science it; + }); } diff --git a/hm_modules/development/nix.nix b/hm_modules/development/nix.nix index 4d44e3f..c3f6b7e 100644 --- a/hm_modules/development/nix.nix +++ b/hm_modules/development/nix.nix @@ -1,7 +1,7 @@ { pkgs, config, lib, ... }: { - home.packages = with pkgs; - [ nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree ] - ++ lib.optionals config.programs.helix.enable [ nil ] - ++ lib.optionals config.programs.kakoune.enable [ rnix-lsp ]; - programs.neovim.plugins = with pkgs.vimPlugins; [ vim-nix ]; + home.packages = builtins.attrValues { + inherit (pkgs) nixpkgs-fmt nixfmt nix-prefetch-scripts nix-review nix-tree; + } ++ lib.optionals config.programs.helix.enable [ pkgs.nil ] + ++ lib.optionals config.programs.kakoune.enable [ pkgs.rnix-lsp ]; + programs.neovim.plugins = [ pkgs.vimPlugins.vim-nix ]; } diff --git a/hm_modules/development/pycharm.nix b/hm_modules/development/pycharm.nix index 04d201c..d28e580 100644 --- a/hm_modules/development/pycharm.nix +++ b/hm_modules/development/pycharm.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - jetbrains.pycharm-professional - python3 + home.packages = { + inherit (pkgs) python3; + inherit (pkgs.jetbrains) pycharm-professional; # pypy3 - ]; + }; } diff --git a/hm_modules/development/python.nix b/hm_modules/development/python.nix index b898cd3..1715ab6 100644 --- a/hm_modules/development/python.nix +++ b/hm_modules/development/python.nix @@ -1,17 +1,9 @@ { pkgs, lib, config, ... }: { - home.packages = with pkgs; - [ black ] ++ lib.optionals config.programs.helix.enable [ - python3Packages.python-lsp-server # PYLSP - # python3Packages.pyls-mypy # MYPY # NOT UPDATED - python3Packages.pyls-flake8 # FLAKE8 - # python3Packages.pyls-black # BLACK # NOT UPDATED - python3Packages.pyls-isort # ISORT - ] ++ lib.optionals config.programs.kakoune.enable [ - python3Packages.python-lsp-server # PYLSP - # python3Packages.pyls-mypy # MYPY # NOT UPDATED - python3Packages.pyls-flake8 # FLAKE8 - # python3Packages.pyls-black # BLACK # NOT UPDATED - python3Packages.pyls-isort # ISORT - ]; + home.packages = [ pkgs.black ] + ++ lib.optionals config.programs.helix.enable builtins.attrValues { + inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort; + } ++ lib.optionals config.programs.kakoune.enable builtins.attrValues { + inherit (pkgs.python3Packages) python-lsp-server pyls-flake8 pyls-isort; + }; programs.neovim.withPython3 = true; } diff --git a/hm_modules/development/rust.nix b/hm_modules/development/rust.nix index 4212aeb..146367f 100644 --- a/hm_modules/development/rust.nix +++ b/hm_modules/development/rust.nix @@ -1,35 +1,19 @@ { pkgs, lib, config, ... }: { - home.packages = with pkgs; - [ - bacon - cargo - # cargo-about - cargo-audit - # cargo-auditable - cargo-criterion - cargo-deadlinks - # cargo-deny - # cargo-deps - cargo-expand - # cargo-feature - cargo-flamegraph - cargo-fuzz - cargo-hack - cargo-hakari - cargo-inspect - cargo-modules - cargo-outdated - cargo-profiler - cargo-release - cargo-show-asm - cargo-spellcheck - cargo-tarpaulin - cargo-udeps - cargo-watch - cargo-workspaces - clippy - rustc - rustfmt - ] ++ lib.optionals config.programs.helix.enable [ lldb rust-analyzer ] - ++ lib.optionals config.programs.kakoune.enable [ rust-analyzer ]; + home.packages = builtins.attrValues { + inherit (pkgs) + bacon cargo cargo-audit cargo-criterion cargo-deadlinks cargo-expand + cargo-flamegraph cargo-fuzz cargo-hack cargo-hakari cargo-inspect + cargo-modules cargo-outdated cargo-profiler cargo-release cargo-show-asm + cargo-spellcheck cargo-tarpaulin cargo-udeps cargo-watch cargo-workspaces + clippy rustc rustfmt; + # cargo-about + # cargo-auditable + # cargo-deny + # cargo-deps + # cargo-feature + + } ++ lib.optionals config.programs.helix.enable + (builtins.attrValues { inherit (pkgs) lldb rust-analyzer; }) + ++ lib.optionals config.programs.kakoune.enable + (builtins.attrValues { inherit (pkgs) rust-analyzer; }); } diff --git a/hm_modules/dunst.nix b/hm_modules/dunst.nix index d7e0a07..a90744f 100644 --- a/hm_modules/dunst.nix +++ b/hm_modules/dunst.nix @@ -2,7 +2,10 @@ with pkgs.lib.nix-rice; let strPalette = palette.toRGBHex pkgs.rice.colorPalette; in { - home.packages = with pkgs; [ dunst rice.font.normal.package ]; + home.packages = builtins.attrValues { + inherit (pkgs) dunst; + inherit (pkgs.rice.font.normal) package; + }; services.dunst = { enable = true; iconTheme = { diff --git a/hm_modules/fonts.nix b/hm_modules/fonts.nix index 1bc7f8d..497be0b 100644 --- a/hm_modules/fonts.nix +++ b/hm_modules/fonts.nix @@ -1,12 +1,9 @@ { pkgs, ... }: { fonts.fontconfig = { enable = true; }; - home.packages = with pkgs; [ - dejavu_fonts - noto-fonts - noto-fonts-extra - noto-fonts-cjk-sans - font-awesome - corefonts # Microsoft fonts - vistafonts - ]; + home.packages = builtins.attrValues { + inherit (pkgs) + dejavu_fonts noto-fonts noto-fonts-extra noto-fonts-cjk-sans font-awesome + corefonts # Microsoft fonts + vistafonts; + }; } diff --git a/hm_modules/git.nix b/hm_modules/git.nix index d394173..3281f7c 100644 --- a/hm_modules/git.nix +++ b/hm_modules/git.nix @@ -118,5 +118,6 @@ in { }; programs.bash.shellAliases = shellAliases; programs.zsh.shellAliases = shellAliases; - home.packages = with pkgs; [ gh git-secret glab meld ]; + home.packages = + builtins.attrValues { inherit (pkgs) gh git-secret glab meld; }; } diff --git a/hm_modules/helix.nix b/hm_modules/helix.nix index da16628..13cb1f1 100644 --- a/hm_modules/helix.nix +++ b/hm_modules/helix.nix @@ -33,10 +33,10 @@ in { EDITOR = "hx"; VISUAL = "hx"; }; - home.packages = with pkgs; [ - nil # Nix language server - desktopItem - ]; + home.packages = builtins.attrValues { + inherit (pkgs) nil; # Nix language server + inherit desktopItem; + }; programs.helix = { enable = true; package = pkgs.unstable_pkgs.helix; diff --git a/hm_modules/kakoune.nix b/hm_modules/kakoune.nix index b50f192..e82244c 100644 --- a/hm_modules/kakoune.nix +++ b/hm_modules/kakoune.nix @@ -30,36 +30,36 @@ let set-face global BufferPadding default,default ''; - packages = with pkgs; [ - editorconfig-core-c - - (pkgs.makeDesktopItem { - name = "Kakoune"; - exec = "kak %F"; - icon = "kakoune"; - desktopName = "Kakoune"; - comment = "Kakoune text editor"; - terminal = true; - categories = [ "Development" ]; - mimeTypes = [ - "text/english" - "text/plain" - "text/x-makefile" - "text/x-c++hdr" - "text/x-c++src" - "text/x-chdr" - "text/x-csrc" - "text/x-java" - "text/x-moc" - "text/x-pascal" - "text/x-tcl" - "text/x-tex" - "application/x-shellscript" - "text/x-c" - "text/x-c++" - ]; - }) - ]; + desktopItem = pkgs.makeDesktopItem { + name = "Kakoune"; + exec = "kak %F"; + icon = "kakoune"; + desktopName = "Kakoune"; + comment = "Kakoune text editor"; + terminal = true; + categories = [ "Development" ]; + mimeTypes = [ + "text/english" + "text/plain" + "text/x-makefile" + "text/x-c++hdr" + "text/x-c++src" + "text/x-chdr" + "text/x-csrc" + "text/x-java" + "text/x-moc" + "text/x-pascal" + "text/x-tcl" + "text/x-tex" + "application/x-shellscript" + "text/x-c" + "text/x-c++" + ]; + }; + packages = builtins.attrValues { + inherit (pkgs) editorconfig-core-c; + inherit desktopItem; + }; in { programs.bash.shellAliases = { k = "kak"; }; diff --git a/hm_modules/kicad.nix b/hm_modules/kicad.nix index 2b8a37f..4f5d3b5 100644 --- a/hm_modules/kicad.nix +++ b/hm_modules/kicad.nix @@ -1 +1 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ kicad ]; } +{ pkgs, ... }: { home.packages = [ pkgs.kicad ]; } diff --git a/hm_modules/nautilus.nix b/hm_modules/nautilus.nix index 0b9b7b6..5b2197b 100644 --- a/hm_modules/nautilus.nix +++ b/hm_modules/nautilus.nix @@ -1 +1 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ gnome.nautilus ]; } +{ pkgs, ... }: { home.packages = [ pkgs.gnome.nautilus ]; } diff --git a/hm_modules/office.nix b/hm_modules/office.nix index 96271d9..49b5824 100644 --- a/hm_modules/office.nix +++ b/hm_modules/office.nix @@ -1,10 +1,6 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - libreoffice-fresh - # onlyoffice-bin - hunspellDicts.en_GB-large - hunspellDicts.en_US-large - hunspellDicts.it_IT - hunspell.bin - ]; + home.packages = builtins.attrValues { + inherit (pkgs) hunspell libreoffice-fresh; + inherit (pkgs.hunspellDicts) en_GB-large en_US-large it_IT; + }; } diff --git a/hm_modules/polybar.nix b/hm_modules/polybar.nix index df909cb..66152ab 100644 --- a/hm_modules/polybar.nix +++ b/hm_modules/polybar.nix @@ -110,15 +110,13 @@ let ramp = [ "▂" "▃" "▄" "▅" "▆" "▇" ]; in { - home.packages = with pkgs; [ - pkgs.rice.font.monospace.package + home.packages = builtins.attrValues { + inherit (pkgs) noto-fonts material-design-icons noto-fonts-cjk-sans; # emojione # noto-fonts-emoji - noto-fonts - material-design-icons # font-awesome - noto-fonts-cjk-sans - ]; + inherit (pkgs.rice.font.monospace) package; + }; services.polybar = { enable = true; package = pkgs.polybarFull; diff --git a/hm_modules/pro_audio.nix b/hm_modules/pro_audio.nix index c1e0b5d..da6116b 100644 --- a/hm_modules/pro_audio.nix +++ b/hm_modules/pro_audio.nix @@ -14,38 +14,25 @@ let VST3_PATH = "$HOME/.vst3:${userLibFolder}/vst3:${systemLibFolder}/vst3"; }; in { - home.packages = with pkgs; [ - carla - rnnoise - ardour - # zrythm - breeze-icons - mixxx + home.packages = builtins.attrValues { + inherit (pkgs) + carla rnnoise ardour + # zrythm + breeze-icons mixxx - # Plugins - artyFX - autotalent - boops - cardinal - geonkick - # helm - lsp-plugins - # noise-repellent - samplv1 - # speech-denoiser - # stochas - # sunvox - surge - giada - surge-XT - talentedhack - # tunefish - vocproc - x42-plugins - zita-at1 - zynaddsubfx - zyn-fusion - ]; + # Plugins + artyFX autotalent boops cardinal geonkick + # helm + lsp-plugins + # noise-repellent + samplv1 + # speech-denoiser + # stochas + # sunvox + surge giada surge-XT talentedhack + # tunefish + vocproc x42-plugins zita-at1 zynaddsubfx zyn-fusion; + }; home.sessionVariables = variables; } diff --git a/hm_modules/research.nix b/hm_modules/research.nix index d4a421b..5f83e63 100644 --- a/hm_modules/research.nix +++ b/hm_modules/research.nix @@ -1,7 +1,8 @@ { pkgs, ... }: { - home.packages = with pkgs; - [ - # unstable.mendeley # Reference manager - unstable_pkgs.obsidian # Note manager - ]; + home.packages = builtins.attrValues { + inherit (pkgs.unstable_pkgs) + # mendeley # Reference manager + obsidian # Note manager + ; + }; } diff --git a/hm_modules/rofi.nix b/hm_modules/rofi.nix index 258d368..e15a482 100644 --- a/hm_modules/rofi.nix +++ b/hm_modules/rofi.nix @@ -1,11 +1,8 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - rofimoji - rofi-bluetooth - rofi-power-menu - rofi-vpn - ]; + home.packages = builtins.attrValues { + inherit (pkgs) rofimoji rofi-bluetooth rofi-power-menu rofi-vpn; + }; programs.rofi = { enable = true; @@ -13,7 +10,7 @@ font = "${pkgs.rice.font.monospace.name} ${ toString pkgs.rice.font.monospace.size }"; - plugins = with pkgs; [ rofi-calc ]; + plugins = [ pkgs.rofi-calc ]; extraConfig = { modi = "drun,run,ssh,window,calc"; }; terminal = "kitty"; theme = "onedark"; diff --git a/hm_modules/security.nix b/hm_modules/security.nix index 29a62bc..032b502 100644 --- a/hm_modules/security.nix +++ b/hm_modules/security.nix @@ -1,20 +1,18 @@ { pkgs, ... }: { - home.packages = with pkgs; [ - # RECOGNITION - nmap + home.packages = builtins.attrValues { + inherit (pkgs) + nmap # RECOGNITION - # WEB - # altair - # burpsuite - httpie + # WEB + httpie + # altair + # burpsuite - # REVERSING - bintools - ghidra-bin - radare2 - # cutter + bintools ghidra-bin radare2 # REVERSING + # cutter - # INFRASTRUCTURE - # cocktail-bar-cli - ]; + # INFRASTRUCTURE + # cocktail-bar-cli + ; + }; } diff --git a/hm_modules/sxhkd.nix b/hm_modules/sxhkd.nix index 4f784f7..cad0bbc 100644 --- a/hm_modules/sxhkd.nix +++ b/hm_modules/sxhkd.nix @@ -3,14 +3,11 @@ # ./nautilus.nix # ./thunar.nix ]; - home.packages = with pkgs; [ - gnome.gnome-screenshot - lockscreen - terminator - bsp-layout - bc # required by bsp-layout - clipedit - ]; + home.packages = builtins.attrValues { + inherit (pkgs) + # bc + bsp-layout clipedit lockscreen terminator; # required by bsp-layout + }; services.sxhkd = let primaryTerminal = "kitty"; secondaryTerminal = "terminator"; @@ -41,7 +38,7 @@ enable = true; keybindings = { "alt + Tab" = "rofi -show window"; - "Print" = "gnome-screenshot"; + "Print" = "${pkgs.gnome.gnome-screenshot}/bin/gnome-screenshot"; "super + alt + {h,j,k,l}" = "bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}"; "super + alt + m" = "lockscreen"; diff --git a/hm_modules/terminator.nix b/hm_modules/terminator.nix index 1d1a413..b565bfc 100644 --- a/hm_modules/terminator.nix +++ b/hm_modules/terminator.nix @@ -27,7 +27,7 @@ let bright.white ]; in { - home.packages = with pkgs; [ terminator ]; + home.packages = [ pkgs.terminator ]; xdg.configFile."terminator/config".text = with strPalette; '' [global_config] diff --git a/hm_modules/zsh.nix b/hm_modules/zsh.nix index f67d0de..51aabfa 100644 --- a/hm_modules/zsh.nix +++ b/hm_modules/zsh.nix @@ -1,5 +1,6 @@ { pkgs, ... }: { - home.packages = with pkgs; [ nix-zsh-completions zsh-completions ]; + home.packages = + builtins.attrValues { inherit (pkgs) nix-zsh-completions zsh-completions; }; programs.zsh = { enable = true; diff --git a/loki/configuration.nix b/loki/configuration.nix index 1a4732a..dd90753 100644 --- a/loki/configuration.nix +++ b/loki/configuration.nix @@ -16,7 +16,7 @@ with lib; { environment = { pathsToLink = [ "/share/zsh" ]; - systemPackages = with pkgs; [ kakoune tmux vim ]; + systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; }; }; hardware = { @@ -33,12 +33,9 @@ with lib; { opengl = { enable = true; - extraPackages = with pkgs; [ - intel-media-driver - libvdpau-va-gl - vaapiIntel - vaapiVdpau - ]; + extraPackages = builtins.attrValues { + inherit (pkgs) intel-media-driver libvdpau-va-gl vaapiIntel vaapiVdpau; + }; }; bluetooth.enable = true; @@ -89,7 +86,7 @@ with lib; { group = "users"; }; blueman.enable = true; - dbus.packages = with pkgs; [ dconf ]; + dbus.packages = [ pkgs.dconf ]; fail2ban = { enable = true; bantime-increment.enable = true; diff --git a/nixos_modules/big_data.nix b/nixos_modules/big_data.nix index 7e3ca5f..0b03f69 100644 --- a/nixos_modules/big_data.nix +++ b/nixos_modules/big_data.nix @@ -297,7 +297,7 @@ in { users.users.bertof.extraGroups = [ "hadoop" ]; systemd.services.spark-history = { - path = with pkgs; [ procps openssh nettools ]; + path = builtins.attrValues { inherit (pkgs) procps openssh nettools; }; description = "spark history service."; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos_modules/pentablet.nix b/nixos_modules/pentablet.nix index bd735cf..04a5790 100644 --- a/nixos_modules/pentablet.nix +++ b/nixos_modules/pentablet.nix @@ -6,7 +6,7 @@ ''; # XP-Pen tablet driver - environment.systemPackages = with pkgs; [ xp-pen-deco-01-v2-driver ]; + environment.systemPackages = [ pkgs.xp-pen-deco-01-v2-driver ]; # hardware.opentabletdriver = { # enable = true; diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index a4cfc01..0aa8ee9 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -17,12 +17,9 @@ with lib; { enable = true; driSupport = true; driSupport32Bit = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; + extraPackages = builtins.attrValues { + inherit (pkgs) intel-media-driver vaapiIntel vaapiVdpau libvdpau-va-gl; + }; }; # Use same ACPI identifier as Dell Ubuntu @@ -77,11 +74,10 @@ with lib; { # Enable CUPS to print documents. services.printing = { enable = true; - drivers = with pkgs; - [ - gutenprint - # cups-kyocera - ]; + drivers = [ + pkgs.gutenprint + # pkgs.cups-kyocera + ]; }; services.keybase.enable = true; @@ -133,7 +129,8 @@ with lib; { # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ tmux helix vim git ntfs3g ]; + environment.systemPackages = + builtins.attrValues { inherit (pkgs) tmux helix vim git ntfs3g; }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -195,7 +192,7 @@ with lib; { }; services.dbus = { - packages = with pkgs; [ dconf ]; + packages = [ pkgs.dconf ]; implementation = "broker"; }; services.gnome.gnome-keyring.enable = true; @@ -267,7 +264,7 @@ with lib; { nixpkgs.config = { allowUnfree = true; packageOverrides = pkgs: { - steam = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ icu ]; }; + steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; }; }; }; diff --git a/odin/hm.nix b/odin/hm.nix index 08dfc08..ec0ae78 100644 --- a/odin/hm.nix +++ b/odin/hm.nix @@ -6,68 +6,35 @@ variant = ",,colemak"; options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; }; - packages = with pkgs; [ - arandr - authy - bitwarden - cava - discord - dmenu - droidcam - easyeffects + packages = builtins.attrValues { + inherit (pkgs) # element-desktop # matrix client - evince # evolution # freecad - gallery-dl - gnome.eog - gnome.file-roller - # gnome.geary - # gnome.gnome-boxes - # gnome.gnome-calendar - gnome.gnome-font-viewer - gnome.gnome-screenshot - # gnome.gnome-sound-recorder - gnome.gnome-system-monitor - # gnome.seahorse - gnome.totem - # (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; }) - gucharmap - handbrake - httpie - inkscape - jetbrains.datagrip - krita # lutris - meld # minecraft # mycrypto - openvpn - p7zip - pavucontrol # pcmanfm - pentablet-driver - postman - procps # pulseaudio - pulseaudio # retroarchFull - shotwell # signal-desktop - skypeforlinux # slack - spotify - tdesktop - teams - thunderbird - transmission-gtk - virt-manager - virt-viewer # wineFull - wireguard-tools - xournalpp - zoom-us - ]; + arandr authy bitwarden cava discord dmenu droidcam easyeffects evince + gallery-dl krita meld openvpn p7zip pavucontrol pentablet-driver postman + procps pulseaudio shotwell skypeforlinux spotify tdesktop teams + thunderbird transmission-gtk virt-manager virt-viewer wireguard-tools + xournalpp zoom-us gucharmap handbrake httpie inkscape; + inherit (pkgs.gnome) + # geary + # gnome-boxes + # gnome-calendar + # gnome-sound-recorder + # seahorse + eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor + totem; + inherit (pkgs.jetbrains) datagrip; + }; }; services = { gnome-keyring.enable = true; }; @@ -107,7 +74,7 @@ ../hm_modules/dwarf-fortress.nix ../hm_modules/easyeffects.nix ../hm_modules/firefox.nix - ../hm_modules/fonts.nix + # ../hm_modules/fonts.nix # ../hm_modules/gnome_shell.nix # ../hm_modules/grobi.nix ../hm_modules/gtk_theme.nix diff --git a/thor/configuration.nix b/thor/configuration.nix index 4eed544..abeb5de 100644 --- a/thor/configuration.nix +++ b/thor/configuration.nix @@ -28,7 +28,7 @@ with lib; { environment = { pathsToLink = [ "/share/zsh" ]; - systemPackages = with pkgs; [ kakoune tmux vim ]; + systemPackages = builtins.attrValues { inherit (pkgs) kakoune tmux vim; }; }; hardware = { @@ -95,7 +95,7 @@ with lib; { # daemon.enable = true; # updater.enable = true; # }; - dbus.packages = with pkgs; [ dconf ]; + dbus.packages = [ pkgs.dconf ]; gnome.gnome-keyring.enable = true; gvfs = { enable = true; @@ -202,7 +202,7 @@ with lib; { nixpkgs.config = { allowUnfree = true; packageOverrides = pkgs: { - steam = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ icu ]; }; + steam = pkgs.steam.override { extraPkgs = pkgs: [ pkgs.icu ]; }; }; # cudaSupport = true; }; diff --git a/thor/hm.nix b/thor/hm.nix index 11748b6..cb04cce 100644 --- a/thor/hm.nix +++ b/thor/hm.nix @@ -6,72 +6,36 @@ variant = ",colemak,"; options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ]; }; - packages = with pkgs; [ - arandr - authy - bitwarden - discord - dmenu - docker-compose - docker-machine - droidcam - easyeffects + packages = builtins.attrValues { + inherit (pkgs) # electrum # element-desktop # matrix client - evince # evolution - filelight # freecad - gallery-dl - gnome.eog - gnome.file-roller - # gnome.geary - # gnome.gnome-boxes - # gnome.gnome-calendar - gnome.gnome-font-viewer - gnome.gnome-screenshot - # gnome.gnome-sound-recorder - gnome.gnome-system-monitor - # gnome.seahorse - gnome.totem - # (google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; }) - gucharmap - handbrake - httpie - inkscape - jetbrains.datagrip - krita # lutris - meld # minecraft # mycrypto - openvpn - p7zip - pavucontrol # pcmanfm - pcsx2 - pentablet-driver - postman - procps # pulseaudio - pulseaudio - retroarchFull - shotwell # signal-desktop - skypeforlinux # slack - spotify - tdesktop - teams - thunderbird - transmission-gtk - virt-manager - virt-viewer # wineFull - wireguard-tools - xournalpp - zoom-us - ]; + arandr authy bitwarden discord dmenu docker-compose docker-machine + droidcam easyeffects evince filelight gallery-dl gucharmap handbrake + httpie inkscape krita meld openvpn p7zip pavucontrol pcsx2 + pentablet-driver postman procps pulseaudio retroarchFull shotwell + skypeforlinux spotify tdesktop teams thunderbird transmission-gtk + virt-manager virt-viewer wireguard-tools xournalpp zoom-us; + inherit (pkgs.gnome) + # geary + # gnome-boxes + # gnome-calendar + # gnome-sound-recorder + # seahorse + eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor + totem; + inherit (pkgs.jetbrains) datagrip; + }; }; services = { gnome-keyring.enable = true; };