Move overlays to flake definition

.gitattributes

@@ -1,5 +1,4 @@
 secrets/soundcloud_token filter=git-crypt diff=git-crypt
-secrets/bandcamp_token filter=git-crypt diff=git-crypt
 assets/bitwig/activation.bwreg filter=lfs diff=lfs merge=lfs -text
 assets/bitwig/bitwig-studio.deb filter=lfs diff=lfs merge=lfs -text
 assets/bitwig/bitwig.jar filter=lfs diff=lfs merge=lfs -text

Makefile

@@ -1,9 +1,8 @@
 switch:
-	nixos-rebuild switch --target-host root@localhost \
+	sudo nixos-rebuild switch --flake path://$(PWD)#
-    --build-host root@localhost --flake path://$(PWD)#panacea
 
 update:
-	nix flake update --commit-lock-file
+	nix flake update . --commit-lock-file
 
 upgrade:
 	make update && make switch

configuration.nix

@@ -1,59 +1,53 @@
-{
+{ config, lib, pkgs, inputs, ... }:
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
 
 with pkgs;
 
 {
   # Kernel configuration
   boot = {
-    blacklistedKernelModules = [
+    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-      "btusb"
-      "bluetooth"
-    ];
     kernelParams = [
-      "zfs.zfs_arc_max=8589934592"
+      "zfs.zfs_arc_max=2147483648"
-      "zfs.zfs_arc_min=1073741824"
+      "zfs.zfs_arc_meta_limit_percent=90"
+      "workqueue.power_efficient=y"
+      "ipv6.disable=1"
+      "ahci.mobile_lpm_policy=3"
+      "nmi_watchdog=0"
+      "msr.allow_writes=on"
     ];
+    kernelModules = [ "i915" ];
+    blacklistedKernelModules = [ "btusb" "bluetooth" ];
     supportedFilesystems = [ "zfs" ];
     zfs = {
       requestEncryptionCredentials = true;
-      package = zfs_unstable;
+      enableUnstable = true;
     };
   };
 
-  # Device firmware updates
+  # Intel CPU tweaks
+  hardware.enableRedistributableFirmware = true;
   services.fwupd.enable = true;
 
-  # Secure boot using lanzaboote
+  # Hardware video acceleration
+  hardware.opengl.extraPackages =
+    [ intel-media-driver vaapiIntel vaapiVdpau libvdpau-va-gl ];
+
+  # Bootloader configuration
   boot.loader = {
     efi.canTouchEfiVariables = true;
     systemd-boot = {
-      enable = false;
+      enable = true;
       configurationLimit = 50;
       editor = false;
     };
     timeout = 3;
   };
-  boot.lanzaboote = {
-    enable = true;
-    pkiBundle = "/etc/secureboot";
-  };
 
   # Run Nix garbage collector and enable flakes
   nix = {
     settings = {
       auto-optimise-store = true;
-      trusted-users = [
+      trusted-users = [ "root" "coolneng" ];
-        "root"
-        "coolneng"
-      ];
-      lazy-trees = true;
-      eval-cores = 2;
     };
     gc = {
       automatic = true;
@@ -66,13 +60,14 @@ with pkgs;
       gc-keep-outputs = true
       experimental-features = nix-command flakes
     '';
+    package = nixUnstable;
   };
 
   # Clean tmp directory on shutdown
   boot.tmp.cleanOnBoot = true;
 
-  # Keep logs for a month
+  # Keep logs for a week
-  services.journald.extraConfig = "MaxRetentionSec=4week";
+  services.journald.extraConfig = "MaxRetentionSec=1week";
 
   # Scrub zpool monthly
   services.zfs.autoScrub = {
@@ -85,18 +80,13 @@ with pkgs;
   services.chrony.enable = true;
 
   # NixOS version
-  system.stateVersion = "24.05";
+  system.stateVersion = "22.05";
 
   # Create coolneng user
   users.users.coolneng = {
     isNormalUser = true;
     home = "/home/coolneng";
-    extraGroups = [
+    extraGroups = [ "wheel" "video" "audio" "libvirtd" "lp" ];
-      "wheel"
-      "video"
-      "audio"
-      "lp"
-    ];
     shell = fish;
   };
 
@@ -111,19 +101,14 @@ with pkgs;
       group = "systemd-network";
     };
     secrets.syncthing.file = secrets/syncthing.age;
+    secrets.samba-ugent.file = secrets/samba-ugent.age;
     secrets.msmtp.file = secrets/msmtp.age;
     identityPaths = [ "/etc/ssh/id_ed25519" ];
   };
 
   # Use same version of nixpkgs for nix-shell
-  nix.nixPath =
+  nix.nixPath = let path = toString ./.;
-    let
+  in [ "nixpkgs=${inputs.nixpkgs}" "nixos-config=${path}/configuration.nix" ];
-      path = toString ./.;
-    in
-    [
-      "nixpkgs=${inputs.nixpkgs}"
-      "nixos-config=${path}/configuration.nix"
-    ];
 
   # Auto-upgrade the system
   system.autoUpgrade = {
@@ -131,6 +116,8 @@ with pkgs;
     dates = "22:30";
     flake = "/home/coolneng/Projects/panacea";
     flags = [
+      "--update-input"
+      "agenix"
       "--update-input"
       "nixpkgs"
       "--commit-lock-file"
@@ -148,7 +135,7 @@ with pkgs;
     config.programs.ssh.package
     git-crypt
     git-lfs
-    inputs.agenix.packages.${config.nixpkgs.localSystem.system}.default
+    inputs.agenix.packages.x86_64-linux.default
   ];
 
   # Configure git for auto-upgrade
@@ -184,7 +171,6 @@ with pkgs;
     ./modules/periodic.nix
     ./modules/power.nix
     ./modules/monitoring.nix
-    ./modules/latest-zfs-kernel.nix
   ];
 
 }

flake.lock

@@ -6,15 +6,14 @@
         "home-manager": "home-manager",
         "nixpkgs": [
           "nixpkgs"
-        ],
+        ]
-        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1762618334,
+        "lastModified": 1690228878,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792",
         "type": "github"
       },
       "original": {
@@ -23,21 +22,6 @@
         "type": "github"
       }
     },
-    "crane": {
-      "locked": {
-        "lastModified": 1765739568,
-        "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "cyrus-sasl-xoauth2": {
       "flake": false,
       "locked": {
@@ -62,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744478979,
+        "lastModified": 1673295039,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
+        "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
+        "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
         "type": "github"
       },
       "original": {
@@ -76,161 +60,18 @@
         "type": "github"
       }
     },
-    "determinate": {
+    "flake-utils": {
-      "inputs": {
-        "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin",
-        "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux",
-        "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux",
-        "nix": "nix",
-        "nixpkgs": "nixpkgs_2"
-      },
       "locked": {
-        "lastModified": 1765254444,
+        "lastModified": 1622445595,
-        "narHash": "sha256-kAO/ZeBnjaF+uqOP6qweXlRk2ylocLuv/9Dn8FsuPlU=",
+        "narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=",
-        "rev": "3ccc0297525e51ac3d7905509e0616c9c8350108",
+        "owner": "numtide",
-        "revCount": 316,
+        "repo": "flake-utils",
-        "type": "tarball",
+        "rev": "7d706970d94bc5559077eb1a6600afddcd25a7c8",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.14.0/019b0160-c5de-7941-9c26-cb47bc17eec3/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A"
-      }
-    },
-    "determinate-nixd-aarch64-darwin": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-6PWoqx52nvlWzlElTjcn7KAPKitfcKZYEFSsC3PoEoE=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/macOS"
-      }
-    },
-    "determinate-nixd-aarch64-linux": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-b1e25BUPL7Qf0QVbYlfZ/+QiClrP/SHIjMPtA47aOLc=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/aarch64-linux"
-      }
-    },
-    "determinate-nixd-x86_64-linux": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-8EI2f8IftPcRFlR6K4+cpIEAVf5UIeMCjHysEtVqDw0=",
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://install.determinate.systems/determinate-nixd/tag/v3.14.0/x86_64-linux"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "numtide",
-        "repo": "flake-compat",
+        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "determinate",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748821116,
-        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
-        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
-        "revCount": 377,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1"
-      }
-    },
-    "git-hooks-nix": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "gitignore": [
-          "determinate",
-          "nix"
-        ],
-        "nixpkgs": [
-          "determinate",
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
-        "revCount": 1026,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "pre-commit",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
         "type": "github"
       }
     },
@@ -242,11 +83,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745494811,
+        "lastModified": 1682203081,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
+        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
+        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
         "type": "github"
       },
       "original": {
@@ -255,34 +96,11 @@
         "type": "github"
       }
     },
-    "lanzaboote": {
-      "inputs": {
-        "crane": "crane",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pre-commit": "pre-commit",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1765887029,
-        "narHash": "sha256-s6LGO6kMlHRdnspV0LReSi47iaYaJ/Oveb4rM9fklPM=",
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "rev": "5a8c9b5339588bb6ec388da5d0a6e701a46a82c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "type": "github"
-      }
-    },
     "local-bitwig": {
       "flake": false,
       "locked": {
-        "lastModified": 1765321606,
+        "lastModified": 1680095020,
-        "narHash": "sha256-WteEWi5GPrGGfzLNTEmgQaH5/DAT/zeZofbBE6D+Po8=",
+        "narHash": "sha256-n8gLgN6QEVuHe30kQZ/gCWInDHwDpPWOB5RgVh1tSt8=",
         "path": "/home/coolneng/Projects/panacea/assets/bitwig",
         "type": "path"
       },
@@ -291,27 +109,6 @@
         "type": "path"
       }
     },
-    "nix": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "git-hooks-nix": "git-hooks-nix",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-23-11": "nixpkgs-23-11",
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1765252170,
-        "narHash": "sha256-p98D44tYJMgB5Qet5S8cTQFdffk/GmoaGkpQtZ3hqJU=",
-        "rev": "1ddd28880651054346c34009d7bb9de36f1db2c1",
-        "revCount": 23362,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.14.0/019b0159-8907-7fab-a120-9d287c7e6d2e/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -319,11 +116,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765267181,
+        "lastModified": 1693107069,
-        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
+        "narHash": "sha256-5dVXPchyvzmytanlwXHcmeQP9AfO/98Q6V+QtsMl5vQ=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
+        "rev": "53d40cf1bea235658ef8f6e8b8a1d033e2ecbfff",
         "type": "github"
       },
       "original": {
@@ -332,117 +129,39 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1764440730,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761597516,
+        "lastModified": 1693565476,
-        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
+        "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=",
-        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
-        "revCount": 811874,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505"
-      }
-    },
-    "nixpkgs-23-11": {
-      "locked": {
-        "lastModified": 1717159533,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
-        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
-        "type": "github"
-      }
-    },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1764611609,
-        "narHash": "sha256-yU9BNcP0oadUKupw0UKmO9BKDOVIg9NStdJosEbXf8U=",
-        "rev": "8c29968b3a942f2903f90797f9623737c215737c",
-        "revCount": 905078,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.905078%2Brev-8c29968b3a942f2903f90797f9623737c215737c/019add91-3add-7a0d-8a25-9569cbe01efe/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1766309749,
-        "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
         "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "type": "indirect"
-        "type": "github"
       }
     },
-    "pre-commit": {
+    "openconnect-sso": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils",
-        "gitignore": "gitignore",
         "nixpkgs": [
-          "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1765464257,
+        "lastModified": 1692692901,
-        "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
+        "narHash": "sha256-JFVvTw11KFnrd/A5z3QCh30ac9MZG+ojDY3udAFpmCE=",
-        "owner": "cachix",
+        "owner": "vlaci",
-        "repo": "pre-commit-hooks.nix",
+        "repo": "openconnect-sso",
-        "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
+        "rev": "94128073ef49acb3bad84a2ae19fdef926ab7bdf",
         "type": "github"
       },
       "original": {
-        "owner": "cachix",
+        "owner": "vlaci",
-        "repo": "pre-commit-hooks.nix",
+        "repo": "openconnect-sso",
         "type": "github"
       }
     },
@@ -450,48 +169,10 @@
       "inputs": {
         "agenix": "agenix",
         "cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
-        "determinate": "determinate",
-        "lanzaboote": "lanzaboote",
         "local-bitwig": "local-bitwig",
         "nix-index-database": "nix-index-database",
-        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs": "nixpkgs_3"
+        "openconnect-sso": "openconnect-sso"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765680428,
-        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
       }
     }
   },

flake.nix

@@ -2,21 +2,23 @@
   description = "System configuration for panacea";
 
   nixConfig = {
-    extra-substituters = "https://cachix.cachix.org https://nix-community.cachix.org https://install.determinate.systems";
+    extra-substituters =
+      "https://cachix.cachix.org https://nix-community.cachix.org";
     extra-trusted-public-keys = ''
       cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=
-      nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
+            nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs='';
-      cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM=
-    '';
   };
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
     agenix = {
       url = "github:ryantm/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    openconnect-sso = {
+      url = "github:vlaci/openconnect-sso";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     cyrus-sasl-xoauth2 = {
       url = "github:robn/sasl2-oauth";
       flake = false;
@@ -25,19 +27,13 @@
       url = "github:Mic92/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
     local-bitwig = {
       url = "path:/home/coolneng/Projects/panacea/assets/bitwig";
       flake = false;
     };
   };
 
-  outputs =
+  outputs = { self, nixpkgs, agenix, nix-index-database, ... }@inputs:
-    { self, nixpkgs, ... }@inputs:
     let
       system = "x86_64-linux";
 
@@ -45,37 +41,26 @@
         inherit system;
         config.allowUnfree = true;
         overlays = [
+          inputs.openconnect-sso.overlay
           (final: prev: {
-            emacs-vterm = (
+            emacs-vterm =
-              (pkgs.emacsPackagesFor pkgs.emacs-pgtk).emacsWithPackages (
+              ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages
-                epkgs: with epkgs; [
+                (epkgs: with epkgs; [ vterm ]));
-                  vterm
-                  mu4e
-                ]
-              )
-            );
           })
         ];
       };
 
       lib = nixpkgs.lib;
 
-    in
+    in {
-    {
       nixosConfigurations.panacea = lib.nixosSystem {
         inherit system;
         modules = [
           (import ./configuration.nix)
-          inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-amd
+          agenix.nixosModules.age
-          inputs.agenix.nixosModules.age
+          nix-index-database.nixosModules.nix-index
-          inputs.nix-index-database.nixosModules.nix-index
-          inputs.lanzaboote.nixosModules.lanzaboote
-          inputs.determinate.nixosModules.default
         ];
-        specialArgs = {
+        specialArgs = { inherit inputs; };
-          inherit inputs;
-          inherit pkgs;
-        };
       };
 
     };

modules/audio.nix

@@ -1,26 +1,27 @@
-{
+{ config, lib, pkgs, inputs, ... }:
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
 
 with pkgs;
 
 let
   # HACK Replace youtube-dl with yt-dlp in mopidy-youtube
   mopidy-youtube-yt_dlp = mopidy-youtube.overrideAttrs (old: rec {
-    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+    propagatedBuildInputs = old.propagatedBuildInputs
-      python3.pkgs.yt-dlp
+      ++ [ python3.pkgs.yt-dlp python310Packages.ytmusicapi ];
-      python3.pkgs.ytmusicapi
-    ];
   });
   soundcloud_token = builtins.readFile ../secrets/soundcloud_token;
-  bandcamp_token = builtins.readFile ../secrets/bandcamp_token;
+  latest-mopidy-soundcloud = mopidy-soundcloud.overrideAttrs (old: rec {
+    src = fetchFromGitHub {
+      owner = "mopidy";
+      repo = "mopidy-soundcloud";
+      rev = "fc766b0bf17feb4fc989029b92a315a10ff453ee";
+      sha256 = "sha256-LftBbfs5KqqkhFQVZRh/AQKQQ+18x8RapRU1mTB7FD8=";
+    };
 
-in
+    propagatedBuildInputs = old.propagatedBuildInputs
-{
+      ++ [ python3.pkgs.beautifulsoup4 ];
+  });
+
+in {
   # Configure pipewire as sound server
   services.pipewire = {
     enable = true;
@@ -30,18 +31,19 @@ in
     };
     pulse.enable = true;
     wireplumber.enable = true;
-    # Enable pipewire-pulse's audio via TCP
-    extraConfig.pipewire-pulse.tcp-server = {
-      "pulse.properties" = {
-        "server.address" = [
-          "unix:native"
-          "tcp:127.0.0.1:4713"
-        ];
-      };
-    };
   };
   security.rtkit.enable = true;
 
+  # Enable pipewire-pulse's audio via TCP
+  environment.etc."pipewire/pipewire-pulse.conf.d/pulse-server.conf".text = ''
+    pulse.properties = {
+      server.address = [
+        "unix:native"
+        "tcp:127.0.0.1:4713"
+      ]
+    }
+  '';
+
   # Set up Mopidy
   services.mopidy = {
     enable = true;
@@ -51,55 +53,49 @@ in
       mopidy-youtube-yt_dlp
       mopidy-bandcamp
       mopidy-somafm
-      mopidy-soundcloud
+      latest-mopidy-soundcloud
     ];
-    settings = {
+    configuration = ''
-      audio.output = "pulsesink server=127.0.0.1";
+      [audio]
+      output = pulsesink server=127.0.0.1
 
-      local = {
+      [local]
-        media_dir = "/home/coolneng/Music";
+      media_dir = /home/coolneng/Music
-        directories = ''
+      directories =
-          Album Artists       local:directory?type=artist&role=albumartist
+        Album Artists       local:directory?type=artist&role=albumartist
-          Albums              local:directory?type=album
+        Albums              local:directory?type=album
-          Artists             local:directory?type=artist
+        Artists             local:directory?type=artist
-          Genres              local:directory?type=genre
+        Genres              local:directory?type=genre
-        '';
+      excluded_file_extensions =
-        excluded_file_extensions = ''
+        .directory
-          .directory
+        .html
-          .html
+        .jpeg
-          .jpeg
+        .jpg
-          .jpg
+        .log
-          .log
+        .nfo
-          .nfo
+        .png
-          .png
+        .txt
-          .txt
+      scan_timeout = 3000
-        '';
-        scan_timeout = 3000;
-      };
 
-      mpd.zeroconf = "";
+      [mpd]
+      zeroconf = ""
 
-      m3u = {
+      [m3u]
-        playlists_dir = "/home/coolneng/.config/mpd/playlists";
+      playlists_dir = /home/coolneng/.config/mpd/playlists
-        base_dir = "/home/coolneng/Music";
+      base_dir = /home/coolneng/Music
-      };
 
-      youtube = {
+      [youtube]
-        search_results = 50;
+      search_results = 50
-        youtube_dl_package = "yt_dlp";
+      youtube_dl_package = yt_dlp
-        musicapi_enabled = true;
+      musicapi_enabled = true
-      };
 
-      somafm = {
+      [somafm]
-        encoding = "aac";
+      encoding = aac
-        quality = "highest";
+      quality = highest
-      };
 
-      soundcloud = {
+      [soundcloud]
-        auth_token = soundcloud_token;
+      auth_token = ${soundcloud_token}
-        explore_songs = 100;
+      explore_songs = 100
-      };
+    '';
-      bandcamp.identity = bandcamp_token;
-    };
   };
 }

modules/cachix.nix

@@ -5,9 +5,9 @@ let
   folder = ../cachix;
   toImport = name: value: folder + ("/" + name);
   filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
+  imports = lib.mapAttrsToList toImport
-in
+    (lib.filterAttrs filterCaches (builtins.readDir folder));
-{
+in {
   inherit imports;
   nix.binaryCaches = [ "https://cache.nixos.org/" ];
 }

modules/datasync.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
   # ZFS automatic snapshots
@@ -21,10 +16,11 @@
     enable = true;
     user = "coolneng";
     dataDir = "/home/coolneng";
+    key = config.age.secrets.syncthing.path;
     settings = {
       devices.zion = {
         id = "FLI2RS7-GNI5PDM-SQRNF7P-YJIOXJ7-46FRPEI-NRLQGBC-HXRWG7O-RKOVLAF";
-        addresses = [ "tcp://192.168.128.2:22000" ];
+        addresses = [ "tcp://192.168.13.2:22000" ];
       };
       folders = {
         Documents = {
@@ -93,4 +89,48 @@
     };
   };
 
+  # Automount external storage
+  systemd.mounts = [
+    # UGent Samba
+    {
+      what = "//files.ugent.be/akasroua/home";
+      type = "cifs";
+      where = "/ugent";
+      options =
+        "credentials=${config.age.secrets.samba-ugent.path},noperm,vers=3.11,sec=ntlmv2i,noserverino";
+      mountConfig = { TimeoutSec = "5"; };
+    }
+  ];
+  systemd.automounts = [
+    # UGent Samba
+    {
+      where = "/ugent";
+      automountConfig = { TimeoutIdleSec = "5"; };
+      wantedBy = [ "default.target" ];
+    }
+  ];
+
+  # HACK Workaround to change the configuration of keyutils in order to get CIFS working
+  environment.etc."request-key.conf" = {
+    text = let
+      upcall = "${pkgs.cifs-utils}/bin/cifs.upcall";
+      keyctl = "${pkgs.keyutils}/bin/keyctl";
+    in ''
+      #OP     TYPE          DESCRIPTION  CALLOUT_INFO  PROGRAM
+      # -t is required for DFS share servers...
+      create  cifs.spnego   *            *             ${upcall} -t %k
+      create  dns_resolver  *            *             ${upcall} %k
+      # Everything below this point is essentially the default configuration,
+      # modified minimally to work under NixOS. Notably, it provides debug
+      # logging.
+      create  user          debug:*      negate        ${keyctl} negate %k 30 %S
+      create  user          debug:*      rejected      ${keyctl} reject %k 30 %c %S
+      create  user          debug:*      expired       ${keyctl} reject %k 30 %c %S
+      create  user          debug:*      revoked       ${keyctl} reject %k 30 %c %S
+      create  user          debug:loop:* *             |${pkgs.coreutils}/bin/cat
+      create  user          debug:*      *             ${pkgs.keyutils}/share/keyutils/request-key-debug.sh %k %d %c %S
+      negate  *             *            *             ${keyctl} negate %k 30 %S
+    '';
+  };
+
 }

modules/development.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
   # Improve nix-shell and direnv integration

modules/gui.nix

@@ -1,22 +1,19 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with pkgs;
 
 {
   # Display manager
-  services.greetd = {
+  services.xserver.enable = true;
-    enable = true;
+  services.xserver.displayManager = {
-    settings = rec {
+    defaultSession = "sway";
-      initial_session = {
+    autoLogin = {
-        command = "${sway}/bin/sway";
+      enable = true;
-        user = "coolneng";
+      user = "coolneng";
-      };
+    };
-      default_session = initial_session;
+    lightdm = {
+      enable = true;
+      greeter.enable = false;
     };
   };
 
@@ -28,13 +25,13 @@ with pkgs;
       swaylock
       swayidle
       swaybg
-      rofi
+      rofi-wayland
       waybar
-      cliphist
+      clipman
       wl-clipboard
       grim
       slurp
-      swayimg
+      imv
       kanshi
       kitty
       qt5.qtwayland
@@ -51,7 +48,7 @@ with pkgs;
       export NVIM_LISTEN_ADDRESS=/tmp/nvimsocket
       export GIT_CONFIG_NOSYSTEM=true
       export SYSTEMD_LESS=FRSMK
-      export WLR_RENDERER=vulkan
+      export LIBVA_DRIVER_NAME=iHD
     '';
     wrapperFeatures.gtk = true;
   };
@@ -75,7 +72,7 @@ with pkgs;
   # GPG agent
   programs.gnupg.agent = {
     enable = true;
-    pinentryPackage = pinentry-gnome3;
+    pinentryFlavor = "gnome3";
   };
 
   # Tmux
@@ -90,7 +87,6 @@ with pkgs;
 
   # Integrate pass with the browser
   programs.browserpass.enable = true;
-  programs.firefox.enable = true;
 
   # Enable WebRTC screensharing
   xdg.portal = {

modules/hardware-configuration.nix

@@ -1,76 +1,72 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
+{ config, lib, pkgs, modulesPath, ... }:
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
 
 {
-  imports = [
+  imports =
-    (modulesPath + "/installer/scan/not-detected.nix")
+    [ (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+    ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "rtsx_pci_sdmmc" ];
-    "nvme"
-    "xhci_pci"
-    "usbhid"
-  ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "syscea/stateful/root";
+    { device = "syscea/stateful/root";
-    fsType = "zfs";
+      fsType = "zfs";
-  };
+    };
 
-  fileSystems."/nix" = {
+  fileSystems."/nix" =
-    device = "syscea/ephemeral/nix";
+    { device = "syscea/ephemeral/nix";
-    fsType = "zfs";
+      fsType = "zfs";
-  };
+    };
 
-  fileSystems."/ugent" = {
+  fileSystems."/ugent" =
-    device = "systemd-1";
+    { device = "systemd-1";
-    fsType = "autofs";
+      fsType = "autofs";
-  };
+    };
 
-  fileSystems."/home/coolneng" = {
+  fileSystems."/tmp" =
-    device = "syscea/stateful/home";
+    { device = "syscea/ephemeral/tmp";
-    fsType = "zfs";
+      fsType = "zfs";
-  };
+    };
 
-  fileSystems."/tmp" = {
+  fileSystems."/home/coolneng" =
-    device = "syscea/ephemeral/tmp";
+    { device = "syscea/stateful/home";
-    fsType = "zfs";
+      fsType = "zfs";
-  };
+    };
 
-  fileSystems."/home/coolneng/Downloads" = {
+  fileSystems."/home/coolneng/Downloads" =
-    device = "syscea/stateful/home/downloads";
+    { device = "syscea/stateful/home/downloads";
-    fsType = "zfs";
+      fsType = "zfs";
-  };
+    };
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/C374-A2FD";
+    { device = "/dev/disk/by-uuid/4851-6B40";
-    fsType = "vfat";
+      fsType = "vfat";
-  };
+    };
 
-  swapDevices = [
+  fileSystems."/home/coolneng/Videos" =
-    { device = "/dev/disk/by-uuid/1231a42f-a71a-4c67-b4d8-7506c02a8328"; }
+    { device = "syscea/stateful/home/videos";
-  ];
+      fsType = "zfs";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/1f0ea09c-e655-4a9f-83d4-9d396de01720"; }
+    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   # networking.interfaces.wg0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

modules/latest-zfs-kernel.nix

@@ -1,28 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-let
-  isUnstable = config.boot.zfs.package == pkgs.zfs_unstable;
-  zfsCompatibleKernelPackages = lib.filterAttrs (
-    name: kernelPackages:
-    (builtins.match "linux_[0-9]+_[0-9]+" name) != null
-    && (builtins.tryEval kernelPackages).success
-    && (
-      (!isUnstable && !kernelPackages.zfs.meta.broken)
-      || (isUnstable && !kernelPackages.zfs_unstable.meta.broken)
-    )
-  ) pkgs.linuxKernel.packages;
-  latestKernelPackage = lib.last (
-    lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
-      builtins.attrValues zfsCompatibleKernelPackages
-    )
-  );
-in
-{
-  # Note this might jump back and worth as kernel get added or removed.
-  boot.kernelPackages = lib.mkIf (lib.meta.availableOn pkgs.hostPlatform pkgs.zfs) latestKernelPackage;
-}

modules/monitoring.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with pkgs;
 
@@ -11,14 +6,13 @@ let
   sender = "akasroua@disroot.org";
   recipient = "akasroua+smart@disroot.org";
 
-in
+in {
-{
   # Notify when a disk starts going haywire
   services.smartd = {
     enable = true;
     defaults.monitored = "-H -f -t -C 197 -U 198 -d nvme";
     autodetect = false;
-    devices = [ { device = "/dev/nvme0"; } ];
+    devices = [{ device = "/dev/nvme0"; }];
     notifications.mail = {
       enable = true;
       sender = sender;

modules/networking.nix

@@ -1,15 +1,8 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
-let
+let wireguard_port = "1194";
-  wireguard_port = "1194";
 
-in
+in {
-{
   # Set hostname, hostid and enable WiFi
   networking = {
     hostName = "panacea";
@@ -53,11 +46,11 @@ in
     name = "wlan0";
     matchConfig = {
       Name = "wlan0";
-      SSID = "anakinosi-5GHz";
+      SSID = "WiFi-5.0-CE42";
     };
-    address = [ "192.168.129.3/23" ];
+    address = [ "192.168.13.131/24" ];
-    gateway = [ "192.168.128.1" ];
+    gateway = [ "192.168.13.1" ];
-    dns = [ "192.168.128.2" ];
+    dns = [ "192.168.13.2" ];
     networkConfig.MulticastDNS = "yes";
   };
 
@@ -69,7 +62,7 @@ in
     };
     address = [ "192.168.13.3/24" ];
     gateway = [ "192.168.13.1" ];
-    dns = [ "1.1.1.1" ];
+    dns = [ "192.168.13.2" ];
     networkConfig.MulticastDNS = "yes";
   };
 
@@ -84,45 +77,39 @@ in
       PrivateKeyFile = config.age.secrets.wireguard.path;
       FirewallMark = 34952;
     };
-    wireguardPeers = [
+    wireguardPeers = [{
-      {
+      wireguardPeerConfig = {
         PublicKey = "GN8lqPBZYOulh6xD4GhkoEWI65HMMCpSxJSH5871YnU=";
-        AllowedIPs = [
+        AllowedIPs = [ "0.0.0.0/0" ];
-          "0.0.0.0/0"
+        Endpoint = "coolneng.duckdns.org:1194";
-          "::0"
+      };
-        ];
+    }];
-        Endpoint = "psydnd.org:1194";
-      }
-    ];
   };
   systemd.network.networks."wg0" = {
     matchConfig.Name = "wg0";
+    linkConfig.ActivationPolicy = "manual";
     networkConfig = {
-      Address = [
+      Address = "10.8.0.2/32";
-        "10.8.0.2/32"
+      DNS = "10.8.0.1";
-        "fd00::2/128"
-      ];
-      DNS = [
-        "10.8.0.1"
-        "fd00::2"
-      ];
       DNSDefaultRoute = true;
+      Domains = "~.";
+      MulticastDNS = "yes";
     };
-    routingPolicyRules = [
+    routingPolicyRules = [{
-      {
+      routingPolicyRuleConfig = {
         FirewallMark = 34952;
         InvertRule = true;
         Table = 1000;
         Priority = 10;
-      }
+      };
-    ];
+    }];
-    routes = [
+    routes = [{
-      {
+      routeConfig = {
         Gateway = "10.8.0.1";
         GatewayOnLink = true;
         Table = 1000;
-      }
+      };
-    ];
+    }];
   };
 
   # Firewall configuration
@@ -144,15 +131,4 @@ in
       iptables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport ${wireguard_port} -j RETURN || true
     '';
   };
-
-  # Enable localhost SSH
-  services.openssh = {
-    enable = true;
-    openFirewall = false;
-    startWhenNeeded = true;
-    settings = {
-      PermitRootLogin = "without-password";
-      PasswordAuthentication = false;
-    };
-  };
 }

modules/periodic.nix

@@ -1,65 +1,94 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with pkgs;
 
-let
+let isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
-  isync-oauth2 = (isync.override { withCyrusSaslXoauth2 = true; });
 
-in
+in {
-{
   # Upgrade Doom Emacs daily
   systemd.user.services.doom-upgrade = {
     description = "Upgrade Doom Emacs";
-    path = [
+    path = [ bash emacs-vterm git coreutils ];
-      bash
-      emacs-vterm
-      git
-      coreutils
-    ];
     script = ''
-      /home/coolneng/.emacs.d/bin/doom -! upgrade
+      ${pkgs.bash}/bin/bash -c "/home/coolneng/.emacs.d/bin/doom -! upgrade"
     '';
     serviceConfig.Type = "oneshot";
     startAt = "22:00:00";
     after = [ "network-online.target" ];
   };
 
+  # Upgrade Neovim plugins weekly
+  systemd.user.services.vim-plug-upgrade = {
+    description = "Upgrade Vim-Plug";
+    path = [ git neovim ];
+    script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
+    serviceConfig.Type = "oneshot";
+    startAt = "Wed 18:00:00";
+    after = [ "network-online.target" ];
+  };
+
   # Push password-store changes to git daily
   systemd.user.services.password-store-push = {
     description = "Push password-store changes to git";
-    path = [
+    path = [ pass-wayland git gitAndTools.pass-git-helper ];
-      pass-wayland
-      git
-      pass-git-helper
-    ];
     script = "${pkgs.pass-wayland}/bin/pass git push";
     serviceConfig.Type = "oneshot";
     startAt = "18:00:00";
     after = [ "network-online.target" ];
   };
 
-  # Sync mail using IMAP IDLE
+  # Sync mail using IDLE
-  systemd.user.services.goimapnotify = {
+  systemd.user.services.goimapnotify-ugent = {
-    description = "Sync mail using IMAP IDLE";
+    description = "Sync UGent mail using IMAP IDLE";
     wantedBy = [ "default.target" ];
     path = [
       goimapnotify
       pass-wayland
       isync-oauth2
       mu
+      python39
+      gnupg
+      nix
       procps
       emacs-vterm
     ];
     script = ''
-      ${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/goimapnotify.yaml
+      ${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/ugent.conf
     '';
     serviceConfig = {
-      ExecStartPre = "/home/coolneng/.local/share/scripts/mail-sync";
+      ExecStartPre = "/home/coolneng/.local/share/scripts/mail-sync ugent";
+      Type = "simple";
+      Restart = "always";
+      RestartSec = 20;
+    };
+    after = [ "network-online.target" ];
+  };
+
+  systemd.user.services.goimapnotify-gmail = {
+    description = "Sync gmail mail using IMAP IDLE";
+    wantedBy = [ "default.target" ];
+    path = [ goimapnotify pass-wayland isync-oauth2 mu procps emacs-vterm ];
+    script = ''
+      ${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/gmail.conf
+    '';
+    serviceConfig = {
+      ExecStartPre = "/home/coolneng/.local/share/scripts/mail-sync gmail";
+      Type = "simple";
+      Restart = "always";
+      RestartSec = 20;
+    };
+    after = [ "network-online.target" ];
+  };
+
+  systemd.user.services.goimapnotify-disroot = {
+    description = "Sync disroot mail using IMAP IDLE";
+    wantedBy = [ "default.target" ];
+    path = [ goimapnotify pass-wayland isync-oauth2 mu procps emacs-vterm ];
+    script = ''
+      ${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/disroot.conf
+    '';
+    serviceConfig = {
+      ExecStartPre = "/home/coolneng/.local/share/scripts/mail-sync disroot";
       Type = "simple";
       Restart = "always";
       RestartSec = 20;
@@ -71,16 +100,8 @@ in
   systemd.user.services.periodic-mail-sync = {
     description = "Run a mail sync operation periodically";
     wantedBy = [ "default.target" ];
-    path = [
+    path =
-      pass-wayland
+      [ pass-wayland isync-oauth2 mu procps emacs-vterm python39 gnupg nix ];
-      isync-oauth2
-      mu
-      procps
-      emacs-vterm
-      python3
-      gnupg
-      nix
-    ];
     script = ''
       /home/coolneng/.local/share/scripts/mail-sync -a
     '';
@@ -95,34 +116,26 @@ in
     script = "chmod 751 /home/coolneng";
     serviceConfig.Type = "oneshot";
     after = [ "home-coolneng.mount" ];
-    before = [
+    before = [ "mopidy.service" "mopidy-scan.service" ];
-      "mopidy.service"
-      "mopidy-scan.service"
-    ];
   };
 
   # Push panacea changes to git daily
   systemd.user.services.panacea-push = {
     description = "Push panacea changes to git";
-    path = [
+    path = [ pass-wayland git gitAndTools.pass-git-helper ];
-      pass-wayland
-      git
-      pass-git-helper
-    ];
     script = "${pkgs.git}/bin/git -C /home/coolneng/Projects/panacea push";
     serviceConfig.Type = "oneshot";
-    startAt = "18:00:00";
+    startAt = "14:00:00";
     after = [ "network-online.target" ];
   };
 
-  # Show notification when the battery is low
+  # Pull changes from zion daily
-  systemd.user.services.swaynag-battery = {
+  systemd.user.services.zion-pull = {
-    description = "Show notification when the battery is low";
+    description = "Pull zion changes to git";
-    path = [
+    path = [ git ];
-      swaynag-battery
+    script = "${pkgs.git}/bin/git -C /home/coolneng/Projects/zion pull";
-      sway
+    serviceConfig.Type = "oneshot";
-    ];
+    startAt = "10:00:00";
-    script = "${pkgs.swaynag-battery}/bin/swaynag-battery --threshold 10";
+    after = [ "network-online.target" ];
-    wantedBy = [ "sway-session.target" ];
   };
 }

modules/power.nix

@@ -1,16 +1,64 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
-  # Enable power-profiles-daemon
+  # Enable the TLP daemon
-  services.power-profiles-daemon.enable = true;
+  services.tlp = {
+    enable = true;
+    settings = {
+      PCIE_ASPM_ON_AC = "performance";
+      PCIE_ASPM_ON_BAT = "powersave";
+      USB_AUTOSUSPEND = 1;
+    };
+  };
 
-  # Suspend when the battery is critical
+  # Enable the auto-cpufreq daemon
+  services.auto-cpufreq.enable = true;
+
+  # Suspend when the battery is critical and autosuspend USB and PCI
   services.udev.extraRules = ''
     SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{model_name}=="01AV405", ATTR{capacity}=="[0-5]", RUN+="${config.systemd.package}/bin/systemctl suspend -i"
+    ACTION=="add", SUBSYSTEM=="usb", TEST=="power/control", ATTR{power/control}="auto"
+    ACTION=="add", SUBSYSTEM=="pci", TEST=="power/control", ATTR{power/control}="auto"
   '';
+
+  # Undervolt CPU and GPU
+  services.undervolt = {
+    enable = true;
+    coreOffset = -100;
+    gpuOffset = -75;
+  };
+
+  # Prevent overheating of the CPU
+  services.thermald.enable = true;
+
+  # HACK Enable internal microphone when headphones are plugged in and add workaround for frequent WiFi disconnects
+  hardware.firmware = [
+    (pkgs.writeTextDir "/lib/firmware/hda-jack-retask.fw" ''
+      [codec]
+      0x10ec0293 0x17aa2233 0
+
+      [pincfg]
+      0x12 0x90a60130
+      0x13 0x40000000
+      0x14 0x90170110
+      0x15 0x03211040
+      0x16 0x21211010
+      0x18 0x411111f0
+      0x19 0x21a11010
+      0x1a 0x40f000f0
+      0x1b 0x411111f0
+      0x1d 0x40738105
+      0x1e 0x411111f0
+    '')
+  ];
+
+  # Power saving features for multiple devices
+  boot.extraModprobeConfig = ''
+    options snd-hda-intel patch=hda-jack-retask.fw power_save=1
+    options mac80211 beacon_loss_count=500
+    options iwlwifi power_save=1
+    options iwlmvm power_scheme=3
+    options i915 enable_guc=2
+  '';
+
 }

modules/printing.nix

@@ -1,18 +1,10 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 {
   # Enable CUPS
   services.printing = {
     enable = true;
-    drivers = with pkgs; [
+    drivers = with pkgs; [ brgenml1cupswrapper hplip ];
-      brgenml1cupswrapper
-      hplip
-    ];
   };
 
   # Enable SANE

modules/software.nix

@@ -1,23 +1,11 @@
-{
+{ config, lib, pkgs, inputs, ... }:
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
 
 with pkgs;
 
 let
-  custom-mpv = (
+  mpv-sponsorblock = (pkgs.wrapMpv pkgs.mpv-unwrapped {
-    mpv-unwrapped.wrapper {
+    scripts = [ mpvScripts.sponsorblock ];
-      mpv = mpv-unwrapped;
+  });
-      scripts = with mpvScripts; [
-        sponsorblock-minimal
-        mpv-cheatsheet
-      ];
-    }
-  );
 
   patched-bitwig = bitwig-studio.overrideAttrs (old: rec {
     src = "${inputs.local-bitwig}/bitwig-studio.deb";
@@ -26,8 +14,7 @@ let
     '';
   });
 
-in
+in {
-{
   environment.systemPackages = [
     # Monitoring
     htop
@@ -36,11 +23,12 @@ in
     gnupg
     pass-wayland
     passff-host
-    pass-git-helper
+    gitAndTools.pass-git-helper
-    inputs.agenix.packages.${config.nixpkgs.localSystem.system}.default
+    inputs.agenix.packages.x86_64-linux.default
     git-crypt
     git-lfs
     # Browsers
+    firefox-wayland
     ungoogled-chromium
     # LaTeX
     texlive.combined.scheme-full
@@ -48,6 +36,7 @@ in
     texlab
     # Text editors
     neovim
+    neovim-remote
     emacs-vterm
     # Emacs dependencies
     (ripgrep.override { withPCRE2 = true; })
@@ -63,23 +52,24 @@ in
     direnv
     nix-direnv
     gnumake
-    pre-commit
+    gitAndTools.pre-commit
-    emacs-lsp-booster
     # Rice
     adapta-gtk-theme
     paper-icon-theme
     # Audio
     mopidy
     ncmpcpp
-    mpc
+    mpc_cli
     pulsemixer
     easyeffects
     patched-bitwig
     # Productivity
     zathura
     libreoffice-fresh
-    simple-scan
+    gnome.simple-scan
     bc
+    citrix_workspace
+    teams
     pdfgrep
     # Mail stack
     mu
@@ -87,31 +77,31 @@ in
     msmtp
     # Media
     gimp
-    custom-mpv
+    mpv-sponsorblock
+    nodePackages.webtorrent-cli
     deluge
     yt-dlp-light
-    ffmpeg
     calibre
     beets
     # File management
     zip
     unzip
     unar
+    cifs-utils
+    keyutils
     # Overlays
     cachix
-    # Budgeting
+    # Networking
-    beancount
+    openconnect-sso
-    beancount-language-server
-    fava
     # Programming tools
     ## Shell
     shellcheck
     shfmt
     ## Nix
-    nixfmt-rfc-style
+    nixfmt
     ## Python
-    ty
+    nodePackages.pyright
-    ruff
+    black
     ## C/C++
     clang-tools
     ## Go
@@ -124,11 +114,11 @@ in
   # Fonts declaration
   fonts.packages = with pkgs; [
     google-fonts
+    inconsolata-nerdfont
     terminus_font_ttf
     iosevka-bin
     libertine
-    nerd-fonts.inconsolata
+    emacs-all-the-icons-fonts
-    nerd-fonts.symbols-only
   ];
 
 }

overlays/emacs-vterm.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+with pkgs;
+
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      emacs-vterm = ((emacsPackagesFor emacs29-pgtk).emacsWithPackages
+        (epkgs: with epkgs; [ vterm ]));
+    })
+  ];
+}

secrets/secrets.nix

@@ -1,8 +1,9 @@
 let
-  coolneng = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC57m1j/G6iQyi2EpU3nj3+df5Z4PL/XbiOmDcqA7ODg";
+  coolneng =
-in
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC57m1j/G6iQyi2EpU3nj3+df5Z4PL/XbiOmDcqA7ODg";
-{
+in {
   "wireguard.age".publicKeys = [ coolneng ];
   "syncthing.age".publicKeys = [ coolneng ];
+  "samba-ugent.age".publicKeys = [ coolneng ];
   "msmtp.age".publicKeys = [ coolneng ];
 }