diff --git a/flake.lock b/flake.lock index 0ec9a83..9de0072 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1763922789, - "narHash": "sha256-XnkWjCpeXfip9tqYdL0b0zzBDjq+dgdISvEdSVGdVyA=", + "lastModified": 1764714051, + "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a20a0e67a33b6848378a91b871b89588d3a12573", + "rev": "a43bedcceced5c21ad36578ed823e6099af78214", "type": "github" }, "original": { @@ -54,28 +54,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764351487, - "narHash": "sha256-7XJcTfz0dPhBd7nfyjcFxT1LIIctJZ2LthiI2Ltd7zY=", + "lastModified": 1765204341, + "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "2031f4a0507d0f7ab3e1aaff4c027a010feee447", + "rev": "aacb796ccd42be1555196c20013b9b674b71df75", "type": "github" }, "original": { @@ -166,40 +166,19 @@ "type": "github" } }, - "dankMaterialShell": { - "inputs": { - "dgop": "dgop", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764561720, - "narHash": "sha256-QOeUx+gacbziKlfuLUDDmiv7GwltUBp/S8rcGXqrKMg=", - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "rev": "4e66d3532e7324ad0c3ae744fa67d2eb0ccc702e", - "type": "github" - }, - "original": { - "owner": "AvengeMedia", - "repo": "DankMaterialShell", - "type": "github" - } - }, "dgop": { "inputs": { "nixpkgs": [ - "dankMaterialShell", + "dms", "nixpkgs" ] }, "locked": { - "lastModified": 1762435535, - "narHash": "sha256-QhzRn7pYN35IFpKjjxJAj3GPJECuC+VLhoGem3ezycc=", + "lastModified": 1762835999, + "narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=", "owner": "AvengeMedia", "repo": "dgop", - "rev": "6cf638dde818f9f8a2e26d0243179c43cb3458d7", + "rev": "799301991cd5dcea9b64245f9d500dcc76615653", "type": "github" }, "original": { @@ -229,14 +208,37 @@ "type": "github" } }, + "dms": { + "inputs": { + "dgop": "dgop", + "nixpkgs": [ + "nixpkgs" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1765804469, + "narHash": "sha256-cYCzFgYax1Cu/qdao5TEpB4ep/yOxZ14W/Dvj9zfovs=", + "owner": "AvengeMedia", + "repo": "DankMaterialShell", + "rev": "42a2835929e346e65226876ce3032eef23953eaf", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "ref": "42a283", + "repo": "DankMaterialShell", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -248,11 +250,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -280,11 +282,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -310,27 +312,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "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-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -338,11 +319,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -423,6 +404,9 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], @@ -430,11 +414,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1764535114, - "narHash": "sha256-CgMBjRFaEq/gYgqThjQFw0hdGJczqsx2wAkIH4ahxPQ=", + "lastModified": 1766101315, + "narHash": "sha256-FZLl2/ufs2l4XBNO5gelF9g0XmrAvyTiiHJ7GRTB0aI=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "2a9a57dafff583120af82ca03428cf251a31cd2e", + "rev": "fa0a982ff26ac851b6cb5d31717ad3deb037be9c", "type": "github" }, "original": { @@ -469,7 +453,7 @@ "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit-hooks-nix", + "pre-commit", "nixpkgs" ] }, @@ -491,11 +475,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -513,11 +497,11 @@ ] }, "locked": { - "lastModified": 1764544324, - "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=", + "lastModified": 1765980955, + "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612", + "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "type": "github" }, "original": { @@ -594,6 +578,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -604,11 +589,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764515131, - "narHash": "sha256-gDP05ePlorViRWcDA3eYu4l+3NE53sayi6iHaaQDEMA=", + "lastModified": 1766078604, + "narHash": "sha256-ECrUjlHZw/jQaLYS1lb10V3gmcHsYgJUgFtP9Z+aOKo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "bb963fb00263bac78a0c633d1d0d02ae4763222c", + "rev": "6175ecd4c4ba817c4620f66a75e1e11da7c7a8ca", "type": "github" }, "original": { @@ -650,11 +635,11 @@ ] }, "locked": { - "lastModified": 1763727565, - "narHash": "sha256-vRff/2R1U1jzPBy4OODqh2kfUzmizW/nfV2ROzTDIKo=", + "lastModified": 1764812575, + "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "7724d3a12a0453e7aae05f2ef39474219f05a4b4", + "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", "type": "github" }, "original": { @@ -704,11 +689,11 @@ ] }, "locked": { - "lastModified": 1763819661, - "narHash": "sha256-0jLarTR/BLWdGlboM86bPVP2zKJNI2jvo3JietnDkOM=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a318deec0c12409ec39c68d2be8096b636dc2a5c", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -796,11 +781,11 @@ ] }, "locked": { - "lastModified": 1763503177, - "narHash": "sha256-VPoiswJBBmTLVuNncvT/8FpFR+sYcAi/LgP/zTZ+5rA=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "f4e1e12755567ecf39090203b8f43eace8279630", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -821,11 +806,11 @@ ] }, "locked": { - "lastModified": 1763996058, - "narHash": "sha256-DsqzFZvrEV+aDmavjaD4/bk5qxeZwhGxPWBQdpFyM9Y=", + "lastModified": 1764962281, + "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0168583075baffa083032ed13a8bea8ea12f281a", + "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "type": "github" }, "original": { @@ -859,6 +844,35 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1764872015, + "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -868,11 +882,11 @@ ] }, "locked": { - "lastModified": 1764275117, - "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -884,25 +898,22 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "pre-commit": "pre-commit", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1766225539, + "narHash": "sha256-0Y6o3oUmQCxrzLIvZTcUAQCPEXAc+tU+N3ZjmzdrC28=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "14455220bef50f8df94f05e5763cdf51bc704acd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -923,27 +934,6 @@ "url": "ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets" } }, - "niri": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1764485473, - "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "niri-flake": { "inputs": { "niri-stable": "niri-stable", @@ -951,16 +941,18 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": [ + "nixpkgs-stable" + ], "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764563982, - "narHash": "sha256-6pB9TEo5++jkowiajprT6kqDuEYlGrvyIjTc86hZn2M=", + "lastModified": 1766090778, + "narHash": "sha256-e1SOJYHe5IbKFIOpWswB/4nIog1Zx5iXA4YB49XTFxE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9b1ac5828fc04bd7b07f147f26908eeaebb31ca7", + "rev": "d06ab0308d797dc4b2f9025d5952cca90afd11a7", "type": "github" }, "original": { @@ -989,11 +981,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764485473, - "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", + "lastModified": 1766085543, + "narHash": "sha256-96X+37m2HH8IG3BzXEN3d4eHeUbiu9g1Q+KJQRX/Jpw=", "owner": "YaLTeR", "repo": "niri", - "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", + "rev": "c4462d0c7fddfc11c9e98d43e3ef68a5b3c844ca", "type": "github" }, "original": { @@ -1047,11 +1039,11 @@ ] }, "locked": { - "lastModified": 1764475780, - "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -1069,7 +1061,7 @@ "nixpkgs-stable": [ "nixpkgs-stable" ], - "rust-overlay": "rust-overlay_4" + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1751591814, @@ -1087,11 +1079,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1764252389, - "narHash": "sha256-3bbuneTKZBkYXlm0bE36kUjiDsasoIC1GWBw/UEJ9T4=", + "lastModified": 1765442039, + "narHash": "sha256-k3lYQ+A1F7aTz8HnlU++bd9t/x/NP2A4v9+x6opcVg0=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "5ea68886d95218646d11d3551a476d458df00778", + "rev": "9dd775ee92de63f14edd021d59416e18ac2c00f1", "type": "github" }, "original": { @@ -1102,72 +1094,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758360447, - "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=", - "rev": "8eaee110344796db060382e15d3af0a9fc396e0e", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -1177,6 +1108,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": [ @@ -1189,11 +1136,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -1202,6 +1149,29 @@ "type": "github" } }, + "pre-commit": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1212,11 +1182,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -1225,59 +1195,52 @@ "type": "github" } }, - "pre-commit-hooks-nix": { + "quickshell": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], - "gitignore": "gitignore_2", "nixpkgs": [ - "lanzaboote", + "dms", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", - "type": "github" + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "ref": "refs/heads/master", + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "type": "git", + "url": "https://git.outfoxxed.me/quickshell/quickshell" } }, "root": { "inputs": { "blueprint": "blueprint", "chaotic": "chaotic", - "dankMaterialShell": "dankMaterialShell", "disko": "disko", + "dms": "dms", "ghostty": "ghostty", "home-manager": "home-manager", "hyprland": "hyprland", "hyprsunset": "hyprsunset", "lanzaboote": "lanzaboote", "mysecrets": "mysecrets", - "niri": "niri", "niri-flake": "niri-flake", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-cosmic": "nixos-cosmic", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "stylix": "stylix", "systems": "systems", "vicinae": "vicinae", - "walker": "walker", - "xwst": "xwst" + "zmx": "zmx" } }, "rust-overlay": { @@ -1288,11 +1251,11 @@ ] }, "locked": { - "lastModified": 1764211126, - "narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -1323,27 +1286,6 @@ } }, "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "niri", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757989933, - "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { "inputs": { "nixpkgs": [ "nixos-cosmic", @@ -1364,27 +1306,6 @@ "type": "github" } }, - "rust-overlay_5": { - "inputs": { - "nixpkgs": [ - "xwst", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1739240901, - "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -1392,11 +1313,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1765836173, + "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", "owner": "mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", "type": "github" }, "original": { @@ -1412,7 +1333,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -1428,11 +1349,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764550443, - "narHash": "sha256-ArO2V1YEHmEILilTj4KPtqF4gqc1q2HBrrrmygQ/UyU=", + "lastModified": 1765897595, + "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", "owner": "danth", "repo": "stylix", - "rev": "794b6e1fa75177ebfeb32967f135858a1ab1ba15", + "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", "type": "github" }, "original": { @@ -1507,11 +1428,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -1523,11 +1444,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -1539,11 +1460,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -1562,11 +1483,11 @@ ] }, "locked": { - "lastModified": 1764588501, - "narHash": "sha256-XpmTC4NmiKh1hau/EnaW1xnNtYhIktyKq0Iw8phDTTo=", + "lastModified": 1765982567, + "narHash": "sha256-lii6QTyRYIaQk9eDsvwzSZ1ZlICQoP/sIAWDGlXVpbI=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "e305f46bca41cb5d80166e08ce975396f1ab6c12", + "rev": "69f8a116929b9bc5f4b0e3b822a148ae657bb9c6", "type": "github" }, "original": { @@ -1575,30 +1496,6 @@ "type": "github" } }, - "walker": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ] - }, - "locked": { - "lastModified": 1753363004, - "narHash": "sha256-nNq0+o6lPiKntuL9rOonxihfkCIPvQ+SszTbjoAftC0=", - "owner": "abenz1267", - "repo": "walker", - "rev": "0f366b1f556398d47459b0bd3a9e27e9a0d2c398", - "type": "github" - }, - "original": { - "owner": "abenz1267", - "ref": "0f366b1", - "repo": "walker", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1660,33 +1557,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764560400, - "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", + "lastModified": 1765935116, + "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwst": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_5" - }, - "locked": { - "lastModified": 1764560400, - "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", + "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4", "type": "github" }, "original": { @@ -1711,11 +1586,11 @@ ] }, "locked": { - "lastModified": 1760401936, - "narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=", + "lastModified": 1763295135, + "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "365085b6652259753b598d43b723858184980bbe", + "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", "type": "github" }, "original": { @@ -1724,9 +1599,51 @@ "type": "github" } }, + "zig2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1764678235, + "narHash": "sha256-NNQWR3DAufaH7fs6ZplfAv1xPHEc0Ne3Z0v4MNHCqSw=", + "owner": "Cloudef", + "repo": "zig2nix", + "rev": "8b6ec85bccdf6b91ded19e9ef671205937e271e6", + "type": "github" + }, + "original": { + "owner": "Cloudef", + "repo": "zig2nix", + "type": "github" + } + }, + "zmx": { + "inputs": { + "zig2nix": "zig2nix" + }, + "locked": { + "lastModified": 1764777638, + "narHash": "sha256-9OBEct1ja/UgnpXm67YS8wILzqdTJo5D8xBD16X405Y=", + "owner": "brittonr", + "repo": "zmx", + "rev": "8d9a0d749bcefa23adce4f685d2179728d3aac01", + "type": "github" + }, + "original": { + "owner": "brittonr", + "repo": "zmx", + "type": "github" + } + }, "zon2nix": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] }, "locked": { "lastModified": 1758405547, diff --git a/flake.nix b/flake.nix index 71d22c0..1c9386e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,133 +2,60 @@ description = "unexplrd's personal configuration"; inputs = { - # lix = { - # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # neve = { - # inputs.nixvim.follows = "nixvim"; - # url = "git+https://gitea.linerds.us/unexplrd/Neve"; - # }; - # nixvim.url = "github:nix-community/nixvim"; - systems.url = "github:nix-systems/default"; - blueprint = { - url = "github:numtide/blueprint"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.systems.follows = "systems"; - }; - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs = { - home-manager.follows = "home-manager"; - nixpkgs.follows = "nixpkgs"; - }; - }; - disko = { - url = "github:nix-community/disko/latest"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - dankMaterialShell = { - url = "github:AvengeMedia/DankMaterialShell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - ghostty = { - url = "github:ghostty-org/ghostty"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.inputs.systems.follows = "systems"; - }; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland = { - url = "github:hyprwm/Hyprland"; - inputs = { - systems.follows = "systems"; - nixpkgs.follows = "nixpkgs"; - }; - }; - hyprsunset = { - url = "github:hyprwm/hyprsunset"; - inputs = { - hyprland-protocols.follows = "hyprland/hyprland-protocols"; - hyprlang.follows = "hyprland/hyprlang"; - hyprutils.follows = "hyprland/hyprutils"; - hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner"; - nixpkgs.follows = "nixpkgs"; - systems.follows = "hyprland/systems"; - }; - }; - lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.2"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - mysecrets = { - url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets"; - flake = false; - }; - niri = { - url = "github:YaLTeR/niri"; - inputs = { - # nixpkgs-stable.follows = "nixpkgs-stable"; - nixpkgs.follows = "nixpkgs"; - }; - }; - niri-flake = { - url = "github:sodiboo/niri-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + blueprint.url = "github:numtide/blueprint"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + dms.url = "github:AvengeMedia/DankMaterialShell/42a283"; + disko.url = "github:nix-community/disko/latest"; + ghostty.url = "github:ghostty-org/ghostty"; + home-manager.url = "github:nix-community/home-manager"; + hyprland.url = "github:hyprwm/Hyprland"; + hyprsunset.url = "github:hyprwm/hyprsunset"; + lanzaboote.url = "github:nix-community/lanzaboote"; + mysecrets.url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets"; + niri-flake.url = "github:sodiboo/niri-flake"; nix-flatpak.url = "github:gmodena/nix-flatpak"; - nix-index-database = { - url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs = { - nixpkgs-stable.follows = "nixpkgs-stable"; - nixpkgs.follows = "nixpkgs"; - }; - }; + nix-index-database.url = "github:nix-community/nix-index-database"; + nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; - nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable"; - # workaround for `unexpected Nix daemon error: error: serialised integer 7022364302122705765 is too large for type 'j'` - # url = "github:NixOS/nixpkgs/pull/413627/head"; - }; - sops-nix = { - url = "github:mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - stylix = { - url = "github:danth/stylix"; - inputs = { - # home-manager.follows = "home-manager"; - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; - walker = { - url = "github:abenz1267/walker/0f366b1"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; - xwst = { - url = "github:Supreeeme/xwayland-satellite"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; - vicinae = { - url = "github:vicinaehq/vicinae"; - inputs = { - nixpkgs.follows = "nixpkgs"; - systems.follows = "systems"; - }; - }; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + sops-nix.url = "github:mic92/sops-nix"; + stylix.url = "github:danth/stylix"; + systems.url = "github:nix-systems/default"; + vicinae.url = "github:vicinaehq/vicinae"; + zmx.url = "github:brittonr/zmx"; + + blueprint.inputs.nixpkgs.follows = "nixpkgs"; + blueprint.inputs.systems.follows = "systems"; + chaotic.inputs.home-manager.follows = "home-manager"; + chaotic.inputs.nixpkgs.follows = "nixpkgs"; + dms.inputs.nixpkgs.follows = "nixpkgs"; + disko.inputs.nixpkgs.follows = "nixpkgs"; + ghostty.inputs.flake-utils.inputs.systems.follows = "systems"; + ghostty.inputs.home-manager.follows = "home-manager"; + ghostty.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland.inputs.systems.follows = "systems"; + hyprsunset.inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols"; + hyprsunset.inputs.hyprlang.follows = "hyprland/hyprlang"; + hyprsunset.inputs.hyprutils.follows = "hyprland/hyprutils"; + hyprsunset.inputs.hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner"; + hyprsunset.inputs.nixpkgs.follows = "nixpkgs"; + hyprsunset.inputs.systems.follows = "hyprland/systems"; + lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; + mysecrets.flake = false; + niri-flake.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + niri-flake.inputs.nixpkgs.follows = "nixpkgs"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + nixos-cosmic.inputs.nixpkgs-stable.follows = "nixpkgs-stable"; + nixos-cosmic.inputs.nixpkgs.follows = "nixpkgs"; + sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; + stylix.inputs.systems.follows = "systems"; + vicinae.inputs.nixpkgs.follows = "nixpkgs"; + vicinae.inputs.systems.follows = "systems"; + zmx.inputs.zig2nix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs: inputs.blueprint {inherit inputs;}; diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index fb01ee0..ba996b1 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -67,7 +67,7 @@ in { platformTheme.name = "gtk3"; }; - programs.walker = import ./programs/walker {inherit config inputs pkgs;}; + # programs.walker = import ./programs/walker {inherit config inputs pkgs;}; programs.waybar = import ./programs/waybar {inherit config colors getExe ifLaptop pkgs;}; wayland.windowManager.hyprland = import ./hyprland.nix {inherit config osConfig perSystem launcher lockscreen;}; services = import ./services {inherit pkgs lockscreen getExe perSystem;}; @@ -189,7 +189,7 @@ in { ExecStart = "${getExe perSystem.hyprsunset.hyprsunset} -t 6500"; }; }; - walker = mkGraphicalService {}; + # walker = mkGraphicalService {}; }; }; }; diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix index d3b2965..7f28ddc 100644 --- a/modules/home/desktop/niri/default.nix +++ b/modules/home/desktop/niri/default.nix @@ -24,7 +24,7 @@ in { imports = with inputs; [ # vicinae.homeManagerModules.default - walker.homeManagerModules.default + # walker.homeManagerModules.default ]; options = { desktop.niri.enable = @@ -102,7 +102,7 @@ in { xdg = { configFile = { - niri = import ./niri.nix commonArgs; + # niri = import ./niri.nix commonArgs; "mimeapps.list".force = true; }; mime.enable = true; diff --git a/modules/home/desktop/niri/niri.nix b/modules/home/desktop/niri/niri.nix index 722527b..92533ad 100644 --- a/modules/home/desktop/niri/niri.nix +++ b/modules/home/desktop/niri/niri.nix @@ -246,10 +246,12 @@ in { match app-id="org.wezfurlong.wezterm" match app-id="com.mitchellh.ghostty" default-column-width { proportion 1.0; } + draw-border-with-background false } window-rule { match app-id="re.sonny.Junction" match app-id="com.github.hluk.copyq" + match title=r"^.* - Choose User Profile$" open-floating true open-focused true } @@ -292,6 +294,8 @@ in { Mod+Ctrl+M { fullscreen-window; } Mod+Ctrl+G { toggle-window-floating; } + Mod+Shift+M { maximize-window-to-edges; } + Mod+Ctrl+Shift+M { toggle-windowed-fullscreen; } Mod+Minus { set-column-width "-10%"; } @@ -305,7 +309,7 @@ in { Mod+Ctrl+Space repeat=false { toggle-overview; } - Mod+Return repeat=false { spawn "/bin/sh" "-c" "$TERMINAL"; } + Mod+Return repeat=false { spawn "sh" "-c" "$TERMINAL"; } Mod+BackSpace repeat=false { spawn "sh" "-c" "${launcher}"; } Mod+D repeat=false { spawn "sh" "-c" "${launcher}"; } Mod+Ctrl+L repeat=false { spawn "${lockscreen}"; } diff --git a/modules/nixos/desktop/dms/default.nix b/modules/nixos/desktop/dms/default.nix index 17f73d9..dc314b9 100644 --- a/modules/nixos/desktop/dms/default.nix +++ b/modules/nixos/desktop/dms/default.nix @@ -10,8 +10,8 @@ with lib; let cfg = config.desktop.dms; in { imports = with inputs; [ - dankMaterialShell.nixosModules.dankMaterialShell - dankMaterialShell.nixosModules.greeter + dms.nixosModules.dankMaterialShell + dms.nixosModules.greeter niri-flake.nixosModules.niri ]; options = { @@ -28,9 +28,11 @@ in { module.desktop.gnome-keyring.enable = true; sound.pipewire.enable = true; + services.gvfs.enable = true; + programs.niri = { enable = true; - package = perSystem.niri.niri; + package = perSystem.niri-flake.niri-unstable; }; systemd.user.services.niri-flake-polkit.enable = false; @@ -39,6 +41,7 @@ in { enable = true; greeter = { enable = true; + configHome = "/home/user"; compositor.name = "niri"; }; };