diff options
| -rw-r--r-- | flake.lock | 48 | ||||
| -rw-r--r-- | modules/by-name/i3/i3status-rust/module.nix | 6 | ||||
| -rw-r--r-- | modules/by-name/ri/river/keymap.nix | 184 | ||||
| -rw-r--r-- | pkgs/by-name/fu/fupdate/flake.lock | 6 | ||||
| -rw-r--r-- | pkgs/by-name/i3/i3bar-river-patched/package.nix | 4 | ||||
| -rw-r--r-- | pkgs/by-name/lf/lf-make-map/Cargo.lock | 4 | ||||
| -rw-r--r-- | pkgs/by-name/lf/lf-make-map/flake.lock | 6 | ||||
| -rw-r--r-- | pkgs/by-name/ri/river-mk-keymap/Cargo.lock | 4 | ||||
| -rw-r--r-- | pkgs/by-name/ri/river-mk-keymap/flake.lock | 6 | ||||
| -rw-r--r-- | pkgs/by-name/ts/tskm/Cargo.lock | 4 | ||||
| -rw-r--r-- | pkgs/by-name/ts/tskm/flake.lock | 6 |
11 files changed, 140 insertions, 138 deletions
diff --git a/flake.lock b/flake.lock index 66b6ddae..41ac27dc 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "crane": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1750903843, - "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", + "lastModified": 1751607816, + "narHash": "sha256-5PtrwjqCIJ4DKQhzYdm8RFePBuwb+yTzjV52wWoGSt4=", "owner": "nix-community", "repo": "disko", - "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", + "rev": "da6109c917b48abc1f76dd5c9bf3901c8c80f662", "type": "github" }, "original": { @@ -133,11 +133,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -239,11 +239,11 @@ ] }, "locked": { - "lastModified": 1751336185, - "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=", + "lastModified": 1751638848, + "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", "owner": "nix-community", "repo": "home-manager", - "rev": "96354906f58464605ff81d2f6c2ea23211cbf051", + "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", "type": "github" }, "original": { @@ -432,11 +432,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751331362, - "narHash": "sha256-U4PMIjimk9RQwERsPkd7+84WRoWgaeVGDo/XuydRpns=", + "lastModified": 1751619433, + "narHash": "sha256-5aZFBHQNQzrfCisewtYBDNbiKcHbxPYChiP4dkEcSXQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08ed4a9c085d54f04207ec4e8c5e0eddbe991229", + "rev": "a2867cc3f8acc944cb19fe0b73c840e9fa1ba589", "type": "github" }, "original": { @@ -463,11 +463,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1751479989, + "narHash": "sha256-M5KgdpVBVcW4HRVq9/OSRbrxlwsQ1ogEKqnvzsClDqU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "34627c90f062da515ea358360f448da57769236e", "type": "github" }, "original": { @@ -493,11 +493,11 @@ ] }, "locked": { - "lastModified": 1751144320, - "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", + "lastModified": 1751492444, + "narHash": "sha256-26NgRXwhNM2x4hrok0C3CqSf2v0vi9byONNON5PzbHQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "ceb52aece5d571b37096945c2815604195a04eb4", + "rev": "239d331bb48673dfd00d7187654892471cd60d44", "type": "github" }, "original": { @@ -658,11 +658,11 @@ ] }, "locked": { - "lastModified": 1751338093, - "narHash": "sha256-/yd9nPcTfUZPFtwjRbdB5yGLdt3LTPqz6Ja63Joiahs=", + "lastModified": 1751596734, + "narHash": "sha256-1tQOwmn3jEUQjH0WDJyklC+hR7Bj+iqx6ChtRX2QiPA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6cfb7821732dac2d3e2dea857a5613d3b856c20c", + "rev": "e28ba067a9368286a8bc88b68dc2ca92181a09f0", "type": "github" }, "original": { diff --git a/modules/by-name/i3/i3status-rust/module.nix b/modules/by-name/i3/i3status-rust/module.nix index 5bd911d8..48bcd5de 100644 --- a/modules/by-name/i3/i3status-rust/module.nix +++ b/modules/by-name/i3/i3status-rust/module.nix @@ -81,11 +81,12 @@ in { } { block = "memory"; - format = " $icon $mem_used_percents {($swap_used_percents.eng(range:1..)) | }"; + format = " $icon $mem_used_percents{ ($swap_used_percents.eng(range:1..))|} "; } { block = "amd_gpu"; - format = " $icon $utilization (^icon_memory_mem $vram_used_percents) "; + format = " $icon $utilization (^icon_memory_mem $vram_used_percents) "; + error_format = ""; } { @@ -117,6 +118,7 @@ in { } { block = "battery"; + format = " $icon $percentage{ $time_remaining.dur(hms:true, min_unit:m)|}{ $power|} "; missing_format = ""; } diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix index 6873f40e..d1266576 100644 --- a/modules/by-name/ri/river/keymap.nix +++ b/modules/by-name/ri/river/keymap.nix @@ -8,7 +8,7 @@ index2tag = input: builtins.toString (libraries.base.pow 2 (input - 1)); mkTagCommand = name: index: [name (index2tag index)]; - mkSpawnInner = pkg: binaryName: args: further: (further + mkSpawn' = pkg: binaryName: args: further: (further // { command = [ "spawn" @@ -18,114 +18,117 @@ description = "${binaryName} ${args}"; }); - mkSpawnOnce = pkg: args: (mkSpawnInner pkg pkg.meta.mainProgram args {once = true;}); - mkSpawn = pkg: args: (mkSpawn' pkg pkg.meta.mainProgram args); - mkSpawn' = pkg: binaryName: args: (mkSpawnInner pkg binaryName args {}); + mkSpawn = pkg: args: further: (mkSpawn' pkg pkg.meta.mainProgram args further); cfg = config.soispha.programs.river; -in { - soispha.programs.river.init.mappings.keymap = lib.mkIf cfg.enable { - "<LEFT_SUPER>" = { - # Change focus - "f" = { - "t" = ["focus-view" "next"]; - "n" = ["focus-view" "previous"]; - "T" = ["focus-output" "next"]; - "N" = ["focus-output" "previous"]; - }; - # Spawn standard programs - "r" = { - "a" = mkSpawn pkgs.alacritty ""; - "b" = mkSpawn pkgs.tskm "open select"; - "k" = mkSpawn pkgs.keepassxc ""; - "s" = mkSpawn pkgs.signal-desktop ""; - "p" = mkSpawnOnce pkgs.screenshot_persistent ""; - }; + coreKeymap = { + # Change focus + "f" = { + "t" = ["focus-view" "next"]; + "n" = ["focus-view" "previous"]; + "T" = ["focus-output" "next"]; + "N" = ["focus-output" "previous"]; + }; - # Client changes - "c" = { - "f" = ["toggle-fullscreen"]; - "c" = ["close"]; - " " = ["toggle-float"]; - "<ENTER>" = ["zoom"]; - "o" = ["send-to-output" "next"]; - "t" = ["swap" "next"]; - "n" = ["swap" "previous"]; - }; + # Spawn standard programs + "r" = { + "a" = mkSpawn pkgs.alacritty "" {}; + "b" = mkSpawn pkgs.tskm "open select" {once = true;}; + "k" = mkSpawn pkgs.keepassxc "" {once = true;}; + "s" = mkSpawn pkgs.signal-desktop "" {once = true;}; + "p" = mkSpawn pkgs.screenshot_persistent "" {once = true;}; + }; - # River compositor control. - "x" = { - "q" = ["exit"]; - "l" = mkSpawn pkgs.lock ""; - }; + # Client changes + "c" = { + "f" = ["toggle-fullscreen"]; + "c" = ["close"]; + " " = ["toggle-float"]; + "<ENTER>" = ["zoom"]; + "o" = ["send-to-output" "next"]; + "t" = ["swap" "next"]; + "n" = ["swap" "previous"]; + }; - # Media control - "m" = { - "r" = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+"; - "l" = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-"; - "m" = mkSpawn pkgs.mpp "toggle"; - }; + # This is a fill in for <Super-L>, as that is otherwise impossible to input. + "l" = coreKeymap.x.l; - # Select tags to view. - "v" = { - "0" = ["set-view-tags" (builtins.toString ((libraries.base.pow 2 32) - 1))]; - "p" = ["send-to-previous-tags"]; - - "1" = mkTagCommand "set-view-tags" 1; - "2" = mkTagCommand "set-view-tags" 2; - "3" = mkTagCommand "set-view-tags" 3; - "4" = mkTagCommand "set-view-tags" 4; - "5" = mkTagCommand "set-view-tags" 5; - "6" = mkTagCommand "set-view-tags" 6; - "7" = mkTagCommand "set-view-tags" 7; - "8" = mkTagCommand "set-view-tags" 8; - "9" = mkTagCommand "set-view-tags" 9; - - # Add tags to view. - "a" = { - "1" = mkTagCommand "toggle-view-tags" 1; - "2" = mkTagCommand "toggle-view-tags" 2; - "3" = mkTagCommand "toggle-view-tags" 3; - "4" = mkTagCommand "toggle-view-tags" 4; - "5" = mkTagCommand "toggle-view-tags" 5; - "6" = mkTagCommand "toggle-view-tags" 6; - "7" = mkTagCommand "toggle-view-tags" 7; - "8" = mkTagCommand "toggle-view-tags" 8; - "9" = mkTagCommand "toggle-view-tags" 9; - }; - }; + # River compositor control. + "x" = { + "q" = ["exit"]; + "l" = mkSpawn pkgs.lock "" {once = true;}; + }; - # Select tags to focus. - "f" = { - "0" = ["set-focused-tags" (builtins.toString ((libraries.base.pow 2 32) - 1))]; - "p" = ["focus-previous-tags"]; - - "1" = mkTagCommand "set-focused-tags" 1; - "2" = mkTagCommand "set-focused-tags" 2; - "3" = mkTagCommand "set-focused-tags" 3; - "4" = mkTagCommand "set-focused-tags" 4; - "5" = mkTagCommand "set-focused-tags" 5; - "6" = mkTagCommand "set-focused-tags" 6; - "7" = mkTagCommand "set-focused-tags" 7; - "8" = mkTagCommand "set-focused-tags" 8; - "9" = mkTagCommand "set-focused-tags" 9; + # Media control + "m" = { + "r" = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+" {}; + "l" = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-" {}; + "m" = mkSpawn pkgs.mpp "toggle" {}; + }; + + # Select tags to view. + "v" = { + "0" = ["set-view-tags" (builtins.toString ((libraries.base.pow 2 32) - 1))]; + "p" = ["send-to-previous-tags"]; + + "1" = mkTagCommand "set-view-tags" 1; + "2" = mkTagCommand "set-view-tags" 2; + "3" = mkTagCommand "set-view-tags" 3; + "4" = mkTagCommand "set-view-tags" 4; + "5" = mkTagCommand "set-view-tags" 5; + "6" = mkTagCommand "set-view-tags" 6; + "7" = mkTagCommand "set-view-tags" 7; + "8" = mkTagCommand "set-view-tags" 8; + "9" = mkTagCommand "set-view-tags" 9; + + # Add tags to view. + "a" = { + "1" = mkTagCommand "toggle-view-tags" 1; + "2" = mkTagCommand "toggle-view-tags" 2; + "3" = mkTagCommand "toggle-view-tags" 3; + "4" = mkTagCommand "toggle-view-tags" 4; + "5" = mkTagCommand "toggle-view-tags" 5; + "6" = mkTagCommand "toggle-view-tags" 6; + "7" = mkTagCommand "toggle-view-tags" 7; + "8" = mkTagCommand "toggle-view-tags" 8; + "9" = mkTagCommand "toggle-view-tags" 9; }; }; + # Select tags to focus. + "f" = { + "0" = ["set-focused-tags" (builtins.toString ((libraries.base.pow 2 32) - 1))]; + "p" = ["focus-previous-tags"]; + + "1" = mkTagCommand "set-focused-tags" 1; + "2" = mkTagCommand "set-focused-tags" 2; + "3" = mkTagCommand "set-focused-tags" 3; + "4" = mkTagCommand "set-focused-tags" 4; + "5" = mkTagCommand "set-focused-tags" 5; + "6" = mkTagCommand "set-focused-tags" 6; + "7" = mkTagCommand "set-focused-tags" 7; + "8" = mkTagCommand "set-focused-tags" 8; + "9" = mkTagCommand "set-focused-tags" 9; + }; + }; +in { + soispha.programs.river.init.mappings.keymap = lib.mkIf cfg.enable { + "<LEFT_SUPER>" = coreKeymap; + # Audio "<MEDIA_RAISEVOLUME>" = - (mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+") + coreKeymap.m.r // { allow_locked = true; }; "<MEDIA_LOWERVOLUME>" = - (mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-") + coreKeymap.m.l // { allow_locked = true; }; "<MEDIA_MUTEVOLUME>" = - (mkSpawn pkgs.mpp "toggle") + coreKeymap.m.m // { allow_locked = true; }; @@ -134,10 +137,7 @@ in { "<Meta-<MOUSE_LEFT>>" = ["move-view"]; "<Meta-<MOUSE_RIGHT>>" = ["resize-view"]; - # Lock screen. - "<Meta-L>" = mkSpawn pkgs.lock ""; - # Screenshot - "<PRINTSCREEN>" = mkSpawn pkgs.screenshot_persistent ""; + "<PRINTSCREEN>" = coreKeymap.r.p; }; } diff --git a/pkgs/by-name/fu/fupdate/flake.lock b/pkgs/by-name/fu/fupdate/flake.lock index 175494e6..1ebbe915 100644 --- a/pkgs/by-name/fu/fupdate/flake.lock +++ b/pkgs/by-name/fu/fupdate/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1751285371, - "narHash": "sha256-/hDU+2AUeFFu5qGHO/UyFMc4UG/x5Cw5uXO36KGTk6c=", + "lastModified": 1751596331, + "narHash": "sha256-7WSzIrw0nCl8iYroj7c//LLsf2zgNEIJNyUSvx4MPLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9c03fbbaf84d85bb28eee530c7e9edc4021ca1b", + "rev": "472908faa934435cf781ae8fac77291af3d137d3", "type": "github" }, "original": { diff --git a/pkgs/by-name/i3/i3bar-river-patched/package.nix b/pkgs/by-name/i3/i3bar-river-patched/package.nix index f6c3b5fd..26f11ab3 100644 --- a/pkgs/by-name/i3/i3bar-river-patched/package.nix +++ b/pkgs/by-name/i3/i3bar-river-patched/package.nix @@ -21,8 +21,8 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "bpeetz"; repo = "i3bar-river"; - rev = "bdaf362f24c143beeb92b783af15d3b99a0490e4"; - hash = "sha256-jOv/DmXBpUCV/zbkWSKSYQ+yXcZZQY+T03rNre9hjn8="; + rev = "d460a9a283426e9474a0034a146d09816e92f571"; + hash = "sha256-E04b2FzEhOX5NyE/VpEGdg27Sg+1+lSSRZbGyX6PXrk="; }; cargoHash = "sha256-jIB4XH67FmtPxAatHkuW8v5mNgr/KsyriaBNZ5t2dLo="; diff --git a/pkgs/by-name/lf/lf-make-map/Cargo.lock b/pkgs/by-name/lf/lf-make-map/Cargo.lock index 05d59f92..e05520ee 100644 --- a/pkgs/by-name/lf/lf-make-map/Cargo.lock +++ b/pkgs/by-name/lf/lf-make-map/Cargo.lock @@ -96,9 +96,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "cc" -version = "1.2.27" +version = "1.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "4ad45f4f74e4e20eaa392913b7b33a7091c87e59628f4dd27888205ad888843c" dependencies = [ "shlex", ] diff --git a/pkgs/by-name/lf/lf-make-map/flake.lock b/pkgs/by-name/lf/lf-make-map/flake.lock index 175494e6..1ebbe915 100644 --- a/pkgs/by-name/lf/lf-make-map/flake.lock +++ b/pkgs/by-name/lf/lf-make-map/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1751285371, - "narHash": "sha256-/hDU+2AUeFFu5qGHO/UyFMc4UG/x5Cw5uXO36KGTk6c=", + "lastModified": 1751596331, + "narHash": "sha256-7WSzIrw0nCl8iYroj7c//LLsf2zgNEIJNyUSvx4MPLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9c03fbbaf84d85bb28eee530c7e9edc4021ca1b", + "rev": "472908faa934435cf781ae8fac77291af3d137d3", "type": "github" }, "original": { diff --git a/pkgs/by-name/ri/river-mk-keymap/Cargo.lock b/pkgs/by-name/ri/river-mk-keymap/Cargo.lock index 5640dc9b..7ac1734d 100644 --- a/pkgs/by-name/ri/river-mk-keymap/Cargo.lock +++ b/pkgs/by-name/ri/river-mk-keymap/Cargo.lock @@ -109,9 +109,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.27" +version = "1.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "4ad45f4f74e4e20eaa392913b7b33a7091c87e59628f4dd27888205ad888843c" dependencies = [ "shlex", ] diff --git a/pkgs/by-name/ri/river-mk-keymap/flake.lock b/pkgs/by-name/ri/river-mk-keymap/flake.lock index 175494e6..1ebbe915 100644 --- a/pkgs/by-name/ri/river-mk-keymap/flake.lock +++ b/pkgs/by-name/ri/river-mk-keymap/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1751285371, - "narHash": "sha256-/hDU+2AUeFFu5qGHO/UyFMc4UG/x5Cw5uXO36KGTk6c=", + "lastModified": 1751596331, + "narHash": "sha256-7WSzIrw0nCl8iYroj7c//LLsf2zgNEIJNyUSvx4MPLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9c03fbbaf84d85bb28eee530c7e9edc4021ca1b", + "rev": "472908faa934435cf781ae8fac77291af3d137d3", "type": "github" }, "original": { diff --git a/pkgs/by-name/ts/tskm/Cargo.lock b/pkgs/by-name/ts/tskm/Cargo.lock index a7395090..db4a72a3 100644 --- a/pkgs/by-name/ts/tskm/Cargo.lock +++ b/pkgs/by-name/ts/tskm/Cargo.lock @@ -132,9 +132,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.27" +version = "1.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" +checksum = "4ad45f4f74e4e20eaa392913b7b33a7091c87e59628f4dd27888205ad888843c" dependencies = [ "shlex", ] diff --git a/pkgs/by-name/ts/tskm/flake.lock b/pkgs/by-name/ts/tskm/flake.lock index 175494e6..1ebbe915 100644 --- a/pkgs/by-name/ts/tskm/flake.lock +++ b/pkgs/by-name/ts/tskm/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1751285371, - "narHash": "sha256-/hDU+2AUeFFu5qGHO/UyFMc4UG/x5Cw5uXO36KGTk6c=", + "lastModified": 1751596331, + "narHash": "sha256-7WSzIrw0nCl8iYroj7c//LLsf2zgNEIJNyUSvx4MPLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9c03fbbaf84d85bb28eee530c7e9edc4021ca1b", + "rev": "472908faa934435cf781ae8fac77291af3d137d3", "type": "github" }, "original": { |