Merge remote-tracking branch 'origin/main'

.forgejo/workflows/nix-build.yaml

@@ -0,0 +1,37 @@
+on: [push]
+jobs:
+  check:
+    runs-on: nixos-host
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+        
+    # cache not needed since we now run on the host directly
+    # - name: Load cached nix store
+    #   id: cache-nix-store
+    #   uses: actions/cache/restore@v4
+    #   with:
+    #     path: /nix/store
+    #     key: ${{ runner.os }}-nix-store
+
+    - name: Build server
+      run: |
+        nix shell nixpkgs#nixos-rebuild -c nixos-rebuild build --flake .#beefcake
+
+    - name: Build router
+      run: |
+        nix shell nixpkgs#nixos-rebuild -c nixos-rebuild build --flake .#router
+
+    - name: Build desktop
+      run: |
+        nix shell nixpkgs#nixos-rebuild -c nixos-rebuild build --flake .#dragon
+
+    - name: Build laptop
+      run: |
+        nix shell nixpkgs#nixos-rebuild -c nixos-rebuild build --flake .#foxtrot
+
+    # - name: Save nix store
+    #   uses: actions/cache/save@v4
+    #   with:
+    #     path: /nix/store
+    #     key: ${{ steps.cache-nix-store.outputs.cache-primary-key }}

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721992626,
+        "lastModified": 1724850097,
-        "narHash": "sha256-GFDSPWxOqEkNrbuSfyoQHGIaRhJNapn2Rv0EEmBGR9A=",
+        "narHash": "sha256-3BHxvFb3NJzch1X8puRMkVZujOoarQ1llu3ZcwuvsKU=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "f95d1509370b7f40ef356ff69a332bd0356ab044",
+        "rev": "23c7925dd31e79e8c06086ace3edb129a070ac01",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722028105,
+        "lastModified": 1724895876,
-        "narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=",
+        "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "5b01cea8b5753de9c2febd27203c530be14745ff",
+        "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3",
         "type": "github"
       },
       "original": {
@@ -125,6 +125,41 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "freetype2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1687587065,
+        "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=",
+        "owner": "wez",
+        "repo": "freetype2",
+        "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "wez",
+        "repo": "freetype2",
+        "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -135,11 +170,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1721042469,
+        "lastModified": 1724857454,
-        "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
         "type": "github"
       },
       "original": {
@@ -217,11 +252,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1722017959,
+        "lastModified": 1724878143,
-        "narHash": "sha256-vkv3MtjRtJdqeWMLH874ngbC6/5wUYzsdw0pb96ZLRc=",
+        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "0b4d40f95a68ef0a6785f6b938ac8c1383321dbf",
+        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
         "type": "github"
       },
       "original": {
@@ -230,6 +265,23 @@
         "type": "github"
       }
     },
+    "harfbuzz": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1711722720,
+        "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
+        "owner": "harfbuzz",
+        "repo": "harfbuzz",
+        "rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "harfbuzz",
+        "ref": "8.4.0",
+        "repo": "harfbuzz",
+        "type": "github"
+      }
+    },
     "helix": {
       "inputs": {
         "crane": "crane",
@@ -238,11 +290,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1722007233,
+        "lastModified": 1724856988,
-        "narHash": "sha256-iS7yGpnaY7sAojvNeTav7fFiwz7aWT4MAZipkK6mDUM=",
+        "narHash": "sha256-JBLe2CxAhG+J8+x8qmbzkGHNYmGcSiuY2QO4Zhb72lI=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "229784ccc7833a52bc88c7a8b60ecb1d56303593",
+        "rev": "1b5295a3f3d7cccd96eed5bfd394807a4dae87fc",
         "type": "github"
       },
       "original": {
@@ -280,11 +332,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722203588,
+        "lastModified": 1724435763,
-        "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=",
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "792757f643cedc13f02098d8ed506d82e19ec1da",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -309,11 +361,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721330371,
+        "lastModified": 1722623071,
-        "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
         "type": "github"
       },
       "original": {
@@ -334,11 +386,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1722085443,
+        "lastModified": 1724938863,
-        "narHash": "sha256-TOmy/PQI0DuV/AbuGKzsnO3L4Yby0mn4qL+oRIy96L4=",
+        "narHash": "sha256-CxVxeKpXWm5Jl5wkJFwDnmU/EhJ95/NPiTGKdjrpaLM=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "963816b9a6524a99a6716fa1aa30b2c4f369d2f0",
+        "rev": "92a0dd164e9cc74060b63abae67b0204b6b6074c",
         "type": "github"
       },
       "original": {
@@ -361,11 +413,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718746314,
+        "lastModified": 1721326555,
-        "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=",
+        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290",
+        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
         "type": "github"
       },
       "original": {
@@ -390,11 +442,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721324361,
+        "lastModified": 1724174162,
-        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
+        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
+        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
         "type": "github"
       },
       "original": {
@@ -415,11 +467,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721324102,
+        "lastModified": 1724863980,
-        "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
+        "narHash": "sha256-7Ke9wFRYPUIXwm5ZndGHkWBKj6BsFTkSEXUNXQRHE54=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "962582a090bc233c4de9d9897f46794280288989",
+        "rev": "aadf9a27dddd2272ca354ba5a22a0c2d1f919039",
         "type": "github"
       },
       "original": {
@@ -453,6 +505,23 @@
         "type": "github"
       }
     },
+    "libpng": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1549245649,
+        "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
+        "owner": "glennrp",
+        "repo": "libpng",
+        "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
+        "type": "github"
+      },
+      "original": {
+        "owner": "glennrp",
+        "repo": "libpng",
+        "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1709479366,
@@ -503,11 +572,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1722040881,
+        "lastModified": 1724999960,
-        "narHash": "sha256-NMDotPxtCNvmRnUo/YuxNOpN8+UMONBlNBnRFsGHADQ=",
+        "narHash": "sha256-LB3jqSGW5u1ZcUcX6vO/qBOq5oXHlmOCxsTXGMEitp4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "48bacf585a51d953def8bff32087970f273052e2",
+        "rev": "b96f849e725333eb2b1c7f1cb84ff102062468ba",
         "type": "github"
       },
       "original": {
@@ -519,11 +588,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1721924956,
+        "lastModified": 1724819573,
-        "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ad6a14c6bf098e98800b091668718c336effc95",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
         "type": "github"
       },
       "original": {
@@ -535,11 +604,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1721949857,
+        "lastModified": 1724727824,
-        "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=",
+        "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665",
+        "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776",
         "type": "github"
       },
       "original": {
@@ -561,7 +630,8 @@
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "slippi": "slippi",
-        "sops-nix": "sops-nix"
+        "sops-nix": "sops-nix",
+        "wezterm": "wezterm"
       }
     },
     "rust-overlay": {
@@ -589,6 +659,27 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "nixpkgs": [
+          "wezterm",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721441897,
+        "narHash": "sha256-gYGX9/22tPNeF7dR6bWN5rsrpU4d06GnQNNgZ6ZiXz0=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b7996075da11a2d441cfbf4e77c2939ce51506fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "slippi": {
       "inputs": {
         "git-hooks": "git-hooks_2",
@@ -623,11 +714,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721688883,
+        "lastModified": 1723501126,
-        "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
@@ -666,6 +757,49 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "wezterm": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "freetype2": "freetype2",
+        "harfbuzz": "harfbuzz",
+        "libpng": "libpng",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
+        "rust-overlay": "rust-overlay_2",
+        "zlib": "zlib"
+      },
+      "locked": {
+        "dir": "nix",
+        "lastModified": 1723525023,
+        "narHash": "sha256-ZsDJQSUokodwFMP4FIZm2dYojf5iC4F/EeKC5VuQlqY=",
+        "owner": "wez",
+        "repo": "wezterm",
+        "rev": "30345b36d8a00fed347e4df5dadd83915a7693fb",
+        "type": "github"
+      },
+      "original": {
+        "dir": "nix",
+        "owner": "wez",
+        "repo": "wezterm",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
@@ -683,11 +817,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721755049,
+        "lastModified": 1724073926,
-        "narHash": "sha256-O17b38bQnmfxv7It3OnVYx7fp1seEdI7xxnw5vJFv30=",
+        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "5555f467f68ce7cdf1060991c24263073b95e9da",
+        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
         "type": "github"
       },
       "original": {
@@ -695,6 +829,23 @@
         "repo": "xdg-desktop-portal-hyprland",
         "type": "github"
       }
+    },
+    "zlib": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1484501380,
+        "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
+        "owner": "madler",
+        "repo": "zlib",
+        "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "madler",
+        "ref": "v1.2.11",
+        "repo": "zlib",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -23,6 +23,9 @@
     hardware.url = "github:nixos/nixos-hardware";
     hyprland.url = "github:hyprwm/Hyprland";
 
+    wezterm.url = "github:wez/wezterm?dir=nix";
+    wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
     slippi.url = "github:lytedev/slippi-nix";
     # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix";
     slippi.inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -58,6 +61,7 @@
     disko,
     sops-nix,
     git-hooks,
+    wezterm,
     home-manager,
     home-manager-unstable,
     helix,
@@ -210,23 +214,15 @@
         };
       };
 
-      modifications = final: prev: rec {
+      modifications = final: prev: let
+        wezterm-input = wezterm;
+      in rec {
         helix = helix.outputs.packages.${prev.system}.helix;
         final.helix = helix;
         # TODO: would love to use a current wezterm build so I can make use of ssh/mux functionality without breakage
         # source: https://github.com/wez/wezterm/issues/3771
-        # wezterm = prev.wezterm.overrideAttrs rec {
+        wezterm = wezterm-input.outputs.packages.${prev.system}.default;
-        #   version = "56a27e93a9ee50aab50ff4d78308f9b3154b5122";
+        final.wezterm = wezterm;
-        #   src = prev.fetchFromGitHub {
-        #     owner = "wez";
-        #     repo = "wezterm";
-        #     rev = version;
-        #     fetchSubmodules = true;
-        #     hash = "sha256-zl0Me24ncrpXUCvkQHlbgUucf0zrkhFFI242wsSQKLw=";
-        #   };
-        #   cargoLockFile = null;
-        #   cargoHash = "";
-        # };
       };
 
       unstable-packages = final: _prev: {

modules/home-manager/default.nix

@@ -1249,6 +1249,7 @@
     # docs: https://wezfurlong.org/wezterm/config/appearance.html#defining-your-own-colors
     programs.wezterm = with colors.withHashPrefix; {
       enable = true;
+      package = pkgs.wezterm;
       extraConfig = builtins.readFile ./wezterm/config.lua;
       colorSchemes = {
         catppuccin-mocha-sapphire = {

modules/nixos/default.nix

@@ -468,6 +468,7 @@
     environment = {
       systemPackages = with pkgs; [
         libnotify
+        slides
       ];
       variables = {
         # GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";

packages/iosevkaLyteTerm.nix

@@ -12,7 +12,7 @@ in ((iosevka.override {
 
       [buildPlans.Iosevka${set}.ligations]
       inherits = "dlig"
-      disables = [ "exeqeqeq", "exeqeq", "exeqeq-dl", "exeq", "ineq", "connected-underscore", "connected-tilde-as-wave" ]
+      disables = [ "exeqeqeq", "exeqeq", "eqexeq-dl", "exeq", "tildeeq" ]
 
       [buildPlans.Iosevka${set}.weights.regular]
       shape = 400

readme.md

@@ -1,6 +1,6 @@
 # Nix
 
-[![build status](https://git.lyte.dev/lytedev/nix/badges/workflows/nix.yaml/badge.svg)](https://git.lyte.dev/lytedev/nix/actions?workflow=nix.yaml)
+[![build status](https://git.lyte.dev/lytedev/nix/badges/workflows/nix-flake-check.yaml/badge.svg)](https://git.lyte.dev/lytedev/nix/actions?workflow=nix-flake-check.yaml)
 
 My grand, declarative, and unified application, service, environment, and
 machine configuration, secret, and package management in a single flake. ❤️ ❄️