From d610304eebbe9a310f1df8401dbee742ec2199aa Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Fri, 12 Sep 2025 23:37:23 +0200 Subject: [PATCH] qol --- flake.lock | 78 +++++++++---------- .../kylekrein/niri/desktopShell.nix | 3 + homes/x86_64-linux/kylekrein/niri/niri.nix | 8 +- .../nixos/hardware/framework12/default.nix | 4 +- packages/lisgd-kylekrein/lisgd-config.h | 4 +- 5 files changed, 52 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 454e01d..bf1e8f3 100644 --- a/flake.lock +++ b/flake.lock @@ -198,11 +198,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1757505806, - "narHash": "sha256-n9/XRT0g6ucBpq2r1NUGDVwI6CTqg45sdljjAJdvWwc=", + "lastModified": 1757683904, + "narHash": "sha256-L9EIKWKKHwDCA8UgZSqK3L9NW8ATg+6sROMPkxKYCPU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0e34b767650b5b71a9c2b2caf4270f50a66a9305", + "rev": "558b28d33e88d8d446929ff32899248b1298d51f", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1757549595, - "narHash": "sha256-6FBYH+h3DI4CZ5pSdpX+s3JNPETmWNmAbbSYGqTk9uU=", + "lastModified": 1757695043, + "narHash": "sha256-33OsSuYkRqnqSznO0qPpjrfKQJAg0zi/uX0a4B/3mOU=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "2395274714eaa8b41931bf748261a25fafc45b2a", + "rev": "27344a47e2d2b73a392d3283a220aed1f13bc2bb", "type": "github" }, "original": { @@ -1149,11 +1149,11 @@ ] }, "locked": { - "lastModified": 1757503661, - "narHash": "sha256-bBh9sAJn0x/EdCVA6NYj/hXpcW1YBLCRMgn8A2T1l2E=", + "lastModified": 1757598712, + "narHash": "sha256-5PWVrdMp8u31Q247jqnJcwxKg3MJrs1TadTyTBRVBDY=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c97248d6f896232355735e34bb518ae9f130c5d", + "rev": "6d7c11a0adee0db21e3a8ef90ae07bb89bc20b8f", "type": "github" }, "original": { @@ -1261,11 +1261,11 @@ }, "master": { "locked": { - "lastModified": 1757590547, - "narHash": "sha256-sC+AlFrjF7V4WhYhrh5nOTFXeqJ8pgasRqyvv7s872M=", + "lastModified": 1757695067, + "narHash": "sha256-YevQrJiEsqW6KIkLG9VR1WdzsLN714EmwGg6whQi/E4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "863f2ae65d8ca452cf26c3583fa21035cdc98e2f", + "rev": "2a9ea24125277defd7ea9ec9b53d7147ed8ecd3e", "type": "github" }, "original": { @@ -1349,11 +1349,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757437545, - "narHash": "sha256-7ssbrFnmSrqtCtOySiu5ncyOBxPrR6p2nhNHrg6D+fo=", + "lastModified": 1757671360, + "narHash": "sha256-XXDAhFbVeTEanzS1HVcqwagsuWNFApe5YThlVarZut0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ef694b996daeeb8684c0adfaa9b7067a6e709054", + "rev": "f9d9c624257f4c817f1043eb10374e9a4a159eb7", "type": "github" }, "original": { @@ -1382,11 +1382,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757358784, - "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", + "lastModified": 1757656821, + "narHash": "sha256-MDaLusQZflxngGMU41g6cqabM7KE8I55UazzAZsjNN0=", "owner": "YaLTeR", "repo": "niri", - "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", + "rev": "b7909dbf61c7c1511b9a51ef46e1d503d5ba3d05", "type": "github" }, "original": { @@ -1520,11 +1520,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1757555349, - "narHash": "sha256-IoGBZQH2ZImikLh8kl8qnonrxhuK4uFckJeyYwYzQLs=", + "lastModified": 1757641478, + "narHash": "sha256-PZp0uvF6++tVln91cX8t0ZALMZHHoX++eeG7ysKgt1c=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "03d1ea7df555e3517e28ff90581cf7b223c3ea95", + "rev": "5cba556b6c1a6fa4ea9c28d2e4cf946eff45ac07", "type": "github" }, "original": { @@ -1657,11 +1657,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1757427959, - "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=", + "lastModified": 1757671225, + "narHash": "sha256-ZzoQXe7GV7QX3B3Iw59BogmrtHSP5Ig7MAPPD0cOFW4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161", + "rev": "42666441c3ddf34a8583a77f07a2c7cae32513c3", "type": "github" }, "original": { @@ -1764,11 +1764,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "type": "github" }, "original": { @@ -1780,11 +1780,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1757347588, - "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", + "lastModified": 1757487488, + "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", + "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", "type": "github" }, "original": { @@ -1828,11 +1828,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "type": "github" }, "original": { @@ -1876,11 +1876,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1757420003, - "narHash": "sha256-SPaZFFDt7CzE+BdNyh3HGfUKmttle/yN+ELIl6ZhEeE=", + "lastModified": 1757598577, + "narHash": "sha256-+PccWxBVh1cFy2sDWHlpSBG+OP0b6o/DE2EzCxsB0ns=", "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "b4fc8b5dcc7c1a4dab87d6dc35048cb188e49289", + "rev": "7bbfafff0e9f1c9a0d10ca4d4c26aaa49a13d893", "type": "github" }, "original": { @@ -4347,11 +4347,11 @@ ] }, "locked": { - "lastModified": 1757471515, - "narHash": "sha256-0+rSzNsYindDWjO9VVULKGjXlPsQV6IDjRU5G3SwI9U=", + "lastModified": 1757558036, + "narHash": "sha256-DyZaeaHy8iibckZ63XOqYJtEHc3kmVy8JrBIBV/GQHI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aecf31120156fe47a7d1992aa814052910178fca", + "rev": "b8adf899786b7b77b8c3636a9b753e3622f00db0", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 699ff0d..3c11574 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -29,6 +29,9 @@ in gammastep # night mode colloid-gtk-theme qt6ct + grim + slurp + satty libsForQt5.qt5ct ]; programs.kitty = { diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix index cc4df22..346dd50 100644 --- a/homes/x86_64-linux/kylekrein/niri/niri.nix +++ b/homes/x86_64-linux/kylekrein/niri/niri.nix @@ -61,7 +61,7 @@ in binds = with config.lib.niri.actions; let sh = spawn "sh" "-c"; emacs = action: sh "emacsclient -c --eval \"${action}\""; - screenshot-annotate = sh ''${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp} -w 0)" -t ppm - | ${lib.getExe pkgs.satty} --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush''; + screenshot-annotate = sh ''${lib.getExe pkgs.grim} -g "$(${lib.getExe pkgs.slurp} -w 0)" -t ppm - | ${lib.getExe pkgs.satty} --early-exit --copy-command 'wl-copy' --filename '~/Pictures/Screenshots/Screenshot-%Y-%m-%d_%H:%M:%S.png' --initial-tool brush''; in { "Mod+E".action = sh "emacsclient -c"; "Mod+Shift+C".action = sh "nautilus"; @@ -111,8 +111,10 @@ in "Ctrl+Alt+Delete" = { hotkey-overlay.title = "Restart Desktop Shell"; action.spawn = [ - "pkill" - "quickshell" + "systemctl" + "--user" + "restart" + "desktop-shell.service" ]; }; diff --git a/modules/nixos/hardware/framework12/default.nix b/modules/nixos/hardware/framework12/default.nix index 381f0ad..9de3081 100644 --- a/modules/nixos/hardware/framework12/default.nix +++ b/modules/nixos/hardware/framework12/default.nix @@ -54,8 +54,8 @@ in { environment.systemPackages = [ pkgs.framework-tool (pkgs.writeShellScriptBin "reset-tablet" '' - sudo ${pkgs.framework-tool}/bin/framework_tool --tablet-mode tablet - sudo ${pkgs.framework-tool}/bin/framework_tool --tablet-mode auto + sudo ${pkgs.framework-tool}/bin/framework_tool --tablet-mode tablet + sudo ${pkgs.framework-tool}/bin/framework_tool --tablet-mode auto '') ]; security.sudo.extraRules = [ diff --git a/packages/lisgd-kylekrein/lisgd-config.h b/packages/lisgd-kylekrein/lisgd-config.h index de68225..1df3498 100644 --- a/packages/lisgd-kylekrein/lisgd-config.h +++ b/packages/lisgd-kylekrein/lisgd-config.h @@ -50,7 +50,9 @@ Gesture gestures[] = { {2, SwipeDU, EdgeBottom, DistanceAny, ActModeReleased, "pkill -34 -f wvkbd"}, {3, SwipeUD, EdgeTop, DistanceLong, ActModeReleased, - "pkill quickshell"}, + "systemctl --user restart desktop-shell.service"}, + {2, SwipeUD, EdgeTop, DistanceLong, ActModeReleased, + "grim -g \"$(slurp -w 0)\" -t ppm - | satty --early-exit --copy-command 'wl-copy' --filename '~/Pictures/Screenshots/Screenshot-%Y-%m-%d_%H:%M:%S.png' --initial-tool brush"}, //{2, SwipeUD, EdgeBottom, DistanceAny, ActModeReleased, //"pkill -9 -f wvkbd-mobintl"}, {3, SwipeDU, EdgeAny, DistanceAny, ActModeReleased,