.github/actions/clean-disk/action.yml

@@ -41,19 +41,18 @@ runs:
               $(non_manifest_packages) # > /dev/null
           fi
 
+          GLOBIGNORE="/usr/share/git-core/**/*"
           sudo rm -rf \
             /var/lib/docker/ \
             "$AGENT_TOOLSDIRECTORY" \
             /opt \
-            /usr/local/** &
+            /usr/{local,share} &
 
-          # nix flake update wants to find git-core templates
-          # /usr/share/git-core/templates
-          # /usr/share/**
           {
             sudo swapoff -a
             sudo rm -f /mnt/swapfile
           } &
+
           wait
           echo "... done"
 

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
       hosts:
         description: 'list of hosts to build'
         required: true
-        default: ',othalan,algiz'
+        default: 'othalan algiz'
         type: string
       lockFile:
         description: 'flake.lock file'
@@ -16,7 +16,7 @@ on:
     inputs:
       hosts:
         description: 'list of hosts to build'
-        default: ',othalan,algiz'
+        default: 'othalan algiz'
         type: string
 
 # concurrency:
@@ -60,7 +60,7 @@ jobs:
           nix run . \
             -- \
             build --minimal \
-              --host,="${{ inputs.hosts }}" \
+              --host "${{ inputs.hosts }}" \
               --flake . \
               --debug \
               -- \

flake.lock

@@ -545,32 +545,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1725469705,
-        "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
+        "lastModified": 1725465990,
+        "narHash": "sha256-+KN+E3B5lVxi5K0rrDC41l080n/r04LOpmfxK3ZJ058=",
         "owner": "daylinmorgan",
         "repo": "nim2nix",
-        "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
-        "type": "github"
-      },
-      "original": {
-        "owner": "daylinmorgan",
-        "repo": "nim2nix",
-        "type": "github"
-      }
-    },
-    "nim2nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "utils",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1725469705,
-        "narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
-        "owner": "daylinmorgan",
-        "repo": "nim2nix",
-        "rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
+        "rev": "cac4c7106ea09e04b4a555e4f957e38be65dfbb4",
         "type": "github"
       },
       "original": {
@@ -773,16 +752,16 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
+        "lastModified": 1725194671,
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -819,22 +798,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1725103162,
-        "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pixi": {
       "inputs": {
         "nixpkgs": [
@@ -1093,8 +1056,12 @@
     },
     "utils": {
       "inputs": {
-        "nim2nix": "nim2nix_2",
-        "nixpkgs": "nixpkgs_7"
+        "nim2nix": [
+          "nim2nix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1725378965,

flake.nix

@@ -4,7 +4,7 @@
   outputs = inputs: (import ./lib inputs).oizysFlake;
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     stable.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
     nixos-wsl.url = "github:nix-community/NixOS-WSL";
@@ -33,6 +33,11 @@
     hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
     utils.url = "git+https://git.dayl.in/daylin/utils.git";
 
+    utils.inputs = {
+      nixpkgs.follows = "nixpkgs";
+      nim2nix.follows = "nim2nix";
+    };
+
     nim2nix.inputs.nixpkgs.follows = "nixpkgs";
     hyprman.inputs.nixpkgs.follows = "nixpkgs";
     f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";

pkgs/oizys-nim/default.nix

@@ -8,5 +8,5 @@ buildNimblePackage {
   verions = "unstable";
   src = lib.cleanSource ./.;
   nativeBuildInputs = [ openssl ];
-  nimbleDepsHash = "sha256-KErXGNNU5VVBHcvBmBhbagxZabHzajY5dF2OLHPmWf8=";
+  nimbleDepsHash = "sha256-n+K5hFiS1tEy2jDAoAoSgE75TCiqZK+al/0Mfc1d4kI=";
 }

pkgs/oizys-nim/src/oizys/nix.nim

@@ -53,7 +53,6 @@ proc cmpDrv(x, y: Derivation): int =
   cmp(x.name, y.name)
 
 proc parseDryRunOutput(err: string): DryRunOutput =
-  debug "parsing result of dry run"
   let lines = err.strip().splitLines()
   let theseLines = collect:
     for i, line in enumerate(lines):
@@ -239,6 +238,8 @@ proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
   else:
     cmd.addArgs nixosConfigAttrs()
   cmd.addArgs rest
+  debug cmd
+  quit QuitSuccess
   let err = runCmd(cmd)
   quit err
 

todo.md

@@ -3,11 +3,10 @@
 ## oizys
 
 - [ ] write a flake template that includes the systems boilerplate
-- [ ] include all of the defined overlays from `./overlays` in the `forAllSystems` nixpkgs
 
 ## software
 
-- [ ] check if there are multiple version of mako?
+- [ ] there seems tot be multiple version of mako
 - [ ] lid closed does not engage hyprlock?
   > check the logind conf in Nixos
 - [ ] include langservers for enabled languages?