diff --git a/flake.lock b/flake.lock index 94a8a44..54d4919 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1762521437, - "narHash": "sha256-RXN+lcx4DEn3ZS+LqEJSUu/HH+dwGvy0syN7hTo/Chg=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "07bacc9531f5f4df6657c0a02a806443685f384a", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1762661401, - "narHash": "sha256-SVmijc8t23UMwru5f/9X1Ak5bSwvYkm0OQ5SxR7hOB0=", + "lastModified": 1760103600, + "narHash": "sha256-R4cltQFceN3POiPhBu7aTKsrwqTiwo6zjzmitrHD80E=", "owner": "nix-community", "repo": "home-manager", - "rev": "c053d701d64f0727f62e0269c7940da5805bc9bc", + "rev": "bcccb01d0a353c028cc8cb3254cac7ebae32929e", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "homepage": { "flake": false, "locked": { - "lastModified": 1762696280, - "narHash": "sha256-ncxcwvRNbN/WaZzi1NjV5fgtqfw/wypRtM/y1ZoJKNg=", - "rev": "d75353b55e10775649954d789d432be61ff663bf", + "lastModified": 1727338449, + "narHash": "sha256-VwOGtT1WB+isk0z/D/Be05GgeaTFfsXTGt7aScCAfec=", + "rev": "60398d3d728a0057b4cad49879ef637c06b28371", "type": "tarball", - "url": "https://git.dadada.li/api/v1/repos/dadada/dadada.li/archive/d75353b55e10775649954d789d432be61ff663bf.tar.gz?rev=d75353b55e10775649954d789d432be61ff663bf" + "url": "https://git.dadada.li/api/v1/repos/dadada/dadada.li/archive/60398d3d728a0057b4cad49879ef637c06b28371.tar.gz?rev=60398d3d728a0057b4cad49879ef637c06b28371" }, "original": { "type": "tarball", @@ -240,9 +240,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": [ - "rust-overlay" - ] + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1737639419, @@ -297,11 +295,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -313,11 +311,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -402,7 +400,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "repo-rs": "repo-rs", - "rust-overlay": "rust-overlay", "systems": "systems_2", "treefmt-nix": "treefmt-nix" } @@ -410,15 +407,16 @@ "rust-overlay": { "inputs": { "nixpkgs": [ + "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1762655942, - "narHash": "sha256-hOM12KcQNQALrhB9w6KJmV5hPpm3GA763HRe9o7JUiI=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6ac961b02d4235572692241e333d0470637f5492", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -464,11 +462,11 @@ ] }, "locked": { - "lastModified": 1762410071, - "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", + "lastModified": 1760120816, + "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "97a30861b13c3731a84e09405414398fbf3e109f", + "rev": "761ae7aff00907b607125b2f57338b74177697ed", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5ae56ad..671ba3a 100644 --- a/flake.nix +++ b/flake.nix @@ -17,10 +17,7 @@ }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; - inputs = { - nixpkgs.follows = "nixpkgs"; - rust-overlay.follows = "rust-overlay"; - }; + inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; homepage = { @@ -53,10 +50,6 @@ 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/default.nix b/home/default.nix index c886594..b70d7e2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,7 +3,7 @@ ... }: let - colors_light = { + colors = { background = "fdf6e3"; foreground = "657b83"; regular0 = "eee8d5"; # background darker @@ -23,29 +23,6 @@ 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 = [ @@ -138,9 +115,10 @@ in enable = true; server.enable = false; settings = { - colors = colors_dark; + inherit colors; main = { shell = "tmux"; + font = "Jetbrains Mono:size=8"; dpi-aware = false; }; mouse.hide-when-typing = true; diff --git a/home/git.nix b/home/git.nix index 9fdb15b..c7006b6 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 = false; + light = true; }; diff = { renames = "copies"; @@ -91,6 +91,9 @@ in home.packages = with pkgs; [ delta git-lfs + gitAndTools.hub + gitAndTools.lab + gitAndTools.git-absorb meld ]; } diff --git a/home/helix/config/config.toml b/home/helix/config/config.toml index 9f37e3f..41cf786 100644 --- a/home/helix/config/config.toml +++ b/home/helix/config/config.toml @@ -1,4 +1,4 @@ -theme = "solarized_dark" +theme = "solarized_light" [editor] line-number = "relative" diff --git a/nixos/modules/steam.nix b/nixos/modules/steam.nix index 7204d6f..2d2963f 100644 --- a/nixos/modules/steam.nix +++ b/nixos/modules/steam.nix @@ -18,10 +18,7 @@ in programs.steam.enable = true; hardware.graphics = { enable = true; - extraPackages32 = with pkgs.pkgsi686Linux; [ - libva - libvdpau-va-gl - ]; + extraPackages32 = with pkgs.pkgsi686Linux; [ libva ]; }; services.pulseaudio.support32Bit = true; }; diff --git a/nixos/stolas/default.nix b/nixos/stolas/default.nix index 7b486f0..5ff063a 100644 --- a/nixos/stolas/default.nix +++ b/nixos/stolas/default.nix @@ -52,29 +52,6 @@ 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; @@ -84,7 +61,7 @@ graphics = { enable = true; extraPackages = with pkgs; [ - libva-vdpau-driver + vaapiVdpau libvdpau-va-gl ]; }; @@ -109,7 +86,7 @@ }; nix = { - settings.max-jobs = "auto"; + settings.max-jobs = lib.mkDefault 16; }; dadada = { @@ -127,7 +104,7 @@ adb.enable = true; firefox = { enable = true; - package = pkgs.firefox; + package = pkgs.firefox-wayland; }; gnupg.agent.enable = true; ssh.startAgent = true;