From 0c69d4373fbbf795c67aa6f8c4dfb5a9e26430fc Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Fri, 10 Oct 2025 23:07:40 +0200 Subject: [PATCH 1/7] fix: readd jetbrains mono --- home/default.nix | 2 +- home/pkgs.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/home/default.nix b/home/default.nix index b70d7e2..46e10b4 100644 --- a/home/default.nix +++ b/home/default.nix @@ -119,7 +119,7 @@ in main = { shell = "tmux"; font = "Jetbrains Mono:size=8"; - dpi-aware = false; + dpi-aware = true; }; mouse.hide-when-typing = true; csd.preferred = "server"; diff --git a/home/pkgs.nix b/home/pkgs.nix index 71c9472..9bb42dc 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -29,6 +29,7 @@ with pkgs; iproute2 iputils # tracepath irssi + jetbrains-mono jq keepassxc krita From de5d7ae0b485ab7029c57c2a1a96c46c44662417 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 12 Oct 2025 15:23:15 +0200 Subject: [PATCH 2/7] chore(flake): update and re-add fixed libvdpau-va-gl --- flake.lock | 6 +++--- nixos/modules/steam.nix | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 54d4919..30cfa7c 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1760103600, - "narHash": "sha256-R4cltQFceN3POiPhBu7aTKsrwqTiwo6zjzmitrHD80E=", + "lastModified": 1760239230, + "narHash": "sha256-eqSP/BAbQwNTlQ/6yuK0yILzZAPNNj91gp6oIfVtu/E=", "owner": "nix-community", "repo": "home-manager", - "rev": "bcccb01d0a353c028cc8cb3254cac7ebae32929e", + "rev": "c4aaddeaecc09554c92518fd904e3e84b497ed09", "type": "github" }, "original": { diff --git a/nixos/modules/steam.nix b/nixos/modules/steam.nix index 2d2963f..7204d6f 100644 --- a/nixos/modules/steam.nix +++ b/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; }; From 37260a6ba732e4f3ae1ae32ca6a3cc62a58b3f1a Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Tue, 14 Oct 2025 22:35:06 +0200 Subject: [PATCH 3/7] fix: max-jobs = auto --- nixos/stolas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 5ff063a..0d0dc81 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -86,7 +86,7 @@ }; nix = { - settings.max-jobs = lib.mkDefault 16; + settings.max-jobs = "auto"; }; dadada = { From 38f51f5391bdae4fec8b9c4c9761c0ce85ba70ca Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Fri, 31 Oct 2025 14:18:38 +0100 Subject: [PATCH 4/7] feat: switch to solarized dark --- home/default.nix | 30 ++++++++++++++++++++++++++---- home/git.nix | 2 +- home/helix/config/config.toml | 2 +- home/pkgs.nix | 1 - nixos/stolas/default.nix | 23 +++++++++++++++++++++++ 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/home/default.nix b/home/default.nix index 46e10b4..c886594 100644 --- a/home/default.nix +++ b/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,11 +138,10 @@ in enable = true; server.enable = false; settings = { - inherit colors; + colors = colors_dark; main = { shell = "tmux"; - font = "Jetbrains Mono:size=8"; - dpi-aware = true; + dpi-aware = false; }; mouse.hide-when-typing = true; csd.preferred = "server"; diff --git a/home/git.nix b/home/git.nix index c7006b6..3bed5cb 100644 --- a/home/git.nix +++ b/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"; diff --git a/home/helix/config/config.toml b/home/helix/config/config.toml index 41cf786..9f37e3f 100644 --- a/home/helix/config/config.toml +++ b/home/helix/config/config.toml @@ -1,4 +1,4 @@ -theme = "solarized_light" +theme = "solarized_dark" [editor] line-number = "relative" diff --git a/home/pkgs.nix b/home/pkgs.nix index 9bb42dc..71c9472 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -29,7 +29,6 @@ with pkgs; iproute2 iputils # tracepath irssi - jetbrains-mono jq keepassxc krita diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 0d0dc81..37726c5 100644 --- a/nixos/stolas/default.nix +++ b/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; From 4b0d350ffe0cd2b00c0b075a435355702d570db0 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Fri, 31 Oct 2025 14:18:53 +0100 Subject: [PATCH 5/7] chore: update flakes --- flake.lock | 36 ++++++++++++++++++------------------ nixos/stolas/default.nix | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 30cfa7c..2a9352a 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1761899396, + "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1760239230, - "narHash": "sha256-eqSP/BAbQwNTlQ/6yuK0yILzZAPNNj91gp6oIfVtu/E=", + "lastModified": 1761878381, + "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c4aaddeaecc09554c92518fd904e3e84b497ed09", + "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", "type": "github" }, "original": { @@ -295,11 +295,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1761827175, + "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", "type": "github" }, "original": { @@ -311,11 +311,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760038930, - "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", + "lastModified": 1761311587, + "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", + "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", "type": "github" }, "original": { diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 37726c5..985583d 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -84,7 +84,7 @@ graphics = { enable = true; extraPackages = with pkgs; [ - vaapiVdpau + libva-vdpau-driver libvdpau-va-gl ]; }; From 66ff2999db00bac505df6b0753104b880aaa96a2 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sat, 8 Nov 2025 22:51:02 +0100 Subject: [PATCH 6/7] fix: things --- flake.lock | 54 +++++++++++++++++++++------------------- flake.nix | 9 ++++++- home/git.nix | 3 --- nixos/stolas/default.nix | 2 +- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 2a9352a..5f2e12c 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "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": 1761899396, - "narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -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": 1761827175, - "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -311,11 +313,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "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": 1762569282, + "narHash": "sha256-vINZAJpXQTZd5cfh06Rcw7hesH7sGSvi+Tn+HUieJn8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "a35a6144b976f70827c2fe2f5c89d16d8f9179d8", "type": "github" }, "original": { @@ -462,11 +464,11 @@ ] }, "locked": { - "lastModified": 1761311587, - "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 671ba3a..5ae56ad 100644 --- a/flake.nix +++ b/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; diff --git a/home/git.nix b/home/git.nix index 3bed5cb..9fdb15b 100644 --- a/home/git.nix +++ b/home/git.nix @@ -91,9 +91,6 @@ in home.packages = with pkgs; [ delta git-lfs - gitAndTools.hub - gitAndTools.lab - gitAndTools.git-absorb meld ]; } diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 985583d..7b486f0 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -127,7 +127,7 @@ adb.enable = true; firefox = { enable = true; - package = pkgs.firefox-wayland; + package = pkgs.firefox; }; gnupg.agent.enable = true; ssh.startAgent = true; From 864701cac02c945ea88c13a356f2131ff28f8638 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 9 Nov 2025 14:55:16 +0100 Subject: [PATCH 7/7] chore: update dependencies --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 5f2e12c..94a8a44 100644 --- a/flake.lock +++ b/flake.lock @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1762661401, + "narHash": "sha256-SVmijc8t23UMwru5f/9X1Ak5bSwvYkm0OQ5SxR7hOB0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "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", @@ -313,11 +313,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1762569282, - "narHash": "sha256-vINZAJpXQTZd5cfh06Rcw7hesH7sGSvi+Tn+HUieJn8=", + "lastModified": 1762655942, + "narHash": "sha256-hOM12KcQNQALrhB9w6KJmV5hPpm3GA763HRe9o7JUiI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a35a6144b976f70827c2fe2f5c89d16d8f9179d8", + "rev": "6ac961b02d4235572692241e333d0470637f5492", "type": "github" }, "original": {