diff options
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | home/wayland/hyprland/binds.nix | 99 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 2 |
3 files changed, 57 insertions, 62 deletions
@@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1762810396, + "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "type": "github" }, "original": { @@ -961,11 +961,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1762733080, - "narHash": "sha256-kgGO0tdvFChcUk3KXHwqrvKfY1Td3i4EehtE2xsch8s=", + "lastModified": 1762819488, + "narHash": "sha256-krX4RpjxT5FxBvxF2M5KCf8M7mOgzf8r9qMYN89SC0A=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "383208e4ec49f9eb568d25fd9f5efa0625873e59", + "rev": "198cab0ed97958984f1a3a70fa91feb7c1a5a168", "type": "github" }, "original": { @@ -977,11 +977,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1762729645, - "narHash": "sha256-QnSYFDWlfQAtPWLtOY7Ab3SipYC5l27eCCJKX0i8jkY=", + "lastModified": 1762786736, + "narHash": "sha256-WNVL98v4R9recsJ6CgdY6rdtaOHStHOtLDx5stZ+FP0=", "owner": "neovim", "repo": "neovim", - "rev": "76fdd9b882489b233ca00a0809d719c70e48b164", + "rev": "70ea589d79f66ea29cfc20451a1a177652a24f27", "type": "github" }, "original": { diff --git a/home/wayland/hyprland/binds.nix b/home/wayland/hyprland/binds.nix index 8dc9ec8..0111a3b 100644 --- a/home/wayland/hyprland/binds.nix +++ b/home/wayland/hyprland/binds.nix @@ -1,65 +1,62 @@ -let - workspaces = builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}" - ] - ) - 5); -in { +{ wayland.windowManager.hyprland.settings = { bindm = [ "$mod, mouse:272, movewindow" "$mod, mouse:273, resizewindow" ]; - bind = - [ - "$mod, RETURN, exec, foot" - "$mod, D, exec, wofi -f --show=drun --lines=5" -# --prompt=\"\"" - "$mod SHIFT, D, exec, grimblast --freeze copy area" -# "$mod SHIFT, F, exec, grimblast copysave output ~/.screenshots/$(date +'%s_hypr.png')" -# "$mod SHIFT, G, exec, grimblast copy active" -# "$mod CTRL, P, exec, swayidle timeout 2 'sleep 1; hyprctl dispatcher dpms off' resume 'hyprctl dispatcher dpms on & pkill swayidle'" + bind = [ + "$mod, RETURN, exec, foot" + "$mod, D, exec, wofi --show=drun --lines=5--prompt=\"\"" + "$mod SHIFT, D, exec, grimblast --freeze copy area" +# "$mod SHIFT, F, exec, grimblast copysave output ~/.screenshots/$(date +'%s_hypr.png')" +# "$mod SHIFT, G, exec, grimblast copy active" +# "$mod CTRL, P, exec, swayidle timeout 2 'sleep 1; hyprctl dispatcher dpms off' resume 'hyprctl dispatcher dpms on & pkill swayidle'" - "$mod SHIFT, Q, killactive," - "$mod CTRL, E, exit," - "$mod, SPACE, togglesplit," - "$mod, F, fullscreen," - "$mod, V, togglefloating," - "$mod, P, pseudo," + "$mod SHIFT, Q, killactive," + "$mod CTRL, E, exit," + "$mod, SPACE, togglesplit," + "$mod, F, fullscreen," + "$mod, V, togglefloating," + "$mod, P, pseudo," - "$mod, H, movefocus, l" - "$mod, L, movefocus, r" - "$mod, K, movefocus, u" - "$mod, J, movefocus, d" + "$mod, H, movefocus, l" + "$mod, L, movefocus, r" + "$mod, K, movefocus, u" + "$mod, J, movefocus, d" - "$mod SHIFT, H, movewindow, l" - "$mod SHIFT, L, movewindow, r" - "$mod SHIFT, K, movewindow, u" - "$mod SHIFT, J, movewindow, d" + "$mod SHIFT, H, movewindow, l" + "$mod SHIFT, L, movewindow, r" + "$mod SHIFT, K, movewindow, u" + "$mod SHIFT, J, movewindow, d" - "$mod SUPER, H, resizeactive, -10 0" - "$mod SUPER, L, resizeactive, 10 0" - "$mod SUPER, K, resizeactive, 0 -10" - "$mod SUPER, J, resizeactive, 0 10" + "$mod SUPER, H, resizeactive, -10 0" + "$mod SUPER, L, resizeactive, 10 0" + "$mod SUPER, K, resizeactive, 0 -10" + "$mod SUPER, J, resizeactive, 0 10" -# "$mod, E, togglegroup" -# "$mod SHIFT, E, lockactivegroup, toggle" -# "$mod, TAB, changegroupactive, f" -# "$mod SHIFT, TAB, changegroupactive, b" -# "$mod CTRL, L, moveoutofgroup, r" -# "$mod CTRL, H, moveoutofgroup, l" +# "$mod, E, togglegroup" +# "$mod SHIFT, E, lockactivegroup, toggle" +# "$mod, TAB, changegroupactive, f" +# "$mod SHIFT, TAB, changegroupactive, b" +# "$mod CTRL, L, moveoutofgroup, r" +# "$mod CTRL, H, moveoutofgroup, l" -# "$mod, Prior, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" -# "$mod, Next, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ] - ++ workspaces; + "$mod, Prior, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" + "$mod, Next, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + + # --- Workspace bindings (1–5) --- + "$mod, 1, workspace, 1" + "$mod, 2, workspace, 2" + "$mod, 3, workspace, 3" + "$mod, 4, workspace, 4" + "$mod, 5, workspace, 5" + + "$mod SHIFT, 1, movetoworkspacesilent, 1" + "$mod SHIFT, 2, movetoworkspacesilent, 2" + "$mod SHIFT, 3, movetoworkspacesilent, 3" + "$mod SHIFT, 4, movetoworkspacesilent, 4" + "$mod SHIFT, 5, movetoworkspacesilent, 5" + ]; }; } diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 14adc7c..c206d8f 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -1,5 +1,4 @@ { inputs, pkgs, ... }: - { nixpkgs.config.allowUnfree = true; @@ -58,7 +57,6 @@ hardware.cpu.amd.updateMicrocode = true; services.xserver.videoDrivers = [ "amdgpu" ]; hardware.sensor.iio.enable = true; -programs.kdeconnect.enable = true; services.lact.enable = true; environment.variables.AMD_VULKAN_ICD = "RADV"; hardware.amdgpu.initrd.enable = true; |