diff --git a/flake.lock b/flake.lock index 61f229c..c95dd39 100644 --- a/flake.lock +++ b/flake.lock @@ -327,14 +327,17 @@ "dms-cli": "dms-cli", "nixpkgs": [ "nixpkgs" + ], + "quickshell": [ + "quickshell" ] }, "locked": { - "lastModified": 1761226278, - "narHash": "sha256-88y+EgM00/PMjIlb46gVSieLxSuiGlAvIAeATTFsbnE=", + "lastModified": 1760979807, + "narHash": "sha256-pHfjqh346v0ewgeoV90I7prR/r5nVlrLBamjfmknL9M=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "beab1a7b019325ff8030b108bf32d4f24c7e75b3", + "rev": "9a305355c2bd9744309cc5609194b016c8e7b3c7", "type": "github" }, "original": { @@ -419,18 +422,17 @@ }, "dms-cli": { "inputs": { - "gomod2nix": "gomod2nix", "nixpkgs": [ "desktopShell", "nixpkgs" ] }, "locked": { - "lastModified": 1761135910, - "narHash": "sha256-51m0k2BN6EjUKZI/tRs563HqGPhsM639kwuXcqxuniM=", + "lastModified": 1760241259, + "narHash": "sha256-DlLGn+4M6tIafoDsHr2WhHG2hrHrC24S2IL3+KAvjEU=", "owner": "AvengeMedia", "repo": "danklinux", - "rev": "d42b58f35c129e893819742746f11ef7e82be56f", + "rev": "dae4c3ff4ce0feb930361c399747edb29d081775", "type": "github" }, "original": { @@ -558,22 +560,6 @@ "type": "github" } }, - "flake-compat_11": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_2": { "flake": false, "locked": { @@ -827,7 +813,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1738591040, @@ -845,7 +831,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1715533576, @@ -864,7 +850,7 @@ }, "flake-utils-plus_3": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1738591040, @@ -876,6 +862,7 @@ }, "original": { "owner": "gytis-ivaskevicius", + "ref": "master", "repo": "flake-utils-plus", "type": "github" } @@ -884,24 +871,6 @@ "inputs": { "systems": "systems_4" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -916,7 +885,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -931,9 +900,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -1076,30 +1045,6 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "desktopShell", - "dms-cli", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756047880, - "narHash": "sha256-JeuGh9kA1SPL70fnvpLxkIkCWpTjtoPaus3jzvdna0k=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "47d628dc3b506bd28632e47280c6b89d3496909d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v1.7.0", - "repo": "gomod2nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -1148,7 +1093,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1709914708, @@ -1242,11 +1187,11 @@ }, "master": { "locked": { - "lastModified": 1761229794, - "narHash": "sha256-YkH1zHrMIFVPPbWN/smJVay/o2mLeV4Dynfn6J8MaHA=", + "lastModified": 1761082581, + "narHash": "sha256-2MjpIfwSXomwup67MTRdi2LrEkoYKnl1mT+Z3lxidg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ddd7747c41a3d12106c6a8d9c81720e13460b761", + "rev": "7d08a8522f8fd5feb0f694bd1da07f2e51be7d11", "type": "github" }, "original": { @@ -1268,11 +1213,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761187190, - "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=", + "lastModified": 1760950171, + "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c", + "rev": "f851a923137c0a54719412146fd63d24b3214e60", "type": "github" }, "original": { @@ -1449,11 +1394,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1761137276, - "narHash": "sha256-4lDjGnWRBLwqKQ4UWSUq6Mvxu9r8DSqCCydodW/Jsi8=", + "lastModified": 1761056547, + "narHash": "sha256-j3T1QDLK/VPUFLyFHDjhCKrEUVIKOrTYKm2mkempK8M=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "70bcd64225d167c7af9b475c4df7b5abba5c7de8", + "rev": "98434bad207101657df2491af88f625d2e82b7d7", "type": "github" }, "original": { @@ -1532,11 +1477,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -1660,11 +1605,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -1985,24 +1930,23 @@ }, "snowfall-lib_3": { "inputs": { - "flake-compat": "flake-compat_11", "flake-utils-plus": "flake-utils-plus_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1761079383, - "narHash": "sha256-Fd2hO/lOEdLHc0SOW58XFWe17yeQDrEOuQjmhKBov28=", - "ref": "refs/heads/main", - "rev": "73e5ee371b7e9b5a91fc0b7226ad7c0d82af9cc4", - "revCount": 96, - "type": "git", - "url": "https://git.kylekrein.com/kylekrein/snowfall-lib" + "lastModified": 1759988077, + "narHash": "sha256-LUel3DQ6WoHwkb9R88awz9tGzGwBGrJJyQjn81qgeuM=", + "owner": "anntnzrb", + "repo": "snowfall-lib", + "rev": "1e41848ba9a198bd3cf9fda4603894e23d1da9a2", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.kylekrein.com/kylekrein/snowfall-lib" + "owner": "anntnzrb", + "repo": "snowfall-lib", + "type": "github" } }, "sops-nix": { @@ -2034,7 +1978,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_10", "nur": "nur", - "systems": "systems_9", + "systems": "systems_8", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -2116,21 +2060,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2145,6 +2074,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_7": { "locked": { "lastModified": 1681028828, @@ -2175,21 +2119,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -2316,11 +2245,11 @@ }, "unstable": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -2350,7 +2279,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -2406,11 +2335,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761173223, - "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "bf745144acda1343934e9a094cf9458a54d57889", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7cd9021..1fabe49 100644 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ # The name "snowfall-lib" is required due to how Snowfall Lib processes your # flake's inputs. snowfall-lib = { - url = "git+https://git.kylekrein.com/kylekrein/snowfall-lib"; #"git+file:///home/kylekrein/Git/snowfall-lib"; + url = "github:anntnzrb/snowfall-lib"; #"git+file:///home/kylekrein/Git/snowfall-lib"; inputs.nixpkgs.follows = "nixpkgs"; }; snowfall-flake = { @@ -89,6 +89,7 @@ url = "github:KyleKrein/DesktopShell"; inputs.nixpkgs.follows = "nixpkgs"; inputs.dgop.follows = "dgop"; + inputs.quickshell.follows = "quickshell"; }; rose-pine-hyprcursor = { url = "github:ndom91/rose-pine-hyprcursor"; diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 224cff3..597840c 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -65,7 +65,7 @@ in WantedBy = ["graphical-session.target"]; }; Service = { - ExecStart = ''${lib.getExe pkgs.bash} -c "qs -c dms"''; + ExecStart = ''${lib.getExe pkgs.bash} -c "qs -c DankMaterialShell"''; Restart = "always"; RestartSec = 5; }; diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index 3bd368b..e6a7568 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -124,7 +124,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "spotlight" @@ -136,7 +136,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "clipboard" @@ -148,7 +148,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "processlist" @@ -160,7 +160,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "settings" @@ -172,7 +172,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "lock" @@ -185,7 +185,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "audio" @@ -199,7 +199,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "audio" @@ -213,7 +213,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "audio" @@ -226,7 +226,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "audio" @@ -240,7 +240,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "brightness" @@ -255,7 +255,7 @@ in action.spawn = [ "qs" "-c" - "dms" + "DankMaterialShell" "ipc" "call" "brightness" @@ -411,7 +411,7 @@ in niri = lib.getExe config.programs.niri.package; loginctl = "${pkgs.systemd}/bin/loginctl"; qs = "${inputs.quickshell.packages.${pkgs.system}.quickshell}/bin/qs"; - locking-script = "${qs} -c dms ipc call lock lock"; + locking-script = "${qs} -c DankMaterialShell ipc call lock lock"; systemctl = "${pkgs.systemd}/bin/systemctl"; suspendScript = cmd: pkgs.writeShellScript "suspend-script" '' diff --git a/systems/x86_64-linux/kylekrein-framework12/default.nix b/systems/x86_64-linux/kylekrein-framework12/default.nix index f6a94be..b899108 100644 --- a/systems/x86_64-linux/kylekrein-framework12/default.nix +++ b/systems/x86_64-linux/kylekrein-framework12/default.nix @@ -49,7 +49,7 @@ in custom.windowManagers.niri = enabled; custom.services.ai = { enable = true; - models = ["qwq" "llama3.1" "qwen2.5-coder:7b"]; + models = ["qwq" "llama3.1" "qwen2.5-coder:7b" "gpt-oss:20b"]; ui = disabled; }; custom.users.kylekrein = {