diff --git a/configs/niri-config.kdl b/configs/niri-config.kdl index 9005db3..96a5408 100644 --- a/configs/niri-config.kdl +++ b/configs/niri-config.kdl @@ -5,6 +5,7 @@ input { natural-scroll } } +spawn-at-startup "hypridle" spawn-at-startup "xwayland-satellite" spawn-at-startup "ghostty" spawn-at-startup "mako" diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl new file mode 100644 index 0000000..96a5408 --- /dev/null +++ b/configs/niri/config.kdl @@ -0,0 +1,202 @@ +// https://github.com/YaLTeR/niri/wiki/Configuration:-Input +input { + touchpad { + tap + natural-scroll + } +} +spawn-at-startup "hypridle" +spawn-at-startup "xwayland-satellite" +spawn-at-startup "ghostty" +spawn-at-startup "mako" +spawn-at-startup "nm-applet --indicator" +spawn-at-startup "waybar" +spawn-at-startup "waybar -c /home/ari/.config/waybar/bottom-config.jsonc" + +environment { + QT_QPA_PLATFORM "wayland" + QT_WAYLAND_DISABLE_WINDOWDECORATION "1" + NIXOS_OZONE_WL "1" + DISPLAY ":0" + ELECTRON_OZONE_PLATFORM_HINT "auto" +} + + +// ========================= +// Outputs +// ========================= +output "BOE 0x0BCA Unknown" { + mode "2256x1504@60" + scale 1 + transform "normal" + position x=0 y=0 +} +// Portable Azopa +output "PNP(GWD) ARZOPA \\x15\\xd9F\\x1675US0000" { + mode "1920x1080@60" + scale 1 + transform "normal" + position x=-1920 y=0 +} +// Two Screens in Office +output "Samsung Electric Company S22R35x H4TR604392" { + mode "1920x1080@74.973" + scale 1 + transform "normal" + position x=-960 y=-1080 +} + +output "Samsung Electric Company S22R35x H4TR503886" { + mode "1920x1080@74.973" + scale 1 + transform "normal" + position x=980 y=-1080 +} + +// Office +output "Dell Inc. DELL SE3223Q 1WDWKK3" { + scale 2 + position x=0 y=-1080 +} + +// ========================= +// General layout +// ========================= +layout { + gaps 8 + center-focused-column "never" + tab-indicator + preset-column-widths { + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + } + default-column-width { proportion 0.5; } + focus-ring { + width 4 + active-color "#7fc8ff" + inactive-color "#505050" + } +} + +// ========================= +// Screen Shots +// ========================= +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + +// ========================= +// Window Rules +// ========================= +// Open the Firefox picture-in-picture player as floating by default. +window-rule { + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + match app-id="org.pulseaudio.pavucontrol" + match app-id="Rofi" + match app-id="nm-connection-editor" + match app-id=".blueman-manager-wrapped" + match app-id=r#"^org.gnome.Calendar$"# + match app-id=r#"^gcr-prompter$"# + match app-id=r#"^xdg-desktop-portal-gnome$"# + match app-id=r#"^nm-applet$"# + match app-id=r#"^chrome-.*"# + match title="$Huddle:.*" app-id="Slack" + match title="Visual Studio Code" app-id="code" + + open-focused true + open-floating true + default-floating-position x=0 y=25 relative-to="top" + default-window-height { proportion 0.5; } + default-column-width { proportion 0.25; } +} +window-rule { + match is-active=false + opacity 0.85 +} +window-rule { + match app-id=r#"^Slack$"# + match app-id="code" + exclude app-id=r#"^code$"# title=r#"^Visual Studio Code$"# + open-fullscreen false + open-floating false + open-maximized true + open-focused true +} +// ========================= +// General Stuff +// ========================= +switch-events { + lid-close { spawn "notify-send" "The laptop lid is closed!"; } + lid-open { spawn "notify-send" "The laptop lid is open!"; } +} +hotkey-overlay { + skip-at-startup +} + +// ========================= +// General binds +// ========================= +binds { + Mod+Shift+H { show-hotkey-overlay; } + Mod+T { spawn "ghostty"; } + Mod+Space { spawn "fuzzel"; } + Mod+B { spawn "chromium" "--profile-directory=ProfilePersonal"; } + Mod+Alt+B { spawn "chromium" "--profile-directory=ProfileWork"; } + Mod+E { spawn "wofi-emoji"; } + XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } + 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"; } + XF86MonBrightnessUp { spawn "brightnessctl" "set" "10%+"; } + XF86MonBrightnessDown { spawn "brightnessctl" "set" "10%-"; } + Mod+Alt+L { spawn "/run/current-system/sw/bin/makoctl" "dismiss" "-a"; } + + Mod+Left { focus-column-left; } + Mod+Down { focus-workspace-down; } + Mod+Up { focus-workspace-up; } + Mod+Right { focus-column-right; } + + Mod+Shift+Tab { focus-monitor-next; } + + Mod+Ctrl+Right { swap-window-right; } + Mod+Ctrl+Left { swap-window-left; } + Mod+Ctrl+Up { move-window-to-workspace-up; } + Mod+Ctrl+Down { move-window-to-workspace-down; } + + Mod+W { toggle-column-tabbed-display; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+Ctrl+F { reset-window-height; } + Mod+V { toggle-window-floating; } + + Mod+C { center-column; } + + Mod+Minus { set-column-width "-10%"; } + Mod+Equal { set-column-width "+10%"; } + + Mod+Shift+Minus { set-window-height "-10%"; } + Mod+Shift+Equal { set-window-height "+10%"; } + + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + + Print { screenshot; } + Mod+P { screenshot; } + + Ctrl+Alt+Delete { quit; } + Mod+Q { close-window; } + + Mod+Ctrl+W { spawn "waybar"; } + Mod+Ctrl+B { spawn "waybar" "-c" "/home/ari/.config/waybar/bottom-config.jsonc"; } +} + + +/// Com Apps +workspace "chat" { + open-on-output "eDP-1" +} +spawn-at-startup "slack" +window-rule { + match app-id=r#"^Slack$"# + match app-id=r#"^signal$"# + open-on-workspace "chat" + open-focused true +} diff --git a/modules/lib.nix b/modules/lib.nix index 69dda2e..8347d4e 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -7,6 +7,7 @@ , specialArgs }: let + skygUtils = import ./skyg-utils.nix; makeImports = { attrs , extraConfiguration ? [ ] @@ -29,7 +30,7 @@ let in nixpkgs.lib.nixosSystem { specialArgs = specialArgs // { - inherit system; + inherit system skygUtils; }; system = system; modules = (makeImports { diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 544607e..607d1b6 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -13,6 +13,7 @@ in ./gnome.nix ./tiler.nix ./hyprland.nix + ./niri.nix ]; options = { diff --git a/modules/nixos/desktop/niri.nix b/modules/nixos/desktop/niri.nix index cdcf610..9fa2a95 100644 --- a/modules/nixos/desktop/niri.nix +++ b/modules/nixos/desktop/niri.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, skygUtils, ... }: let cfg = config.skyg.nixos.desktop.niri; in @@ -13,11 +13,13 @@ in skyg.nixos.desktop.tiler.enable = true; programs.niri = { enable = true; - withUWSM = true; }; - programs.niri.enable = true; environment.systemPackages = with pkgs; [ hypridle ]; + system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { + filePath = "niri.kdl"; + configSource = "/home/${config.skyg.user.name}/nixos-setup/configs/niri"; + }; }; } diff --git a/modules/skyg-utils.nix b/modules/skyg-utils.nix new file mode 100644 index 0000000..d14652f --- /dev/null +++ b/modules/skyg-utils.nix @@ -0,0 +1,16 @@ +{ + makeHyperlinkScriptToConfigs = + { filePath + , configSource + }: + let + homePath = "$HOME/.config/${filePath}"; + sourcePath = "${configSource}/${filePath}"; + in + '' + rm -f "${homePath}" + if [[ ! -h "$HOME/.config/${filePath}" ]]; then + ln -s "${sourcePath}" "${homePath}" + fi + ''; +}