diff --git a/flake.lock b/flake.lock index 5fb0b92..158180e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1725860795, - "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "type": "github" }, "original": { @@ -99,11 +99,11 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1731949548, - "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "lastModified": 1735953590, + "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", + "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1737085297, + "narHash": "sha256-0gpgsX7hCauT6pblVg+hrDnt83lPoYzq/2BqqyvU8Tc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "09414c7e2def24a5c52e588017b8524bcb68972a", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1734969791, - "narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=", + "lastModified": 1736899990, + "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe", + "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d", "type": "github" }, "original": { @@ -246,11 +246,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -399,19 +399,14 @@ "nixpkgs": [ "stylix", "nixpkgs" - ], - "nixpkgs-stable": [ - "stylix", - "git-hooks", - "nixpkgs" ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -487,11 +482,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737075266, + "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", "type": "github" }, "original": { @@ -509,11 +504,11 @@ ] }, "locked": { - "lastModified": 1735774425, - "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", + "lastModified": 1736785676, + "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", + "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "type": "github" }, "original": { @@ -531,11 +526,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1736817594, - "narHash": "sha256-3bpgIyL50b/tUj8UQijAL/4LCEJ/dJnfWvSAxHmV/94=", + "lastModified": 1737086202, + "narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=", "ref": "refs/heads/main", - "rev": "acbb3cff2d1a8b998135dc6f48cdd7fda85a3124", - "revCount": 16621, + "rev": "0d14c2b67a407825e3427bf079b31de069d9653a", + "revCount": 16626, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, @@ -574,11 +569,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1736855225, - "narHash": "sha256-2+ayH/0B37BLPJy4thO1titHIrVCoDdCtdnl0CyV8kc=", + "lastModified": 1737109534, + "narHash": "sha256-ONWusynmMvogEBeCTeZewIDmY4kZYxgv9D/TSL5kH70=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b013bedcff63b5cdbb9cd9841ac339361fc5cfcc", + "rev": "ce46857ea5bcd4e40040d46c6f495fa387fb812a", "type": "github" }, "original": { @@ -607,11 +602,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1736851192, - "narHash": "sha256-579fAoE9hZtuZHlYLMH0mICaak1HPEmymiKdF/HJAig=", + "lastModified": 1737102881, + "narHash": "sha256-5Lyjc7NduC+5t/Ypuj8DwjfJmdxetzELj6noRNBY8fQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "0df7a085de6fb0ebfe7af640e60fb496e52656aa", + "rev": "b4add625b2ffdad3e003b3e437891daacf53a12f", "type": "github" }, "original": { @@ -703,11 +698,11 @@ }, "nix-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -762,11 +757,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -856,11 +851,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1736684107, - "narHash": "sha256-vH5mXxEvZeoGNkqKoCluhTGfoeXCZ1seYhC2pbMN0sg=", + "lastModified": 1736916166, + "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "635e887b48521e912a516625eee7df6cf0eba9c1", + "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", "type": "github" }, "original": { @@ -919,11 +914,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -935,11 +930,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "github" }, "original": { @@ -966,10 +961,10 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", - "path": "/nix/store/apfqvr9kddcl6fscjvb92p4xdrqzcwk0-source", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "lastModified": 1736883708, + "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "path": "/nix/store/xb4yfxa32hsjpincdgjv7xdq9kyys8l9-source", + "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "type": "path" }, "original": { @@ -1147,11 +1142,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736779864, - "narHash": "sha256-OgKIMua33t0ZcdcFiUntFKidwhZrRZUTLlVHJ+mAiZQ=", + "lastModified": 1736993991, + "narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=", "owner": "danth", "repo": "stylix", - "rev": "934e2bfe7954d6c94f25d45cb12a8b3547825699", + "rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407", "type": "github" }, "original": { @@ -1309,11 +1304,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1729501581, - "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "lastModified": 1735737224, + "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", "type": "github" }, "original": { diff --git a/nixos/configs/gui/niri.nix b/nixos/configs/gui/niri.nix index b9f2bfc..cf12c47 100644 --- a/nixos/configs/gui/niri.nix +++ b/nixos/configs/gui/niri.nix @@ -306,6 +306,9 @@ in "Mod+Shift+F".action = fullscreen-window; "Mod+C".action = center-column; + "Mod+L".action = switch-focus-between-floating-and-tiling; + "Mod+Shift+L".action = toggle-window-floating; + "Mod+Minus".action = set-column-width "-10%"; "Mod+Plus".action = set-column-width "+10%"; "Mod+Shift+Minus".action = set-window-height "-10%"; diff --git a/nixos/configs/gui/waybar/default.nix b/nixos/configs/gui/waybar/default.nix index c687595..17ff00f 100644 --- a/nixos/configs/gui/waybar/default.nix +++ b/nixos/configs/gui/waybar/default.nix @@ -194,11 +194,6 @@ in programs.waybar = { enable = true; #systemd.enable = true; - - # Replace the package with a patched one. - package = pkgs.waybar.overrideAttrs (prev: { - patches = prev.patches ++ [ ./01-fix-privacy-null-pointer-deref.patch ]; - }); }; programs.waybar.settings.mainBar = { @@ -220,7 +215,6 @@ in "privacy" "custom/yubikey" "wireplumber" - "custom/puckdown" "battery" ]; @@ -262,7 +256,7 @@ in "clock#otherzone" = { interval = 1; format = "${icons.puclock} {:%H:%M %Z}"; - timezone = "Europe/Amsterdam"; + timezone = "America/Denver"; tooltip-format = '' Homosexuality Statistics diff --git a/nixos/hosts/trailblazer/default.nix b/nixos/hosts/trailblazer/default.nix index 40a3a79..7826431 100644 --- a/nixos/hosts/trailblazer/default.nix +++ b/nixos/hosts/trailblazer/default.nix @@ -104,6 +104,7 @@ in imports = [ #./ups.nix + ./scanner.nix (modulesPath + "/installer/scan/not-detected.nix") ../../configs/build-machine-users.nix ]; @@ -143,49 +144,6 @@ in # # Niri configuration for our monitors. # - home-manager.users.deprekated = { - - programs.niri.settings = { - - # Top monitor. - outputs."DP-2" = { - scale = 1.0; - position = { - x = 0; - y = 0; - }; - }; - - # Bottom monitor. - outputs."DP-3" = { - scale = 1.0; - position = { - x = 0; - y = 1440; - }; - mode = { - width = 3440; - height = 1440; - refresh = 144.0; - }; - }; - - # Right, vertical monitor. - # Note that the y position here makes the monitor not -so- offset. - outputs."HDMI-A-1" = { - scale = 1.0; - position = { - x = 3440; - y = 1440; - }; - }; - - input.tablet.map-to-output = "HDMI-A-1"; - }; - - # Also position waybar on only one monitor. - programs.waybar.settings.mainBar.output = "DP-3"; - }; # Override stylix font sizes. stylix.fonts.sizes.desktop = lib.mkForce 16; diff --git a/nixos/hosts/trailblazer/scanner.nix b/nixos/hosts/trailblazer/scanner.nix new file mode 100644 index 0000000..faeb1e8 --- /dev/null +++ b/nixos/hosts/trailblazer/scanner.nix @@ -0,0 +1,13 @@ +{ ... }: +{ + hardware.sane = { + enable = true; + brscan4 = { + enable = true; + netDevices.pronter = { + model = "MFC-L3740CDWE"; + ip = "pronter.puck.moe"; + }; + }; + }; +} diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix index 100e932..91991bf 100644 --- a/nixos/packages/gui.pkgs.nix +++ b/nixos/packages/gui.pkgs.nix @@ -13,7 +13,7 @@ let # Hack wine to not explode when starting MLO. - wineWayland = (pkgs.wineWowPackages.stableFull.override { waylandSupport = false; }); + wineWayland = pkgs.wineWowPackages.waylandFull; wine = wineWayland.overrideAttrs (prev: { patches = prev.patches ++ [ diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index f492fb4..cfdf68f 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -35,7 +35,7 @@ config = { tab_max_width = 32, -- Disable window styling, where possible. - window_decorations = "RESIZE", + window_decorations = "NONE", -- Use WebGpu, when we can. front_end = "WebGpu",