From f45e9a377ac7587cbde4e5e217e4da06c7b40cae Mon Sep 17 00:00:00 2001 From: niten Date: Wed, 4 Jan 2023 10:50:38 -0800 Subject: [PATCH] Updates --- config/groups.nix | 11 +- config/hardware/lambda.nix | 2 +- config/hardware/limina.nix | 2 +- config/hardware/spark.nix | 2 +- config/hardware/zbox.nix | 2 +- config/profile-config/common-ui.nix | 2 +- config/profile-config/common.nix | 4 +- flake.lock | 266 ++++++++++++++++++++-------- flake.nix | 9 +- 9 files changed, 203 insertions(+), 97 deletions(-) diff --git a/config/groups.nix b/config/groups.nix index 73a7c6f..5a43299 100644 --- a/config/groups.nix +++ b/config/groups.nix @@ -5,11 +5,7 @@ admin = { gid = 1000; description = "Admin User Group"; - members = [ - "niten" - "reaper" - "swaff" - ]; + members = [ "niten" "reaper" "swaff" ]; }; fudo = { @@ -79,10 +75,7 @@ informis = { gid = 1003; description = "Informis User Group"; - members = [ - "niten" - "viator" - ]; + members = [ "niten" "viator" ]; }; }; } diff --git a/config/hardware/lambda.nix b/config/hardware/lambda.nix index 2319ae1..2639a3e 100644 --- a/config/hardware/lambda.nix +++ b/config/hardware/lambda.nix @@ -66,7 +66,7 @@ in { swapDevices = [{ device = "/dev/disk/by-label/lambda-swap"; }]; - nix.maxJobs = lib.mkDefault 12; + nix.settings.max-jobs = lib.mkDefault 12; networking = { macvlans = { diff --git a/config/hardware/limina.nix b/config/hardware/limina.nix index aa56947..dbd4b45 100644 --- a/config/hardware/limina.nix +++ b/config/hardware/limina.nix @@ -60,7 +60,7 @@ with lib; { swapDevices = [{ device = "/dev/disk/by-label/limina-swap"; }]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; hardware.bluetooth.enable = false; diff --git a/config/hardware/spark.nix b/config/hardware/spark.nix index b3845f8..056f334 100644 --- a/config/hardware/spark.nix +++ b/config/hardware/spark.nix @@ -59,6 +59,6 @@ }; services.xserver.videoDrivers = [ "intel" ]; - nix.maxJobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 4; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/config/hardware/zbox.nix b/config/hardware/zbox.nix index 1d5fa1d..559e2bd 100644 --- a/config/hardware/zbox.nix +++ b/config/hardware/zbox.nix @@ -103,7 +103,7 @@ services.xserver.videoDrivers = [ "nvidia" ]; - nix.maxJobs = lib.mkDefault 8; + nix.settings.max-jobs = lib.mkDefault 8; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; systemd.targets = { diff --git a/config/profile-config/common-ui.nix b/config/profile-config/common-ui.nix index 2da993f..ede1fa6 100644 --- a/config/profile-config/common-ui.nix +++ b/config/profile-config/common-ui.nix @@ -27,7 +27,7 @@ in { autoSuspend = false; }; - windowManager.stumpwm.enable = true; + # windowManager.stumpwm.enable = true; # windowManager.session = pkgs.lib.singleton { # name = "stumpwm"; diff --git a/config/profile-config/common.nix b/config/profile-config/common.nix index b9c9ded..4c4c9bc 100644 --- a/config/profile-config/common.nix +++ b/config/profile-config/common.nix @@ -102,7 +102,7 @@ in { xserver = { layout = "us"; xkbVariant = "dvp"; - xkbOptions = "ctrl:nocaps"; + xkbOptions = ""; }; btrfs.autoScrub.enable = let @@ -178,7 +178,5 @@ in { # }; }; }; - - home-manager = { useGlobalPkgs = true; }; }; } diff --git a/flake.lock b/flake.lock index 3259cd5..2663d5c 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1669340080, - "narHash": "sha256-/YLYpng6mZ2/NgaCiL3BCQK1cegbUNrQx1Cc1i+nQ8E=", + "lastModified": 1671758850, + "narHash": "sha256-B6us/CLIIPJRJgjn/hVp7N07j90kil4HmjUVj8TBhKE=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "3c02175dd06714c15ddd2f73708de9b4dacc6aa9", + "rev": "85a48dbec84e9c26785b58fecdefa1cfc580aea7", "type": "github" }, "original": { @@ -309,11 +309,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1669319842, - "narHash": "sha256-JSfABiy5/7usgQSy/ua3XbsjJ6F9Dd3P4nJiE56gFME=", + "lastModified": 1671729646, + "narHash": "sha256-crrTM9K1q8zGZ2gibEPJAudAnr0bMqPiLr1I8P+I5ls=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "49d5cbd389a3fb843793cd7503ad7abdb4f40a9d", + "rev": "9c95614e0b1a2f6a3f4cf9b99b17439887ea0373", "type": "github" }, "original": { @@ -581,7 +581,7 @@ "locked": { "lastModified": 1662665220, "narHash": "sha256-nFIPsBwT9/vgM8+mRJQpVPaabUKkN5BUYF8+nfvOuaY=", - "ref": "master", + "ref": "refs/heads/master", "rev": "0375d2c98014f0923d2cde2d1ae186533052d02c", "revCount": 105, "type": "git", @@ -596,18 +596,19 @@ "inputs": { "doom-emacs": "doom-emacs", "fudo-pkgs": "fudo-pkgs", - "home-manager": "home-manager", + "gnome-manager": "gnome-manager", + "home-manager": "home-manager_2", "niten-doom-config": "niten-doom-config", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1669829872, - "narHash": "sha256-mH1rqA2dt5UtzBkyM+T9jmOKu7M1Q4lvEh84NkBBeiU=", - "ref": "master", - "rev": "9a4de0bd4a40d7bd6d77e657f438153948f7faf8", - "revCount": 246, + "lastModified": 1672858188, + "narHash": "sha256-Rc7b07aYiD1nLnDdD1ZlmGdsgiVGN3/8D7VsCnfHuns=", + "ref": "refs/heads/master", + "rev": "81cad87b318ca38af748aa3a790f645efaaf6f58", + "revCount": 284, "type": "git", "url": "https://git.fudo.org/fudo-nix/home.git" }, @@ -633,26 +634,23 @@ }, "fudo-lib_2": { "locked": { - "lastModified": 1663264893, - "narHash": "sha256-5qb0+YAHnZTfSHyN/IrvR3O6XQ04GfYQy/Lywad/mAo=", - "ref": "master", - "rev": "ff1aa983bf2584f57de02cd0c3fbc6f228111203", - "revCount": 89, - "type": "git", - "url": "https://git.fudo.org/fudo-nix/lib.git" + "lastModified": 1671734339, + "narHash": "sha256-Sfo5KQVG6d9PW8xQfCcLiNmX5tt06hYuxff4kqhu2+o=", + "path": "/state/fudo-lib", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.fudo.org/fudo-nix/lib.git" + "path": "/state/fudo-lib", + "type": "path" } }, "fudo-pkgs": { "locked": { - "lastModified": 1663789893, - "narHash": "sha256-hJ070rVUmRNrnzbN8OoKmjWhsTkHWvAhHZo/YdUTTOo=", - "ref": "master", - "rev": "bcecb878116a0f3cb1f12262d6f58d8a3ce083e4", - "revCount": 65, + "lastModified": 1671908188, + "narHash": "sha256-WCMIJg++GcUhsquYsVwtozpKAtHIt9NEuEv8cn0Re1U=", + "ref": "refs/heads/master", + "rev": "33925888f6d99ff09db36572c79c9bdc3a32c701", + "revCount": 67, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -663,11 +661,11 @@ }, "fudo-pkgs_2": { "locked": { - "lastModified": 1663789893, - "narHash": "sha256-hJ070rVUmRNrnzbN8OoKmjWhsTkHWvAhHZo/YdUTTOo=", - "ref": "master", - "rev": "bcecb878116a0f3cb1f12262d6f58d8a3ce083e4", - "revCount": 65, + "lastModified": 1671908188, + "narHash": "sha256-WCMIJg++GcUhsquYsVwtozpKAtHIt9NEuEv8cn0Re1U=", + "ref": "refs/heads/master", + "rev": "33925888f6d99ff09db36572c79c9bdc3a32c701", + "revCount": 67, "type": "git", "url": "https://git.fudo.org/fudo-nix/pkgs.git" }, @@ -684,15 +682,17 @@ "dnssec-keys": "dnssec-keys", "filesystem-keys": "filesystem-keys", "host-keytabs": "host-keytabs", + "nixpkgs": "nixpkgs_6", "realm-master-keys": "realm-master-keys", "service-keytabs": "service-keytabs", "service-passwords": "service-passwords", "service-secrets": "service-secrets", - "ssh-keypairs": "ssh-keypairs" + "ssh-keypairs": "ssh-keypairs", + "utils": "utils_7" }, "locked": { - "lastModified": 1668018156, - "narHash": "sha256-aNQKjFpnF24YwIADh2fgRZ81We7oGQZqun6lqO1rQeg=", + "lastModified": 1672857129, + "narHash": "sha256-lrKfITnPNG9iSXrVEPmDyWGfyGatL+ZEDcaazIgtHdc=", "path": "/state/secrets", "type": "path" }, @@ -743,24 +743,64 @@ "type": "github" } }, - "home-manager": { + "gnome-manager": { "inputs": { - "nixpkgs": [ - "fudo-home", - "nixpkgs" - ] + "home-manager": "home-manager" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1672420375, + "narHash": "sha256-/dEy6VJHtyCh+/5vA5gLIiBbarR3HwQS+uKHXEXywqw=", + "owner": "fudoniten", + "repo": "gnome-manager", + "rev": "6be38e0db4ccb07ca219951744a58e5d0bb17fe2", + "type": "github" + }, + "original": { + "owner": "fudoniten", + "ref": "hm-module", + "repo": "gnome-manager", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs_5", + "utils": "utils_5" + }, + "locked": { + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.05", + "ref": "release-22.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "fudo-home", + "nixpkgs" + ], + "utils": "utils_6" + }, + "locked": { + "lastModified": 1672244468, + "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -781,11 +821,11 @@ "niten-doom-config": { "flake": false, "locked": { - "lastModified": 1666377366, - "narHash": "sha256-IOyfNAYrY8o5LWWYVFc8wI9sKcCD6fwLtzd2qUgAQZc=", - "ref": "master", - "rev": "97042208eaecd09bad17c28119d7963466878a22", - "revCount": 62, + "lastModified": 1671579159, + "narHash": "sha256-tM/aeAi7yLNtJ8WaK2Tl3sAIOW2DnDUIRZ75cZpKulY=", + "ref": "refs/heads/master", + "rev": "2dc9bcd1afda4efdb18cc0d47f93c4565ba3e652", + "revCount": 63, "type": "git", "url": "https://git.fudo.org/niten/doom-emacs.git" }, @@ -842,11 +882,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1669542132, - "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", + "lastModified": 1672617983, + "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a115bb9bd56831941be3776c8a94005867f316a7", + "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", "type": "github" }, "original": { @@ -902,20 +942,51 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1669677308, - "narHash": "sha256-n788Cx+W6J1CtQofJD/KUY1c2WcJx6GqyJ+++1y9B3k=", + "lastModified": 1672617983, + "narHash": "sha256-68WDiCBs631mbDDk4UAKdGURKcsfW6hjb7wgudTAe5o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0fc9fca9c8d43edd79d33fea0dd8409d7c4580f4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1672616430, + "narHash": "sha256-e18rRwDUaW/Uw1tBmtsVueJ2SVI5DLhrEGwhkIo+c50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f214b8c9455e90b70bafd4ed9a58d448c243e8bb", + "rev": "0bf3109eeb61780965c27f4a0a4affdcd0cd4d3d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { + "locked": { + "lastModified": 1672616430, + "narHash": "sha256-e18rRwDUaW/Uw1tBmtsVueJ2SVI5DLhrEGwhkIo+c50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0bf3109eeb61780965c27f4a0a4affdcd0cd4d3d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1659446231, "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", @@ -930,7 +1001,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1656265786, "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", @@ -980,11 +1051,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1668865287, - "narHash": "sha256-q7TfqUuEdZsD+JkF8Cr0Lnn0po6qo2zXMZDieocLpeQ=", + "lastModified": 1670680538, + "narHash": "sha256-afmN2tOY6Par235bVsqhtFHOSVyw4NBgTxI5Eo6Yk5A=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "0737112852afe835a5a5833a2dd0a6852c04e0f0", + "rev": "42153ea2fec66f90c1623be25d6774d96ecf8062", "type": "github" }, "original": { @@ -1044,13 +1115,13 @@ "pricebot": { "inputs": { "clj-nix": "clj-nix", - "nixpkgs": "nixpkgs_6", - "utils": "utils_5" + "nixpkgs": "nixpkgs_8", + "utils": "utils_8" }, "locked": { "lastModified": 1661201877, "narHash": "sha256-aA2DKV24Gq2oRb6Tnvq+IBfkTJZNXx5n5E7ELLgFdbU=", - "ref": "master", + "ref": "refs/heads/master", "rev": "9269eb1a7e9f1b177d0ab3382c4c641b5bb2bbfa", "revCount": 44, "type": "git", @@ -1077,11 +1148,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1668674340, - "narHash": "sha256-JEXPS67bgKnnRdA37mC18PyGm4EWVQ/BrWeBZLVKPvU=", + "lastModified": 1670408834, + "narHash": "sha256-2LG8/AwMC+caNK9DKDyVGw+EPT2W6ys177xQj7mdKng=", "owner": "hakimel", "repo": "reveal.js", - "rev": "9f1f7789bfbf689d9c1615e523d5c6262771e90f", + "rev": "4fe3946cb43de57f79aaa7b646aee7e78f4bcc75", "type": "github" }, "original": { @@ -1099,7 +1170,7 @@ "fudo-lib": "fudo-lib_2", "fudo-pkgs": "fudo-pkgs_2", "fudo-secrets": "fudo-secrets", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixpkgs2111": "nixpkgs2111", "nixpkgsUnstable": "nixpkgsUnstable", "pricebot": "pricebot", @@ -1193,11 +1264,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1663136308, - "narHash": "sha256-FI25RLoHqhcjA2qel75LVmQH4rTkKiAUR2w9QODT1XM=", + "lastModified": 1671426601, + "narHash": "sha256-NrvSK+olbi4P+9q5KOomNHGgmrRtI9cW9ZqkdU4n0Sc=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "c3da5520b988720f7f6e9e5e11b60746598112e0", + "rev": "a64f5252a66253852bef1c627cea9e39928e6392", "type": "github" }, "original": { @@ -1267,6 +1338,51 @@ } }, "utils_5": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_6": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_7": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_8": { "locked": { "lastModified": 1653893745, "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", @@ -1281,7 +1397,7 @@ "type": "github" } }, - "utils_6": { + "utils_9": { "locked": { "lastModified": 1656065134, "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=", @@ -1299,13 +1415,13 @@ "wallfly": { "inputs": { "clj-nix": "clj-nix_2", - "nixpkgs": "nixpkgs_7", - "utils": "utils_6" + "nixpkgs": "nixpkgs_9", + "utils": "utils_9" }, "locked": { "lastModified": 1664215454, "narHash": "sha256-pKzJQ4mmUThFY7po+c6bYXbz2RZT9QkxazW94bYF/II=", - "ref": "master", + "ref": "refs/heads/master", "rev": "90ba657a24c7ab3032ce4e54faea2a8163ce1091", "revCount": 14, "type": "git", diff --git a/flake.nix b/flake.nix index 742b455..1b90b26 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Fudo Host Configuration"; inputs = { - nixpkgs.url = "nixpkgs/nixos-22.05"; + nixpkgs.url = "nixpkgs/nixos-22.11"; fudo-home = { url = "git+https://git.fudo.org/fudo-nix/home.git"; @@ -16,9 +16,8 @@ }; fudo-lib = { - url = "git+https://git.fudo.org/fudo-nix/lib.git"; - #url = "path:/state/fudo-lib"; - inputs.nixpkgs.follows = "nixpkgs"; + #url = "git+https://git.fudo.org/fudo-nix/lib.git"; + url = "path:/state/fudo-lib"; }; fudo-pkgs.url = "git+https://git.fudo.org/fudo-nix/pkgs.git"; @@ -77,7 +76,7 @@ pkgsUnstable = unstable; }) (final: prev: { - nyxt = unstable.nyxt; + signal-desktop = unstable.signal-desktop; factorio-experimental = unstable.factorio-experimental; factorio-headless-experimental = unstable.factorio-headless-experimental;