2024-04-09

11 files changed, 150 insertions, 120 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..322d04f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,38 @@
+root=true
+
+[*]
+charset=utf-8
+end_of_line=lf
+indent_size=2
+indent_style=space
+insert_final_newline=true
+max_line_length=80
+trim_trailing_whitespace=true
+
+[*.nix]
+indent_size=2
+indent_style=space
+
+[*.py]
+indent_size=4
+indent_style=space
+
+[*.{json,jsn}]
+indent_size=2
+indent_style=space
+
+[*.{lisp,cl,rkt,scm,el}]
+indent_size=2
+indent_style=space
+
+[*.{sh,bash}]
+indent_size=2
+indent_style=space
+
+[*.{toml,tml}]
+indent_size=2
+indent_style=space
+
+[*.{yaml,yml}]
+indent_size=2
+indent_style=space
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..427ec30
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+*.json
+/flake.lock
diff --git a/.typos.toml b/.typos.toml
deleted file mode 100644
index d82a6e2..0000000
--- a/.typos.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[default.extend-identifiers]
-gud = "gud"
-iterm2 = "iterm2"
-openpgp4fpr= "openpgp4fpr"
-
-[files]
-extend-exclude = ["**/hidden.nix", "secrets/*"]
diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml
index e0e8240..18c2c86 100644
--- a/Taskfile.dist.yml
+++ b/Taskfile.dist.yml
@@ -1,5 +1,5 @@
 ---
-version: '3'
+version: "3"
 
 tasks:
   update-firefox-addons:
diff --git a/checks.nix b/checks.nix
index f9949e3..1bb454c 100644
--- a/checks.nix
+++ b/checks.nix
@@ -1,5 +1,4 @@
 { inputs, system }:
-with inputs.nixpkgs.lib;
 let
   pkgs = inputs.self.legacyPackages.${system};
 in
@@ -14,24 +13,6 @@ in
         enable = true;
         package = pkgs.nixfmt;
       };
-      deadnix = {
-        enable = true;
-        settings.edit = true;
-      };
-      editorconfig-checker.enable = true;
-      prettier = {
-        enable = true;
-        types_or = mkForce [ "css" ];
-      };
-      shellcheck.enable = true;
-      shfmt.enable = true;
-      statix.enable = true;
-      typos = {
-        enable = true;
-        types = [ "text" ];
-        pass_filenames = false;
-      };
-      yamllint.enable = true;
       promtool = {
         enable = true;
         name = "promtool";
@@ -39,6 +20,13 @@ in
         entry = "${pkgs.prometheus.cli}/bin/promtool check rules";
         files = "(?x)^(modules/nixos/monitoring/rules/.*\.yaml)$";
       };
+      deadnix.enable = true;
+      editorconfig-checker.enable = true;
+      prettier.enable = true;
+      shellcheck.enable = true;
+      shfmt.enable = true;
+      statix.enable = true;
+      yamllint.enable = true;
     };
   };
 }
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix
index b9e7474..a004d1d 100644
--- a/darwinConfigurations/mairon/default.nix
+++ b/darwinConfigurations/mairon/default.nix
@@ -8,35 +8,42 @@ with lib;
 {
   nixfiles.modules.zathura.enable = mkForce false;
 
-  hm.home.packages = with pkgs; [
-    cocoapods
-    ruby
-  ];
+  hm = {
+    home.packages = with pkgs; [
+      cocoapods
+      ruby
+    ];
+
+    programs.bash.initExtra = mkAfter ''
+      if [ -f "$HOME/.orbstack/shell/init.bash" ]; then
+        source "$HOME/.orbstack/shell/init.bash"
+      fi
+    '';
+  };
 
   homebrew = {
     taps = [ { name = "kreuzwerker/homebrew-taps"; } ];
     brews = [
-      { name = "carthage"; }
-      { name = "go@1.21"; }
-      { name = "m1-terraform-provider-helper"; } # kreuzwerker/homebrew-taps
-      { name = "podman"; }
-      { name = "sourcery"; }
-      { name = "xcbeautify"; }
-      { name = "xcodegen"; }
-      { name = "xcodes"; }
+      {name = "carthage";}
+      {name = "go@1.22";}
+      {name = "m1-terraform-provider-helper";} # kreuzwerker/homebrew-taps
+      {name = "sourcery";}
+      {name = "xcbeautify";}
+      {name = "xcodegen";}
+      {name = "xcodes";}
     ];
     casks = [
-      { name = "burp-suite"; }
-      { name = "docker"; }
-      { name = "jetbrains-toolbox"; }
-      { name = "krita"; }
-      { name = "obs"; }
-      { name = "openlens"; }
-      { name = "podman-desktop"; }
-      { name = "shadowsocksx-ng"; }
-      { name = "vial"; }
-      { name = "vnc-viewer"; }
-      { name = "wireshark"; }
+      {name = "burp-suite";}
+      {name = "jetbrains-toolbox";}
+      {name = "krita";}
+      {name = "obs";}
+      {name = "openlens";}
+      {name = "orbstack";}
+      {name = "podman-desktop";}
+      {name = "shadowsocksx-ng";}
+      {name = "vial";}
+      {name = "vnc-viewer";}
+      {name = "wireshark";}
     ];
   };
 
diff --git a/flake.lock b/flake.lock
index 6767bd5..7483e81 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,11 +16,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707830867,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "lastModified": 1712079060,
+        "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "1381a759b205dff7a6818733118d02253340fd5e",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711312305,
-        "narHash": "sha256-n2I6qw6Lzcn2LqgDynUgWHd6i7fKMVos0JysmxW8xVU=",
+        "lastModified": 1712050237,
+        "narHash": "sha256-O4yrTNgnlx+WNS9Ha++veExncRmkX83mkywumjtPw3U=",
         "owner": "pinpox",
         "repo": "alertmanager-ntfy",
-        "rev": "fca24b84f276ef4b40e261cc32187d4e9b996191",
+        "rev": "c669b8701235d779fa7277008ccb617fc3d94538",
         "type": "github"
       },
       "original": {
@@ -420,11 +420,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711625603,
-        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
+        "lastModified": 1712462372,
+        "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
+        "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
         "type": "github"
       },
       "original": {
@@ -488,11 +488,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711761232,
-        "narHash": "sha256-3Lv+rfgD2uTMGe2fu3lojPxlspRrkA+RQCHdAPoO0sc=",
+        "lastModified": 1712539101,
+        "narHash": "sha256-SWWhUvpljUYEYSGvCArN90k0KXpzYybNCxVzzce2dys=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "02437b1efb9aac284c03692f8c3336a1e886446b",
+        "rev": "74add7a6ba3874d9896088cf120fb3e1551ede79",
         "type": "github"
       },
       "original": {
@@ -508,11 +508,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711249705,
-        "narHash": "sha256-h/NQECj6mIzF4XR6AQoSpkCnwqAM+ol4+qOdYi2ykmQ=",
+        "lastModified": 1712459390,
+        "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "34519f3bb678a5abbddf7b200ac5347263ee781b",
+        "rev": "4676d72d872459e1e3a248d049609f110c570e9a",
         "type": "github"
       },
       "original": {
@@ -523,11 +523,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1711352745,
-        "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
+        "lastModified": 1712566108,
+        "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
+        "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
         "type": "github"
       },
       "original": {
@@ -538,11 +538,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711715736,
-        "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
+        "lastModified": 1712573573,
+        "narHash": "sha256-xxon7WwNm4/EadMKg1eF40/5s0O78nXUy2ILZt6vT7E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
+        "rev": "0d28066770464d19d637f6e8e42e8688420b6ac6",
         "type": "github"
       },
       "original": {
@@ -554,11 +554,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1711793261,
-        "narHash": "sha256-v1KGar+L1wB0nFum4AheIfxuSy/QWGshp5InteL/qz4=",
+        "lastModified": 1712612676,
+        "narHash": "sha256-ccfthr2twjsERX5gd1MEp7YOvyGdkCFhJ+/2ICDDKMw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3863ee018a4cb24252a444d509b627453615231",
+        "rev": "0b3487168462acfd2b0a8b4433d08f3182e68bf5",
         "type": "github"
       },
       "original": {
@@ -570,11 +570,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1711793301,
-        "narHash": "sha256-xheP3IPzzORdwwzr7Y+2n6fzjVgmenObvqjg/hPCwYk=",
+        "lastModified": 1712608516,
+        "narHash": "sha256-Ypvy1sEKH8AmcjZpT4l+nvbEJtgFZpyudRQBYQeif+g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "86d71a6e6d36f3ef8e0998ff881584a16a794afb",
+        "rev": "d7329da4b1cd24f4383455071346f4f81b7becba",
         "type": "github"
       },
       "original": {
@@ -587,11 +587,11 @@
     "nmap-vulners": {
       "flake": false,
       "locked": {
-        "lastModified": 1671189750,
-        "narHash": "sha256-WUAAWmwiW0uSTGdBE1rxrbSSWBRhzAMrtcyP4mmwkQ8=",
+        "lastModified": 1712145195,
+        "narHash": "sha256-bV7L/Ba/3sQF/2x7Pz78TgappLTaPfyAfCOzAQR2IUc=",
         "owner": "vulnersCom",
         "repo": "nmap-vulners",
-        "rev": "4899a73532f2d166ba229f6c1e8a4046023623da",
+        "rev": "b913758f029b570e67c6def343b838dda1c9e7e4",
         "type": "github"
       },
       "original": {
@@ -635,11 +635,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711760932,
-        "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=",
+        "lastModified": 1712579741,
+        "narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "c11e43aed6f17336c25cd120eac886b96c455731",
+        "rev": "70f504012f0a132ac33e56988e1028d88a48855c",
         "type": "github"
       },
       "original": {
@@ -701,11 +701,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711784035,
-        "narHash": "sha256-NWKh+TEakGWO/Zdr97Gi0HpLpooMge0ksBMDM4jOAzE=",
+        "lastModified": 1712154372,
+        "narHash": "sha256-2HFQm/gpmxtMokn6pInHlTlU7mBONLb3Y1aN8SlY0tc=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "bad1af63ff330b397b87fc243d479701417740da",
+        "rev": "f9b9bc7c8e69942cd2583a3309f86fc5260f1275",
         "type": "github"
       },
       "original": {
@@ -742,11 +742,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711761168,
-        "narHash": "sha256-w7GgKhBcrg1B72Ymb24rDeAoHsNwZdF8OghR4VxGYHk=",
+        "lastModified": 1712580452,
+        "narHash": "sha256-X1LjMY8wpnflD2nq7GuYxTichyWR9qxw8eGmzyEW4h8=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "5fae7231f16bd5467660c50e7d6a3732559443a0",
+        "rev": "5041ca76d6c80d057673e5202fa4167f81202391",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 018bd45..e6666d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -155,15 +155,17 @@
         program = "${self.packages.${system}.default}/bin/nixfiles";
       };
 
-      packages =
-        let
-          buildIsoImage = name: self.nixosConfigurations.${name}.config.system.build.isoImage;
-        in
-        {
-          default = self.legacyPackages.${system}.nixfiles;
-          iso-arm = buildIsoImage "iso-arm";
-          iso-x86 = buildIsoImage "iso-x86";
-        };
+      # NOTE Leave this commented out because otherthise `nix flake check`
+      # complains a lot.
+      # packages =
+      #   let
+      #     buildIsoImage = name: self.nixosConfigurations.${name}.config.system.build.isoImage;
+      #   in
+      #   {
+      #     default = self.legacyPackages.${system}.nixfiles;
+      #     iso-arm = buildIsoImage "iso-arm";
+      #     iso-x86 = buildIsoImage "iso-x86";
+      #   };
 
       legacyPackages = import nixpkgs {
         inherit system;
diff --git a/modules/common/common/nix.nix b/modules/common/common/nix.nix
index 6cc32d3..fdb0125 100644
--- a/modules/common/common/nix.nix
+++ b/modules/common/common/nix.nix
@@ -4,7 +4,6 @@
   lib,
   localUsername ? lib.my.username,
   pkgs,
-  pkgsPr,
   this,
   ...
 }:
@@ -37,10 +36,7 @@ with lib;
 
   nixpkgs.overlays = with inputs; [
     self.overlays.default
-    (_: _: {
-      inherit (pkgsPr 298756 "sha256-AxNXEDRb9yEde0sPEBRxfXSAu/ZL6/BlOzSj+aoOlHk=") qolibri;
-      inherit (pkgsPr 298346 "sha256-CSEUeivyTWxVskjWzDUal8KYthk7UYMOM4KdjZyhV3o=") dmalloc;
-    })
+    (_: _: { })
   ];
 
   nix =
diff --git a/modules/nixos/common/users.nix b/modules/nixos/common/users.nix
index eca9e1b..a92a38e 100644
--- a/modules/nixos/common/users.nix
+++ b/modules/nixos/common/users.nix
@@ -1,7 +1,11 @@
-{ lib, ... }:
+{
+  lib,
+  localUsername ? lib.my.username,
+  ...
+}:
 with lib;
 let
-  home = "/home/${my.username}";
+  home = "/home/${localUsername}";
 in
 {
   ark.directories = [ home ];
@@ -12,7 +16,7 @@ in
     users = {
       root.hashedPassword = "@HASHED_PASSWORD@";
 
-      ${my.username} = {
+      ${localUsername} = {
         isNormalUser = true;
         uid = 1000;
         description = my.fullname;
diff --git a/nixosConfigurations/default.nix b/nixosConfigurations/default.nix
index 1f0d78c..8ef5f33 100644
--- a/nixosConfigurations/default.nix
+++ b/nixosConfigurations/default.nix
@@ -25,18 +25,18 @@ let
       } // extraSpecialArgs;
     });
 
-  mkIso = system: {
-    this = {
-      hostname = "iso";
-      inherit system;
-      isHeadless = false;
-      isHeadful = false;
-    };
-    configuration = ./iso;
-    modules = [
-      "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
-    ];
-  };
+  # mkIso = system: {
+  #   this = {
+  #     hostname = "iso";
+  #     inherit system;
+  #     isHeadless = false;
+  #     isHeadful = false;
+  #   };
+  #   configuration = ./iso;
+  #   modules = [
+  #     "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
+  #   ];
+  # };
 
   mkTest = this: {
     modules = with inputs; [
@@ -47,8 +47,8 @@ let
   };
 in
 mapAttrs' mkConfiguration {
-  iso-arm = mkIso "aarch64-linux";
-  iso-x86 = mkIso "x86_64-linux";
+  # iso-arm = mkIso "aarch64-linux";
+  # iso-x86 = mkIso "x86_64-linux";
 
   test-headless = mkTest {
     hostname = "test-headless";