flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=d361fcbd85a92f0494c6d8ef0c63aad798df20a7' (2024-08-12)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=77cf651825c2afac69e3a827ff910a62c73e1218' (2024-08-12)
• Updated input 'lix':
    '5137cea990.tar.gz?narHash=sha256-JVnQ3OLbXQAlkOluFc3gWhZMbhared1Rg5YvNEc92m0%3D&rev=5137cea99044d54337e439510a647743110b2d7d' (2024-08-10)
  → 'f9a3bf6ccc.tar.gz?narHash=sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg%3D&rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44' (2024-08-13)
• Updated input 'lix-module':
    'e350380d72.tar.gz?narHash=sha256-%2B7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8%3D&rev=e350380d72f94035c309e19fda2fd550f6ab7376' (2024-08-01)
  → 'cecf70b775.tar.gz?narHash=sha256-rT/OkVXKkns2YvyF1nFvl%2B8Gc3sld1c1sXPtGkbqaDY%3D&rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9' (2024-08-13)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/6d1c004b346b6a80d851cc2a66ef4f4c22be0f19' (2024-08-12)
  → 'github:nix-community/nixpkgs-wayland/e551336e36b8e275cdbdfc08ea6d1182239263b3' (2024-08-12)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/c87c16d6c6aa605c638f8a2b9e1116d705aabe06' (2024-08-12)
  → 'github:mitchellh/zig-overlay/4dbfd05d2d1382eaf40ff1ebab854abe7e30702f' (2024-08-13)

.github/workflows/update.yml

@@ -28,6 +28,7 @@ jobs:
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
+            experimental-features = pipe-operator
             accept-flake-config = true
 
       - uses: cachix/cachix-action@v15
@@ -81,6 +82,7 @@ jobs:
         with:
           source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
+            experimental-features = pipe-operator
             accept-flake-config = true
 
       - uses: ./.github/actions/clean-disk

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722347739,
+        "lastModified": 1723405438,
-        "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
+        "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
+        "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719994518,
+        "lastModified": 1722555600,
-        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -298,11 +298,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721330371,
+        "lastModified": 1722623071,
-        "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
         "type": "github"
       },
       "original": {
@@ -323,11 +323,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1723241066,
+        "lastModified": 1723488592,
-        "narHash": "sha256-et+BwLETF5e/9jBHK2GnVh6WGjRztRBThtllMezCvcM=",
+        "narHash": "sha256-nPYQrQD8rldLIhrz6px0YHGB4WwIaWLdmBtWsMgLLNI=",
         "ref": "refs/heads/main",
-        "rev": "4fdc0d55e4b44bb5300679025d2378fb6de0cae4",
+        "rev": "77cf651825c2afac69e3a827ff910a62c73e1218",
-        "revCount": 5074,
+        "revCount": 5083,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -444,11 +444,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722098849,
+        "lastModified": 1722869141,
-        "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
+        "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
+        "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
         "type": "github"
       },
       "original": {
@@ -500,11 +500,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1722773431,
+        "lastModified": 1723378259,
-        "narHash": "sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg=",
+        "narHash": "sha256-8JZVHJAoDgbAk9nn7blBB+wnQbgCq1lIxBsyT7qgeI8=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "04a4b4d84e02590715e753da3d35fb03cddc6425",
+        "rev": "8834c9b308bf4d9d448dd73be5f9782f4635d4ca",
         "type": "github"
       },
       "original": {
@@ -516,11 +516,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1723233557,
+        "lastModified": 1723511168,
-        "narHash": "sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM=",
+        "narHash": "sha256-XDcqLVPcsMhORerIPuQ1XNALtDvG6QRA2dKyNrccXyg=",
-        "rev": "c7d97802e4f59b8621e67cf62275d6a7fde8fe62",
+        "rev": "f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c7d97802e4f59b8621e67cf62275d6a7fde8fe62.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44.tar.gz?rev=f9a3bf6ccccf8ac6b1604c1a2980e3a565ae4f44"
       },
       "original": {
         "type": "tarball",
@@ -539,11 +539,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722485024,
+        "lastModified": 1723511483,
-        "narHash": "sha256-+7RReWaFQUO8MfAhJYNm4FkALuM3rPGy2AlXXv9Jmc8=",
+        "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=",
-        "rev": "e350380d72f94035c309e19fda2fd550f6ab7376",
+        "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/e350380d72f94035c309e19fda2fd550f6ab7376.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9"
       },
       "original": {
         "type": "tarball",
@@ -558,11 +558,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1721505437,
+        "lastModified": 1723372011,
-        "narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=",
+        "narHash": "sha256-zqenoufFiPfobw74idorZMG8AXG3DnFzbHplt/Nkvrg=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f",
+        "rev": "8802412b8747633e9d80639897e4d58fa6290909",
         "type": "github"
       },
       "original": {
@@ -600,11 +600,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722740924,
+        "lastModified": 1723352546,
-        "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
+        "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
+        "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
         "type": "github"
       },
       "original": {
@@ -660,11 +660,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722185531,
+        "lastModified": 1723175592,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
         "type": "github"
       },
       "original": {
@@ -676,11 +676,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1722732880,
+        "lastModified": 1723337705,
-        "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=",
+        "narHash": "sha256-znSU0DeNDPt7+LMAfFkvKloMaeQ6yl/U5SqV/ktl1vA=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c",
+        "rev": "ace7856d327b618d3777e31b1f224b3ab57ed71a",
         "type": "github"
       },
       "original": {
@@ -697,11 +697,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1723234766,
+        "lastModified": 1723504763,
-        "narHash": "sha256-p7VFHo/YlNcdlQCpcTq/ygmgnzZmgeaAgEx88dKHnfQ=",
+        "narHash": "sha256-q+Leb6hrkfc5cwysvYcGVslr6tBtSC9ggIjqpV9wmy0=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "cece0e097e27f583e61ff54f26916c29af7be7af",
+        "rev": "e551336e36b8e275cdbdfc08ea6d1182239263b3",
         "type": "github"
       },
       "original": {
@@ -744,11 +744,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1723151389,
+        "lastModified": 1723221148,
-        "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=",
+        "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2",
+        "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
         "type": "github"
       },
       "original": {
@@ -760,11 +760,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1720781449,
+        "lastModified": 1723221148,
-        "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
+        "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
+        "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6",
         "type": "github"
       },
       "original": {
@@ -776,11 +776,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1722813957,
+        "lastModified": 1723175592,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
         "type": "github"
       },
       "original": {
@@ -839,11 +839,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1723239681,
+        "lastModified": 1723447286,
-        "narHash": "sha256-1UPtz+CsXFr4LbM2AijSqnzSZLBuZtfURE4ZPtlS3NI=",
+        "narHash": "sha256-P3YvswRWaPlBr6YOkeNOVs4P/IcjPC24FfN8gUM7VkY=",
         "owner": "roc-lang",
         "repo": "roc",
-        "rev": "0bffd6001c7b27794222db76ba0eb48506935871",
+        "rev": "3ebff4348ff8a361e59b9ca3997c41ac8076a201",
         "type": "github"
       },
       "original": {
@@ -1027,11 +1027,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720930114,
+        "lastModified": 1723303070,
-        "narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=",
+        "narHash": "sha256-krGNVA30yptyRonohQ+i9cnK+CfCpedg6z3qzqVJcTs=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "b92afa1501ac73f1d745526adc4f89b527595f14",
+        "rev": "14c092e0326de759e16b37535161b3cb9770cea3",
         "type": "github"
       },
       "original": {
@@ -1101,11 +1101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723249552,
+        "lastModified": 1723508807,
-        "narHash": "sha256-4nQBvZQOOiI3kr+Ch0XH9ZIhajpLooqGbrcUNMI1Hmw=",
+        "narHash": "sha256-2j6u7X2ziCjpUgeZbP1h4/MNG6glc4sO2DzDXgw43o0=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "d15f6040f95938da639fa7287821799f76dcaef3",
+        "rev": "4dbfd05d2d1382eaf40ff1ebab854abe7e30702f",
         "type": "github"
       },
       "original": {
@@ -1127,11 +1127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722987529,
+        "lastModified": 1723396350,
-        "narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=",
+        "narHash": "sha256-f5RTadUCYeGPDI6Y7xDYa6sJsdKFCdtD4WipGxuof3A=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "d8084a342f40b444addf772fdef36a589299ebe6",
+        "rev": "3ec8ad16337e5fc391fbdfb394f68f155b2a7a69",
         "type": "github"
       },
       "original": {

hosts/algiz/default.nix

@@ -1,17 +1,14 @@
-{ enabled, ... }:
+{
+  enabled,
+  enableAttrs,
+  listify,
+  ...
+}:
 {
   oizys = {
-    languages = [
-      "nim"
-      "node" # for docker langservers
-      "python"
-      "nushell"
-    ];
     rune.motd = enabled;
-    docker = enabled;
+    languages = "nim|node|python|nushell" |> listify;
-    backups = enabled;
+  } // ("docker|backups|nix-ld" |> listify |> enableAttrs);
-    nix-ld = enabled;
-  };
 
   services.restic.backups.gdrive = {
     # directories created by gitea and soft-serve aren't world readable
@@ -27,15 +24,6 @@
     ];
   };
 
-  security.sudo.wheelNeedsPassword = false;
+  # git user handles the forgjo ssh authentication
-
+  users.users.git.isNormalUser = true;
-  users.users = {
-    daylin = {
-      extraGroups = [ "docker" ];
-    };
-
-    git = {
-      isNormalUser = true;
-    };
-  };
 }

hosts/algiz/system.nix

@@ -1,9 +1,10 @@
 { enabled, ... }:
 {
+
+  security.sudo.wheelNeedsPassword = false;
   services.resolved = enabled;
 
-  services.fail2ban = {
+  services.fail2ban = enabled // {
-    enable = true;
     maxretry = 5;
     bantime = "24h";
   };
@@ -26,8 +27,9 @@
   # users.mutableUsers = false;
 
   # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
+  boot.loader.grub = enabled // {
-  boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
+    device = "/dev/sda"; # or "nodev" for efi only
+  };
 
   # don't delete this you foo bar
   system.stateVersion = "23.11"; # Did you read the comment?

hosts/mannaz/default.nix

@@ -4,14 +4,13 @@
     desktop = enabled;
     nix-ld = enabled;
     rune.motd = enabled;
+    docker = enabled;
   };
 
   # Enable the X11 windowing system.
-  services.xserver = {
+  services.xserver = enabled // {
-    enable = true;
+    displayManager.startx = enabled;
-    displayManager.startx.enable = true;
+    windowManager.qtile = enabled;
-    windowManager.qtile.enable = true;
   };
 
-  users.users.daylin.extraGroups = [ "docker" ];
 }

hosts/othalan/default.nix

@@ -1,39 +1,26 @@
-{ enabled, config, ... }:
 {
-  oizys = {
+  lib,
-    vpn = enabled;
+  config,
-    desktop = enabled;
+  enabled,
-    hyprland = enabled;
+  enableAttrs,
-    chrome = enabled;
+  listify,
-    docker = enabled;
+  ...
+}:
+{
+  oizys =
+    {
       nix-ld = enabled // {
         overkill = enabled;
       };
-    vbox = enabled;
+      languages = "misc|nim|node|nushell|python|roc|tex|zig" |> listify;
-    backups = enabled;
+    }
-    hp-scanner = enabled;
+    // (
-    languages = [
+      ''
-      "misc"
+        vpn|desktop|hyprland|chrome
-      "nim"
+        docker|vbox|backups|hp-scanner|llm
-      "node"
+      ''
-      "nushell"
+      |> listify
-      "python"
+      |> enableAttrs
-      "roc"
+    );
-      "tex"
-      "zig"
-    ];
-    llm = enabled;
-  };
 
-  services.restic.backups.gdrive = {
-    user = "daylin";
-    repository = "rclone:g:archives/othalan";
-    passwordFile = "/home/daylin/.config/restic/othalan-pass";
-    paths = [
-      "/home/daylin/stuff/"
-      "/home/daylin/dev/"
-    ];
-  };
-
-  users.users.${config.oizys.user}.extraGroups = [ "audio" ];
 }

hosts/othalan/services.nix

@@ -3,6 +3,16 @@ let
   notes-git = ''${pkgs.git}/bin/git -C /home/daylin/stuff/notes'';
 in
 {
+  services.restic.backups.gdrive = {
+    user = "daylin";
+    repository = "rclone:g:archives/othalan";
+    passwordFile = "/home/daylin/.config/restic/othalan-pass";
+    paths = [
+      "/home/daylin/stuff/"
+      "/home/daylin/dev/"
+    ];
+  };
+
   systemd.services.notes-bot = {
     description = "auto commit changes to notes";
     serviceConfig = {

hosts/othalan/system.nix

@@ -1,4 +1,9 @@
-{ pkgs, enabled, ... }:
+{
+  config,
+  pkgs,
+  enabled,
+  ...
+}:
 {
   networking.networkmanager = enabled;
   services.fwupd = enabled;
@@ -21,7 +26,7 @@
       support32Bit = true;
     };
   };
-
+  users.users.${config.oizys.user}.extraGroups = [ "audio" ];
   environment.systemPackages = with pkgs; [ pamixer ];
 
   # catppuccin/tty move to "module"

lib/checks.nix

@@ -24,7 +24,7 @@ let
 
   # TODO: start using pipes once support lands in nixd
   # selfPackages = self.packages.${pkgs.system} |> attrValues;
-  selfPackages = (attrValues self.packages.${pkgs.system});
+  selfPackages = attrValues self.packages.${pkgs.system};
 in
 {
   makePackages =
@@ -34,7 +34,7 @@ in
           # packages from overlays
           (with pkgs; [
             swww
-            # nixVersions.git
+            nixVersions.git
           ])
           ++ [
             (flake.pkgs "roc").full

lib/extended.nix

@@ -1,6 +1,11 @@
 inputs: final: prev:
 let
-  inherit (builtins) listToAttrs substring filter;
+  inherit (builtins)
+    listToAttrs
+    substring
+    filter
+    replaceStrings
+    ;
   inherit (final)
     concatStringsSep
     hasSuffix
@@ -8,10 +13,13 @@ let
     mkIf
     mkOption
     types
+    splitString
+    trim
     ;
   inherit (final.filesystem) listFilesRecursive;
 in
 let
+
   enabled = {
     enable = true;
   };
@@ -19,6 +27,20 @@ let
     enable = false;
   };
 
+  # split a string on newlines and pipes to generate list
+  # "opt1|opt2" |> listify -> ["opt1" "opt2"]
+  # ''
+  # opt1
+  # opt2|opt3
+  # '' |> listify ["opt1" "opt2" "opt3"]
+  listify =
+    s:
+    s
+    |> replaceStrings [ "\n" ] [ "|" ]
+    |> splitString "|"
+    |> filter (s': s' != "")
+    |> map (s': trim s');
+
   # ["a" "b"] -> {a.enable = true; b.enable = true;}
   enableAttrs =
     attrs:
@@ -66,10 +88,12 @@ let
   flakeVer =
     flake: "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
 
-  isNixFile = p: hasSuffix ".nix" p;
+  isNixFile = p: p |> hasSuffix ".nix";
-  isDefaultNixFile = p: hasSuffix "default.nix" p;
+  isDefaultNixFile = p: p |> hasSuffix "default.nix";
-  filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
+  # filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
-  listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
+  filterNotDefaultNixFile = paths: paths |> filter (p: !(isDefaultNixFile p) && (isNixFile p));
+  # listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
+  listNixFilesRecursive = dir: dir |> listFilesRecursive |> filterNotDefaultNixFile;
 
   # defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
   # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
@@ -81,6 +105,7 @@ let
     pkgs = pkgsFromSystem system;
     pkg = pkgFromSystem system;
   };
+
 in
 {
   inherit
@@ -99,5 +124,6 @@ in
     pkgFromSystem
     overlayFrom
     flakeFromSystem
+    listify
     ;
 }

lib/generators.nix

@@ -14,37 +14,34 @@ let
     enableAttrs
     isNixFile
     flakeFromSystem
+    listify
     ;
   inherit (lib.filesystem) listFilesRecursive;
 
-  # pkgFrom = pkgFromSystem "x86_64-linux";
-  # pkgsFrom = pkgsFromSystem "x86_64-linux";
   flake = flakeFromSystem "x86_64-linux";
   hostPath = host: ../. + "/hosts/${host}";
   # all nix files not including pkgs.nix
-  hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
+  # hostFiles = host: filter isNixFile (listFilesRecursive (hostPath host));
+  hostFiles = host: host |> hostPath |> listFilesRecursive |> filter isNixFile;
+
+  commonSpecialArgs = {
+    inherit
+      self
+      inputs
+      lib
+      enabled
+      ;
+  };
 
   mkIso = nixosSystem {
     system = "x86_64-linux";
     modules = [
+      inputs.lix-module.nixosModules.default
       self.nixosModules.nix
       self.nixosModules.essentials
-      (
+      self.nixosModules.iso
-        { pkgs, modulesPath, ... }:
-        {
-          imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
-          environment.systemPackages = (with pkgs; [ neovim ]) ++ [ (flake.pkg "self") ];
-        }
-      )
     ];
-    specialArgs = {
+    specialArgs = commonSpecialArgs;
-      inherit
-        inputs
-        lib
-        self
-        enabled
-        ;
-    };
   };
 
   mkSystem =
@@ -58,14 +55,11 @@ let
         inputs.hyprland.nixosModules.default
       ] ++ (hostFiles hostName);
 
-      specialArgs = {
+      specialArgs = commonSpecialArgs // {
         inherit
-          inputs
-          lib
-          self
           mkDefaultOizysModule
           mkOizysModule
-          enabled
+          listify
           enableAttrs
           hostName
           flake

modules/iso.nix

@@ -0,0 +1,5 @@
+{ pkgs, modulesPath, ... }:
+{
+  imports = [ (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") ];
+  environment.systemPackages = (with pkgs; [ neovim ]);
+}

modules/networking/vpn.nix

@@ -11,13 +11,24 @@ mkOizysModule config "vpn" {
   ];
 
   services.openvpn.servers = {
-    express-ny = {
+    # subscription expired
+    # express-ny = {
+    #   config = ''
+    #     config /home/daylin/.config/openvpn/express-ny/config.ovpn
+    #     auth-user-pass /home/daylin/.config/openvpn/express-ny/credentials
+    #   '';
+    #   autoStart = false;
+    #   updateResolvConf = true;
+    # };
+    #
+  
+    mullvad-chi = {
       config = ''
-        config /home/${config.oizys.user}/.config/openvpn/express-ny/config.ovpn
+        config /home/daylin/.config/openvpn/mullvad-chi/mullvad_us_chi.conf
-        auth-user-pass /home/${config.oizys.user}/.config/openvpn/express-ny/credentials
       '';
       autoStart = false;
       updateResolvConf = true;
     };
   };
+
 }

modules/nix.nix

@@ -16,7 +16,11 @@ in
   # nix.package = pkgs.nixVersions.latest;
   nix = {
     settings = {
-      experimental-features = [ "nix-command" "flakes" "pipe-operator"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "pipe-operator"
+      ];
       use-xdg-base-directories = true;
     };
 

overlays/nimble/default.nix

@@ -1,17 +1,15 @@
 { ... }:
 (final: prev: {
-  nimble = prev.nimble.overrideNimAttrs {
+  nimble = prev.nimble.overrideNimAttrs rec {
-    version = "0.14.2-5e7901760e89108476a4e21976a0ef783403e8fe";
+    version = "0.16.0";
     requiredNimVersion = 2;
     buildInputs = [ prev.pkgs.openssl ];
 
     src = final.fetchFromGitHub {
       owner = "nim-lang";
       repo = "nimble";
-
+      rev = "v${version}";
-      # most recent commit 2024-03-11
+      hash = "sha256-nsQAUe+soRkWAFPYP5LftBCvQdkC1SpiIORscDsPQB4=";
-      rev = "5e7901760e89108476a4e21976a0ef783403e8fe";
-      hash = "sha256-8b5yKvEl7c7wA/8cpdaN2CSvawQJzuRce6mULj3z/mI=";
     };
   };
 })

overlays/nimlsp/default.nix

@@ -1,12 +0,0 @@
-{ ... }:
-(final: prev: {
-  nimlsp = prev.nimlsp.overrideNimAttrs {
-    requiredNimVersion = 2;
-    nimFlags = [
-      "--threads:on"
-      ""
-      "-d:explicitSourcePath=${final.srcOnly final.pkgs.nim-unwrapped-2}"
-      "-d:tempDir=/tmp"
-    ];
-  };
-})

pkgs/oizys/internal/oizys/ignored.txt

@@ -0,0 +1,21 @@
+ld-library-path
+builder.pl
+profile
+system-path
+nixos-help
+nixos-install
+nixos-version
+nixos-manual-html
+nixos-rebuild
+nixos-configuration-reference-manpage
+nixos-generate-config
+nixos-enter
+nixos-container
+nixos-build-vms
+nixos-wsl-version
+nixos-wsl-welcome-message
+nixos-wsl-welcome
+restic-gdrive
+gitea
+lock
+code

pkgs/oizys/internal/oizys/main.go

@@ -255,6 +255,12 @@ func splitDrv(drv string) (string, string) {
 	return drvName, hash
 }
 
+const tableTmpl = `# Building Derivations
+| derivation | hash |
+|---|---|
+%s
+`
+
 func writeDervationsToStepSummary(drvs []string) {
 	tableRows := make([]string, len(drvs))
 	for i, drv := range drvs {
@@ -264,16 +270,7 @@ func writeDervationsToStepSummary(drvs []string) {
 			name, hash,
 		)
 	}
-
+	o.writeToGithubStepSummary(fmt.Sprintf(tableTmpl, strings.Join(tableRows, "\n")))
-	o.writeToGithubStepSummary(
-		fmt.Sprintf(`# Building Derivations
-| derivation | hash |
-|---|---|
-%s
-`,
-			strings.Join(tableRows, "\n"),
-		),
-	)
 }
 
 func NixBuild(minimal bool, rest ...string) {

pkgs/oizys/internal/oizys/nix.go

@@ -1,6 +1,7 @@
 package oizys
 
 import (
+  _ "embed"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -12,22 +13,21 @@ import (
 	"github.com/charmbracelet/log"
 )
 
-var ignoredMap = stringSliceToMap(
+//go:embed ignored.txt
-	[]string{
+var ignoredList string
-		// nix
+var ignoredMap = stringToMap(ignoredList)
-		"ld-library-path", "builder.pl", "profile", "system-path",
+
-		// nixos
+func stringToMap(s string) map[string]struct{} {
-		"nixos-help",
+  return stringSliceToMap(strings.Split(s, "\n"))
-		"nixos-install", "nixos-version",
+}
-		"nixos-manual-html", "nixos-rebuild",
+
-		"nixos-configuration-reference-manpage",
+func stringSliceToMap(slice []string) map[string]struct{} {
-		"nixos-generate-config", "nixos-enter",
+	hashMap := make(map[string]struct{}, len(slice))
-		"nixos-container", "nixos-build-vms",
+	for _, s := range slice {
-		"nixos-wsl-version", "nixos-wsl-welcome-message", "nixos-wsl-welcome",
+		hashMap[s] = struct{}{}
-		// trivial packages
+	}
-		"restic-gdrive", "gitea", "lock", "code",
+	return hashMap
-	},
+}
-)
 
 type Derivation struct {
 	InputDrvs map[string]interface{}
@@ -72,13 +72,7 @@ func drvNotIgnored(drv string) bool {
 	return !ok
 }
 
-func stringSliceToMap(slice []string) map[string]struct{} {
+
-	hashMap := make(map[string]struct{}, len(slice))
-	for _, s := range slice {
-		hashMap[s] = struct{}{}
-	}
-	return hashMap
-}
 
 func drvsToInputs(derivation map[string]Derivation) []string {
 	var drvs []string