From 11031dba48912bb4d0acab183633b9c1308fdc7d Mon Sep 17 00:00:00 2001 From: Joakim Repomaa Date: Fri, 29 May 2026 17:51:12 +0300 Subject: [PATCH] use noctalia shell and niri flake --- flake.lock | 196 +++++++++- flake.nix | 8 + home/common/default.nix | 682 +++++++++++++++++++++++++++------- home/common/dotfiles/niri.kdl | 633 ------------------------------- home/moco/default.nix | 42 +-- hosts/radish/desktop.nix | 4 +- hosts/radish/packages.nix | 1 + hosts/radish/users.nix | 10 +- 8 files changed, 776 insertions(+), 800 deletions(-) delete mode 100644 home/common/dotfiles/niri.kdl diff --git a/flake.lock b/flake.lock index 3cf1a08..bd2b3d4 100644 --- a/flake.lock +++ b/flake.lock @@ -257,7 +257,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -275,7 +275,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -494,6 +494,64 @@ "type": "github" } }, + "niri-flake": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1780062130, + "narHash": "sha256-3XF+oy0PX4aajJw2RNB8rlMpyu0eXCG4pGH7fe94yBg=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "3cb351d73c357a4e413f59c4551d219118791c14", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1780056110, + "narHash": "sha256-t7lKVshV/srD0G06j4r5P5qj9zaDeZ9JYFCxHDGROZU=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "f9f43d826ab4014a7c302be28d7da33e12f5be37", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -591,6 +649,22 @@ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "25f538306313eae3927264466c70d7001dcea1df", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1779560665, @@ -639,6 +713,50 @@ "type": "github" } }, + "noctalia": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ], + "noctalia-qs": "noctalia-qs" + }, + "locked": { + "lastModified": 1779763713, + "narHash": "sha256-as2Vo4PitnWfXezfkQB2H3Rsr/DXJPp4Oe+dE+dZ0Xo=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "272cd91408b5ff6e329e6397eed042fe422069e7", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ], + "systems": "systems_5", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1779588472, + "narHash": "sha256-CVonDVo41DqdqS/kNeXFatwEuTltyXcppm9zkVOnrsM=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "70fea8a39a908e395de63024a4dfdb829bff1ffe", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "pnpm2nix": { "inputs": { "flake-utils": "flake-utils_3", @@ -694,9 +812,11 @@ "ksoloti-pr": "ksoloti-pr", "lanzaboote": "lanzaboote", "models-dev": "models-dev", + "niri-flake": "niri-flake", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", + "noctalia": "noctalia", "syntax-renderer": "syntax-renderer", "tonearm": "tonearm", "tree_hugger": "tree_hugger", @@ -820,6 +940,21 @@ } }, "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -834,7 +969,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -888,6 +1023,28 @@ "url": "ssh://git@github.com/everii-Group/tree_hugger" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "turny": { "inputs": { "flake-parts": [ @@ -975,6 +1132,39 @@ "repo": "workout-sync", "type": "sourcehut" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1779745227, + "narHash": "sha256-yqY7RtEJGJiENzR0GwL6q69tSAy6xAAmAcLuIhLjPf8=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "5d1efbc9dc3ab1c10160b656e0247f3325daf0f2", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9b0ba57..a1e0521 100644 --- a/flake.nix +++ b/flake.nix @@ -74,6 +74,14 @@ url = "github:anomalyco/models.dev"; flake = false; }; + noctalia = { + url = "github:noctalia-dev/noctalia-shell"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + niri-flake = { + url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = { diff --git a/home/common/default.nix b/home/common/default.nix index 7d24ce3..632110f 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -1,6 +1,5 @@ { config, - osConfig, lib, pkgs, pkgs-unstable, @@ -8,6 +7,20 @@ self, ... }: +let + noctalia-package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default.override { + calendarSupport = true; + }; + ns = lib.getExe noctalia-package; + ns-ipc = + args: + [ + ns + "ipc" + "call" + ] + ++ args; +in { imports = [ ../gnome @@ -19,6 +32,8 @@ inputs.hastebin.nixosModules.hm inputs.agenix.homeManagerModules.default inputs.voxtype.homeManagerModules.default + inputs.noctalia.homeModules.default + inputs.niri-flake.homeModules.niri ]; # This value determines the Home Manager release that your configuration is @@ -119,73 +134,123 @@ ${lib.getExe grim} -t ppm -g "$(${lib.getExe slurp} -o -d -F monospace)" - | ${lib.getExe gradia} '') inputs.tree_hugger.packages.${stdenv.hostPlatform.system}.default + (writeShellScriptBin "ns" "${lib.join " " (ns-ipc [ ''"$@"'' ])}") ]; programs = { - ashell = { + noctalia-shell = { enable = true; - package = pkgs-unstable.ashell; - systemd = { - enable = true; - target = "graphical-session.target"; - }; settings = { - modules = { - left = [ "Workspaces" ]; - center = [ "WindowTitle" ]; - right = [ - "CustomNotifications" - "SystemInfo" - [ - "Clock" - "Privacy" - "Settings" - ] - ]; - }; - settings = { - lock_cmd = "hyprlock &"; - logout_cmd = "niri msg action quit"; - audio_sinks_more_cmd = "pavucontrol -t 3"; - audio_sources_more_cmd = "pavucontrol -t 4"; - bluetooth_more_cmd = "blueman-manager"; - CustomButton = - let - isDark = lib.getExe ( - pkgs.writeShellScriptBin "is-dark" '' - gsettings get org.gnome.desktop.interface color-scheme | grep -q dark - '' - ); - toggleDark = lib.getExe ( - pkgs.writeShellScriptBin "toggle-dark" '' - if ${isDark}; then - gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' - else - gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' - fi - '' - ); - in - [ + bar = { + density = "compact"; + position = "top"; + showCapsule = false; + widgets = { + left = [ { - name = "Dark Mode"; - icon = " "; - command = toggleDark; - status_command = isDark; + id = "Workspace"; + hideUnoccupied = true; + labelMode = "none"; } ]; + center = [ + { + id = "Clock"; + formatHorizontal = "HH:mm"; + formatVertical = "HH mm"; + usePrimaryColor = true; + } + ]; + right = [ + { + id = "plugin:privacy-indicator"; + } + { + id = "Battery"; + warningThreshold = 20; + } + { + id = "NotificationHistory"; + } + { + id = "Network"; + } + { + id = "Bluetooth"; + } + { + id = "VPN"; + } + { + id = "ControlCenter"; + useDistroLogo = true; + } + ]; + }; }; - CustomModule = [ - { - name = "CustomNotifications"; - type = "Button"; - icon = " "; - command = "swaync-client -t -sw"; - listen_cmd = "swaync-client -swb"; - icons."dnd.*" = " "; - alert = ".*notification"; - } - ]; + + audio.visualizerType = "linear"; + + wallpaper = { + overviewEnabled = true; + directory = "~/Pictures/Wallpapers"; + automationEnabled = true; + }; + + controlCenter.shortcuts = { + right = [ + { id = "PowerProfile"; } + { id = "KeepAwake"; } + { id = "NightLight"; } + { id = "DarkMode"; } + ]; + }; + + sessionMenu = { + countdownDuration = 5000; + powerOptions = + let + powerOption = + action: options: + { + inherit action; + enabled = true; + } + // options; + in + [ + (powerOption "lock" { + keybind = "1"; + countdownEnabled = false; + }) + (powerOption "suspend" { + keybind = "2"; + countdownEnabled = false; + }) + (powerOption "hibernate" { keybind = "3"; }) + (powerOption "reboot" { keybind = "4"; }) + (powerOption "logout" { keybind = "5"; }) + (powerOption "shutdown" { keybind = "6"; }) + (powerOption "rebootToUefi" { keybind = "7"; }) + ]; + }; + + colorSchemes.useWallpaperColors = true; + nightLight.enabled = true; + idle.enabled = true; + general = { + avatarImage = "~/.face"; + radiusRatio = 0.2; + clockStyle = "analog"; + }; + location = { + monthBeforeDay = false; + analogClockInCalendar = true; + firstDayOfWeek = 0; + showWeekNumberInCalendar = true; + autoLocate = true; + }; + package = noctalia-package; }; }; @@ -518,37 +583,6 @@ enable = true; defaultEditor = true; }; - hyprlock = { - enable = true; - package = pkgs-unstable.hyprlock; - settings = { - general = { - hide_cursor = true; - ignore_empty_input = true; - }; - background = { - monitor = ""; - path = "screenshot"; - blur_passes = 3; - }; - input-field = { - size = "20%, 5%"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - rounding = 15; - shadow_passes = 2; - outline_thickness = 2; - placeholder_text = "Password..."; - fail_text = "$PAMFAIL"; - dots_spacing = "0.3"; - position = "0, -20"; - halign = "center"; - valign = "center"; - }; - }; - }; - voxtype = { enable = true; package = inputs.voxtype.packages.${pkgs.stdenv.hostPlatform.system}.vulkan; @@ -764,47 +798,6 @@ }; services = { - swaync = { - enable = true; - package = pkgs-unstable.swaynotificationcenter; - settings = { - scripts = { - focus-window = - let - jq = lib.getExe pkgs.jq; - niri = lib.getExe osConfig.programs.niri.package; - script = pkgs.writeShellScriptBin "swaync-focus-window" '' - set -e - - APP_NAME="''${SWAYNC_APP_NAME:-}" - DESKTOP_ENTRY="''${SWAYNC_DESKTOP_ENTRY:-}" - - APP_ID="" - if [[ -n "$DESKTOP_ENTRY" ]]; then - APP_ID="$DESKTOP_ENTRY" - elif [[ -n "$APP_NAME" ]]; then - APP_ID=$(echo "$APP_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/ //g') - fi - - [[ -z "$APP_ID" ]] && exit - - # Find window ID for this app in niri and focus it - ${jq} -r --arg app_id "$APP_ID" '.[] | select(.app_id | ascii_downcase | contains($app_id)) | .id' \ - <(${niri} msg --json windows 2>/dev/null) | head -n1 | while read -r WINDOW_ID; do - if [[ -n "$WINDOW_ID" && "$WINDOW_ID" != "null" ]]; then - ${niri} msg action focus-window --id "$WINDOW_ID" - fi - done - ''; - in - { - exec = lib.getExe script; - run-on = "action"; - }; - }; - }; - }; - gpg-agent = with pkgs; { enable = true; enableSshSupport = true; @@ -949,7 +942,432 @@ }; }; - xdg.configFile."niri/config.kdl".source = ./dotfiles/niri.kdl; + programs.niri = + let + bind = + { + modifiers, + key, + action, + args ? [ ], + }: + { + ${lib.join "+" (modifiers ++ [ key ])}.action.${action} = args; + }; + in + { + enable = true; + package = pkgs-unstable.niri; + settings = { + input = { + keyboard = { + xkb = { + layout = "us"; + variant = "altgr-intl"; + }; + numlock = true; + }; + + touchpad = { + tap = true; + dwt = true; + dwtp = true; + natural-scroll = true; + }; + + focus-follows-mouse = { + enable = true; + max-scroll-amount = "10%"; + }; + }; + + outputs = { + "eDP-1" = { + scale = 1.5; + }; + "DP-5" = { + scale = 1.0; + }; + "DP-3" = { + scale = 1.2; + }; + }; + + layout = { + gaps = 5; + center-focused-column = "never"; + + preset-column-widths = [ + { proportion = 1.0 / 3.0; } + { proportion = 1.0 / 2.0; } + { proportion = 2.0 / 3.0; } + ]; + + default-column-width = { + proportion = 1.0 / 2.0; + }; + + focus-ring = { + enable = true; + width = 4; + active.color = "#7fc8ff"; + inactive.color = "#505050"; + }; + + border = { + enable = false; + width = 4; + active.color = "#ffc87f"; + inactive.color = "#505050"; + urgent.color = "#9b0000"; + }; + + shadow = { + enable = true; + softness = 30; + spread = 5; + offset = { + x = 0; + y = 5; + }; + color = "#0007"; + }; + }; + + spawn-at-startup = [ + { argv = [ ns ]; } + ]; + + hotkey-overlay.skip-at-startup = true; + screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"; + debug.honor-xdg-activation-with-invalid-serial = true; + + layer-rules = [ + { + matches = [ { namespace = "^noctalia-overview*"; } ]; + place-within-backdrop = true; + } + ]; + + window-rules = [ + { + matches = [ + { + app-id = "firefox$"; + title = "^Picture-in-Picture$"; + } + ]; + open-floating = true; + } + { + geometry-corner-radius = { + top-left = 14.; + top-right = 14.; + bottom-left = 14.; + bottom-right = 14.; + }; + clip-to-geometry = true; + } + #{ + # background-effect = { + # blur = true; + # xray = false; + # }; + #} + ]; + + binds = lib.foldl' (acc: x: acc // x) { } ( + [ + { + "Mod+Shift+Slash" = { + action.show-hotkey-overlay = [ ]; + }; + "Mod+Return" = { + hotkey-overlay.title = "Open a Terminal: kitty"; + action.spawn = "kitty"; + }; + "Mod+Z" = { + hotkey-overlay.title = "Open a launcher: walker"; + action.spawn = "walker"; + }; + "Mod+Space" = { + action.spawn = "voxtoggle"; + }; + "Mod+Alt+L" = { + hotkey-overlay.title = "Lock the Screen: hyprlock"; + action.spawn = ns-ipc [ + "lockScreen" + "lock" + ]; + }; + "XF86AudioRaiseVolume" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "volume" + "increase" + ]; + }; + "XF86AudioLowerVolume" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "volume" + "decrease" + ]; + }; + "XF86AudioMute" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "volume" + "muteOutput" + ]; + }; + "XF86AudioMicMute" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "volume" + "muteInput" + ]; + }; + "XF86AudioPlay" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "media" + "playPause" + ]; + }; + "XF86AudioPrev" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "media" + "previous" + ]; + }; + "XF86AudioNext" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "media" + "next" + ]; + }; + "XF86MonBrightnessUp" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "brightness" + "increase" + ]; + }; + "XF86MonBrightnessDown" = { + allow-when-locked = true; + action.spawn = ns-ipc [ + "brightness" + "decrease" + ]; + }; + "Mod+O" = { + repeat = false; + action.toggle-overview = [ ]; + }; + "Mod+Backspace" = { + repeat = false; + action.close-window = [ ]; + }; + "Mod+BracketLeft".action.consume-or-expel-window-left = [ ]; + "Mod+BracketRight".action.consume-or-expel-window-right = [ ]; + "Mod+Comma".action.consume-window-into-column = [ ]; + "Mod+Period".action.expel-window-from-column = [ ]; + "Mod+R".action.switch-preset-column-width = [ ]; + "Mod+Ctrl+R".action.switch-preset-window-height = [ ]; + "Mod+Shift+R".action.reset-window-height = [ ]; + "Mod+F".action.maximize-column = [ ]; + "Mod+Shift+F".action.fullscreen-window = [ ]; + "Mod+M".action.maximize-window-to-edges = [ ]; + "Mod+Ctrl+F".action.expand-column-to-available-width = [ ]; + "Mod+C".action.center-column = [ ]; + "Mod+Ctrl+C".action.center-visible-columns = [ ]; + "Mod+Minus".action.set-column-width = "-10%"; + "Mod+Equal".action.set-column-width = "+10%"; + "Mod+Shift+Minus".action.set-window-height = "-10%"; + "Mod+Shift+Equal".action.set-window-height = "+10%"; + "Mod+V".action.toggle-window-floating = [ ]; + "Mod+Shift+V".action.switch-focus-between-floating-and-tiling = [ ]; + "Mod+W".action.toggle-column-tabbed-display = [ ]; + "Print".action.spawn = "scrot"; + "Mod+Escape" = { + allow-inhibiting = true; + action.toggle-keyboard-shortcuts-inhibit = [ ]; + }; + "Mod+Shift+E".action.quit = [ ]; + "Ctrl+Alt+Delete".action.quit = [ ]; + "Mod+Shift+P".action.power-off-monitors = [ ]; + } + ] + ++ (map + ( + { + dir, + keys, + }: + (lib.mergeAttrsList ( + map + ( + { modifiers, action }: (lib.mergeAttrsList (map (key: bind { inherit modifiers key action; }) keys)) + ) + [ + { + modifiers = [ "Mod" ]; + action = "focus-column-${dir}"; + } + { + modifiers = [ + "Mod" + "Shift" + ]; + action = "move-column-${dir}"; + } + { + modifiers = [ + "Mod" + "Ctrl" + ]; + action = "focus-monitor-${dir}"; + } + { + modifiers = [ + "Mod" + "Shift" + "Ctrl" + ]; + action = "move-column-to-monitor-${dir}"; + } + ] + )) + ) + [ + { + dir = "left"; + keys = [ + "Left" + "H" + ]; + } + { + dir = "right"; + keys = [ + "Right" + "L" + ]; + } + ] + ) + ++ (map + ( + { + dir, + keys, + }: + (lib.mergeAttrsList ( + map + ( + { modifiers, action }: (lib.mergeAttrsList (map (key: bind { inherit modifiers key action; }) keys)) + ) + [ + { + modifiers = [ "Mod" ]; + action = "focus-window-or-workspace-${dir}"; + } + { + modifiers = [ + "Mod" + "Shift" + ]; + action = "move-window-${dir}-or-to-workspace-${dir}"; + } + { + modifiers = [ + "Mod" + "Ctrl" + ]; + action = "focus-monitor-${dir}"; + } + { + modifiers = [ + "Mod" + "Shift" + "Ctrl" + ]; + action = "move-column-to-monitor-${dir}"; + } + ] + )) + ) + [ + { + dir = "up"; + keys = [ + "Up" + "K" + ]; + } + { + dir = "down"; + keys = [ + "Down" + "J" + ]; + } + ] + ) + ++ [ + { + "Mod+Home".action.focus-column-first = [ ]; + "Mod+End".action.focus-column-last = [ ]; + "Mod+Shift+Home".action.move-column-to-first = [ ]; + "Mod+Shift+End".action.move-column-to-last = [ ]; + "Mod+Page_Down".action.focus-workspace-down = [ ]; + "Mod+Page_Up".action.focus-workspace-up = [ ]; + "Mod+U".action.focus-workspace-down = [ ]; + "Mod+I".action.focus-workspace-up = [ ]; + "Mod+Ctrl+Page_Down".action.move-column-to-workspace-down = [ ]; + "Mod+Ctrl+Page_Up".action.move-column-to-workspace-up = [ ]; + "Mod+Ctrl+U".action.move-column-to-workspace-down = [ ]; + "Mod+Ctrl+I".action.move-column-to-workspace-up = [ ]; + "Mod+Shift+Page_Down".action.move-workspace-down = [ ]; + "Mod+Shift+Page_Up".action.move-workspace-up = [ ]; + "Mod+Shift+U".action.move-workspace-down = [ ]; + "Mod+Shift+I".action.move-workspace-up = [ ]; + "Mod+WheelScrollDown" = { + cooldown-ms = 150; + action.focus-workspace-down = [ ]; + }; + "Mod+WheelScrollUp" = { + cooldown-ms = 150; + action.focus-workspace-up = [ ]; + }; + "Mod+Ctrl+WheelScrollDown" = { + cooldown-ms = 150; + action.move-column-to-workspace-down = [ ]; + }; + "Mod+Ctrl+WheelScrollUp" = { + cooldown-ms = 150; + action.move-column-to-workspace-up = [ ]; + }; + "Mod+WheelScrollRight".action.focus-column-right = [ ]; + "Mod+WheelScrollLeft".action.focus-column-left = [ ]; + "Mod+Ctrl+WheelScrollRight".action.move-column-right = [ ]; + "Mod+Ctrl+WheelScrollLeft".action.move-column-left = [ ]; + "Mod+Shift+WheelScrollDown".action.focus-column-right = [ ]; + "Mod+Shift+WheelScrollUp".action.focus-column-left = [ ]; + "Mod+Ctrl+Shift+WheelScrollDown".action.move-column-right = [ ]; + "Mod+Ctrl+Shift+WheelScrollUp".action.move-column-left = [ ]; + } + ] + ++ (map (number: { + "Mod+${toString number}".action.focus-workspace = number; + "Mod+Shift+${toString number}".action.move-column-to-workspace = number; + }) (lib.range 1 9)) + ); + }; + }; gnome.automaticTimeZone = true; gtk.enable = true; diff --git a/home/common/dotfiles/niri.kdl b/home/common/dotfiles/niri.kdl deleted file mode 100644 index cb20311..0000000 --- a/home/common/dotfiles/niri.kdl +++ /dev/null @@ -1,633 +0,0 @@ -// This config is in the KDL format: https://kdl.dev -// "/-" comments out the following node. -// Check the wiki for a full description of the configuration: -// https://niri-wm.github.io/niri/Configuration:-Introduction - -// Input device configuration. -// Find the full list of options on the wiki: -// https://niri-wm.github.io/niri/Configuration:-Input -input { - keyboard { - xkb { - // You can set rules, model, layout, variant and options. - // For more information, see xkeyboard-config(7). - - layout "us" - variant "altgr-intl" - // For example: - // layout "us,ru" - // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" - - // If this section is empty, niri will fetch xkb settings - // from org.freedesktop.locale1. You can control these using - // localectl set-x11-keymap. - } - - // Enable numlock on startup, omitting this setting disables it. - numlock - } - - // Next sections include libinput settings. - // Omitting settings disables them, or leaves them at their default values. - // All commented-out settings here are examples, not defaults. - touchpad { - // off - tap - dwt - dwtp - // drag false - // drag-lock - natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "two-finger" - // disabled-on-external-mouse - } - - mouse { - // off - // natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "no-scroll" - } - - trackpoint { - // off - // natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "on-button-down" - // scroll-button 273 - // scroll-button-lock - // middle-emulation - } - - // Uncomment this to make the mouse warp to the center of newly focused windows. - // warp-mouse-to-focus - - // Focus windows and outputs automatically when moving the mouse into them. - // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. - focus-follows-mouse max-scroll-amount="10%" -} - -// You can configure outputs by their name, which you can find -// by running `niri msg outputs` while inside a niri instance. -// The built-in laptop monitor is usually called "eDP-1". -// Find more information on the wiki: -// https://niri-wm.github.io/niri/Configuration:-Outputs -// Remember to uncomment the node by removing "/-"! -output "eDP-1" { - // Uncomment this line to disable this output. - // off - - // Resolution and, optionally, refresh rate of the output. - // The format is "x" or "x@". - // If the refresh rate is omitted, niri will pick the highest refresh rate - // for the resolution. - // If the mode is omitted altogether or is invalid, niri will pick one automatically. - // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. - // mode "1920x1080@120.030" - - // You can use integer or fractional scale, for example use 1.5 for 150% scale. - scale 1.5 - - // Transform allows to rotate the output counter-clockwise, valid values are: - // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. - // transform "normal" - - // Position of the output in the global coordinate space. - // This affects directional monitor actions like "focus-monitor-left", and cursor movement. - // The cursor can only move between directly adjacent outputs. - // Output scale and rotation has to be taken into account for positioning: - // outputs are sized in logical, or scaled, pixels. - // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, - // so to put another output directly adjacent to it on the right, set its x to 1920. - // If the position is unset or results in an overlap, the output is instead placed - // automatically. - // position x=1280 y=0 -} - -output "DP-5" { - scale 1 -} - -output "DP-3" { - scale 1.2 -} - -// Settings that influence how windows are positioned and sized. -// Find more information on the wiki: -// https://niri-wm.github.io/niri/Configuration:-Layout -layout { - // Set gaps around windows in logical pixels. - gaps 5 - - // When to center a column when changing focus, options are: - // - "never", default behavior, focusing an off-screen column will keep at the left - // or right edge of the screen. - // - "always", the focused column will always be centered. - // - "on-overflow", focusing a column will center it if it doesn't fit - // together with the previously focused column. - center-focused-column "never" - - // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. - preset-column-widths { - // Proportion sets the width as a fraction of the output width, taking gaps into account. - // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. - // The default preset widths are 1/3, 1/2 and 2/3 of the output. - proportion 0.33333 - proportion 0.5 - proportion 0.66667 - - // Fixed sets the width in logical pixels exactly. - // fixed 1920 - } - - // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. - // preset-window-heights { } - - // You can change the default width of the new windows. - default-column-width { proportion 0.5; } - // If you leave the brackets empty, the windows themselves will decide their initial width. - // default-column-width {} - - // By default focus ring and border are rendered as a solid background rectangle - // behind windows. That is, they will show up through semitransparent windows. - // This is because windows using client-side decorations can have an arbitrary shape. - // - // If you don't like that, you should uncomment `prefer-no-csd` below. - // Niri will draw focus ring and border *around* windows that agree to omit their - // client-side decorations. - // - // Alternatively, you can override it with a window rule called - // `draw-border-with-background`. - - // You can change how the focus ring looks. - focus-ring { - // Uncomment this line to disable the focus ring. - // off - - // How many logical pixels the ring extends out from the windows. - width 4 - - // Colors can be set in a variety of ways: - // - CSS named colors: "red" - // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" - // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. - - // Color of the ring on the active monitor. - active-color "#7fc8ff" - - // Color of the ring on inactive monitors. - // - // The focus ring only draws around the active window, so the only place - // where you can see its inactive-color is on other monitors. - inactive-color "#505050" - - // You can also use gradients. They take precedence over solid colors. - // Gradients are rendered the same as CSS linear-gradient(angle, from, to). - // The angle is the same as in linear-gradient, and is optional, - // defaulting to 180 (top-to-bottom gradient). - // You can use any CSS linear-gradient tool on the web to set these up. - // Changing the color space is also supported, check the wiki for more info. - // - // active-gradient from="#80c8ff" to="#c7ff7f" angle=45 - - // You can also color the gradient relative to the entire view - // of the workspace, rather than relative to just the window itself. - // To do that, set relative-to="workspace-view". - // - // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" - } - - // You can also add a border. It's similar to the focus ring, but always visible. - border { - // The settings are the same as for the focus ring. - // If you enable the border, you probably want to disable the focus ring. - off - - width 4 - active-color "#ffc87f" - inactive-color "#505050" - - // Color of the border around windows that request your attention. - urgent-color "#9b0000" - - // Gradients can use a few different interpolation color spaces. - // For example, this is a pastel rainbow gradient via in="oklch longer hue". - // - // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue" - - // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" - } - - // You can enable drop shadows for windows. - shadow { - // Uncomment the next line to enable shadows. - // on - - // By default, the shadow draws only around its window, and not behind it. - // Uncomment this setting to make the shadow draw behind its window. - // - // Note that niri has no way of knowing about the CSD window corner - // radius. It has to assume that windows have square corners, leading to - // shadow artifacts inside the CSD rounded corners. This setting fixes - // those artifacts. - // - // However, instead you may want to set prefer-no-csd and/or - // geometry-corner-radius. Then, niri will know the corner radius and - // draw the shadow correctly, without having to draw it behind the - // window. These will also remove client-side shadows if the window - // draws any. - // - // draw-behind-window true - - // You can change how shadows look. The values below are in logical - // pixels and match the CSS box-shadow properties. - - // Softness controls the shadow blur radius. - softness 30 - - // Spread expands the shadow. - spread 5 - - // Offset moves the shadow relative to the window. - offset x=0 y=5 - - // You can also change the shadow color and opacity. - color "#0007" - } - - // Struts shrink the area occupied by windows, similarly to layer-shell panels. - // You can think of them as a kind of outer gaps. They are set in logical pixels. - // Left and right struts will cause the next window to the side to always be visible. - // Top and bottom struts will simply add outer gaps in addition to the area occupied by - // layer-shell panels and regular gaps. - struts { - // left 64 - // right 64 - // top 64 - // bottom 64 - } -} - -// Add lines like this to spawn processes at startup. -// Note that running niri as a session supports xdg-desktop-autostart, -// which may be more convenient to use. -// See the binds section below for more spawn examples. - -//spawn-at-startup "systemctl start --user niri-session.target" - -// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: -// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" - -hotkey-overlay { - // Uncomment this line to disable the "Important Hotkeys" pop-up at startup. - skip-at-startup -} - -// Uncomment this line to ask the clients to omit their client-side decorations if possible. -// If the client will specifically ask for CSD, the request will be honored. -// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. -// This option will also fix border/focus ring drawing behind some semitransparent windows. -// After enabling or disabling this, you need to restart the apps for this to take effect. -// prefer-no-csd - -// You can change the path where screenshots are saved. -// A ~ at the front will be expanded to the home directory. -// The path is formatted with strftime(3) to give you the screenshot date and time. -screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" - -// You can also set this to null to disable saving screenshots to disk. -// screenshot-path null - -// Animation settings. -// The wiki explains how to configure individual animations: -// https://niri-wm.github.io/niri/Configuration:-Animations -animations { - // Uncomment to turn off all animations. - // off - - // Slow down all animations by this factor. Values below 1 speed them up instead. - // slowdown 3.0 -} - -// Window rules let you adjust behavior for individual windows. -// Find more information on the wiki: -// https://niri-wm.github.io/niri/Configuration:-Window-Rules - -// Work around WezTerm's initial configure bug -// by setting an empty default-column-width. -window-rule { - // This regular expression is intentionally made as specific as possible, - // since this is the default config, and we want no false positives. - // You can get away with just app-id="wezterm" if you want. - match app-id=r#"^org\.wezfurlong\.wezterm$"# - default-column-width {} -} - -// Open the Firefox picture-in-picture player as floating by default. -window-rule { - // This app-id regular expression will work for both: - // - host Firefox (app-id is "firefox") - // - Flatpak Firefox (app-id is "org.mozilla.firefox") - match app-id=r#"firefox$"# title="^Picture-in-Picture$" - open-floating true -} - -// Example: block out two password managers from screen capture. -// (This example rule is commented out with a "/-" in front.) -/-window-rule { - match app-id=r#"^org\.keepassxc\.KeePassXC$"# - match app-id=r#"^org\.gnome\.World\.Secrets$"# - - block-out-from "screen-capture" - - // Use this instead if you want them visible on third-party screenshot tools. - // block-out-from "screencast" -} - -// Example: enable rounded corners for all windows. -// (This example rule is commented out with a "/-" in front.) -window-rule { - geometry-corner-radius 14 - clip-to-geometry true -} - -binds { - // Keys consist of modifiers separated by + signs, followed by an XKB key name - // in the end. To find an XKB name for a particular key, you may use a program - // like wev. - // - // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt - // when running as a winit window. - // - // Most actions that you can bind here can also be invoked programmatically with - // `niri msg action do-something`. - - // Mod-Shift-/, which is usually the same as Mod-?, - // shows a list of important hotkeys. - Mod+Shift+Slash { show-hotkey-overlay; } - - // Suggested binds for running programs: terminal, app launcher, screen locker. - Mod+Return hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } - Mod+Z hotkey-overlay-title="Open a launcher: walker" { spawn "walker"; } - Mod+Space { spawn "voxtoggle"; } - Mod+Alt+L hotkey-overlay-title="Lock the Screen: hyprlock" { spawn "hyprlock"; } - - // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. - // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. - // For example, this is a standard bind to toggle the screen reader (orca). - // Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } - - // Example volume keys mappings for PipeWire & WirePlumber. - // The allow-when-locked=true property makes them work even when the session is locked. - // Using spawn-sh allows to pass multiple arguments together with the command. - // "-l 1.0" limits the volume to 100%. - XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; } - XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; } - XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } - - // Example media keys mapping using playerctl. - // This will work with any MPRIS-enabled media player. - XF86AudioPlay allow-when-locked=true { spawn-sh "playerctl play-pause"; } - XF86AudioStop allow-when-locked=true { spawn-sh "playerctl stop"; } - XF86AudioPrev allow-when-locked=true { spawn-sh "playerctl previous"; } - XF86AudioNext allow-when-locked=true { spawn-sh "playerctl next"; } - - // Example brightness key mappings for brightnessctl. - // You can use regular spawn with multiple arguments too (to avoid going through "sh"), - // but you need to manually put each argument in separate "" quotes. - XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } - XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } - - // Open/close the Overview: a zoomed-out view of workspaces and windows. - // You can also move the mouse into the top-left hot corner, - // or do a four-finger swipe up on a touchpad. - Mod+O repeat=false { toggle-overview; } - - Mod+Backspace repeat=false { close-window; } - - Mod+Left { focus-column-left; } - Mod+Down { focus-window-down; } - Mod+Up { focus-window-up; } - Mod+Right { focus-column-right; } - - Mod+H { focus-column-left; } - Mod+J { focus-window-or-workspace-down; } - Mod+K { focus-window-or-workspace-up; } - Mod+L { focus-column-right; } - - Mod+Shift+Left { move-column-left; } - Mod+Shift+Down { move-window-down; } - Mod+Shift+Up { move-window-up; } - Mod+Shift+Right { move-column-right; } - Mod+Shift+H { move-column-left; } - Mod+Shift+J { move-window-down-or-to-workspace-down; } - Mod+Shift+K { move-window-up-or-to-workspace-up; } - Mod+Shift+L { move-column-right; } - - - Mod+Home { focus-column-first; } - Mod+End { focus-column-last; } - Mod+Shift+Home { move-column-to-first; } - Mod+Shift+End { move-column-to-last; } - - Mod+Ctrl+Left { focus-monitor-left; } - Mod+Ctrl+Down { focus-monitor-down; } - Mod+Ctrl+Up { focus-monitor-up; } - Mod+Ctrl+Right { focus-monitor-right; } - Mod+Ctrl+H { focus-monitor-left; } - Mod+Ctrl+J { focus-monitor-down; } - Mod+Ctrl+K { focus-monitor-up; } - Mod+Ctrl+L { 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+H { move-column-to-monitor-left; } - Mod+Shift+Ctrl+J { move-column-to-monitor-down; } - Mod+Shift+Ctrl+K { move-column-to-monitor-up; } - Mod+Shift+Ctrl+L { move-column-to-monitor-right; } - - // Alternatively, there are commands to move just a single window: - // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } - // ... - - // And you can also move a whole workspace to another monitor: - // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } - // ... - - Mod+Page_Down { focus-workspace-down; } - Mod+Page_Up { focus-workspace-up; } - Mod+U { focus-workspace-down; } - Mod+I { focus-workspace-up; } - Mod+Ctrl+Page_Down { move-column-to-workspace-down; } - Mod+Ctrl+Page_Up { move-column-to-workspace-up; } - Mod+Ctrl+U { move-column-to-workspace-down; } - Mod+Ctrl+I { move-column-to-workspace-up; } - - // Alternatively, there are commands to move just a single window: - // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } - // ... - - Mod+Shift+Page_Down { move-workspace-down; } - Mod+Shift+Page_Up { move-workspace-up; } - Mod+Shift+U { move-workspace-down; } - Mod+Shift+I { move-workspace-up; } - - // You can bind mouse wheel scroll ticks using the following syntax. - // These binds will change direction based on the natural-scroll setting. - // - // To avoid scrolling through workspaces really fast, you can use - // the cooldown-ms property. The bind will be rate-limited to this value. - // You can set a cooldown on any bind, but it's most useful for the wheel. - 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; } - - // Usually scrolling up and down with Shift in applications results in - // horizontal scrolling; these binds replicate that. - 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; } - - // Similarly, you can bind touchpad scroll "ticks". - // Touchpad scrolling is continuous, so for these binds it is split into - // discrete intervals. - // These binds are also affected by touchpad's natural-scroll, so these - // example binds are "inverted", since we have natural-scroll enabled for - // touchpads by default. - // Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; } - // Mod+TouchpadScrollUp { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; } - - // You can refer to workspaces by index. However, keep in mind that - // niri is a dynamic workspace system, so these commands are kind of - // "best effort". Trying to refer to a workspace index bigger than - // the current workspace count will instead refer to the bottommost - // (empty) workspace. - // - // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on - // will all refer to the 3rd workspace. - 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+Shift+1 { move-column-to-workspace 1; } - Mod+Shift+2 { move-column-to-workspace 2; } - Mod+Shift+3 { move-column-to-workspace 3; } - Mod+Shift+4 { move-column-to-workspace 4; } - Mod+Shift+5 { move-column-to-workspace 5; } - Mod+Shift+6 { move-column-to-workspace 6; } - Mod+Shift+7 { move-column-to-workspace 7; } - Mod+Shift+8 { move-column-to-workspace 8; } - Mod+Shift+9 { move-column-to-workspace 9; } - - // Alternatively, there are commands to move just a single window: - // Mod+Ctrl+1 { move-window-to-workspace 1; } - - // Switches focus between the current and the previous workspace. - // Mod+Tab { focus-workspace-previous; } - - // The following binds move the focused window in and out of a column. - // If the window is alone, they will consume it into the nearby column to the side. - // If the window is already in a column, they will expel it out. - Mod+BracketLeft { consume-or-expel-window-left; } - Mod+BracketRight { consume-or-expel-window-right; } - - // Consume one window from the right to the bottom of the focused column. - Mod+Comma { consume-window-into-column; } - // Expel the bottom window from the focused column to the right. - Mod+Period { expel-window-from-column; } - - Mod+R { switch-preset-column-width; } - // Cycling through the presets in reverse order is also possible. - // Mod+R { switch-preset-column-width-back; } - Mod+Ctrl+R { switch-preset-window-height; } - Mod+Shift+R { reset-window-height; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - - // While maximize-column leaves gaps and borders around the window, - // maximize-window-to-edges doesn't: the window expands to the edges of the screen. - // This bind corresponds to normal window maximizing, - // e.g. by double-clicking on the titlebar. - Mod+M { maximize-window-to-edges; } - - // Expand the focused column to space not taken up by other fully visible columns. - // Makes the column "fill the rest of the space". - Mod+Ctrl+F { expand-column-to-available-width; } - - Mod+C { center-column; } - - // Center all fully visible columns on screen. - Mod+Ctrl+C { center-visible-columns; } - - // Finer width adjustments. - // This command can also: - // * set width in pixels: "1000" - // * adjust width in pixels: "-5" or "+5" - // * set width as a percentage of screen width: "25%" - // * adjust width as a percentage of screen width: "-10%" or "+10%" - // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, - // set-column-width "100" will make the column occupy 200 physical screen pixels. - Mod+Minus { set-column-width "-10%"; } - Mod+Equal { set-column-width "+10%"; } - - // Finer height adjustments when in column with other windows. - Mod+Shift+Minus { set-window-height "-10%"; } - Mod+Shift+Equal { set-window-height "+10%"; } - - // Move the focused window between the floating and the tiling layout. - Mod+V { toggle-window-floating; } - Mod+Shift+V { switch-focus-between-floating-and-tiling; } - - // Toggle tabbed column display mode. - // Windows in this column will appear as vertical tabs, - // rather than stacked on top of each other. - Mod+W { toggle-column-tabbed-display; } - - // Actions to switch layouts. - // Note: if you uncomment these, make sure you do NOT have - // a matching layout switch hotkey configured in xkb options above. - // Having both at once on the same hotkey will break the switching, - // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). - // Mod+Space { switch-layout "next"; } - // Mod+Shift+Space { switch-layout "prev"; } - - Print { spawn "scrot"; } - - // Applications such as remote-desktop clients and software KVM switches may - // request that niri stops processing the keyboard shortcuts defined here - // so they may, for example, forward the key presses as-is to a remote machine. - // It's a good idea to bind an escape hatch to toggle the inhibitor, - // so a buggy application can't hold your session hostage. - // - // The allow-inhibiting=false property can be applied to other binds as well, - // which ensures niri always processes them, even when an inhibitor is active. - Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - - // The quit action will show a confirmation dialog to avoid accidental exits. - Mod+Shift+E { quit; } - Ctrl+Alt+Delete { quit; } - - // Powers off the monitors. To turn them back on, do any input like - // moving the mouse or pressing any other key. - Mod+Shift+P { power-off-monitors; } - -} diff --git a/home/moco/default.nix b/home/moco/default.nix index 2d3be2b..4f08d2a 100644 --- a/home/moco/default.nix +++ b/home/moco/default.nix @@ -6,6 +6,13 @@ }: let homeDirectory = "/home/moco"; + nmcli = lib.getExe' pkgs.networkmanager "nmcli"; + ykman = lib.getExe pkgs.yubikey-manager; + isMocoVpnActive = lib.getExe ( + pkgs.writeShellScriptBin "is-moco-vpn-active" '' + ${nmcli} -t -f NAME connection show --active | grep -q '^moco$' + '' + ); in { # Home Manager needs a bit of information about you and the paths it should @@ -38,6 +45,13 @@ in (writeShellScriptBin "moco-reto-otp" '' ykman oath accounts code -s 'MOCO Reto' | wl-copy -n '') + (writeShellScriptBin "toggle-moco-vpn" '' + if ${isMocoVpnActive}; then + ${nmcli} c down moco + else + ${ykman} oath accounts code -s 'MOCO Reto' | ${nmcli} c up moco --ask + fi + '') ]; }; @@ -62,34 +76,6 @@ in }; }; - programs.ashell.settings.settings.CustomButton = - let - nmcli = lib.getExe' pkgs.networkmanager "nmcli"; - ykman = lib.getExe pkgs.yubikey-manager; - isMocoVpnActive = lib.getExe ( - pkgs.writeShellScriptBin "is-moco-vpn-active" '' - ${nmcli} -t -f NAME connection show --active | grep -q '^moco$' - '' - ); - toggleMocoVpn = lib.getExe ( - pkgs.writeShellScriptBin "toggle-moco-vpn" '' - if ${isMocoVpnActive}; then - ${nmcli} c down moco - else - ${ykman} oath accounts code -s 'MOCO Reto' | ${nmcli} c up moco --ask - fi - '' - ); - in - [ - { - name = "MOCO VPN"; - icon = "󰖂"; - command = toggleMocoVpn; - status_command = isMocoVpnActive; - } - ]; - programs.zsh = { cdpath = [ "${homeDirectory}/Code/mocoapp" diff --git a/hosts/radish/desktop.nix b/hosts/radish/desktop.nix index c468c57..74c0bfd 100644 --- a/hosts/radish/desktop.nix +++ b/hosts/radish/desktop.nix @@ -1,8 +1,8 @@ -{ ... }: +{ pkgs-unstable, ... }: { services.displayManager.gdm.enable = true; services.desktopManager.gnome.enable = true; - programs.niri.enable = true; + services.displayManager.sessionPackages = [ pkgs-unstable.niri ]; services.printing.enable = true; services.keyd = { diff --git a/hosts/radish/packages.nix b/hosts/radish/packages.nix index 64b9170..9168625 100644 --- a/hosts/radish/packages.nix +++ b/hosts/radish/packages.nix @@ -33,6 +33,7 @@ in nerd-fonts.iosevka-term ]; services = { + gnome.evolution-data-server.enable = true; pcscd = { enable = true; plugins = [ pkgs.ccid ]; diff --git a/hosts/radish/users.nix b/hosts/radish/users.nix index bd18f7d..ec475ff 100644 --- a/hosts/radish/users.nix +++ b/hosts/radish/users.nix @@ -4,7 +4,10 @@ users.users.jokke = { uid = 1001; isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ + "wheel" + "networkmanager" + ]; shell = pkgs.zsh; initialPassword = "changeme"; }; @@ -12,7 +15,10 @@ users.users.moco = { uid = 1000; isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ + "wheel" + "networkmanager" + ]; shell = pkgs.zsh; initialPassword = "changeme"; subUidRanges = [