diff --git a/flake.lock b/flake.lock index 2f05fbd..ab1f7e5 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730906442, - "narHash": "sha256-tBuyb8jWBSHHgcIrOfiyQJZGY1IviMzH2V74t7gWfgI=", + "lastModified": 1731270564, + "narHash": "sha256-6KMC/NH/VWP5Eb+hA56hz0urel3jP6Y6cF2PX6xaTkk=", "owner": "zhaofengli", "repo": "attic", - "rev": "d0b66cf897e4d55f03d341562c9821dc4e566e54", + "rev": "47752427561f1c34debb16728a210d378f0ece36", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1731032247, - "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=", + "lastModified": 1731424394, + "narHash": "sha256-J+POQgWQdjhuF1pEnkVKWPJ+dM62FTepk6TmJdj3O5U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632", + "rev": "e30d226a24e4079d068321f935dbf30626f08dc8", "type": "github" }, "original": { @@ -264,24 +264,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -436,11 +418,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -480,11 +462,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1731087338, - "narHash": "sha256-9J8+Pyb/WtzZ+AU5XJLvpVSILN742z37C4CrbnYXkuo=", + "lastModified": 1731334117, + "narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=", "ref": "refs/heads/main", - "rev": "116895acb1fb5b09e8c1b867f345f6c8ca09647a", - "revCount": 16456, + "rev": "8a9094303bc7873c979e54ea20b9f50464ee3965", + "revCount": 16479, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -515,7 +497,6 @@ }, "niri": { "inputs": { - "flake-parts": "flake-parts_2", "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", "nixpkgs": "nixpkgs_5", @@ -524,11 +505,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1731077178, - "narHash": "sha256-ayB01Zz1qkV4IBqB597TIeYYsU2MBIzLDO13UmHdGWo=", + "lastModified": 1731433447, + "narHash": "sha256-QnjiNdq9Ma6nfw6OeyEkt1DDdhAPeqYjAzi0ZvOiLQw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "57d86eb5cc2c22dba5d97e3622ada05488c7d0a0", + "rev": "221350dc34dfc9fe6cea71397939ad5cfb8f3674", "type": "github" }, "original": { @@ -540,16 +521,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1726304152, - "narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=", + "lastModified": 1731164272, + "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", "owner": "YaLTeR", "repo": "niri", - "rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61", + "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v0.1.9", + "ref": "v0.1.10", "repo": "niri", "type": "github" } @@ -557,11 +538,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1731072306, - "narHash": "sha256-jBbeNVgirzpj7lD5bYQSGJJMirU4Uw0lRPaPCHSst7Y=", + "lastModified": 1731428804, + "narHash": "sha256-V3h8abnSf7OrzHek/CYCf/31IM4WnT9GOSsOacAZVy8=", "owner": "YaLTeR", "repo": "niri", - "rev": "c0829087da6c38e693e47a8b961f7d4aaa15a91e", + "rev": "db1faecc9522dd4751344d3aa4e1d1e987dffc0c", "type": "github" }, "original": { @@ -722,18 +703,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -768,11 +737,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1730883749, - "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "lastModified": 1731239293, + "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "type": "github" }, "original": { @@ -831,11 +800,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -847,11 +816,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -878,10 +847,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", - "path": "/nix/store/zq2axpgzd5kykk1v446rkffj3bxa2m2h-source", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "path": "/nix/store/sh0v21n9zc03b94qjj4jkkg5mbsjkpzr-source", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "path" }, "original": { @@ -1244,11 +1213,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1730258684, - "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=", + "lastModified": 1731123454, + "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58", + "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", "type": "github" }, "original": { diff --git a/nixos/configs/gui/waybar.nix b/nixos/configs/gui/waybar.nix index ce754d3..4520eac 100644 --- a/nixos/configs/gui/waybar.nix +++ b/nixos/configs/gui/waybar.nix @@ -206,7 +206,7 @@ in from datetime import datetime, timezone now = datetime.now(timezone.utc) - puck_day = "2024-09-01 17:57:00-06:00" + puck_day = "2024-12-11 13:30:00-07:00" puck_time = datetime.fromisoformat(puck_day) until = puck_time - now @@ -233,9 +233,7 @@ in modules-left = [ "clock" - #"clock#otherzone" - #"custom/puckdown" - "custom/todoist" + "clock#otherzone" "mpd" ]; modules-center = [ @@ -248,6 +246,7 @@ in "privacy" "custom/yubikey" "wireplumber" + "custom/puckdown" "battery" ]; diff --git a/nixos/hosts/valere.nix b/nixos/hosts/valere.nix index a7a2663..4573905 100644 --- a/nixos/hosts/valere.nix +++ b/nixos/hosts/valere.nix @@ -93,6 +93,10 @@ # Hardware config. # + # Use the latest kernel, until the Dell stuff makes it into + # more mainline kernels.~ + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" diff --git a/xonsh/includes/proton.xsh b/xonsh/includes/proton.xsh new file mode 100644 index 0000000..b36f8b1 --- /dev/null +++ b/xonsh/includes/proton.xsh @@ -0,0 +1,5 @@ +# +# Helpers for Proton on linux. +# + +aliases['rescale'] = "niri msg output eDP-1 scale" diff --git a/xonsh/kanbaru.xsh b/xonsh/kanbaru.xsh index 5e7e0e2..afca652 100644 --- a/xonsh/kanbaru.xsh +++ b/xonsh/kanbaru.xsh @@ -14,3 +14,6 @@ try_source("includes/add-ssh-keys") # NixOS compatibility. try_source("includes/nixos") + +# Steam compatibility. +try_source("includes/proton")