diff --git a/README.md b/README.md index a470c73..522e820 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ The following instructions are for a fresh NixOS installation. _: { - config.machine = { + machine = { allowUnfree = true; hostName = ""; users = [ diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix index 7e2a75f..dd4e82a 100644 --- a/machines/Lilim/options.nix +++ b/machines/Lilim/options.nix @@ -2,7 +2,7 @@ ... }: { - config.machine = { + machine = { allowUnfree = true; hostName = "Lilim"; networkD = { diff --git a/machines/Marid/options.nix b/machines/Marid/options.nix index 1e83b4b..0e626b2 100644 --- a/machines/Marid/options.nix +++ b/machines/Marid/options.nix @@ -3,7 +3,7 @@ }: { - config.machine = { + machine = { allowUnfree = true; hostName = "Marid"; users = [ diff --git a/machines/Ophanim/options.nix b/machines/Ophanim/options.nix index f0eca75..e8f2cba 100644 --- a/machines/Ophanim/options.nix +++ b/machines/Ophanim/options.nix @@ -1,7 +1,7 @@ _: { - config.machine = rec { + machine = rec { hostName = "Ophanim"; domain = "ophanim.de"; users = [ diff --git a/machines/Sheol/options.nix b/machines/Sheol/options.nix index 4b80732..5dc5f52 100644 --- a/machines/Sheol/options.nix +++ b/machines/Sheol/options.nix @@ -3,7 +3,7 @@ imports = [ ../../options/copySysConf.nix ]; - config.machine = { + machine = { allowUnfree = true; hostName = "Sheol"; networkD = { diff --git a/pkgsets/ansible.nix b/pkgsets/ansible.nix index 34433ff..963388d 100644 --- a/pkgsets/ansible.nix +++ b/pkgsets/ansible.nix @@ -4,7 +4,7 @@ }: { - config.machine.pkgsets.ansible.pkgs = with pkgs; [ + machine.pkgsets.ansible.pkgs = with pkgs; [ ansible ansible-builder ansible-language-server diff --git a/pkgsets/base.nix b/pkgsets/base.nix index c43f65e..4ce33ec 100644 --- a/pkgsets/base.nix +++ b/pkgsets/base.nix @@ -1,11 +1,11 @@ # Programms I'm likely to want on every machine and/or may execute as root { - config, pkgs, ... }: + { - config.machine.pkgsets.base.pkgs = with pkgs; [ + machine.pkgsets.base.pkgs = with pkgs; [ age sops bat diff --git a/pkgsets/cpp.nix b/pkgsets/cpp.nix index 32d7b10..00fbb61 100644 --- a/pkgsets/cpp.nix +++ b/pkgsets/cpp.nix @@ -3,7 +3,7 @@ ... }: { - config.machine.pkgsets.cpp.pkgs = with pkgs; [ + machine.pkgsets.cpp.pkgs = with pkgs; [ bear clang cmake diff --git a/pkgsets/dict.nix b/pkgsets/dict.nix index c15d7a2..13244bb 100644 --- a/pkgsets/dict.nix +++ b/pkgsets/dict.nix @@ -4,7 +4,7 @@ ... }: { - config.machine.pkgsets.dict.pkgs = with pkgs; [ + machine.pkgsets.dict.pkgs = with pkgs; [ translate-shell (hunspellWithDicts ( with pkgs.hunspellDicts; diff --git a/pkgsets/extra.nix b/pkgsets/extra.nix index 9ecbeef..a869d15 100644 --- a/pkgsets/extra.nix +++ b/pkgsets/extra.nix @@ -4,7 +4,7 @@ ... }: { - config.machine.pkgsets.extra.pkgs = with pkgs; [ + machine.pkgsets.extra.pkgs = with pkgs; [ alsa-utils binutils-unwrapped git-lfs diff --git a/pkgsets/haskell-tools.nix b/pkgsets/haskell-tools.nix index b3a5eb6..f5f2135 100644 --- a/pkgsets/haskell-tools.nix +++ b/pkgsets/haskell-tools.nix @@ -4,7 +4,7 @@ ... }: { - config.machine.pkgsets.haskell-tools.pkgs = with pkgs; [ + machine.pkgsets.haskell-tools.pkgs = with pkgs; [ cabal-install hlint ]; # ghcid diff --git a/pkgsets/latex.nix b/pkgsets/latex.nix index 86399af..d090ac6 100644 --- a/pkgsets/latex.nix +++ b/pkgsets/latex.nix @@ -6,7 +6,7 @@ }: with lib; { - config.machine.pkgsets.latex.pkgs = with pkgs; [ + machine.pkgsets.latex.pkgs = with pkgs; [ texlive.combined.scheme-full texlab ]; diff --git a/pkgsets/mail_utils.nix b/pkgsets/mail_utils.nix index e7c2f9e..97c9e42 100644 --- a/pkgsets/mail_utils.nix +++ b/pkgsets/mail_utils.nix @@ -3,7 +3,7 @@ ... }: { - config.machine.pkgsets.mail_utils.pkgs = with pkgs; [ + machine.pkgsets.mail_utils.pkgs = with pkgs; [ aerc abook pizauth diff --git a/pkgsets/nodejs.nix b/pkgsets/nodejs.nix index de1fdc4..98058b4 100644 --- a/pkgsets/nodejs.nix +++ b/pkgsets/nodejs.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - config.machine.pkgsets.nodejs.pkgs = + machine.pkgsets.nodejs.pkgs = (with pkgs; [ nodejs yarn diff --git a/pkgsets/php.nix b/pkgsets/php.nix index a979a9d..c53d878 100644 --- a/pkgsets/php.nix +++ b/pkgsets/php.nix @@ -6,10 +6,12 @@ ... }: { - config.machine.pkgsets.php.pkgwrap = fn.pkgFilter config.machine.pkgsets.php.pkgs; - config.machine.pkgsets.php.pkgs = - (with pkgs.php82Packages; [ - composer - ]) - ++ (with pkgs; [ php82 ]); + machine.pkgsets.php = { + pkgwrap = fn.pkgFilter config.machine.pkgsets.php.pkgs; + pkgs = + (with pkgs.php82Packages; [ + composer + ]) + ++ (with pkgs; [ php82 ]); + }; } diff --git a/pkgsets/python3.nix b/pkgsets/python3.nix index 6d5e288..469eae2 100644 --- a/pkgsets/python3.nix +++ b/pkgsets/python3.nix @@ -1,16 +1,15 @@ { config, lib, - fn, pkgs, ... }: with lib; { - config.machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages ( + machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages ( ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs) ); - config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [ + machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [ bpython flake8 genanki diff --git a/pkgsets/server.nix b/pkgsets/server.nix index ecec0d2..f3eac3e 100644 --- a/pkgsets/server.nix +++ b/pkgsets/server.nix @@ -4,7 +4,7 @@ ... }: { - config.machine.pkgsets.server.pkgs = with pkgs; [ + machine.pkgsets.server.pkgs = with pkgs; [ audit certbot php diff --git a/pkgsets/tracking.nix b/pkgsets/tracking.nix index e8d2806..237974d 100644 --- a/pkgsets/tracking.nix +++ b/pkgsets/tracking.nix @@ -6,7 +6,7 @@ }: with lib; { - config.machine.pkgsets.tracking.pkgs = with pkgs; [ + machine.pkgsets.tracking.pkgs = with pkgs; [ aw-qt aw-server-rust aw-watcher-afk diff --git a/pkgsets/xpkgs.nix b/pkgsets/xpkgs.nix index f133312..d6430df 100644 --- a/pkgsets/xpkgs.nix +++ b/pkgsets/xpkgs.nix @@ -4,7 +4,7 @@ }: { - config.machine.pkgsets.xpkgs.pkgs = with pkgs; [ + machine.pkgsets.xpkgs.pkgs = with pkgs; [ acpilight dconf ghostty