chore: update dependencies

flake.lock

@@ -12,11 +12,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1754433428,
-        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "lastModified": 1762618334,
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
+        "lastModified": 1762521437,
+        "narHash": "sha256-RXN+lcx4DEn3ZS+LqEJSUu/HH+dwGvy0syN7hTo/Chg=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
+        "rev": "07bacc9531f5f4df6657c0a02a806443685f384a",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758287904,
-        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
+        "lastModified": 1762276996,
+        "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
+        "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760103600,
-        "narHash": "sha256-R4cltQFceN3POiPhBu7aTKsrwqTiwo6zjzmitrHD80E=",
+        "lastModified": 1762661401,
+        "narHash": "sha256-SVmijc8t23UMwru5f/9X1Ak5bSwvYkm0OQ5SxR7hOB0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bcccb01d0a353c028cc8cb3254cac7ebae32929e",
+        "rev": "c053d701d64f0727f62e0269c7940da5805bc9bc",
         "type": "github"
       },
       "original": {
@@ -220,11 +220,11 @@
     "homepage": {
       "flake": false,
       "locked": {
-        "lastModified": 1727338449,
-        "narHash": "sha256-VwOGtT1WB+isk0z/D/Be05GgeaTFfsXTGt7aScCAfec=",
-        "rev": "60398d3d728a0057b4cad49879ef637c06b28371",
+        "lastModified": 1762696280,
+        "narHash": "sha256-ncxcwvRNbN/WaZzi1NjV5fgtqfw/wypRtM/y1ZoJKNg=",
+        "rev": "d75353b55e10775649954d789d432be61ff663bf",
         "type": "tarball",
-        "url": "https://git.dadada.li/api/v1/repos/dadada/dadada.li/archive/60398d3d728a0057b4cad49879ef637c06b28371.tar.gz?rev=60398d3d728a0057b4cad49879ef637c06b28371"
+        "url": "https://git.dadada.li/api/v1/repos/dadada/dadada.li/archive/d75353b55e10775649954d789d432be61ff663bf.tar.gz?rev=d75353b55e10775649954d789d432be61ff663bf"
       },
       "original": {
         "type": "tarball",
@@ -240,7 +240,9 @@
           "nixpkgs"
         ],
         "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "rust-overlay": "rust-overlay"
+        "rust-overlay": [
+          "rust-overlay"
+        ]
       },
       "locked": {
         "lastModified": 1737639419,
@@ -295,11 +297,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1760106635,
-        "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
+        "lastModified": 1762463231,
+        "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
+        "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
         "type": "github"
       },
       "original": {
@@ -311,11 +313,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760038930,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "lastModified": 1762596750,
+        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
         "type": "github"
       },
       "original": {
@@ -400,6 +402,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "repo-rs": "repo-rs",
+        "rust-overlay": "rust-overlay",
         "systems": "systems_2",
         "treefmt-nix": "treefmt-nix"
       }
@@ -407,16 +410,15 @@
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
-          "lanzaboote",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1731897198,
-        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
+        "lastModified": 1762655942,
+        "narHash": "sha256-hOM12KcQNQALrhB9w6KJmV5hPpm3GA763HRe9o7JUiI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
+        "rev": "6ac961b02d4235572692241e333d0470637f5492",
         "type": "github"
       },
       "original": {
@@ -462,11 +464,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760120816,
-        "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=",
+        "lastModified": 1762410071,
+        "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "761ae7aff00907b607125b2f57338b74177697ed",
+        "rev": "97a30861b13c3731a84e09405414398fbf3e109f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -17,7 +17,10 @@
     };
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        rust-overlay.follows = "rust-overlay";
+        };
     };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     homepage = {
@@ -50,6 +53,10 @@
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { ... }@args: import ./outputs.nix args;

home/default.nix

@@ -3,7 +3,7 @@
   ...
 }:
 let
-  colors = {
+  colors_light = {
     background = "fdf6e3";
     foreground = "657b83";
     regular0 = "eee8d5"; # background darker
@@ -23,6 +23,29 @@ let
     bright6 = "586e75"; # pretty dark grey
     bright7 = "002b36"; # dark navy blue
   };
+  colors_dark = {
+    cursor = "002b36 93a1a1";
+    background = "002b36";
+    foreground = "839496";
+    regular0 = "073642";
+    regular1 = "dc322f";
+    regular2 = "859900";
+    regular3 = "b58900";
+    regular4 = "268bd2";
+    regular5 = "d33682";
+    regular6 = "2aa198";
+    regular7 = "eee8d5";
+    bright0 = "002b36";
+    bright1 = "cb4b16";
+    bright2 = "586e75";
+    bright3 = "657b83";
+    bright4 = "839496";
+    bright5 = "6c71c4";
+    bright6 = "93a1a1";
+    bright7 = "fdf6e3";
+    selection-foreground = "93a1a1";
+    selection-background = "073642";
+  };
 in
 {
   imports = [
@@ -115,10 +138,9 @@ in
     enable = true;
     server.enable = false;
     settings = {
-      inherit colors;
+      colors = colors_dark;
       main = {
         shell = "tmux";
-        font = "Jetbrains Mono:size=8";
         dpi-aware = false;
       };
       mouse.hide-when-typing = true;

home/git.nix

@@ -46,7 +46,7 @@ in
         navigate = true; # use n and N to move between diff sections
         side-by-side = false;
         line-numbers = true;
-        light = true;
+        light = false;
       };
       diff = {
         renames = "copies";
@@ -91,9 +91,6 @@ in
   home.packages = with pkgs; [
     delta
     git-lfs
-    gitAndTools.hub
-    gitAndTools.lab
-    gitAndTools.git-absorb
     meld
   ];
 }

home/helix/config/config.toml

@@ -1,4 +1,4 @@
-theme = "solarized_light"
+theme = "solarized_dark"
 
 [editor]
 line-number = "relative"

nixos/modules/steam.nix

@@ -18,7 +18,10 @@ in
     programs.steam.enable = true;
     hardware.graphics = {
       enable = true;
-      extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
+      extraPackages32 = with pkgs.pkgsi686Linux; [
+        libva
+        libvdpau-va-gl
+      ];
     };
     services.pulseaudio.support32Bit = true;
   };

nixos/stolas/default.nix

@@ -52,6 +52,29 @@
     pkgs.fw-ectool
   ];
 
+  fonts = {
+    enableDefaultPackages = true;
+    packages = with pkgs; [
+      fira
+      fira-code
+      fira-code-symbols
+      fira-mono
+      font-awesome
+      uw-ttyp0
+    ];
+    fontconfig = {
+      enable = true;
+      allowBitmaps = true;
+      antialias = true;
+      useEmbeddedBitmaps = true;
+      defaultFonts.monospace = [
+        "Ttyp0"
+        "Siji"
+        "Symbola"
+      ];
+    };
+  };
+
   hardware = {
     # NOTE: hardware.framework.enableKmod requires kernel patching, but enables access to some EC features
     bluetooth.enable = true;
@@ -61,7 +84,7 @@
     graphics = {
       enable = true;
       extraPackages = with pkgs; [
-        vaapiVdpau
+        libva-vdpau-driver
         libvdpau-va-gl
       ];
     };
@@ -86,7 +109,7 @@
   };
 
   nix = {
-    settings.max-jobs = lib.mkDefault 16;
+    settings.max-jobs = "auto";
   };
 
   dadada = {
@@ -104,7 +127,7 @@
     adb.enable = true;
     firefox = {
       enable = true;
-      package = pkgs.firefox-wayland;
+      package = pkgs.firefox;
     };
     gnupg.agent.enable = true;
     ssh.startAgent = true;