From 27a0273f845683306361b7d741e909f9f9a528b6 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 9 Jun 2025 08:23:40 -0400 Subject: [PATCH] updates --- flake.lock | 152 ++++++++++++++++++++++++---------------- modules/home/niri.nix | 1 + modules/home/waybar.nix | 13 +--- 3 files changed, 96 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index 83da3de..79fdc15 100644 --- a/flake.lock +++ b/flake.lock @@ -4,16 +4,17 @@ "inputs": { "elemental-wine-source": "elemental-wine-source", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748860001, - "narHash": "sha256-6DoZ9hRSndZnJ7pAolx2K2umDb9RPq99U+/QWUeL3K0=", + "lastModified": 1749438735, + "narHash": "sha256-MCGkJ7alC6RLs5DfWtxtSLAWzOXnkyI/P3A5nccJW1I=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "05a03d8c96e86e82cacaea1a8a369cea8d714a1d", + "rev": "418861322c63ea6ae3c5ea0885a6041647feeb29", "type": "github" }, "original": { @@ -29,11 +30,11 @@ ] }, "locked": { - "lastModified": 1749200714, - "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", + "lastModified": 1749436314, + "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", "owner": "nix-community", "repo": "disko", - "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", + "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", "type": "github" }, "original": { @@ -89,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749403155, - "narHash": "sha256-NDtAmu/670yRr1z0kXIi2WHe32uEGlMoP5rhFLnBzXE=", + "lastModified": 1749461020, + "narHash": "sha256-EmVW3BNzwpMemCy50+nx8rK+q7U3ioXX3ErhXQFiHEg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f9a3bc6f0b0a8416df4602e7583aecca8d8cca57", + "rev": "3bb5d2b3966b1a79258daf1ec62963698cef90d9", "type": "github" }, "original": { @@ -185,6 +186,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1743550720, "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", @@ -321,6 +340,26 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat_4", @@ -345,7 +384,7 @@ "inputs": { "nixpkgs": [ "affinity-nix", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -852,11 +891,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749396815, - "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=", + "lastModified": 1749470416, + "narHash": "sha256-2n1yq94mP4AICYuncNvALyC+RB4dxoKlNXNWA37YS80=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f", + "rev": "d03319d498dc12854a8ca21c7b50e2d02d6be0c4", "type": "github" }, "original": { @@ -885,11 +924,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749327170, - "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=", + "lastModified": 1749467096, + "narHash": "sha256-QTOnTran2GvHyY+v6j5csv28Ti+i5ulKwZTgQyGQb+I=", "owner": "YaLTeR", "repo": "niri", - "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a", + "rev": "6bab9123833c2b0616c952a1ab2897ad4a05a826", "type": "github" }, "original": { @@ -950,13 +989,13 @@ }, "nix-rice": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "git-hooks-nix": "git-hooks-nix", "kitty-themes-src": "kitty-themes-src", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-lib": "nixpkgs-lib_2", + "nixpkgs-lib": "nixpkgs-lib_3", "systems": "systems_6" }, "locked": { @@ -1012,21 +1051,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", - "owner": "nixos", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { + "locked": { + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1743296961, "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", @@ -1041,7 +1095,7 @@ "type": "github" } }, - "nixpkgs-lib_2": { + "nixpkgs-lib_3": { "locked": { "lastModified": 1748135671, "narHash": "sha256-PIkcBpddXRAGWstWV7zTwRZ9EAPqgzFNssux17p1NTg=", @@ -1106,16 +1160,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1216,26 +1270,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -1742,11 +1776,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1749135826, - "narHash": "sha256-3VhH5g7oriczeTD/+zT056eLUDF1MGiZf2Hxdw7eQ5A=", + "lastModified": 1749459350, + "narHash": "sha256-QNYV2oy1wRJ5sn+7DfZv55hHdvW+hLt1E7Paz76nogI=", "owner": "sxyazi", "repo": "yazi", - "rev": "b637c32ef755813c1b1f6f611132c1feb4bb459f", + "rev": "693dff25e3165e357cc9d0b94ca3f2b176741a36", "type": "github" }, "original": { @@ -1763,11 +1797,11 @@ ] }, "locked": { - "lastModified": 1749401856, - "narHash": "sha256-z7MJ2+kkfhYhunjhojMiayHBlwy50eAcUskVWcRd45U=", + "lastModified": 1749443486, + "narHash": "sha256-FoHjyDf7B2CnVYcDTCuU4rsmZje8N1RTI+oNmcxIi8Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b0ce6a736d2102ab8ad2ff1b8344fb0d9b031e0b", + "rev": "f2d52dd1b3caadba53de552975c38b0a0795b319", "type": "github" }, "original": { diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 2253362..f9ee50e 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -524,6 +524,7 @@ in "Mod+Shift+Alt+P" = { hotkey-overlay.title = "Turn Laptop Display On"; action = spawn "niri" "msg" "output" "eDP-1" "on"; + allow-when-locked = true; }; }; }; diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index 34482f6..a22445f 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -225,14 +225,6 @@ window#waybar { color: #ccc; } -.modules-left .module { - border-right: 2px #222 solid; -} - -.modules-right .module { - border-left: 2px #222 solid; -} - .modules-center { padding: 0 15px; } @@ -247,6 +239,8 @@ window#waybar { #memory { border-left: 0; + margin-right: 0; + padding-right: 0; } #taskbar { @@ -298,12 +292,9 @@ window#waybar { } #mpris { - border-left: 2px #222 solid; - border-right: 0 } #workspaces { - border-right: 0; } #workspaces button {