what if we build from master

.github/workflows/build-and-cache.yml

@@ -7,10 +7,7 @@ jobs:
     strategy:
       matrix:
         package:
-          - github:cything/nixpkgs/lact#lact
+          - github:cything/nixpkgs/fd06e41125350bc3db5628df49d3b84e4652a59d#lact
-          - github:cything/nixpkgs/attic#attic-client
-          - github:cything/nixpkgs/attic#attic-server
-          - github:sodiboo/niri-flake#niri-unstable
         os:
           - ubuntu-latest
           # - macos-latest
@@ -28,7 +25,6 @@ jobs:
           cache: ${{ vars.ATTIC_CACHE }}
           token: ${{ secrets.ATTIC_TOKEN }}
       - run: nix build -L '${{ matrix.package }}'
-
   build-machines:
     strategy:
       matrix:
@@ -53,7 +49,7 @@ jobs:
           remove-codeql: 'true'
           remove-docker-images: 'true'
           build-mount-path: /nix
-      - run: sudo chown root:root /nix
+          build-mount-path-ownership: 'root:root'
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           logger: pretty
@@ -69,7 +65,6 @@ jobs:
         with:
           persist-credentials: false
       - run: nix build -L --accept-flake-config .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
-
   build-homes:
     strategy:
       matrix:
@@ -93,7 +88,7 @@ jobs:
           remove-codeql: 'true'
           remove-docker-images: 'true'
           build-mount-path: /nix
-      - run: sudo chown root:root /nix
+          build-mount-path-ownership: 'root:root'
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           logger: pretty

flake.lock

@@ -411,16 +411,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737274611,
+        "lastModified": 1737341811,
-        "narHash": "sha256-tmD7875tu1P0UvhI3Q/fXvIe8neJo7H9ZrPQ+QF7Q3E=",
+        "narHash": "sha256-a9UXiYA48ja0cvlHA4bqF0et8+4acJT4YVhLC4/tNag=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "50165c4f7eb48ce82bd063e1fb8047a0f515f8ce",
+        "rev": "63dff148c56cc3168d78edefd1087cc5d6fdda16",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable-small",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "cy's flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:nixos/nixpkgs/master";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -89,7 +89,10 @@
               programs.typos.enable = true;
               programs.shellcheck.enable = true;
 
-              settings.global.excludes = [ "secrets/*" ];
+              settings.global.excludes = [
+                "secrets/*"
+                "**/*.png" # tries to format a png file??
+              ];
             };
           };
 

home/niri/default.nix

@@ -1,8 +1,17 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   wallpaper = "${./nixos-c-book.png}";
   terminal = "foot";
-  menu = [ "fuzzel" "-w" "100" ];
+  menu = [
+    "fuzzel"
+    "-w"
+    "100"
+  ];
   browser = "librewolf";
   file-manager = "thunar";
   clipboard = "cliphist list | ${lib.concatStringsSep " " menu} --dmenu | cliphist decode | wl-copy";
@@ -13,7 +22,15 @@ in
     input.keyboard.xkb.options = "ctrl:nocaps";
     spawn-at-startup = [
       { command = [ "${lib.getExe pkgs.waybar}" ]; }
-      { command = [ "${lib.getExe pkgs.swaybg}" "-m" "fill" "-i" wallpaper ]; }
+      {
+        command = [
+          "${lib.getExe pkgs.swaybg}"
+          "-m"
+          "fill"
+          "-i"
+          wallpaper
+        ];
+      }
       { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; }
     ];
     hotkey-overlay.skip-at-startup = true;
@@ -36,10 +53,10 @@ in
     layout = {
       gaps = 4;
       focus-ring = {
-          width = 4;
+        width = 4;
-          active.color = "#00000055";
+        active.color = "#00000055";
-          inactive.color = "#505050";
+        inactive.color = "#505050";
-        };
+      };
       always-center-single-column = true;
       border.enable = false;
     };
@@ -47,25 +64,31 @@ in
     window-rules = [
       {
         matches = [
-          { app-id = "anki"; title = "Add"; }
+          {
+            app-id = "anki";
+            title = "Add";
+          }
           { app-id = "mpv"; }
           { app-id = "Bitwarden"; }
         ];
         open-floating = true;
       }
       {
-        matches = [{ app-id = "anki"; }];
+        matches = [ { app-id = "anki"; } ];
         default-column-width.proportion = .25;
       }
       {
         matches = [
           { app-id = "foot"; }
-          { app-id = "anki"; title = "^Browse"; }
+          {
+            app-id = "anki";
+            title = "^Browse";
+          }
         ];
         default-column-width.proportion = .5;
       }
       {
-        matches = [{ app-id = "librewolf"; }];
+        matches = [ { app-id = "librewolf"; } ];
         default-column-width.proportion = .75;
       }
     ];