summaryrefslogtreecommitdiff
path: root/home/wayland
diff options
context:
space:
mode:
authoradikro <adikro@disroot.org>2025-12-18 21:04:00 +0100
committeradikro <adikro@disroot.org>2025-12-18 21:04:00 +0100
commite60410393cea222b16743a1a87f29c06b9b3543b (patch)
tree8a574048613f6b13024795bd710b824b40f5db18 /home/wayland
parentea3bf9c87ee72d6da5ea2316b229082c7fc9cdf6 (diff)
rewrite of system modules, hm modules are next
Diffstat (limited to 'home/wayland')
-rw-r--r--home/wayland/hyprland/binds.nix64
-rw-r--r--home/wayland/hyprland/hyprland.nix47
-rw-r--r--home/wayland/niri/binds.nix109
-rw-r--r--home/wayland/niri/niri.nix77
-rw-r--r--home/wayland/noctalia.nix8
-rw-r--r--home/wayland/waybar.nix151
6 files changed, 0 insertions, 456 deletions
diff --git a/home/wayland/hyprland/binds.nix b/home/wayland/hyprland/binds.nix
deleted file mode 100644
index 303d83d..0000000
--- a/home/wayland/hyprland/binds.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
- wayland.windowManager.hyprland.settings = {
- bindm = [
- "$mod, mouse:272, movewindow"
- "$mod, mouse:273, resizewindow"
- ];
-
- 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, 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 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"
-
- ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+"
- ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-"
- "$mod, Next, exec, playerctl next"
- "$mod, Prior, exec, playerctl previous"
-
- # --- 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/home/wayland/hyprland/hyprland.nix b/home/wayland/hyprland/hyprland.nix
deleted file mode 100644
index 531ea62..0000000
--- a/home/wayland/hyprland/hyprland.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ ... }:
-{
- imports = [
- ./binds.nix
- ];
-
- wayland.windowManager.hyprland = {
- enable = true;
- settings = {
-
- general = {
- gaps_in = 6;
- gaps_out = 16;
- border_size = 2;
- };
-
- decoration = {
- rounding = 12;
- };
-
- "$mod" = "ALT";
- monitor = [
- "DP-1,2560x1440@240,0x0,1,vrr,0"
- ];
- workspace = [
- "1,monitor:DP-1,default:true"
- "2,monitor:DP-1"
- "3,monitor:DP-1"
- "4,monitor:DP-1"
- "5,monitor:DP-1"
- ];
-
- input = {
- kb_layout = "pl";
-
- accel_profile = "flat";
- sensitivity = -0.6;
- repeat_rate = 45;
- repeat_delay = 500;
- };
-
- animations = {
- enabled = false;
- };
- };
- };
-}
diff --git a/home/wayland/niri/binds.nix b/home/wayland/niri/binds.nix
deleted file mode 100644
index 53d2d4e..0000000
--- a/home/wayland/niri/binds.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{ config, pkgs, ... }:
-{
- programs.niri.settings.binds = with config.lib.niri.actions;
- let
- set-volume = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@";
- playerctl = spawn "${pkgs.playerctl}/bin/playerctl";
- in
- {
- # Overview / help
- "Mod+O" = {
- action = toggle-overview;
- repeat = false;
- };
- "Mod+Slash".action = show-hotkey-overlay;
-
- # Audio
- # XF86AudioRaiseVolume.action = set-volume "2%+";
- # XF86AudioLowerVolume.action = set-volume "2%-";
- XF86AudioRaiseVolume.action = playerctl "volume" "0.02+";
- XF86AudioLowerVolume.action = playerctl "volume" "0.02-";
- XF86AudioMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle";
- XF86AudioMicMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle";
-
- # Media keys
- XF86AudioPlay.action = playerctl "play-pause";
- XF86AudioPrev.action = playerctl "previous";
- XF86AudioNext.action = playerctl "next";
-
- # Column sizing
- "Mod+Minus".action = set-column-width "-10%";
- "Mod+Equal".action = set-column-width "+10%";
-
- # Finer height adjustments when in column with other windows.
- "Mod+Shift+Minus".action = set-window-height "-10%";
- "Mod+Shift+Equal".action = set-window-height "+10%";
-
- # Misc
- "Mod+Shift+V".action = toggle-window-floating;
- "Mod+Shift+P".action = power-off-monitors;
- "Mod+W".action = toggle-column-tabbed-display;
-
- # Screenshot (selection -> copy + save)
- "Mod+S".action = spawn "sh" "-c"
- ''
- filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
- grim -g "$(slurp)" - | tee "$filename" | wl-copy
- '';
-
- # Screenshot (selection -> save -> edit with satty -> copy edited)
- "Mod+Shift+S".action = spawn "sh" "-c"
- ''
- filename="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S).png"
- grim -g "$(slurp)" "$filename"
-
- edited="/media/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)-edited.png"
- satty --filename "$filename" --output-filename "$edited"
- '';
-
- "Mod+Shift+D".action = spawn "sh" "-c"
- ''
- cliphist list | fuzzel --dmenu | cliphist decode | wl-copy
- '';
-
- # --- System / General ---
- "Mod+Return".action = spawn "foot";
- "Mod+D".action = spawn "fuzzel";
- "Mod+BracketLeft".action = consume-or-expel-window-left;
- "Mod+BracketRight".action = consume-or-expel-window-right;
-
- "Mod+R".action = switch-preset-column-width;
- "Mod+Shift+R".action = reset-window-height;
- "Mod+F".action = maximize-column;
- "Mod+Shift+F".action = fullscreen-window;
-
- "Mod+Comma".action = consume-window-into-column;
- "Mod+Period".action = expel-window-from-column;
-
- "Mod+Shift+E".action = quit;
-
- # --- Window Navigation (Focus) ---
- "Mod+H".action = focus-column-left;
- "Mod+L".action = focus-column-right;
- "Mod+J".action = focus-workspace-down;
- "Mod+K".action = focus-workspace-up;
-
- # --- Window Management (Move) ---
- "Mod+Shift+H".action = move-column-left;
- "Mod+Shift+L".action = move-column-right;
- "Mod+Shift+J".action = move-window-down-or-to-workspace-down;
- "Mod+Shift+K".action = move-window-up-or-to-workspace-up;
-
- # --- Window State ---
- "Mod+Shift+Q".action = close-window;
-
- "Mod+1".action = focus-workspace 1;
- "Mod+2".action = focus-workspace 2;
- "Mod+3".action = focus-workspace 3;
- "Mod+4".action = focus-workspace 4;
- "Mod+5".action = focus-workspace 5;
- "Mod+6".action = focus-workspace 6;
-
- "Mod+Shift+1".action.move-column-to-workspace = [ 1 ];
- "Mod+Shift+2".action.move-column-to-workspace = [ 2 ];
- "Mod+Shift+3".action.move-column-to-workspace = [ 3 ];
- "Mod+Shift+4".action.move-column-to-workspace = [ 4 ];
- "Mod+Shift+5".action.move-column-to-workspace = [ 5 ];
- "Mod+Shift+6".action.move-column-to-workspace = [ 6 ];
- };
-}
diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix
deleted file mode 100644
index 341866a..0000000
--- a/home/wayland/niri/niri.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ lib, pkgs, ... }:
-{
- imports = [
- ./binds.nix
- ];
- programs.niri.settings = {
- prefer-no-csd = true;
- hotkey-overlay.skip-at-startup = true;
- input = {
- mouse = {
- accel-profile = "flat";
- accel-speed = -0.6;
- middle-emulation = true;
- scroll-factor = 1.5;
- };
- focus-follows-mouse = {
- enable = true;
- max-scroll-amount = "10%";
- };
- mod-key = "Alt";
- keyboard = {
- xkb.layout = "pl";
- repeat-delay = 400;
- repeat-rate = 60;
- };
- power-key-handling.enable = false;
- };
- outputs = {
- "DP-1" = {
- focus-at-startup = true;
- # backdrop-color = "";
- variable-refresh-rate = "on-demand";
- mode = {
- width = 2560;
- height = 1440;
- refresh = 239.998;
- };
- };
- };
- cursor = {
- hide-when-typing = true;
- size = 8;
- # theme = "";
- };
- layout = {
- border = {
- width = 2;
- # active = <decoration>;
- };
- focus-ring = {
- width = 2;
- # active = <decoration>;
- };
- preset-column-widths = [
- { proportion = 1. / 3.; }
- { proportion = 1. / 2.; }
- { proportion = 2. / 3.; }
- ];
- preset-window-heights = [
- { proportion = 1. / 3.; }
- { proportion = 1. / 2.; }
- { proportion = 2. / 3.; }
- ];
- default-column-width.proportion = 0.5;
- tab-indicator = {
- gaps-between-tabs = 3;
- position = "top";
- };
- };
- spawn-at-startup = [
- { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; }
- { command = [ "awww-daemon" ]; }
- # { command = [ "noctalia-shell" ]; }
- { command = [ "wl-paste --watch cliphist store" ]; }
- ];
- };
-}
diff --git a/home/wayland/noctalia.nix b/home/wayland/noctalia.nix
deleted file mode 100644
index e0b402d..0000000
--- a/home/wayland/noctalia.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ inputs, ... }:
-{
- imports = [ inputs.noctalia.homeModules.default ];
-
- programs.noctalia-shell = {
- enable = true;
- };
-}
diff --git a/home/wayland/waybar.nix b/home/wayland/waybar.nix
deleted file mode 100644
index 17a2f46..0000000
--- a/home/wayland/waybar.nix
+++ /dev/null
@@ -1,151 +0,0 @@
-{ lib, pkgs, ... }:
-{
- programs.waybar = {
- enable = true;
- # settings = [
- # {
- # layer = "top";
- # position = "top";
- #
- # modules-center = [ "niri/workspaces" ];
- # modules-right = [
- # "idle_inhibitor"
- # "pulseaudio"
- # "disk"
- # "battery"
- # "custom/notification"
- # "tray"
- # "clock"
- # ];
- #
- # "niri/workspaces" = {
- # format = "{icon} {value}";
- # format-icons = {
- # active = "";
- # default = "";
- # };
- # };
- #
- # "niri/window" = {
- # icon = true;
- # };
- #
- # "pulseaudio" = {
- # format = "{icon}";
- # format-bluetooth = "{icon} ";
- # format-muted = "󰝟";
- # format-icons = {
- # headphone = "";
- # default = [
- # ""
- # ""
- # ];
- # };
- # scroll-step = 1;
- # on-click = "${lib.getExe pkgs.pwvucontrol}";
- # };
- #
- # clock = {
- # format = "{:%H:%M}  ";
- # format-alt = "{:%A; %B %d, %Y (%R)}  ";
- # tooltip-format = "<tt><small>{calendar}</small></tt>";
- # calendar = {
- # mode = "year";
- # mode-mon-col = 3;
- # weeks-pos = "right";
- # on-scroll = 1;
- # on-click-right = "mode";
- # format = {
- # months = "<span color='#ffead3'><b>{}</b></span>";
- # days = "<span color='#ecc6d9'><b>{}</b></span>";
- # weeks = "<span color='#99ffdd'><b>W{}</b></span>";
- # weekdays = "<span color='#ffcc66'><b>{}</b></span>";
- # today = "<span color='#ff6699'><b><u>{}</u></b></span>";
- # };
- # };
- # actions = {
- # on-click-right = "mode";
- # on-click-forward = "tz_up";
- # on-click-backward = "tz_down";
- # on-scroll-up = "shift_up";
- # on-scroll-down = "shift_down";
- # };
- # };
- #
- # battery = {
- # format = "{icon}";
- #
- # format-icons = [
- # "󰁺"
- # "󰁻"
- # "󰁼"
- # "󰁽"
- # "󰁾"
- # "󰁿"
- # "󰂀"
- # "󰂁"
- # "󰂂"
- # "󰁹"
- # ];
- # states = {
- # battery-10 = 10;
- # battery-20 = 20;
- # battery-30 = 30;
- # battery-40 = 40;
- # battery-50 = 50;
- # battery-60 = 60;
- # battery-70 = 70;
- # battery-80 = 80;
- # battery-90 = 90;
- # battery-100 = 100;
- # };
- #
- # format-plugged = "󰚥";
- # format-charging-battery-10 = "󰢜";
- # format-charging-battery-20 = "󰂆";
- # format-charging-battery-30 = "󰂇";
- # format-charging-battery-40 = "󰂈";
- # format-charging-battery-50 = "󰢝";
- # format-charging-battery-60 = "󰂉";
- # format-charging-battery-70 = "󰢞";
- # format-charging-battery-80 = "󰂊";
- # format-charging-battery-90 = "󰂋";
- # format-charging-battery-100 = "󰂅";
- # tooltip-format = "{capacity}% {timeTo}";
- # };
- #
- # "custom/notification" = {
- # format = "{icon} {} ";
- # tooltip-format = "Left: Open Notification Center\nRight: Toggle Do not Disturb\nMiddle: Clear Notifications";
- # format-icons = {
- # notification = "<span foreground='red'><sup></sup></span>";
- # none = "";
- # dnd-notification = "<span foreground='red'><sup></sup></span>";
- # dnd-none = "";
- # inhibited-notification = "<span foreground='red'><sup></sup></span>";
- # inhibited-none = "";
- # dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
- # dnd-inhibited-none = "";
- # };
- # return-type = "json";
- # exec-if = "which swaync-client";
- # exec = "swaync-client -swb";
- # on-click = "swaync-client -t -sw";
- # on-click-right = "swaync-client -d -sw";
- # on-click-middle = "swaync-client -C";
- # escape = true;
- # };
- #
- # tray = {
- # icon-size = 21;
- # spacing = 10;
- # };
- # }
- # ];
- # style = ''
- # #workspaces button {
- # color: @base05;
- # }
- # '';
- };
-}