2023-03-21

6 files changed, 69 insertions, 396 deletions

diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index 9687120..451a8a9 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -1,4 +1,8 @@
-{lib, ...}:
+{
+  lib,
+  this,
+  ...
+}:
 with lib; {
   nixfiles.modules.vscode.enable = true;
 
diff --git a/flake.lock b/flake.lock
index b518d32..d3b6dcf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,294 +1,5 @@
 {
   "nodes": {
-    "100.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1652122178,
-        "narHash": "sha256-gitVP21/l26hfR+r7+ST2o7pY8ikr2u92n2uzuLgnKs=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "d6b26e75588bcd4311251c68912d3c77b8c6e996",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "100.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "101.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1655041107,
-        "narHash": "sha256-lGRqHEL9I8VgvSiUjT1DngFCsmEzM8n5J7vIfRj6TZM=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "1a899966a911dc2b69a808095ac7836bef5e214b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "101.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "102.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1656722605,
-        "narHash": "sha256-1M1lf3ah4I5KOPlTIZ52uEha8tuQu1wkgkdzEB4iK/0=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "ceacc9dd74086478d43ccf3a4f0bd5befda53a43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "102.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "103.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1660764278,
-        "narHash": "sha256-MhlZav86gz8bH1aEWyNFNLnc6T7MBU1d3dGHtG2lEnA=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "0dba33688fe468aca9b58c60910201afb3b89f60",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "103.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "104.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1662893183,
-        "narHash": "sha256-NyP/kJlV1Ai7os3gMqukKMdRSQ78GAjPCJkZDZtDdeo=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "3f09afdee07c5aea33f6dc4194e1425d6400a0d7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "104.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "105.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1664904885,
-        "narHash": "sha256-XUjX+Tno3EU/3IXR/WCn4M5gVR+sKjCzpKcV31dqzWA=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "db04bc44f2982ae8e39f10d056bc7cfe7804d4fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "105.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "106.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1667741320,
-        "narHash": "sha256-WB9w/UoFqp/WyRhe87dNqwbMAXa8lmsK/QCeTzRWmj8=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "8a65c5a7bad0ec764d968b0941ebdf01bdcd2408",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "106.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "107.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668990997,
-        "narHash": "sha256-TZKoArzALuCNWNBq3un091eR3uRLAi59z/AZ64Xg3BQ=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "cc0f05388f6c721c358e89372caac604f84fd0d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "107.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "108.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673196505,
-        "narHash": "sha256-YsQbH6bqp2I52meYf0X0DQpwLlDdu5pK9XHMT/9RqOg=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "62a68f08147123b0c2c288ffdecc3f03e4ab1ae8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "108.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "109.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1675728165,
-        "narHash": "sha256-ebSx6DaXoGKcCoK6UcDnWvdAW6J2X6pJRPD1Pw7UNOw=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "73884850632ffe284f76881786f7d5903b917f58",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "109.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "93.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1634027026,
-        "narHash": "sha256-/ITf8nv/IWR1sKBchPtdkPjZO5OFH9p6FgVbDfBrJc8=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "85438d00e457bff692303af519da618c6372476b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "93.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "94.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1637651503,
-        "narHash": "sha256-RvG+GRh8Md1yrTzFniu1G2UpTnOb7KCGDfQmFvdtl58=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "cbfb8abf1544c3e87f412f64a9747bd1dea4a705",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "94.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "95.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1638965627,
-        "narHash": "sha256-4g1Vu4zF+EtHK123zSxIDP1wYROK2rqS897Kcv2C/cI=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "7e1b92567ca2bb76ad358d0fc786fd60b3cf7970",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "95.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "96.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1642736886,
-        "narHash": "sha256-P2C59t4DnM11I9GDL9xyc2m8Ml0T8gRuom7UtWykWnk=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "ac0820a5dc00e04fe14fc2a74ba75e590883293c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "96.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "97.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1644750900,
-        "narHash": "sha256-Df2D2eBifkZpFklPBbE94AvgAUM/NUAAiuqUzp67Hdo=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "a98b73c64e2e0b505efb6b23d34e6c5d90abe2c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "97.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "98.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1646873050,
-        "narHash": "sha256-HJu+azYJRMW0C5hhU96pkwZxql7Ijpiz2sw9e/JoqR8=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "d9af90d05f477e5e25f8d9f545eeb7fe0a235d2a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "98.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
-    "99.0": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1649497545,
-        "narHash": "sha256-ScO19N/EVpmMzdN2kkfjYIJN7c0CQdZJ9qMZReqMpI4=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "4ff931781a1bf012e0e7e2ec89dc5c2a9bedd890",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "ref": "99.0",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
     "agenix": {
       "inputs": {
         "darwin": [
@@ -315,35 +26,25 @@
     },
     "arkenfox-nixos": {
       "inputs": {
-        "100.0": "100.0",
-        "101.0": "101.0",
-        "102.0": "102.0",
-        "103.0": "103.0",
-        "104.0": "104.0",
-        "105.0": "105.0",
-        "106.0": "106.0",
-        "107.0": "107.0",
-        "108.0": "108.0",
-        "109.0": "109.0",
-        "93.0": "93.0",
-        "94.0": "94.0",
-        "95.0": "95.0",
-        "96.0": "96.0",
-        "97.0": "97.0",
-        "98.0": "98.0",
-        "99.0": "99.0",
-        "flake-compat": "flake-compat",
-        "master": "master",
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "pre-commit": [
+          "pre-commit-hooks"
         ]
       },
       "locked": {
-        "lastModified": 1676881905,
-        "narHash": "sha256-Im/KQhk3fJouLmIjUQnEU88mJTwqo9QBx9x2KHARyHo=",
+        "lastModified": 1679223908,
+        "narHash": "sha256-7ns8EL9+AKPH2wHouZLosirLKc3/tRogOUg2kj8vDRA=",
         "owner": "dwarfmaster",
         "repo": "arkenfox-nixos",
-        "rev": "b44010831ee47f80327e4f17c3a21e86d3bea8fa",
+        "rev": "8f33d2833cc1391cc7c1a1f0b405820f681e428d",
         "type": "github"
       },
       "original": {
@@ -443,22 +144,6 @@
       },
       "original": {
         "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
         "ref": "master",
         "repo": "flake-compat",
         "type": "github"
@@ -483,11 +168,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -528,11 +213,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678729503,
-        "narHash": "sha256-j+h4Bdqbe+qjzhxdhkRmVgSx2lxJ8HnKeYcAhhnd1zM=",
+        "lastModified": 1679265143,
+        "narHash": "sha256-5RDMW+O4owjdPz7t4K4YxH2fOHCNOcyVmSiKRUikiv0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "24c1a6335e3da6a3ecf82f33ac50c2ad66aee346",
+        "rev": "1b8bf5c3270386a1b6850bd77d79dbdbaf0d7a7c",
         "type": "github"
       },
       "original": {
@@ -574,22 +259,6 @@
         "type": "github"
       }
     },
-    "master": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1675728165,
-        "narHash": "sha256-ebSx6DaXoGKcCoK6UcDnWvdAW6J2X6pJRPD1Pw7UNOw=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "73884850632ffe284f76881786f7d5903b917f58",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "type": "github"
-      }
-    },
     "nix-minecraft": {
       "inputs": {
         "flake-utils": [
@@ -600,11 +269,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678757075,
-        "narHash": "sha256-nB4O3vdGSKFVZF3tF7Mq5BLh4SxhJBNBTsJzL3dI9C8=",
+        "lastModified": 1679276580,
+        "narHash": "sha256-3+YDy2BQuIWauD7oHZZDU0uRC2c0cOWdyRZW3ss76VY=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "7de21a83e4d945d01dc9125a9467a9a0d309630f",
+        "rev": "710b88f976c522deb1306b0310429b4bef3cff39",
         "type": "github"
       },
       "original": {
@@ -616,11 +285,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1678397099,
-        "narHash": "sha256-5xq8YJe+h19TlD+EI4AE/3H3jcCcQ2AWU6CWBVc5tRc=",
+        "lastModified": 1679224149,
+        "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "556101ff85bd6e20900ec73ee525b935154bc8ea",
+        "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59",
         "type": "github"
       },
       "original": {
@@ -632,11 +301,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1678724065,
-        "narHash": "sha256-MjeRjunqfGTBGU401nxIjs7PC9PZZ1FBCZp/bRB3C2M=",
+        "lastModified": 1679319606,
+        "narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b8afc8489dc96f29f69bec50fdc51e27883f89c1",
+        "rev": "8bc6945b1224a1cfa679d6801580b1054dba1a5c",
         "type": "github"
       },
       "original": {
@@ -648,11 +317,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1678816457,
-        "narHash": "sha256-uADLj4wb0/0yrnu/dvZ5+l0XKyGIi3W8RGyAxZr3leI=",
+        "lastModified": 1679348130,
+        "narHash": "sha256-i16avZCx5Wf2ntiGltopk37+xX2hM1BHf+/iuOFp0hw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8889512934037f08a9d09104d604b231095f8d02",
+        "rev": "862746a32f1921a5928062e4b3c4feb055c440be",
         "type": "github"
       },
       "original": {
@@ -664,11 +333,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1678803540,
-        "narHash": "sha256-nHCi/KLdawIyDW68VPqBchIFvwyVmJlq9MJFGzRq4tc=",
+        "lastModified": 1679338459,
+        "narHash": "sha256-3iRGwvIh8h9HrqgYb5KTgheysn6ZvUfttmluW0AKcXs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0bdfe19cde52b55c811fb05b22dde0cf7f6a1d8",
+        "rev": "448db6f9987e95a5fc4abc022be005ec8355b452",
         "type": "github"
       },
       "original": {
@@ -714,11 +383,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1678816247,
-        "narHash": "sha256-Zz8+vqaAcuRxjJWG7zr2PrpEKQIxUVDbWlMBosOuxj8=",
+        "lastModified": 1679341557,
+        "narHash": "sha256-cMj6zzH0cUdd2nMLvplQDO5cfViZB33WApPHtKVDHXI=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "4b8c2bae188553e8c5461e4824d732f86ec85a42",
+        "rev": "d7a59b9f787b1ded42c76969ae3c720024687a24",
         "type": "github"
       },
       "original": {
@@ -770,11 +439,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1678376203,
-        "narHash": "sha256-3tyYGyC8h7fBwncLZy5nCUjTJPrHbmNwp47LlNLOHSM=",
+        "lastModified": 1678976941,
+        "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "1a20b9708962096ec2481eeb2ddca29ed747770a",
+        "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e",
         "type": "github"
       },
       "original": {
@@ -791,7 +460,7 @@
         "azahi-cc": "azahi-cc",
         "darwin": "darwin",
         "dns-nix": "dns-nix",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
         "flake-registry": "flake-registry",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 4b5fa34..fc96852 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,7 +82,12 @@
       owner = "dwarfmaster";
       repo = "arkenfox-nixos";
       ref = "main";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+        pre-commit.follows = "pre-commit-hooks";
+        flake-utils.follows = "flake-utils";
+      };
     };
 
     nix-minecraft = {
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index fe9c794..ea36b91 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -39,7 +39,7 @@ in {
           sd
         ];
 
-        sessionVariables.LOKI_ADDR = "https://loki.${config.networking.domain}";
+        sessionVariables.LOKI_ADDR = "https://loki.shire.net";
       };
 
       accounts.email = {
diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix
index a430294..17fcf03 100644
--- a/modules/nixos/kde.nix
+++ b/modules/nixos/kde.nix
@@ -26,24 +26,19 @@ in {
     };
 
     services.xserver = {
-      desktopManager.plasma5 = {
-        enable = true;
-        excludePackages = with pkgs.plasma5Packages; [
-          elisa
-          gwenview
-          khelpcenter
-          okular
-          print-manager
-        ];
-      };
-      displayManager = {
-        sddm.enable = true;
-
-        # NOTE https://github.com/NixOS/nixpkgs/pull/199881
-        setupCommands = lib.mkForce "";
-      };
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm.enable = true;
     };
 
-    environment.systemPackages = with pkgs; [pinentry-qt];
+    environment = {
+      systemPackages = with pkgs; [pinentry-qt];
+      plasma5.excludePackages = with pkgs.plasma5Packages; [
+        elisa
+        gwenview
+        khelpcenter
+        okular
+        print-manager
+      ];
+    };
   };
 }
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index e5080c3..b5a5fc4 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -62,11 +62,11 @@ with lib; {
   # Usually stuff that is going to be compiled on this machine is going to have
   # parallelisation support enabled, so we will make sure that all cores are
   # utilised and limit the job queue to one.
-  nix.extraOptions = ''
-    keep-going = true
-    max-jobs = 1
-    cores = 32
-  '';
+  nix.settings = {
+    keep-going = true;
+    max-jobs = 1;
+    cores = 32;
+  };
 
   boot = {
     # TODO Override Xanmod kernel to support ZFS. This probably will require