This commit is contained in:
Aleksandr Lebedev 2025-10-23 17:35:31 +02:00
parent e7cd990123
commit 8008a11649
4 changed files with 149 additions and 79 deletions

199
flake.lock generated
View file

@ -327,17 +327,14 @@
"dms-cli": "dms-cli", "dms-cli": "dms-cli",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"quickshell": [
"quickshell"
] ]
}, },
"locked": { "locked": {
"lastModified": 1760979807, "lastModified": 1761226278,
"narHash": "sha256-pHfjqh346v0ewgeoV90I7prR/r5nVlrLBamjfmknL9M=", "narHash": "sha256-88y+EgM00/PMjIlb46gVSieLxSuiGlAvIAeATTFsbnE=",
"owner": "KyleKrein", "owner": "KyleKrein",
"repo": "DesktopShell", "repo": "DesktopShell",
"rev": "9a305355c2bd9744309cc5609194b016c8e7b3c7", "rev": "beab1a7b019325ff8030b108bf32d4f24c7e75b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,17 +419,18 @@
}, },
"dms-cli": { "dms-cli": {
"inputs": { "inputs": {
"gomod2nix": "gomod2nix",
"nixpkgs": [ "nixpkgs": [
"desktopShell", "desktopShell",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1760241259, "lastModified": 1761135910,
"narHash": "sha256-DlLGn+4M6tIafoDsHr2WhHG2hrHrC24S2IL3+KAvjEU=", "narHash": "sha256-51m0k2BN6EjUKZI/tRs563HqGPhsM639kwuXcqxuniM=",
"owner": "AvengeMedia", "owner": "AvengeMedia",
"repo": "danklinux", "repo": "danklinux",
"rev": "dae4c3ff4ce0feb930361c399747edb29d081775", "rev": "d42b58f35c129e893819742746f11ef7e82be56f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -560,6 +558,22 @@
"type": "github" "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-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -813,7 +827,7 @@
}, },
"flake-utils-plus": { "flake-utils-plus": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2" "flake-utils": "flake-utils_3"
}, },
"locked": { "locked": {
"lastModified": 1738591040, "lastModified": 1738591040,
@ -831,7 +845,7 @@
}, },
"flake-utils-plus_2": { "flake-utils-plus_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3" "flake-utils": "flake-utils_4"
}, },
"locked": { "locked": {
"lastModified": 1715533576, "lastModified": 1715533576,
@ -850,7 +864,7 @@
}, },
"flake-utils-plus_3": { "flake-utils-plus_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4" "flake-utils": "flake-utils_5"
}, },
"locked": { "locked": {
"lastModified": 1738591040, "lastModified": 1738591040,
@ -862,7 +876,6 @@
}, },
"original": { "original": {
"owner": "gytis-ivaskevicius", "owner": "gytis-ivaskevicius",
"ref": "master",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
@ -871,6 +884,24 @@
"inputs": { "inputs": {
"systems": "systems_4" "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": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
@ -885,7 +916,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -900,9 +931,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_7" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -1045,6 +1076,30 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1093,7 +1148,7 @@
"rose-pine-hyprcursor", "rose-pine-hyprcursor",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1709914708, "lastModified": 1709914708,
@ -1187,11 +1242,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1761082581, "lastModified": 1761229794,
"narHash": "sha256-2MjpIfwSXomwup67MTRdi2LrEkoYKnl1mT+Z3lxidg4=", "narHash": "sha256-YkH1zHrMIFVPPbWN/smJVay/o2mLeV4Dynfn6J8MaHA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d08a8522f8fd5feb0f694bd1da07f2e51be7d11", "rev": "ddd7747c41a3d12106c6a8d9c81720e13460b761",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1213,11 +1268,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1760950171, "lastModified": 1761187190,
"narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "f851a923137c0a54719412146fd63d24b3214e60", "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1394,11 +1449,11 @@
}, },
"nixos-facter-modules": { "nixos-facter-modules": {
"locked": { "locked": {
"lastModified": 1761056547, "lastModified": 1761137276,
"narHash": "sha256-j3T1QDLK/VPUFLyFHDjhCKrEUVIKOrTYKm2mkempK8M=", "narHash": "sha256-4lDjGnWRBLwqKQ4UWSUq6Mvxu9r8DSqCCydodW/Jsi8=",
"owner": "numtide", "owner": "numtide",
"repo": "nixos-facter-modules", "repo": "nixos-facter-modules",
"rev": "98434bad207101657df2491af88f625d2e82b7d7", "rev": "70bcd64225d167c7af9b475c4df7b5abba5c7de8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1477,11 +1532,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1760862643, "lastModified": 1761016216,
"narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1605,11 +1660,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1760862643, "lastModified": 1761016216,
"narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1930,23 +1985,24 @@
}, },
"snowfall-lib_3": { "snowfall-lib_3": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_11",
"flake-utils-plus": "flake-utils-plus_3", "flake-utils-plus": "flake-utils-plus_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1759988077, "lastModified": 1761079383,
"narHash": "sha256-LUel3DQ6WoHwkb9R88awz9tGzGwBGrJJyQjn81qgeuM=", "narHash": "sha256-Fd2hO/lOEdLHc0SOW58XFWe17yeQDrEOuQjmhKBov28=",
"owner": "anntnzrb", "ref": "refs/heads/main",
"repo": "snowfall-lib", "rev": "73e5ee371b7e9b5a91fc0b7226ad7c0d82af9cc4",
"rev": "1e41848ba9a198bd3cf9fda4603894e23d1da9a2", "revCount": 96,
"type": "github" "type": "git",
"url": "https://git.kylekrein.com/kylekrein/snowfall-lib"
}, },
"original": { "original": {
"owner": "anntnzrb", "type": "git",
"repo": "snowfall-lib", "url": "https://git.kylekrein.com/kylekrein/snowfall-lib"
"type": "github"
} }
}, },
"sops-nix": { "sops-nix": {
@ -1978,7 +2034,7 @@
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_10", "nixpkgs": "nixpkgs_10",
"nur": "nur", "nur": "nur",
"systems": "systems_8", "systems": "systems_9",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
@ -2060,21 +2116,6 @@
} }
}, },
"systems_5": { "systems_5": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_6": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -2089,6 +2130,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_6": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_7": { "systems_7": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -2119,6 +2175,21 @@
"type": "github" "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": { "tinted-foot": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2245,11 +2316,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1760878510, "lastModified": 1761114652,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2279,7 +2350,7 @@
}, },
"utils_2": { "utils_2": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -2335,11 +2406,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1759707084, "lastModified": 1761173223,
"narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "rev": "bf745144acda1343934e9a094cf9458a54d57889",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -62,7 +62,7 @@
# The name "snowfall-lib" is required due to how Snowfall Lib processes your # The name "snowfall-lib" is required due to how Snowfall Lib processes your
# flake's inputs. # flake's inputs.
snowfall-lib = { snowfall-lib = {
url = "github:anntnzrb/snowfall-lib"; #"git+file:///home/kylekrein/Git/snowfall-lib"; url = "git+https://git.kylekrein.com/kylekrein/snowfall-lib"; #"git+file:///home/kylekrein/Git/snowfall-lib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
snowfall-flake = { snowfall-flake = {
@ -89,7 +89,6 @@
url = "github:KyleKrein/DesktopShell"; url = "github:KyleKrein/DesktopShell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.dgop.follows = "dgop"; inputs.dgop.follows = "dgop";
inputs.quickshell.follows = "quickshell";
}; };
rose-pine-hyprcursor = { rose-pine-hyprcursor = {
url = "github:ndom91/rose-pine-hyprcursor"; url = "github:ndom91/rose-pine-hyprcursor";

View file

@ -65,7 +65,7 @@ in
WantedBy = ["graphical-session.target"]; WantedBy = ["graphical-session.target"];
}; };
Service = { Service = {
ExecStart = ''${lib.getExe pkgs.bash} -c "qs -c DankMaterialShell"''; ExecStart = ''${lib.getExe pkgs.bash} -c "qs -c dms"'';
Restart = "always"; Restart = "always";
RestartSec = 5; RestartSec = 5;
}; };

View file

@ -124,7 +124,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"spotlight" "spotlight"
@ -136,7 +136,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"clipboard" "clipboard"
@ -148,7 +148,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"processlist" "processlist"
@ -160,7 +160,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"settings" "settings"
@ -172,7 +172,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"lock" "lock"
@ -185,7 +185,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"audio" "audio"
@ -199,7 +199,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"audio" "audio"
@ -213,7 +213,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"audio" "audio"
@ -226,7 +226,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"audio" "audio"
@ -240,7 +240,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"brightness" "brightness"
@ -255,7 +255,7 @@ in
action.spawn = [ action.spawn = [
"qs" "qs"
"-c" "-c"
"DankMaterialShell" "dms"
"ipc" "ipc"
"call" "call"
"brightness" "brightness"
@ -411,7 +411,7 @@ in
niri = lib.getExe config.programs.niri.package; niri = lib.getExe config.programs.niri.package;
loginctl = "${pkgs.systemd}/bin/loginctl"; loginctl = "${pkgs.systemd}/bin/loginctl";
qs = "${inputs.quickshell.packages.${pkgs.system}.quickshell}/bin/qs"; qs = "${inputs.quickshell.packages.${pkgs.system}.quickshell}/bin/qs";
locking-script = "${qs} -c DankMaterialShell ipc call lock lock"; locking-script = "${qs} -c dms ipc call lock lock";
systemctl = "${pkgs.systemd}/bin/systemctl"; systemctl = "${pkgs.systemd}/bin/systemctl";
suspendScript = cmd: suspendScript = cmd:
pkgs.writeShellScript "suspend-script" '' pkgs.writeShellScript "suspend-script" ''