diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index 00e5f56..05610ba 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -35,6 +35,7 @@ in { pkgs.piper pkgs.libpq pkgs.qmk + pkgs.jq ]; # System @@ -54,15 +55,12 @@ in { mods.theme.wallpaper = ./wallpaper.png; services.xserver.windowManager.i3.enable = true; + # mods.desktop.wayland.enable = true; mods.impermanence.enable = true; - services.hardware.openrgb.enable = true; virtualisation.docker.enable = true; - services.picom.enable = true; - services.picom.opacityRules = ["50:name *= 'Cheat'"]; - users.users.muon.openssh.authorizedKeys.keys = keys; users.users.root.openssh.authorizedKeys.keys = keys; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index a891f58..c77adbf 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -13,6 +13,7 @@ in { # Modules mods.xdg.enable = true; mods.i3.enable = true; + # mods.hyprland.enable = true; mods.battery.enable = true; mods.terminal.zsh.enable = true; mods.terminal.emulator.enable = true; diff --git a/modules/home/desktop/hyprland.nix b/modules/home/desktop/hyprland.nix index 4a41db2..5e445f7 100644 --- a/modules/home/desktop/hyprland.nix +++ b/modules/home/desktop/hyprland.nix @@ -1,4 +1,10 @@ -{ pkgs, lib, config, ... }: { +{ + pkgs, + lib, + config, + osConfig, + ... +}: { options.mods.hyprland.enable = lib.mkEnableOption { description = "enables hyprland"; default = false; @@ -22,32 +28,44 @@ }; "$mod" = "SUPER"; - bind = [ - "$mod, Return, exec, alacritty" - "$mod, D, exec, fuzzel" - "$mod, F, exec, qutebrowser" + bind = + [ + "$mod, Return, exec, alacritty" + "$mod, D, exec, fuzzel" + "$mod, B, exec, qutebrowser" - "$mod SHIFT, Q, killactive," - "$mod SHIFT, X, exit," + "$mod SHIFT, Q, killactive," + "$mod SHIFT, X, exit," - "$mod, H, movefocus, l" - "$mod, J, movefocus, d" - "$mod, K, movefocus, u" - "$mod, L, movefocus, r" - ] - ++ (builtins.concatLists (builtins.genList ( - # workspaces - # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - 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}, movetoworkspace, ${toString (x + 1)}" + "$mod, H, movefocus, l" + "$mod, J, movefocus, d" + "$mod, K, movefocus, u" + "$mod, L, movefocus, r" + + "$mod SHIFT, H, movewindow, l" + "$mod SHIFT, J, movewindow, d" + "$mod SHIFT, K, movewindow, u" + "$mod SHIFT, L, movewindow, r" ] - ) 10) ); + ++ (builtins.concatLists (builtins.genList ( + # workspaces + # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} + 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}, movetoworkspace, ${toString (x + 1)}" + ] + ) + 10)); + + monitor = + lib.mapAttrsToList + (_: v: "${v.name},${v.config.mode}@${v.config.rate},${v.config.position},1") + osConfig.mods.monitors; }; }; }; diff --git a/modules/home/desktop/i3.nix b/modules/home/desktop/i3.nix index 0c2021a..693bb2e 100644 --- a/modules/home/desktop/i3.nix +++ b/modules/home/desktop/i3.nix @@ -28,7 +28,7 @@ ZWIND=$(wmctrl -l | grep "$ZSESH" || echo "") cd "$ZPATH" if [[ -z "$ZWIND" ]]; then - alacritty -T "$ZSESH" -e zsh -c "zellij -s $ZSESH -n compact || zellij a $ZSESH" + alacritty -T "$ZSESH" -e zsh -c "zellij -s $ZSESH -n dev || zellij a $ZSESH" else wmctrl -a "$ZSESH" fi diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix index 3d3757f..b84b69d 100644 --- a/modules/home/terminal/development.nix +++ b/modules/home/terminal/development.nix @@ -33,6 +33,93 @@ enableZshIntegration = lib.mkIf config.mods.terminal.zsh.enable true; }; + programs.zellij = { + settings = { + default_mode._args = ["locked"]; + show_startup_tips._args = [false]; + show_release_notes._args = [false]; + }; + + extraConfig = builtins.readFile ./zellij.kdl; + + layouts = { + dev = { + layout = { + _children = [ + { + default_tab_template = { + _children = [ + { + pane = { + size = 1; + borderless = true; + plugin = { + location = "zellij:tab-bar"; + }; + }; + } + {"children" = {};} + { + pane = { + size = 2; + borderless = true; + plugin = { + location = "zellij:status-bar"; + }; + }; + } + ]; + }; + } + { + tab = { + _props = { + name = "Project"; + focus = true; + }; + _children = [ + { + pane = { + command = "nvim"; + }; + } + ]; + }; + } + { + tab = { + _props = { + name = "Run"; + }; + _children = [ + { + pane = { + command = "zsh"; + }; + } + ]; + }; + } + { + tab = { + _props = { + name = "Test"; + }; + _children = [ + { + pane = { + command = "zsh"; + }; + } + ]; + }; + } + ]; + }; + }; + }; + }; + home.sessionVariables.EDITOR = "hx"; programs.zsh.sessionVariables.EDITOR = "hx"; diff --git a/modules/home/terminal/tools.nix b/modules/home/terminal/tools.nix index 94f7f79..eb93300 100644 --- a/modules/home/terminal/tools.nix +++ b/modules/home/terminal/tools.nix @@ -56,6 +56,11 @@ in }; }; + services.clipmenu = { + enable = true; + launcher = "rofi"; + }; + home.packages = with pkgs; [ # libraries glow diff --git a/modules/home/terminal/zellij.kdl b/modules/home/terminal/zellij.kdl new file mode 100644 index 0000000..0115cec --- /dev/null +++ b/modules/home/terminal/zellij.kdl @@ -0,0 +1,244 @@ +keybinds clear-defaults=true { + unbind "Ctrl g" + locked { + bind "Alt Space" { SwitchToMode "normal"; } + } + pane { + bind "left" { MoveFocus "left"; } + bind "down" { MoveFocus "down"; } + bind "up" { MoveFocus "up"; } + bind "right" { MoveFocus "right"; } + bind "c" { SwitchToMode "renamepane"; PaneNameInput 0; } + bind "d" { NewPane "down"; SwitchToMode "locked"; } + bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "locked"; } + bind "f" { ToggleFocusFullscreen; SwitchToMode "locked"; } + bind "h" { MoveFocus "left"; } + bind "i" { TogglePanePinned; SwitchToMode "locked"; } + bind "j" { MoveFocus "down"; } + bind "k" { MoveFocus "up"; } + bind "l" { MoveFocus "right"; } + bind "n" { NewPane; SwitchToMode "locked"; } + bind "p" { SwitchToMode "normal"; } + bind "r" { NewPane "right"; SwitchToMode "locked"; } + bind "s" { NewPane "stacked"; SwitchToMode "locked"; } + bind "w" { ToggleFloatingPanes; SwitchToMode "locked"; } + bind "x" { CloseFocus; SwitchToMode "locked"; } + bind "z" { TogglePaneFrames; SwitchToMode "locked"; } + bind "tab" { SwitchFocus; } + } + tab { + bind "left" { GoToPreviousTab; } + bind "down" { GoToNextTab; } + bind "up" { GoToPreviousTab; } + bind "right" { GoToNextTab; } + bind "1" { GoToTab 1; SwitchToMode "locked"; } + bind "2" { GoToTab 2; SwitchToMode "locked"; } + bind "3" { GoToTab 3; SwitchToMode "locked"; } + bind "4" { GoToTab 4; SwitchToMode "locked"; } + bind "5" { GoToTab 5; SwitchToMode "locked"; } + bind "6" { GoToTab 6; SwitchToMode "locked"; } + bind "7" { GoToTab 7; SwitchToMode "locked"; } + bind "8" { GoToTab 8; SwitchToMode "locked"; } + bind "9" { GoToTab 9; SwitchToMode "locked"; } + bind "[" { BreakPaneLeft; SwitchToMode "locked"; } + bind "]" { BreakPaneRight; SwitchToMode "locked"; } + bind "b" { BreakPane; SwitchToMode "locked"; } + bind "h" { GoToPreviousTab; } + bind "j" { GoToNextTab; } + bind "k" { GoToPreviousTab; } + bind "l" { GoToNextTab; } + bind "n" { NewTab; SwitchToMode "locked"; } + bind "r" { SwitchToMode "renametab"; TabNameInput 0; } + bind "s" { ToggleActiveSyncTab; SwitchToMode "locked"; } + bind "t" { SwitchToMode "normal"; } + bind "x" { CloseTab; SwitchToMode "locked"; } + bind "tab" { ToggleTab; } + } + resize { + bind "left" { Resize "Increase left"; } + bind "down" { Resize "Increase down"; } + bind "up" { Resize "Increase up"; } + bind "right" { Resize "Increase right"; } + bind "+" { Resize "Increase"; } + bind "-" { Resize "Decrease"; } + bind "=" { Resize "Increase"; } + bind "H" { Resize "Decrease left"; } + bind "J" { Resize "Decrease down"; } + bind "K" { Resize "Decrease up"; } + bind "L" { Resize "Decrease right"; } + bind "h" { Resize "Increase left"; } + bind "j" { Resize "Increase down"; } + bind "k" { Resize "Increase up"; } + bind "l" { Resize "Increase right"; } + bind "r" { SwitchToMode "normal"; } + } + move { + bind "left" { MovePane "left"; } + bind "down" { MovePane "down"; } + bind "up" { MovePane "up"; } + bind "right" { MovePane "right"; } + bind "h" { MovePane "left"; } + bind "j" { MovePane "down"; } + bind "k" { MovePane "up"; } + bind "l" { MovePane "right"; } + bind "m" { SwitchToMode "normal"; } + bind "n" { MovePane; } + bind "p" { MovePaneBackwards; } + bind "tab" { MovePane; } + } + scroll { + bind "Alt left" { MoveFocusOrTab "left"; SwitchToMode "locked"; } + bind "Alt down" { MoveFocus "down"; SwitchToMode "locked"; } + bind "Alt up" { MoveFocus "up"; SwitchToMode "locked"; } + bind "Alt right" { MoveFocusOrTab "right"; SwitchToMode "locked"; } + bind "e" { EditScrollback; SwitchToMode "locked"; } + bind "f" { SwitchToMode "entersearch"; SearchInput 0; } + bind "Alt h" { MoveFocusOrTab "left"; SwitchToMode "locked"; } + bind "Alt j" { MoveFocus "down"; SwitchToMode "locked"; } + bind "Alt k" { MoveFocus "up"; SwitchToMode "locked"; } + bind "Alt l" { MoveFocusOrTab "right"; SwitchToMode "locked"; } + bind "s" { SwitchToMode "normal"; } + } + search { + bind "c" { SearchToggleOption "CaseSensitivity"; } + bind "n" { Search "down"; } + bind "o" { SearchToggleOption "WholeWord"; } + bind "p" { Search "up"; } + bind "w" { SearchToggleOption "Wrap"; } + } + session { + bind "a" { + LaunchOrFocusPlugin "zellij:about" { + floating true + move_to_focused_tab true + } + SwitchToMode "locked" + } + bind "c" { + LaunchOrFocusPlugin "configuration" { + floating true + move_to_focused_tab true + } + SwitchToMode "locked" + } + bind "d" { Detach; } + bind "o" { SwitchToMode "normal"; } + bind "p" { + LaunchOrFocusPlugin "plugin-manager" { + floating true + move_to_focused_tab true + } + SwitchToMode "locked" + } + bind "s" { + LaunchOrFocusPlugin "zellij:share" { + floating true + move_to_focused_tab true + } + SwitchToMode "locked" + } + bind "w" { + LaunchOrFocusPlugin "session-manager" { + floating true + move_to_focused_tab true + } + SwitchToMode "locked" + } + } + shared_among "normal" "locked" { + bind "Alt left" { MoveFocusOrTab "left"; } + bind "Alt down" { MoveFocus "down"; } + bind "Alt up" { MoveFocus "up"; } + bind "Alt right" { MoveFocusOrTab "right"; } + bind "Alt +" { Resize "Increase"; } + bind "Alt -" { Resize "Decrease"; } + bind "Alt =" { Resize "Increase"; } + bind "Alt [" { PreviousSwapLayout; } + bind "Alt ]" { NextSwapLayout; } + bind "Alt f" { ToggleFloatingPanes; } + bind "Alt h" { MoveFocusOrTab "left"; } + bind "Alt i" { MoveTab "left"; } + bind "Alt j" { MoveFocus "down"; } + bind "Alt k" { MoveFocus "up"; } + bind "Alt l" { MoveFocusOrTab "right"; } + bind "Alt n" { NewPane; } + bind "Alt o" { MoveTab "right"; } + bind "Alt p" { TogglePaneInGroup; } + bind "Alt Shift p" { ToggleGroupMarking; } + } + shared_except "locked" "renametab" "renamepane" { + bind "Alt Space" { SwitchToMode "locked"; } + bind "Alt q" { Quit; } + } + shared_except "locked" "entersearch" { + bind "enter" { SwitchToMode "locked"; } + } + shared_except "locked" "entersearch" "renametab" "renamepane" { + bind "esc" { SwitchToMode "locked"; } + } + shared_except "locked" "entersearch" "renametab" "renamepane" "move" { + bind "m" { SwitchToMode "move"; } + } + shared_except "locked" "entersearch" "search" "renametab" "renamepane" "session" { + bind "o" { SwitchToMode "session"; } + } + shared_except "locked" "tab" "entersearch" "renametab" "renamepane" { + bind "t" { SwitchToMode "tab"; } + } + shared_among "normal" "resize" "tab" "scroll" "prompt" "tmux" { + bind "p" { SwitchToMode "pane"; } + } + shared_among "normal" "resize" "search" "move" "prompt" "tmux" { + bind "s" { SwitchToMode "scroll"; } + } + shared_except "locked" "resize" "pane" "tab" "entersearch" "renametab" "renamepane" { + bind "r" { SwitchToMode "resize"; } + } + shared_among "scroll" "search" { + bind "PageDown" { PageScrollDown; } + bind "PageUp" { PageScrollUp; } + bind "left" { PageScrollUp; } + bind "down" { ScrollDown; } + bind "up" { ScrollUp; } + bind "right" { PageScrollDown; } + bind "Ctrl b" { PageScrollUp; } + bind "Ctrl c" { ScrollToBottom; SwitchToMode "locked"; } + bind "d" { HalfPageScrollDown; } + bind "Ctrl f" { PageScrollDown; } + bind "h" { PageScrollUp; } + bind "j" { ScrollDown; } + bind "k" { ScrollUp; } + bind "l" { PageScrollDown; } + bind "u" { HalfPageScrollUp; } + } + entersearch { + bind "Ctrl c" { SwitchToMode "scroll"; } + bind "esc" { SwitchToMode "scroll"; } + bind "enter" { SwitchToMode "search"; } + } + renametab { + bind "esc" { UndoRenameTab; SwitchToMode "tab"; } + } + shared_among "renametab" "renamepane" { + bind "Ctrl c" { SwitchToMode "locked"; } + } + renamepane { + bind "esc" { UndoRenamePane; SwitchToMode "pane"; } + } +} +plugins { + about location="zellij:about" + compact-bar location="zellij:compact-bar" + configuration location="zellij:configuration" + filepicker location="zellij:strider" { + cwd "/" + } + plugin-manager location="zellij:plugin-manager" + session-manager location="zellij:session-manager" + status-bar location="zellij:status-bar" + strider location="zellij:strider" + tab-bar location="zellij:tab-bar" + welcome-screen location="zellij:session-manager" { + welcome_screen true + } +}