[NixOS] Use yshui/pijulius picom

2024-09-05 17:41:53 -06:00
50 changed files with 220 additions and 466 deletions
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -1517,7 +1517,6 @@ https://github.com/alpaker/Fill-Column-Indicator/issues/21 for more details
 ** indent-bars
 #+begin_src emacs-lisp
 (use-package indent-bars
-  :disabled t
  :straight (indent-bars :type git :host github :repo "jdtsmith/indent-bars")
  :config
  (require 'indent-bars-ts) 		; not needed with straight
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -1,5 +1,5 @@
 { config, pkgs, forEachUser, makeEnable, realUsers, ... }:
-makeEnable config "myModules.base" true {
+makeEnable config "modules.base" true {
  nixpkgs.config.permittedInsecurePackages = [
    "openssl-1.0.2u"
    "electron-12.2.3"
@@ -36,7 +36,7 @@ makeEnable config "myModules.base" true {
  };

  # Audio
-  hardware.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = true;

  # Bluetooth
  hardware.bluetooth.enable = true;
--- a/nixos/ben.nix
+++ b/nixos/ben.nix
@@ -1,5 +1,5 @@
 { pkgs, inputs, config, makeEnable, ... }:
-makeEnable config "myModules.ben" true {
+makeEnable config "modules.ben" true {
  home-manager.backupFileExtension = "backup"; # Add this line
  home-manager.users.ben = {
    programs.zsh = {
--- a/nixos/cache-server.nix
+++ b/nixos/cache-server.nix
@@ -1,10 +1,10 @@
 { config, lib, ... }:
 with lib;
-let cfg = config.myModules.cache-server;
+let cfg = config.modules.cache-server;
 in
 {
  options = {
-    myModules.cache-server = {
+    modules.cache-server = {
      enable = mkEnableOption "nix cache server";
      port = mkOption {
        type = types.int;
--- a/nixos/code.nix
+++ b/nixos/code.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, ... }:
-makeEnable config "myModules.code" true {
+makeEnable config "modules.code" true {
  programs.direnv = {
    enable = true;
    nix-direnv.enable = true;
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -19,13 +19,10 @@
    ./gnome.nix
    ./imalison.nix
    ./internet-computer.nix
-    ./k3s.nix
    ./kat.nix
    ./keybase.nix
-    ./kubelet.nix
    ./nix.nix
    ./nixified.ai.nix
-    ./nvidia.nix
    ./options.nix
    ./plasma.nix
    ./postgres.nix
@@ -45,17 +42,17 @@
  };

  config = lib.mkIf config.features.full.enable {
-    myModules.base.enable = true;
-    myModules.desktop.enable = true;
-    myModules.plasma.enable = true;
-    myModules.gnome.enable = false;
-    myModules.xmonad.enable = true;
-    myModules.extra.enable = true;
-    myModules.electron.enable = true;
-    myModules.code.enable = true;
-    myModules.games.enable = true;
-    myModules.syncthing.enable = true;
-    myModules.fonts.enable = true;
-    myModules.nixified-ai.enable = false;
+    modules.base.enable = true;
+    modules.desktop.enable = true;
+    modules.plasma.enable = true;
+    modules.gnome.enable = false;
+    modules.xmonad.enable = true;
+    modules.extra.enable = true;
+    modules.electron.enable = true;
+    modules.code.enable = true;
+    modules.games.enable = true;
+    modules.syncthing.enable = true;
+    modules.fonts.enable = true;
+    modules.nixified-ai.enable = false;
  };
 }
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -1,5 +1,5 @@
 { config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.desktop" true {
+makeEnable config "modules.desktop" true {
  imports = [
    ./fonts.nix
  ];
@@ -71,7 +71,7 @@ makeEnable config "myModules.desktop" true {
    notify-osd-customizable
    okular
    pinentry
-    mission-center
+    psensor
    quassel
    remmina
    rofi
--- a/nixos/electron.nix
+++ b/nixos/electron.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, forEachUser, ... }:
-makeEnable config "myModules.electron" false {
+makeEnable config "modules.electron" false {
  environment.systemPackages = with pkgs; [
    element-desktop
    # bitwarden
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -1,5 +1,5 @@
 { config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.extra" false {
+makeEnable config "modules.extra" false {
  services.expressvpn.enable = true;
  programs.hyprland.enable = true;

--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -217,45 +217,6 @@
        "type": "indirect"
      }
    },
-    "flake-parts_4": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1701473968,
-        "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_5": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixtheplanet",
-          "hercules-ci-effects",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1696343447,
-        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
-        "type": "github"
-      },
-      "original": {
-        "id": "flake-parts",
-        "type": "indirect"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": [
@@ -263,11 +224,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -281,11 +242,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -633,7 +594,7 @@
        "lsp": "lsp",
        "lsp-test": "lsp-test",
        "lsp-types": "lsp-types",
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_6",
        "ormolu-052": "ormolu-052",
        "ormolu-07": "ormolu-07",
        "stylish-haskell-0145": "stylish-haskell-0145"
@@ -668,7 +629,7 @@
        "lsp": "lsp_2",
        "lsp-test": "lsp-test_2",
        "lsp-types": "lsp-types_2",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_8",
        "ormolu-052": "ormolu-052_2",
        "ormolu-07": "ormolu-07_2",
        "stylish-haskell-0145": "stylish-haskell-0145_2"
@@ -710,25 +671,6 @@
        "type": "github"
      }
    },
-    "hercules-ci-effects_2": {
-      "inputs": {
-        "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_6"
-      },
-      "locked": {
-        "lastModified": 1701009247,
-        "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=",
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "hercules-ci-effects",
-        "type": "github"
-      }
-    },
    "hiedb": {
      "flake": false,
      "locked": {
@@ -839,11 +781,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1727381010,
-        "narHash": "sha256-2PqUwnZXjYiPUm5A4d8Z31mvLS4lvUeV/9gUhSMmNR4=",
+        "lastModified": 1723399884,
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "853e7bd24f875bac2e3a0cf72f993e917d0f8cf5",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
        "type": "github"
      },
      "original": {
@@ -1017,11 +959,11 @@
        "nixpkgs-regression": "nixpkgs-regression"
      },
      "locked": {
-        "lastModified": 1727380702,
-        "narHash": "sha256-1YUAqvZc9YOUERyPiaOGYEg2fIf20+yIWGhzB0Ke6j8=",
+        "lastModified": 1723343056,
+        "narHash": "sha256-ixvBNplVIqUqvshVi5azgPiGIFXlXDmahDcoP/guuTE=",
        "owner": "NixOS",
        "repo": "nix",
-        "rev": "0ed67e5b7ee9ad8fae162e1b10b25d22ada2b1f3",
+        "rev": "18485d2d53622c6ec7beab80c77efbd49ed682e2",
        "type": "github"
      },
      "original": {
@@ -1074,11 +1016,11 @@
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1727091786,
-        "narHash": "sha256-n36Vtdtx7tTTKFI9aoWxdNIlJ2dwxoitFDwcPXrS+Jk=",
+        "lastModified": 1723124175,
+        "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "1fcec53c692c15091ca5bb9eaf86a2cac6c53278",
+        "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690",
        "type": "github"
      },
      "original": {
@@ -1119,24 +1061,6 @@
        "type": "github"
      }
    },
-    "nixpkgs-lib": {
-      "locked": {
-        "dir": "lib",
-        "lastModified": 1701253981,
-        "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
-        "type": "github"
-      },
-      "original": {
-        "dir": "lib",
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs-regression": {
      "locked": {
        "lastModified": 1643052045,
@@ -1153,43 +1077,28 @@
        "type": "github"
      }
    },
-    "nixpkgs_10": {
+    "nixpkgs-regression_2": {
      "locked": {
-        "lastModified": 1686874404,
-        "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
+        "lastModified": 1723405223,
+        "narHash": "sha256-VSHY8GQ64AseobyeoVkJl+ZDaWPGzKs+CG6RfDM159o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
+        "rev": "938253e0f8d5c98c4515a10cc388239cc1431db8",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "haskell-updates",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_11": {
-      "locked": {
-        "lastModified": 1682134069,
-        "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1723688146,
-        "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
+        "lastModified": 1721548954,
+        "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
+        "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a",
        "type": "github"
      },
      "original": {
@@ -1217,11 +1126,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1726838390,
-        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
+        "lastModified": 1722087241,
+        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
+        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
        "type": "github"
      },
      "original": {
@@ -1233,11 +1142,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
@@ -1249,31 +1158,31 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1697723726,
-        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
+        "lastModified": 1686874404,
+        "narHash": "sha256-u2Ss8z+sGaVlKtq7sCovQ8WvXY+OoXJmY1zmyxITiaY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
+        "rev": "efc10371d5c5b8d2d58bab6c1100753efacfe550",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "haskell-updates",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_7": {
      "locked": {
-        "lastModified": 1703255338,
-        "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=",
-        "owner": "nixos",
+        "lastModified": 1709703039,
+        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04",
+        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@@ -1297,39 +1206,16 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1709703039,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "lastModified": 1682134069,
+        "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixtheplanet": {
-      "inputs": {
-        "flake-parts": "flake-parts_4",
-        "hercules-ci-effects": "hercules-ci-effects_2",
-        "nixpkgs": "nixpkgs_7",
-        "osx-kvm": "osx-kvm"
-      },
-      "locked": {
-        "lastModified": 1727105240,
-        "narHash": "sha256-FEuqbcZ4TDUMwCpTA/E3J5L7pLD4U+zXPnZbmXSmaJo=",
-        "owner": "matthewcroughan",
-        "repo": "nixtheplanet",
-        "rev": "2f622af217807da78e44a5a15f620743dac57f46",
-        "type": "github"
-      },
-      "original": {
-        "owner": "matthewcroughan",
-        "repo": "nixtheplanet",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
      }
    },
    "notifications-tray-icon": {
@@ -1407,34 +1293,18 @@
        "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
      }
    },
-    "osx-kvm": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701316418,
-        "narHash": "sha256-Sk8LYhFovoMX1ln7DWYArJQphW2a4h8Xg7/ZEZXwZv4=",
-        "owner": "kholia",
-        "repo": "OSX-KVM",
-        "rev": "09daff670a7eb9ff616073df329586c5995623a9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kholia",
-        "repo": "OSX-KVM",
-        "type": "github"
-      }
-    },
    "railbird-secrets": {
      "inputs": {
        "agenix": "agenix_2",
        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1726075726,
-        "narHash": "sha256-eQPDAzUJg8fwqiCyWsKxtHV+G1LGJKs9X3ZtOzytuDE=",
+        "lastModified": 1722639965,
+        "narHash": "sha256-ZRe5Z5s/UNaXI2piyncQ3YrFl5q3GryZAfFTyeJ/vhM=",
        "ref": "refs/heads/master",
-        "rev": "70d8ffd3f3b79b97477ae0655524273bb098b6c5",
-        "revCount": 86,
+        "rev": "9a92b83c3ad376620db3556c33e51a4300c5badd",
+        "revCount": 73,
        "type": "git",
        "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git"
      },
@@ -1457,7 +1327,7 @@
        "nixos-hardware": "nixos-hardware",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_5",
-        "nixtheplanet": "nixtheplanet",
+        "nixpkgs-regression": "nixpkgs-regression_2",
        "notifications-tray-icon": "notifications-tray-icon",
        "railbird-secrets": "railbird-secrets",
        "status-notifier-item": "status-notifier-item",
@@ -1700,7 +1570,6 @@
      },
      "original": {
        "owner": "taffybar",
-        "ref": "old-master",
        "repo": "taffybar",
        "type": "github"
      }
@@ -1724,11 +1593,11 @@
    },
    "unstable": {
      "locked": {
-        "lastModified": 1727122398,
-        "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
+        "lastModified": 1723175592,
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
        "type": "github"
      },
      "original": {
@@ -1741,7 +1610,7 @@
    "vscode-server": {
      "inputs": {
        "flake-utils": "flake-utils_6",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
        "lastModified": 1713958148,
@@ -1771,11 +1640,11 @@
        "unstable": "unstable"
      },
      "locked": {
-        "lastModified": 1726451364,
-        "narHash": "sha256-6WKgYq0+IzPSXxVl1MfODIVwEbd3Sw0zc5sMSOyzA8I=",
+        "lastModified": 1722277235,
+        "narHash": "sha256-fuEgR51OPzwff+ygFhBqJm51oA17rR0KtPfuDLv0Fp0=",
        "owner": "xmonad",
        "repo": "xmonad",
-        "rev": "a4140b93497333ec7f3127ee4dabcb8ae8a721b6",
+        "rev": "a58ccac7ba46414915de6c7f2b4da08b37784016",
        "type": "github"
      },
      "original": {
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -1,6 +1,5 @@
 {
  inputs = {
-    nixtheplanet.url = "github:matthewcroughan/nixtheplanet";
    railbird-secrets = {
      url = "git+ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git";
    };
@@ -35,7 +34,7 @@
    };

    taffybar = {
-      url = "github:taffybar/taffybar/old-master";
+      url = "github:taffybar/taffybar";
      inputs = {
        nixpkgs.follows = "nixpkgs";
        flake-utils.follows = "flake-utils";
@@ -105,6 +104,8 @@

    vscode-server.url = "github:nix-community/nixos-vscode-server";

+    nixpkgs-regression = { url = "github:NixOS/nixpkgs"; };
+
    nixified-ai = { url = "github:nixified-ai/flake"; };

    nixos-wsl = { url = "github:nix-community/NixOS-WSL"; };
@@ -113,7 +114,7 @@
  };

  outputs = inputs@{
-    self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, nixtheplanet,
+    self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad,
    xmonad-contrib, notifications-tray-icon, nix, agenix, imalison-taffybar, ...
  }:
  let
@@ -125,7 +126,7 @@
      name = machineNameFromFilename filename;
      value = {
        modules = [
-          (machinesFilepath + ("/" + filename)) agenix.nixosModules.default nixtheplanet.nixosModules.macos-ventura
+          (machinesFilepath + ("/" + filename)) agenix.nixosModules.default
        ];
      };
    };
--- a/nixos/fonts.nix
+++ b/nixos/fonts.nix
@@ -1,5 +1,5 @@
 { pkgs, makeEnable, config, ... }:
-makeEnable config "myModules.fonts" true {
+makeEnable config "modules.fonts" true {
  # Enable the gtk icon cache
  gtk.iconCache.enable = true;

--- a/nixos/games.nix
+++ b/nixos/games.nix
@@ -1,5 +1,5 @@
 { config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.games" false {
+makeEnable config "modules.games" false {
  environment.systemPackages = with pkgs; [
    steam
    # heroic
--- a/nixos/gitea-runner.nix
+++ b/nixos/gitea-runner.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, ... }:
-makeEnable config "myModules.gitea-runner" false {
+makeEnable config "modules.gitea-runner" false {
  age.secrets.gitea-runner-token = {
    file = ./secrets/gitea-runner-token.${config.networking.hostName}.age;
    group = "docker";
--- a/nixos/gitea.nix
+++ b/nixos/gitea.nix
@@ -1,5 +1,5 @@
 { config, makeEnable, ... }:
-makeEnable config "myModules.gitea" false {
+makeEnable config "modules.gitea" false {

  services.gitea = {
    enable = true;
--- a/nixos/gnome.nix
+++ b/nixos/gnome.nix
@@ -1,5 +1,5 @@
 { config, makeEnable, ... }:
-makeEnable config "myModules.gnome" false {
+makeEnable config "modules.gnome" false {
  services.xserver = {
    desktopManager.gnome.enable = true;
    displayManager.gdm.enable = true;
--- a/nixos/k3s.nix
+++ b/nixos/k3s.nix
@@ -1,23 +0,0 @@
-{ config, makeEnable, ... }:
-makeEnable config "myModules.railbird-k3s" false {
-  services.k3s = {
-    enable = true;
-    role = "server";
-    clusterInit = true;
-    containerdConfigTemplate = ''
-      {{ template "base" . }}
-
-      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia]
-      privileged_without_host_devices = false
-      runtime_engine = ""
-      runtime_root = ""
-      runtime_type = "io.containerd.runc.v2"
-
-      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.nvidia.options]
-      BinaryName = "/run/current-system/sw/bin/nvidia-container-runtime"
-    '';
-    gracefulNodeShutdown = {
-      enable = true;
-    };
-  };
-}
--- a/nixos/kat.nix
+++ b/nixos/kat.nix
@@ -1,11 +1,10 @@
 { pkgs, inputs, config, makeEnable, ... }:
-makeEnable config "myModules.kat" false {
+makeEnable config "modules.kat" false {
  environment.systemPackages = with pkgs; [
    bitwarden
    obsidian
    obs-studio
    ffmpeg
-    code-cursor
  ];

  environment.extraInit = ''
--- a/nixos/keys.nix
+++ b/nixos/keys.nix
@@ -56,5 +56,6 @@ rec {
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAJ6lD0c+frh2vzQjvsrsmJpwM1ovaY59m5NNPml5G+E benjamin.j.corner@gmail.com"
  ];
  interviewKeys = [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDr3Rim92K0aNWh2wCZjZMj927H6NZMvw+Jg5giVEklv/eeXlJn81xm9kFsqWOmN0IyS4X+2V2G/43t4C+REmzMKjkzTu9u6SJi+pC3jdJRm80sJCz2LBdRjPaY3CEubiUdxWvjisE8wUI1YuxxdegJpcemvhZXBfDU+DOqNEtF9KiPhXFMOoGU18k5AqFatdmE4z0H158cc6rCxdEiM8s+H6AJDA+xZSn9BPSx2I/ySRapoN0qJDloV19795ggnegBOjNuGejnKI0RZ8CyTcf1945Yi8/O/i/IChRlxiArjgAbC2DItkQig8YyQYz6WlKE9bwruMqe+8mgBAfuQXH8yTADwD1156VCRGoYAorAz4CLm73oGKtx4pa6WFsklWAIK1UEAhuLT6FKaJ/mmfKxcqdHxj+29FNo3d2Pam/ecFd0aERi5TExH5GKZr+LI7yKQmgk6laiR0n1wZuDwlNN7+69GH+ScxRngGCkc3RdTToqXzEaN3B6EyiAN/sAUgs= finn@LAPTOP-JI7BSSRJ"
  ];
 }
--- a/nixos/kubelet-client.crt
+++ b/nixos/kubelet-client.crt
@@ -1,23 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIDyTCCAjGgAwIBAgIRAMQBZiVjA5BGSkDldScI9cMwDQYJKoZIhvcNAQELBQAw
-LzEtMCsGA1UEAxMkM2I2N2M2NzgtNzI5My00YTIzLTg3ZWItY2NiMTZjYWFkMzFm
-MB4XDTI0MDkyOTIwNTAzNloXDTI5MDkyODIwNTIzNlowOTEVMBMGA1UEChMMc3lz
-dGVtOm5vZGVzMSAwHgYDVQQDExdzeXN0ZW06bm9kZTpyeXplbi1zaGluZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANIOfbq05IIdgX2jXYLaEt66rkXp
-NlqPNfh6v9nL1Aw6PSM3DEIWXVko8AyduRF4kXNO6xc6l/Rzk03w3qSvJpWpALGD
-JjslgRL4VJWUC6/QydsCO9io7SoUEmXFtDcsW6DftFejosr+56ZnVFrz5MMzfUAL
-Ix6n83NJvXZ8f9oHSX8TFW34ZClLxDq2fprFIs+D2QlFRE50Jr/Q8gPI2OSQDUBW
-DFdQrjt81bLs6doQipUqvHb4/Ms49agHek1ceWIMf+KZWoao5KNQTBe6XL2BUgA/
-MS3ZvQppDDTygA0QkgdtOJyG2lsrAmd7LEXTr9ilsqLV3YQMMKhCifwINa0CAwEA
-AaNWMFQwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMAwGA1Ud
-EwEB/wQCMAAwHwYDVR0jBBgwFoAUjvcbOeZ4QIk53EkATOaOFiAZUq0wDQYJKoZI
-hvcNAQELBQADggGBAELWgmdmg9TKjDDqmF6pYr1j43gZYclXW4sB509itSiIeltX
-Isrvn5R5ok0W5Jcl+7QMhpntqIKJi26OqbcdBhqlaVURkBkbrx8aegkWJfPO+Fzz
-NyyiIpk7KQzGy6N5//jfMPZtJfQEQZwMenW0cj7F0QHOdVZy90+JNr2P3uV3Ad7u
-WZuYpbOFjOeQg1hJsX8wEU4KJyptn/kXhM+CqAnQ4S+k2wpjECD8KpWKAmpJWZg0
-RaBPyHZSmWnbXqs4LU6ERaZJxZQG0ODuA18DmGfaAkUUUvE2J0ploc2Y8Xl4zUWW
-Ivwslyx30YO3J9qI30d9tTQw/A0vHCoDNDbCg7lorZqP3TiTG9ANLndPqqg6inYU
-yfj612//JrO8w/4qh7cxR03P35aK0paLC74FaKLtZ5CwPK3BAW/0Zhv5fH4io6hE
-rfJmcjhbKD0Cwr9Dn6wVFz/a33H+0vMohHrVlDk4bSDIymbuJcZpYgR8n5WNQbGu
-nwjiLXCnVxcVjkcj2w==
-----END CERTIFICATE-----
--- a/nixos/kubelet.nix
+++ b/nixos/kubelet.nix
@@ -1,22 +0,0 @@
-{ config, pkgs, makeEnable, ... }:
-makeEnable config "myModules.kubelet" false {
-  age.secrets."api_service_account_key.json.age".file = ./secrets/api_service_account_key.json.age;
-  services.kubernetes.kubelet = {
-    enable = true;
-    kubeconfig = {
-      server = "https://34.31.205.230";
-      caFile = ./railbird-kubernetes.crt;
-      certFile = ./kubelet-client.crt;
-      keyFile = config.age.secrets."api_service_account_key.json.age".path;
-    };
-    registerNode = true;
-    cni = {
-      packages = [ pkgs.cni-plugins pkgs.calico-cni-plugin ];
-    };
-    extraOpts = ''
-      --fail-swap-on=false
-      # --container-runtime=remote
-      # --container-runtime-endpoint=unix:///run/containerd/containerd.sock
-    '';
-  };
-}
--- a/nixos/machines/adele.nix
+++ b/nixos/machines/adele.nix
@@ -6,16 +6,16 @@
    inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = true;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.gitea-runner.enable = false;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = false;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/machines/bencbox.nix
+++ b/nixos/machines/bencbox.nix
@@ -8,10 +8,10 @@
    sublime
    vlc
  ];
-  myModules.desktop.enable = false;
-  myModules.plasma.enable = false;
+  modules.desktop.enable = false;
+  modules.plasma.enable = false;
  imalison.nixOverlay.enable = false;
-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "bencbox";

--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -13,25 +13,25 @@ in
    extraGroups = ["syncthing"];
  };

-  myModules.raspberry-pi.enable = true;
+  modules.raspberry-pi.enable = true;

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = false;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.cache-server = {
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = false;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.cache-server = {
    enable = false;
    host-string = biskcomp-nginx-hostnames;
    port = 80;
    path = "/nix-cache";
  };
-  myModules.gitea.enable = true;
-  myModules.gitea-runner.enable = false;
+  modules.gitea.enable = true;
+  modules.gitea-runner.enable = false;

  services.vaultwarden = {
    enable = true;
--- a/nixos/machines/david-blade.nix
+++ b/nixos/machines/david-blade.nix
@@ -5,15 +5,15 @@
    ../configuration.nix
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = false;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = false;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/machines/dean-zephyrus.nix
+++ b/nixos/machines/dean-zephyrus.nix
@@ -5,10 +5,10 @@
  ];
  services.xserver.enable = true;
  environment.systemPackages = with pkgs; [sublime];
-  myModules.desktop.enable = false;
-  myModules.plasma.enable = false;
+  modules.desktop.enable = false;
+  modules.plasma.enable = false;
  imalison.nixOverlay.enable = false;
-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "dean-zephyrus";

--- a/nixos/machines/jay-lenovo-wsl.nix
+++ b/nixos/machines/jay-lenovo-wsl.nix
@@ -5,7 +5,7 @@
  ];

  imalison.nixOverlay.enable = false;
-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "jay-lenovo-wsl";

--- a/nixos/machines/jay-lenovo.nix
+++ b/nixos/machines/jay-lenovo.nix
@@ -11,7 +11,6 @@
    android-studio
    linuxPackages_latest.perf
    zenmonitor
-    code-cursor
  ];

  hardware.enableRedistributableFirmware = true;
@@ -27,7 +26,7 @@
  boot.loader.systemd-boot.enable = true;
  boot.loader.efi.canTouchEfiVariables = true;

-  myModules.postgres.enable = true;
+  modules.postgres.enable = true;

  networking.networkmanager.enable = true;

--- a/nixos/machines/jimi-hendnix.nix
+++ b/nixos/machines/jimi-hendnix.nix
@@ -5,17 +5,17 @@
    ../configuration.nix
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = true;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.gitea-runner.enable = true;
-  myModules.postgres.enable = true;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = true;
+  modules.postgres.enable = true;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/machines/nixquick.nix
+++ b/nixos/machines/nixquick.nix
@@ -4,21 +4,13 @@
    ../configuration.nix
  ];

-  services.macos-ventura = {
-    enable = true;
-    openFirewall = true;
-    vncListenAddr = "0.0.0.0";
-  };
-
  features.full.enable = true;
-  myModules.cache-server = {
+  modules.cache-server = {
    enable = true;
    port = 3090;
  };
-  myModules.gitea-runner.enable = true;
-  myModules.vscode.enable = true;
-  myModules.kat.enable = true;
-  myModules.nvidia.enable = true;
+  modules.gitea-runner.enable = true;
+  modules.vscode.enable = true;

  networking.hostName = "nixquick";

@@ -29,6 +21,15 @@
  boot.extraModulePackages = [ ];
  boot.loader.systemd-boot.enable = true;

+  # install nvidia drivers in addition to intel one
+  hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
+  hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+  };
+
+  hardware.opengl.driSupport32Bit = true;
+
  hardware.nvidia.modesetting.enable = true;

  # This also enables v4l2loopback
--- a/nixos/machines/railbird-sf.nix
+++ b/nixos/machines/railbird-sf.nix
@@ -55,15 +55,15 @@
  };

  features.full.enable = false;
-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = false;
-  myModules.gnome.enable = true;
-  myModules.code.enable = true;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.plasma.enable = false;
-  myModules.gitea-runner.enable = true;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = false;
+  modules.gnome.enable = true;
+  modules.code.enable = true;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.plasma.enable = false;
+  modules.gitea-runner.enable = true;

  fileSystems."/" =
    { device = "/dev/disk/by-uuid/a317d456-6f84-41ee-a149-8e466e414aae";
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -6,16 +6,14 @@
  ];

  features.full.enable = true;
-  myModules.kubelet.enable = false;
-  myModules.nvidia.enable = true;
  # Needed for now because monitors have different refresh rates
-  myModules.xmonad.picom.vSync.enable = false;
-  myModules.cache-server = {
+  modules.xmonad.picom.vSync.enable = false;
+  modules.cache-server = {
    enable = true;
    port = 3090;
  };
-  myModules.gitea-runner.enable = true;
-  myModules.postgres.enable = true;
+  modules.gitea-runner.enable = true;
+  modules.postgres.enable = true;

  boot.loader.systemd-boot.configurationLimit = 5;

--- a/nixos/machines/strixi-minaj-wsl.nix
+++ b/nixos/machines/strixi-minaj-wsl.nix
@@ -4,7 +4,7 @@
    ../configuration.nix
  ];

-  myModules.wsl.enable = true;
+  modules.wsl.enable = true;

  networking.hostName = "strixi-minaj-wsl";

--- a/nixos/machines/strixi-minaj.nix
+++ b/nixos/machines/strixi-minaj.nix
@@ -6,16 +6,16 @@
    inputs.nixos-hardware.nixosModules.asus-rog-strix-g834jzr
  ];

-  myModules.base.enable = true;
-  myModules.desktop.enable = true;
-  myModules.xmonad.enable = true;
-  myModules.extra.enable = false;
-  myModules.code.enable = true;
-  myModules.games.enable = false;
-  myModules.syncthing.enable = true;
-  myModules.fonts.enable = true;
-  myModules.nixified-ai.enable = false;
-  myModules.gitea-runner.enable = false;
+  modules.base.enable = true;
+  modules.desktop.enable = true;
+  modules.xmonad.enable = true;
+  modules.extra.enable = false;
+  modules.code.enable = true;
+  modules.games.enable = false;
+  modules.syncthing.enable = true;
+  modules.fonts.enable = true;
+  modules.nixified-ai.enable = false;
+  modules.gitea-runner.enable = false;

  hardware.enableRedistributableFirmware = true;

--- a/nixos/nixified.ai.nix
+++ b/nixos/nixified.ai.nix
@@ -1,5 +1,5 @@
 { inputs, config, specialArgs, ... }:
-specialArgs.makeEnable config "myModules.nixified-ai" false {
+specialArgs.makeEnable config "modules.nixified-ai" false {
  imports = [
    inputs.nixified-ai.nixosModules.invokeai
  ];
--- a/nixos/nvidia.nix
+++ b/nixos/nvidia.nix
@@ -1,15 +0,0 @@
-{ config, pkgs, makeEnable, ... }:
-
-makeEnable config "myModules.nvidia" false {
-  environment.systemPackages = with pkgs; [
-    nvidia-container-toolkit
-  ];
-  hardware.nvidia-container-toolkit.enable = true;
-  hardware.nvidia.open = false;
-  hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
-  hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
-  hardware.graphics.enable32Bit = true;
-  services.xserver = {
-    videoDrivers = [ "nvidia" ];
-  };
-}
--- a/nixos/options.nix
+++ b/nixos/options.nix
@@ -1,6 +1,6 @@
 { lib, ... }: {
  options = {
-    myModules.xmonad.picom.vSync.enable = lib.mkOption {
+    modules.xmonad.picom.vSync.enable = lib.mkOption {
      default = true;
      type = lib.types.bool;
    };
--- a/nixos/overlay.nix
+++ b/nixos/overlay.nix
@@ -17,16 +17,15 @@ final: prev: {
    };
  });

-  # picom = prev.picom.overrideAttrs (old: {
-  #   src = prev.fetchFromGitHub {
-  #     repo = "picom";
-  #     owner = "dccsillag";
-  #     rev = "51b21355696add83f39ccdb8dd82ff5009ba0ae5";
-  #     sha256 = "sha256-crCwRJd859DCIC0pEerpDqdX2j8ZrNAzVaSSB3mTPN8==";
-  #   };
-  #   nativeBuildInputs = old.nativeBuildInputs ++ [final.pcre final.gnugrep.pcre2 final.libpcre];
-  #   buildInputs = old.buildInputs ++ [final.pcre];
-  # });
+  picom-pijulius = prev.picom-pijulius.overrideAttrs (old: {
+    src = prev.fetchFromGitHub {
+      repo = "picom";
+      owner = "pijulius";
+      rev = "cb93ce9aeed7362c10f2537cd51f4ba45e7d88b5";
+      sha256 = "sha256-VAYC4ksQHnO3PctkmPlO/5/lL/7vLcHYRptwb03Hcwc=";
+    };
+    nativeBuildInputs = old.nativeBuildInputs ++ [final.asciidoctor];
+  });

  expressvpn = prev.expressvpn.overrideAttrs (_: {
    src = prev.fetchurl {
--- a/nixos/plasma.nix
+++ b/nixos/plasma.nix
@@ -1,5 +1,5 @@
 { config, makeEnable, ... }:
-makeEnable config "myModules.plasma" true {
+makeEnable config "modules.plasma" true {
  services.displayManager.sddm.enable = true;
  services.xserver = {
    desktopManager.plasma5.enable = true;
--- a/nixos/postgres.nix
+++ b/nixos/postgres.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, realUsers, ... }:
-makeEnable config "myModules.postgres" true {
+makeEnable config "modules.postgres" true {
  services.postgresql = {
    enable = true;
    package = pkgs.postgresql_15;
--- a/nixos/rabbitmq.nix
+++ b/nixos/rabbitmq.nix
@@ -1,5 +1,5 @@
 { pkgs, config, makeEnable, realUsers, ... }:
-makeEnable config "myModules.rabbitmq" true {
+makeEnable config "modules.rabbitmq" true {
  services.rabbitmq = {
    enable = true;
  };
--- a/nixos/railbird-kubernetes.crt
+++ b/nixos/railbird-kubernetes.crt
@@ -1,25 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIELTCCApWgAwIBAgIRALNxOT7J7N/eK6edp9LbKAIwDQYJKoZIhvcNAQELBQAw
-LzEtMCsGA1UEAxMkM2I2N2M2NzgtNzI5My00YTIzLTg3ZWItY2NiMTZjYWFkMzFm
-MCAXDTIzMTIyOTE5NTQ0MloYDzIwNTMxMjIxMjA1NDQyWjAvMS0wKwYDVQQDEyQz
-YjY3YzY3OC03MjkzLTRhMjMtODdlYi1jY2IxNmNhYWQzMWYwggGiMA0GCSqGSIb3
-DQEBAQUAA4IBjwAwggGKAoIBgQCUYUuTrpDbwUS2B3SYUoa7LI5mi8NNr0lDe1w4
-3yPpVnu6ubvnTNm2j/v88HYwEjlppEg4HjhP7YEJ8gsGdgUCpIaPWTpifVmA7E4o
-2DbJDiePkkUGkNL0whCClOOcO0hyxdk9Pol5wRzci0l6zSalE6DB4rJrmB5Ppl/A
-t2KAVVqpwbynmbijr4yZh7Bp7LfaIrFthlv2ZPEjLfPLz7YthBw9/iUt94mLMyWZ
-BpygA5y/CocQQnnFMnU1o0eUd37YL7zErfIxx/AmL10Sq0qdFXiYOJJqubURbdS8
-DZ6dyHdX+UlxPls2Rlx9nDaiNGFJdzqHJzDdOlzN3kkdDQoO8xUdH9ekFU7rOwkP
-5NpubSwrd1FOGHh+EknugnEQD4Oip/YQ7IUj3Afm5Ag2la9k4WJRgjACbkQ2+k9I
-sFmPmmMVHn9nepCMiYQMjX7ApZw0isDPeVK5EuQeImgu7uNoV8R5VwG0XoBCXz4S
-UqYv11uEsMqFu07Zwlznsxnm0uECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgIEMA8G
-A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI73GznmeECJOdxJAEzmjhYgGVKtMA0G
-CSqGSIb3DQEBCwUAA4IBgQAm19zlm3WVePflA6Zh/FxvE8MirrJF6jmJzRrBCEM5
-DwkSmY3dvONqCYeeNb4+xWXWQ8eVKVlPdkoW3V7H5xnJ63dXRNN2lQ3JpSTG3+yP
-Omp6XGY9mmatdHwyV7N4h10aKEWAuRhy148sdJZLYj0LbR42pCVYhEP4D3Qj7KjN
-PJe+cR8NSpiYmDH5y88Jqubztj5NVcDj/iN9h/7/GajbU6lCgN/SxZgi9cNGjxSb
-JHFHE2Mp3z9sjsieTXMplLqK045TQ2IBqnJyMdKkvSNkRUCbz2yXdiIOKtvU4ly0
-h884z9P5JQ9bxe+6cwYC4ky3G5WYMn++RUsuCk4ScsrbZtM9jpKnz/TygMdVTC5w
-Siq6OHKtAnh8Ax1LEKicg9FLd6ODxR3OVKu+fUPV4XHAWJnmvElGlivjneHiE+OL
-dzgb/CfBEGHYBVc2PDIhwBmUdoEZ/t3UjvmSI46ZblYpWodJvLFwge2HxSivRlLW
-Uh/oPWX5N/CH9I34HTAhI48=
-----END CERTIFICATE-----
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -1,6 +1,6 @@
 { config, pkgs, inputs, makeEnable, ... }:

-makeEnable config "myModules.raspberry-pi" false {
+makeEnable config "modules.raspberry-pi" false {
  imports = [
    inputs.nixos-hardware.nixosModules.raspberry-pi-4
  ];
--- a/nixos/secrets/api_service_account_key.json.age
+++ b/nixos/secrets/api_service_account_key.json.age
--- a/nixos/secrets/secrets.nix
+++ b/nixos/secrets/secrets.nix
@@ -13,5 +13,4 @@ in
  "gitea-runner-token.mac-demarco-mini.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
  "nextcloud-admin.age".publicKeys = keys.agenixKeys;
  "ryzen-shine-kubernetes-token.age".publicKeys = keys.agenixKeys;
-  "api_service_account_key.json.age".publicKeys = keys.agenixKeys;
 }
--- a/nixos/syncthing.nix
+++ b/nixos/syncthing.nix
@@ -18,11 +18,10 @@ let
    strixi-minaj-wsl = { id = "DOAEFFI-W6EZY3K-GDUHDLX-6DQPVFC-XU3G65X-5KX6RKK-EMF7ZT7-YKKKOAM"; };
    strixi-minaj = { id = "IF76WOS-WVYFAQG-ZZMIT3R-ZR6EQQH-YQP3FGZ-BJ3LJKO-56FK2XA-UREADQM"; };
    dean-zephyrus = { id = "UVIQVZQ-WFWVUQT-OTXPK7V-RXFKAVV-RY5DV2Z-XZEH3Q2-JQZIQLW-XMSB6AT"; };
-    bencbox = { id = "FZFDBDG-J56RKLU-JZUHEAB-SAGB6CM-LRR6QFC-ZLNQG22-R2DEXAC-MY4BXQN"; };
  };
  allDevices = builtins.attrNames devices;
 in
-makeEnable config "myModules.syncthing" true {
+makeEnable config "modules.syncthing" true {
  system.activationScripts.syncthingPermissions = {
    text = ''
      chown -R syncthing:syncthing /var/lib/syncthing
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -92,12 +92,12 @@ in
    railbird = userDefaults // {
      inherit extraGroups;
      name = "railbird";
-      openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdFullstackDevKeys;
+      openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.railbirdDevKeys;
    };
    interview = userDefaults // {
      inherit extraGroups;
      name = "interview";
-      openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdFullstackDevKeys;
+      openssh.authorizedKeys.keys = interviewKeys ++ inputs.railbird-secrets.keys.railbirdDevKeys;
    };
  };

--- a/nixos/vscode.nix
+++ b/nixos/vscode.nix
@@ -1,5 +1,5 @@
 { inputs, config, makeEnable, forEachUser, ... }:
-makeEnable config "myModules.vscode" true {
+makeEnable config "modules.vscode" true {
  home-manager.users = forEachUser {
    imports = [inputs.vscode-server.homeModules.default];
    services.vscode-server.enable = true;
--- a/nixos/wsl.nix
+++ b/nixos/wsl.nix
@@ -1,13 +1,13 @@
 { config, inputs, pkgs, makeEnable, ... }:
-makeEnable config "myModules.wsl" false {
+makeEnable config "modules.wsl" false {
  imports = [
    inputs.nixos-wsl.nixosModules.wsl
  ];

-  myModules.base.enable = false;
-  myModules.desktop.enable = false;
-  myModules.xmonad.enable = false;
-  myModules.plasma.enable = false;
+  modules.base.enable = false;
+  modules.desktop.enable = false;
+  modules.xmonad.enable = false;
+  modules.plasma.enable = false;

  # Update timezone automatically
  services.tzupdate.enable = true;
--- a/nixos/xmonad.nix
+++ b/nixos/xmonad.nix
@@ -1,5 +1,5 @@
 { config, pkgs, inputs, forEachUser, makeEnable, ... }:
-makeEnable config "myModules.xmonad" true  {
+makeEnable config "modules.xmonad" true  {
  nixpkgs.overlays = with inputs; [
    xmonad.overlay
    xmonad-contrib.overlay
@@ -25,7 +25,7 @@ makeEnable config "myModules.xmonad" true  {
    # Haskell Desktop
    haskellPackages.xmonad
    haskellPackages.imalison-xmonad
-    # haskellPackages.notifications-tray-icon
+    haskellPackages.notifications-tray-icon
    haskellPackages.gtk-sni-tray
    haskellPackages.status-notifier-item
    haskellPackages.dbus-hslogger
@@ -80,9 +80,10 @@ makeEnable config "myModules.xmonad" true  {

    services.picom = {
      enable = true;
-      vSync = config.myModules.xmonad.picom.vSync.enable;
+      vSync = config.modules.xmonad.picom.vSync.enable;
      backend = "glx";
-      extraArgs = ["--experimental-backends"];
+      # extraArgs = ["--experimental-backends"];
+      package = pkgs.picom-pijulius;

      settings = {
        animations = true;
@@ -137,21 +138,21 @@ makeEnable config "myModules.xmonad" true  {
      };
    };

-    # systemd.user.services.notifications-tray-icon = {
-    #   Unit = {
-    #     Description = "Notifications tray icon";
-    #     After = [ "graphical-session-pre.target" "tray.target" ];
-    #     PartOf = [ "graphical-session.target" ];
-    #   };
+    systemd.user.services.notifications-tray-icon = {
+      Unit = {
+        Description = "Notifications tray icon";
+        After = [ "graphical-session-pre.target" "tray.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };

-    #   Install = { WantedBy = [ "graphical-session.target" ]; };
+      Install = { WantedBy = [ "graphical-session.target" ]; };

-    #   Service = {
-    #     ExecStart = "${pkgs.haskellPackages.notifications-tray-icon}/bin/notifications-tray-icon  --github-token-pass dfinity-github-api-token";
-    #     Restart = "always";
-    #     RestartSec = 3;
-    #   };
-    # };
+      Service = {
+        ExecStart = "${pkgs.haskellPackages.notifications-tray-icon}/bin/notifications-tray-icon  --github-token-pass dfinity-github-api-token";
+        Restart = "always";
+        RestartSec = 3;
+      };
+    };

    systemd.user.services.shutter = {
      Unit = {