diff --git a/flake.lock b/flake.lock index b3efe0b..5d05131 100644 --- a/flake.lock +++ b/flake.lock @@ -968,11 +968,11 @@ "mysecrets": { "flake": false, "locked": { - "lastModified": 1741087081, - "narHash": "sha256-ms5PD6kSBXT/rYKJkq4hFCPIkTQfURHOoEagBhz+19o=", + "lastModified": 1742222377, + "narHash": "sha256-Yte1I7I7Zf4eeeIvHgRGNElTUdKEke5L3O3VlAFNxkc=", "ref": "refs/heads/main", - "rev": "1b15f763e44502b6afcc526ae4a04eeae0424de2", - "revCount": 8, + "rev": "aa1b7e2fb86c6c9f4557bcbe4071b7da0f3bef6f", + "revCount": 10, "type": "git", "url": "ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets" }, diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index 2069a5d..8554fc0 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -62,6 +62,14 @@ fwupd.enable = true; openssh.enable = true; syncthing.openDefaultPorts = true; + dnscrypt-proxy2 = { + enable = true; + settings = { + require_dnssec = true; + server_names = ["mullvad-doh"]; + bootstrap_resolvers = ["9.9.9.11:53" "9.9.9.9:53"]; + }; + }; opensnitch = { enable = false; settings = { diff --git a/hosts/dunamis/sops.nix b/hosts/dunamis/sops.nix index 48d98dd..341d31d 100644 --- a/hosts/dunamis/sops.nix +++ b/hosts/dunamis/sops.nix @@ -24,6 +24,11 @@ in { mode = "0400"; owner = "user"; }; + "ssh-private-uni" = { + path = "/home/user/.ssh/id_uni_ed25519"; + mode = "0400"; + owner = "user"; + }; }; }; } diff --git a/hosts/dunamis/users/user/home-configuration.nix b/hosts/dunamis/users/user/home-configuration.nix index e3da1f8..fed0aac 100644 --- a/hosts/dunamis/users/user/home-configuration.nix +++ b/hosts/dunamis/users/user/home-configuration.nix @@ -5,6 +5,7 @@ self.homeModules.programs ./programs.nix ./flatpak.nix + ./sops.nix ]; desktop.niri.enable = true; home = { diff --git a/hosts/dunamis/users/user/sops.nix b/hosts/dunamis/users/user/sops.nix index 241c8b0..f637bb0 100644 --- a/hosts/dunamis/users/user/sops.nix +++ b/hosts/dunamis/users/user/sops.nix @@ -1,20 +1,26 @@ {inputs, ...}: let secretsPath = builtins.toString inputs.mysecrets; in { - imports = with inputs; [ - sops-nix.homeManagerModules.sops - ]; + # imports = with inputs; [ + # sops-nix.homeManagerModules.sops + # ]; + # sops = { + # age.keyFile = "/var/lib/sops-nix/key.txt"; - sops = { - age.keyFile = "/var/lib/sops-nix/key.txt"; + # defaultSopsFile = "${secretsPath}/secrets.yaml"; + # validateSopsFiles = false; - defaultSopsFile = "${secretsPath}/secrets.yaml"; - validateSopsFiles = false; - - secrets = { - "ssh/private/dunamis-user" = { - path = "/home/user/.ssh/id_ed25519"; - }; - }; + # secrets = { + # "ssh/private/dunamis-user" = { + # path = "/home/user/.ssh/id_ed25519"; + # }; + # }; + home.file."id_ed25519_pub" = { + source = "${secretsPath}/ssh/user/id_dunamis_ed25519.pub"; + target = ".ssh/id_ed25519.pub"; + }; + home.file."id_uni_ed25519_pub" = { + source = "${secretsPath}/ssh/user/id_uni_ed25519.pub"; + target = ".ssh/id_uni_ed25519.pub"; }; } diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix index abb51d0..9dc2e6b 100644 --- a/modules/home/desktop/niri/default.nix +++ b/modules/home/desktop/niri/default.nix @@ -389,399 +389,389 @@ in { down = "e"; up = "i"; right = "o"; - niriConfig = '' - environment { - DISPLAY ":123" - QT_QPA_PLATFORM "wayland" - QT_QPA_PLATFORMTHEME "gtk3" - GDK_BACKEND "wayland" - MOZ_ENABLE_WAYLAND "1" - MOZ_WEBRENDER "1" - XDG_SESSION_TYPE "wayland" - CLUTTER_BACKEND "wayland" - SDL_VIDEODRIVER "wayland" + in '' + environment { + DISPLAY ":123" + QT_QPA_PLATFORM "wayland" + QT_QPA_PLATFORMTHEME "gtk3" + GDK_BACKEND "wayland" + MOZ_ENABLE_WAYLAND "1" + MOZ_WEBRENDER "1" + XDG_SESSION_TYPE "wayland" + CLUTTER_BACKEND "wayland" + SDL_VIDEODRIVER "wayland" + } + input { + keyboard { + xkb { + layout "us,ua" + ${ + if hostname == "dunamis" + then "// variant \"colemak_dhm,\"" + else "variant \"colemak_dhm,\"" + } + } + repeat-delay 200 + repeat-rate 50 + track-layout "global" } - input { - keyboard { - xkb { - layout "us,ua" - // variant "colemak_dh," - options "grp:menu_toggle" - } - repeat-delay 200 - repeat-rate 50 - track-layout "global" - - } - touchpad { - // off - tap - // dwt - // dwtp - natural-scroll - accel-speed 0.2 - accel-profile "flat" - // scroll-method "two-finger" - // disabled-on-external-mouse - } - mouse { - // off - // natural-scroll - accel-speed 0.0 - accel-profile "flat" - // scroll-method "no-scroll" - } - /-touch { - off - } - - warp-mouse-to-focus - - // focus-follows-mouse - } - - output "eDP-1" { + touchpad { // off - scale 1.2 - transform "normal" - // position x=1920 y=0 - } - output "Samsung Electric Company S24R65x H4TMA03291" { - position x=0 y=0 - variable-refresh-rate - } - output "Philips Consumer Electronics Company 27M2N5500 UK02418033254" { - mode "2560x1440@180.000" - variable-refresh-rate - position x=0 y=0 - scale 1.33 - } - output "PNP(AOC) 27V2G5 0x0000026C" { - position x=1920 y=0 - mode "1920x1080@74.973" - variable-refresh-rate - } - - cursor { - xcursor-theme "${config.stylix.cursor.name}" - xcursor-size ${cursor_size} - } - - layout { - gaps 11 - center-focused-column "never" // "on-overflow" - preset-column-widths { - proportion 0.33333 - proportion 0.5 - proportion 0.66667 + tap + // dwt + // dwtp + natural-scroll + accel-speed 0.2 + accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse } - - // default-column-width { proportion 0.9; } - default-column-width {} - tab-indicator { - active-color "#${config.lib.stylix.colors.base0A}" - inactive-color "#${config.lib.stylix.colors.base05}" - width 8 - gap 8 - corner-radius 4 - gaps-between-tabs 4 - length total-proportion=0.9 - position "left" - place-within-column - } - focus-ring { + mouse { // off - width 3 - active-gradient from="#${config.lib.stylix.colors.base0D}" to="#${config.lib.stylix.colors.base0F}" angle=40 relative-to="workspace-view" - inactive-color "#${config.lib.stylix.colors.base03}" - } - struts { - left 52 - right 52 + // natural-scroll + accel-speed 0.0 + accel-profile "flat" + // scroll-method "no-scroll" } + warp-mouse-to-focus + // focus-follows-mouse + } + output "eDP-1" { + // off + scale 1.2 + transform "normal" + // position x=1920 y=0 + } + output "Samsung Electric Company S24R65x H4TMA03291" { + position x=0 y=0 + variable-refresh-rate + } + output "Philips Consumer Electronics Company 27M2N5500 UK02418033254" { + mode "2560x1440@180.000" + variable-refresh-rate + position x=0 y=0 + scale 1.33 + } + output "PNP(AOC) 27V2G5 0x0000026C" { + position x=1920 y=0 + mode "1920x1080@74.973" + variable-refresh-rate + } + + cursor { + xcursor-theme "${config.stylix.cursor.name}" + xcursor-size ${cursor_size} + } + + layout { + gaps 11 + center-focused-column "never" // "on-overflow" + preset-column-widths { + proportion 0.33333 + proportion 0.5 + proportion 0.66667 } - prefer-no-csd - - hotkey-overlay { - skip-at-startup + // default-column-width { proportion 0.9; } + default-column-width {} + tab-indicator { + active-color "#${config.lib.stylix.colors.base0A}" + inactive-color "#${config.lib.stylix.colors.base05}" + width 8 + gap 8 + corner-radius 4 + gaps-between-tabs 4 + length total-proportion=0.9 + position "left" + place-within-column } - window-rule { - geometry-corner-radius 12 - clip-to-geometry true + focus-ring { + // off + width 3 + active-gradient from="#${config.lib.stylix.colors.base0D}" to="#${config.lib.stylix.colors.base0F}" angle=40 relative-to="workspace-view" + inactive-color "#${config.lib.stylix.colors.base03}" } - window-rule { - match is-window-cast-target=true - focus-ring { - width 3 - active-color "#${config.lib.stylix.colors.base0F}" - inactive-color "#${config.lib.stylix.colors.base03}" - } - border { - width 3 - active-color "#${config.lib.stylix.colors.base0F}" - inactive-color "#${config.lib.stylix.colors.base03}" - } - shadow { - on - color "#${config.lib.stylix.colors.base0F}" - inactive-color "#${config.lib.stylix.colors.base03}" - } + struts { + left 52 + right 52 } + } - screenshot-path "${xdgPics}/screenshots/screenshot-%Y-%m-%d-%H-%M-%S.png" + prefer-no-csd - animations { - slowdown 0.7 + hotkey-overlay { + skip-at-startup + } + window-rule { + geometry-corner-radius 12 + clip-to-geometry true + } + window-rule { + match is-window-cast-target=true + focus-ring { + width 3 + active-color "#${config.lib.stylix.colors.base0F}" + inactive-color "#${config.lib.stylix.colors.base03}" } + border { + width 3 + active-color "#${config.lib.stylix.colors.base0F}" + inactive-color "#${config.lib.stylix.colors.base03}" + } + shadow { + on + color "#${config.lib.stylix.colors.base0F}" + inactive-color "#${config.lib.stylix.colors.base03}" + } + } - window-rule { - match title="TelegramDesktop" - match app-id="org.telegram.desktop" - match title="Картинка в картинці" - match title="Picture-in-Picture" + screenshot-path "${xdgPics}/screenshots/screenshot-%Y-%m-%d-%H-%M-%S.png" + + animations { + slowdown 0.7 + } + + window-rule { + match title="TelegramDesktop" + match app-id="org.telegram.desktop" + match title="Картинка в картинці" + match title="Picture-in-Picture" + open-floating true + } + window-rule { + match app-id="org.wezfurlong.wezterm" + default-column-width { proportion 1.0; } + } + window-rule { + match app-id="re.sonny.Junction" open-floating true - } - window-rule { - match app-id="org.wezfurlong.wezterm" - default-column-width { proportion 1.0; } - } - window-rule { - match app-id="re.sonny.Junction" - open-floating true - open-focused true - } + open-focused true + } - window-rule { - match app-id="com.mitchellh.ghostty" - draw-border-with-background false - } + window-rule { + match app-id="com.mitchellh.ghostty" + draw-border-with-background false + } - window-rule { - match app-id=r#"^org\.keepassxc\.KeePassXC$"# - match app-id=r#"^org\.gnome\.World\.Secrets$"# - match app-id=r#"^Bitwarden$"# - match app-id="org.telegram.desktop" - match app-id="org.signal.Signal" - match app-id="WebCord" - // block-out-from "screen-capture" - block-out-from "screencast" - } - // workspace "general" - // workspace "browse" - // workspace "chat" - // workspace "code" - // workspace "uni" - // workspace "games" - // workspace "sysadmin" - // workspace "media" - // workspace "bg" + window-rule { + match app-id=r#"^org\.keepassxc\.KeePassXC$"# + match app-id=r#"^org\.gnome\.World\.Secrets$"# + match app-id=r#"^Bitwarden$"# + match app-id="org.telegram.desktop" + match app-id="org.signal.Signal" + match app-id="WebCord" + // block-out-from "screen-capture" + block-out-from "screencast" + } + // workspace "general" + // workspace "browse" + // workspace "chat" + // workspace "code" + // workspace "uni" + // workspace "games" + // workspace "sysadmin" + // workspace "media" + // workspace "bg" - // window-rule { - // match app-id=r#"^org\.telegram\.desktop$"# - // match app-id=r#"^im\.riot\.Riot$"# - // match app-id=r#"^WebCord$"# - // match app-id=r#"^signal$"# - // open-on-workspace "chat" - // } + // window-rule { + // match app-id=r#"^org\.telegram\.desktop$"# + // match app-id=r#"^im\.riot\.Riot$"# + // match app-id=r#"^WebCord$"# + // match app-id=r#"^signal$"# + // open-on-workspace "chat" + // } - // window-rule { - // match app-id=r#"^com\.heroicgameslauncher\.hgl$"# - // match app-id=r#"^net\.lutris\.Lutris$"# - // match app-id="steam" - // // match app-id=r#"^$"# - // open-on-workspace "games" - // } + // window-rule { + // match app-id=r#"^com\.heroicgameslauncher\.hgl$"# + // match app-id=r#"^net\.lutris\.Lutris$"# + // match app-id="steam" + // // match app-id=r#"^$"# + // open-on-workspace "games" + // } - // window-rule { - // match app-id=r#"^com\.obsproject\.Studio$"# - // open-on-workspace "bg" - // } + // window-rule { + // match app-id=r#"^com\.obsproject\.Studio$"# + // open-on-workspace "bg" + // } - binds { - Mod+Shift+Slash { show-hotkey-overlay; } + binds { + Mod+Shift+Slash { show-hotkey-overlay; } - Mod+Tab { focus-workspace-previous; } - Mod+C { center-column; } - Mod+M { maximize-column; } - Mod+H { set-column-width "50%"; } - Mod+T { switch-preset-column-width; } - Mod+V { toggle-column-tabbed-display; } - Mod+G { switch-focus-between-floating-and-tiling; } + Mod+Tab { focus-workspace-previous; } + Mod+C { center-column; } + Mod+M { maximize-column; } + Mod+H { set-column-width "50%"; } + Mod+T { switch-preset-column-width; } + Mod+V { toggle-column-tabbed-display; } + Mod+G { switch-focus-between-floating-and-tiling; } - Mod+Ctrl+Comma { consume-or-expel-window-left; } - Mod+Ctrl+Period { consume-or-expel-window-right; } + Mod+Ctrl+Comma { consume-or-expel-window-left; } + Mod+Ctrl+Period { consume-or-expel-window-right; } - Mod+Ctrl+Q { close-window; } - Mod+Ctrl+M { fullscreen-window; } - Mod+Ctrl+G { toggle-window-floating; } + Mod+Ctrl+Q { close-window; } + Mod+Ctrl+M { fullscreen-window; } + Mod+Ctrl+G { toggle-window-floating; } - Mod+Minus { set-column-width "-10%"; } - Mod+Equal { set-column-width "+10%"; } - Mod+Comma { set-column-width "-10%"; } - Mod+Period { set-column-width "+10%"; } - Mod+Shift+Comma { set-window-height "-10%"; } - Mod+Shift+Period { set-window-height "+10%"; } - Mod+Shift+T { reset-window-height; } + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + Mod+Comma { set-column-width "-10%"; } + Mod+Period { set-column-width "+10%"; } + Mod+Shift+Comma { set-window-height "-10%"; } + Mod+Shift+Period { set-window-height "+10%"; } + Mod+Shift+T { reset-window-height; } - Mod+Escape { switch-layout "next"; } + Mod+Escape { switch-layout "next"; } - Mod+Return repeat=false { spawn "${terminal}"; } - Mod+Space repeat=false { spawn "${launcher}"; } - Mod+Alt+L repeat=false { spawn "${lockscreen}"; } - Mod+Alt+B repeat=false { spawn "${browser}"; } - Mod+Alt+V repeat=false { spawn "copyq" "toggle"; } + Mod+Return repeat=false { spawn "${terminal}"; } + Mod+Space repeat=false { spawn "${launcher}"; } + Mod+Alt+L repeat=false { spawn "${lockscreen}"; } + Mod+Alt+B repeat=false { spawn "${browser}"; } + Mod+Alt+V repeat=false { spawn "copyq" "toggle"; } - Mod+Ctrl+Shift+BracketLeft { quit; } - Mod+Ctrl+Shift+BracketRight { power-off-monitors; } + Mod+Ctrl+Shift+BracketLeft { quit; } + Mod+Ctrl+Shift+BracketRight { power-off-monitors; } - Print { screenshot; } - Ctrl+Print { screenshot-screen; } - Shift+Print { screenshot-window; } + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Shift+Print { screenshot-window; } - XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-"; } - XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } - XF86AudioPause allow-when-locked=true { spawn "playerctl" "pause"; } - XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } - XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } + XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-"; } + XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } + XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } + XF86AudioPause allow-when-locked=true { spawn "playerctl" "pause"; } + XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } + XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } - XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "s" "5%+"; } - XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "s" "5%-"; } - Alt+XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "s" "5%+" "-d" "${keyboard}::kbd_backlight"; } - Alt+XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "s" "5%-" "-d" "${keyboard}::kbd_backlight"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "s" "5%+"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "s" "5%-"; } + Alt+XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "s" "5%+" "-d" "${keyboard}::kbd_backlight"; } + Alt+XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "s" "5%-" "-d" "${keyboard}::kbd_backlight"; } + Mod+Left { focus-column-left; } + Mod+Down { focus-window-or-workspace-down; } + Mod+Up { focus-window-or-workspace-up; } + Mod+Right { focus-column-right; } + Mod+${left} { focus-column-left; } + Mod+${down} { focus-window-or-workspace-down; } + Mod+${up} { focus-window-or-workspace-up; } + Mod+${right} { focus-column-right; } - Mod+Left { focus-column-left; } - Mod+Down { focus-window-or-workspace-down; } - Mod+Up { focus-window-or-workspace-up; } - Mod+Right { focus-column-right; } - Mod+${left} { focus-column-left; } - Mod+${down} { focus-window-or-workspace-down; } - Mod+${up} { focus-window-or-workspace-up; } - Mod+${right} { focus-column-right; } + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down-or-to-workspace-down; } + Mod+Ctrl+Up { move-window-up-or-to-workspace-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+${left} { move-column-left; } + Mod+Ctrl+${down} { move-window-down-or-to-workspace-down; } + Mod+Ctrl+${up} { move-window-up-or-to-workspace-up; } + Mod+Ctrl+${right} { move-column-right; } - Mod+Ctrl+Left { move-column-left; } - Mod+Ctrl+Down { move-window-down-or-to-workspace-down; } - Mod+Ctrl+Up { move-window-up-or-to-workspace-up; } - Mod+Ctrl+Right { move-column-right; } - Mod+Ctrl+${left} { move-column-left; } - Mod+Ctrl+${down} { move-window-down-or-to-workspace-down; } - Mod+Ctrl+${up} { move-window-up-or-to-workspace-up; } - Mod+Ctrl+${right} { move-column-right; } + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } - Mod+Home { focus-column-first; } - Mod+End { focus-column-last; } - Mod+Ctrl+Home { move-column-to-first; } - Mod+Ctrl+End { move-column-to-last; } + Mod+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+${left} { focus-monitor-left; } + Mod+Shift+${down} { focus-monitor-down; } + Mod+Shift+${up} { focus-monitor-up; } + Mod+Shift+${right} { focus-monitor-right; } - Mod+Shift+Left { focus-monitor-left; } - Mod+Shift+Down { focus-monitor-down; } - Mod+Shift+Up { focus-monitor-up; } - Mod+Shift+Right { focus-monitor-right; } - Mod+Shift+${left} { focus-monitor-left; } - Mod+Shift+${down} { focus-monitor-down; } - Mod+Shift+${up} { focus-monitor-up; } - Mod+Shift+${right} { focus-monitor-right; } + Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } + Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } + Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+${left} { move-column-to-monitor-left; } + Mod+Shift+Ctrl+${down} { move-column-to-monitor-down; } + Mod+Shift+Ctrl+${up} { move-column-to-monitor-up; } + Mod+Shift+Ctrl+${right} { move-column-to-monitor-right; } - Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } - Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } - Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } - Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } - Mod+Shift+Ctrl+${left} { move-column-to-monitor-left; } - Mod+Shift+Ctrl+${down} { move-column-to-monitor-down; } - Mod+Shift+Ctrl+${up} { move-column-to-monitor-up; } - Mod+Shift+Ctrl+${right} { move-column-to-monitor-right; } + Mod+Next { focus-workspace-down; } + Mod+Prior { focus-workspace-up; } + Mod+Ctrl+Next { move-column-to-workspace-down; } + Mod+Ctrl+Prior { move-column-to-workspace-up; } + Mod+Shift+Next { move-workspace-down; } + Mod+Shift+Prior { move-workspace-up; } - Mod+Next { focus-workspace-down; } - Mod+Prior { focus-workspace-up; } - Mod+Ctrl+Next { move-column-to-workspace-down; } - Mod+Ctrl+Prior { move-column-to-workspace-up; } - Mod+Shift+Next { move-workspace-down; } - Mod+Shift+Prior { move-workspace-up; } + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } - Mod+WheelScrollRight { focus-column-right; } - Mod+WheelScrollLeft { focus-column-left; } - Mod+Ctrl+WheelScrollRight { move-column-right; } - Mod+Ctrl+WheelScrollLeft { move-column-left; } + Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } + Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } - Mod+Shift+WheelScrollDown { focus-column-right; } - Mod+Shift+WheelScrollUp { focus-column-left; } - Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } - Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + // Mod+1 { focus-workspace "general"; } + // Mod+2 { focus-workspace "browse"; } + // Mod+3 { focus-workspace "chat"; } + // Mod+4 { focus-workspace "code"; } + // Mod+5 { focus-workspace "uni"; } + // Mod+6 { focus-workspace "games"; } + // Mod+7 { focus-workspace "sysadmin"; } + // Mod+8 { focus-workspace "media"; } + // Mod+9 { focus-workspace "bg"; } + // Mod+Ctrl+1 { move-column-to-workspace "general"; } + // Mod+Ctrl+2 { move-column-to-workspace "browse"; } + // Mod+Ctrl+3 { move-column-to-workspace "chat"; } + // Mod+Ctrl+4 { move-column-to-workspace "code"; } + // Mod+Ctrl+5 { move-column-to-workspace "uni"; } + // Mod+Ctrl+6 { move-column-to-workspace "games"; } + // Mod+Ctrl+7 { move-column-to-workspace "sysadmin"; } + // Mod+Ctrl+8 { move-column-to-workspace "media"; } + // Mod+Ctrl+9 { move-column-to-workspace "bg"; } - Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } - Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + Mod+Q { focus-workspace 1; } + Mod+W { focus-workspace 2; } + Mod+F { focus-workspace 3; } + Mod+P { focus-workspace 4; } + Mod+B { focus-workspace 5; } + Mod+J { focus-workspace 6; } + Mod+L { focus-workspace 7; } + Mod+U { focus-workspace 8; } + Mod+Y { focus-workspace 9; } + Mod+Ctrl+Shift+Q { move-column-to-workspace 1; } + Mod+Ctrl+Shift+W { move-column-to-workspace 2; } + Mod+Ctrl+Shift+F { move-column-to-workspace 3; } + Mod+Ctrl+Shift+P { move-column-to-workspace 4; } + Mod+Ctrl+Shift+B { move-column-to-workspace 5; } + Mod+Ctrl+Shift+J { move-column-to-workspace 6; } + Mod+Ctrl+Shift+L { move-column-to-workspace 7; } + Mod+Ctrl+Shift+U { move-column-to-workspace 8; } + Mod+Ctrl+Shift+Y { move-column-to-workspace 9; } - // Mod+1 { focus-workspace "general"; } - // Mod+2 { focus-workspace "browse"; } - // Mod+3 { focus-workspace "chat"; } - // Mod+4 { focus-workspace "code"; } - // Mod+5 { focus-workspace "uni"; } - // Mod+6 { focus-workspace "games"; } - // Mod+7 { focus-workspace "sysadmin"; } - // Mod+8 { focus-workspace "media"; } - // Mod+9 { focus-workspace "bg"; } - // Mod+Ctrl+1 { move-column-to-workspace "general"; } - // Mod+Ctrl+2 { move-column-to-workspace "browse"; } - // Mod+Ctrl+3 { move-column-to-workspace "chat"; } - // Mod+Ctrl+4 { move-column-to-workspace "code"; } - // Mod+Ctrl+5 { move-column-to-workspace "uni"; } - // Mod+Ctrl+6 { move-column-to-workspace "games"; } - // Mod+Ctrl+7 { move-column-to-workspace "sysadmin"; } - // Mod+Ctrl+8 { move-column-to-workspace "media"; } - // Mod+Ctrl+9 { move-column-to-workspace "bg"; } - - Mod+Q { focus-workspace 1; } - Mod+W { focus-workspace 2; } - Mod+F { focus-workspace 3; } - Mod+P { focus-workspace 4; } - Mod+B { focus-workspace 5; } - Mod+J { focus-workspace 6; } - Mod+L { focus-workspace 7; } - Mod+U { focus-workspace 8; } - Mod+Y { focus-workspace 9; } - Mod+Ctrl+Shift+Q { move-column-to-workspace 1; } - Mod+Ctrl+Shift+W { move-column-to-workspace 2; } - Mod+Ctrl+Shift+F { move-column-to-workspace 3; } - Mod+Ctrl+Shift+P { move-column-to-workspace 4; } - Mod+Ctrl+Shift+B { move-column-to-workspace 5; } - Mod+Ctrl+Shift+J { move-column-to-workspace 6; } - Mod+Ctrl+Shift+L { move-column-to-workspace 7; } - Mod+Ctrl+Shift+U { move-column-to-workspace 8; } - Mod+Ctrl+Shift+Y { move-column-to-workspace 9; } - - Mod+1 { focus-workspace 1; } - Mod+2 { focus-workspace 2; } - Mod+3 { focus-workspace 3; } - Mod+4 { focus-workspace 4; } - Mod+5 { focus-workspace 5; } - Mod+6 { focus-workspace 6; } - Mod+7 { focus-workspace 7; } - Mod+8 { focus-workspace 8; } - Mod+9 { focus-workspace 9; } - Mod+Ctrl+Shift+1 { move-column-to-workspace 1; } - Mod+Ctrl+Shift+2 { move-column-to-workspace 2; } - Mod+Ctrl+Shift+3 { move-column-to-workspace 3; } - Mod+Ctrl+Shift+4 { move-column-to-workspace 4; } - Mod+Ctrl+Shift+5 { move-column-to-workspace 5; } - Mod+Ctrl+Shift+6 { move-column-to-workspace 6; } - Mod+Ctrl+Shift+7 { move-column-to-workspace 7; } - Mod+Ctrl+Shift+8 { move-column-to-workspace 8; } - Mod+Ctrl+Shift+9 { move-column-to-workspace 9; } - } - ''; - in - if hostname != "dunamis" - then (builtins.replaceStrings ["// variant \"colemak_dh,\""] ["variant \"colemak_dh,\""] niriConfig) - else niriConfig; + Mod+1 { focus-workspace 1; } + Mod+2 { focus-workspace 2; } + Mod+3 { focus-workspace 3; } + Mod+4 { focus-workspace 4; } + Mod+5 { focus-workspace 5; } + Mod+6 { focus-workspace 6; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+Ctrl+Shift+1 { move-column-to-workspace 1; } + Mod+Ctrl+Shift+2 { move-column-to-workspace 2; } + Mod+Ctrl+Shift+3 { move-column-to-workspace 3; } + Mod+Ctrl+Shift+4 { move-column-to-workspace 4; } + Mod+Ctrl+Shift+5 { move-column-to-workspace 5; } + Mod+Ctrl+Shift+6 { move-column-to-workspace 6; } + Mod+Ctrl+Shift+7 { move-column-to-workspace 7; } + Mod+Ctrl+Shift+8 { move-column-to-workspace 8; } + Mod+Ctrl+Shift+9 { move-column-to-workspace 9; } + } + ''; }; }; programs.waybar = {