From ab1bee9783c5a685d781adcf9ae008a5655d4579 Mon Sep 17 00:00:00 2001 From: joshashtondev Date: Sun, 16 Aug 2026 15:09:17 -0600 Subject: [PATCH] =?UTF-8?q?nixos:=20gen=204=20@=20lilac=20=E2=80=94=202026?= =?UTF-8?q?-08-16=2015:09=2026.05.20260814.02e0898=20(Yarara)=20-----?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 24 +++---- home/desktop/niri.nix | 164 +++++++++++++++++++----------------------- 2 files changed, 86 insertions(+), 102 deletions(-) diff --git a/flake.lock b/flake.lock index 5429de1..8e7bdf5 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1786667869, - "narHash": "sha256-Zc6PI2MEpR2dmLWsgt8PZcx9BmCZwKlXgTZ+1ykVq78=", + "lastModified": 1786847024, + "narHash": "sha256-d1vE3V5zzLQPCAGy6HQd6EFh4eG30KdTMUON4ZizTPY=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "85e75e04b8879d50459946d12c74c3152cbe457b", + "rev": "2cde930aa2d735c3d1dac10096bb7d317a15aaa6", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1786528975, - "narHash": "sha256-8KuasCs+mVQ7WbLONUf/QB7NZeQvovyXRyxAj4nOOzY=", + "lastModified": 1786867632, + "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e7edd9afe17e45521300e041c65de3015f4a302", + "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1786599213, - "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", + "lastModified": 1786862985, + "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", + "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1786535285, - "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=", + "lastModified": 1786711500, + "narHash": "sha256-QvnceIGTBeDvDd9oCn+GvdsnkquliuwbVgpiRH68qaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5", + "rev": "02e08985a27c65ffd33d434eeb2e660a2e4dc84d", "type": "github" }, "original": { diff --git a/home/desktop/niri.nix b/home/desktop/niri.nix index a4331d2..c030fce 100644 --- a/home/desktop/niri.nix +++ b/home/desktop/niri.nix @@ -36,7 +36,6 @@ let in { - xdg.portal = { enable = true; # Use gtk or kde based on your preferred file picker dialog @@ -48,95 +47,80 @@ in extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; - programs.niri = { - settings = { - # Autostart DMS if you prefer launching it directly from Niri instead of systemd - spawn-at-startup = [ - { command = [ "dms" "run" ]; } - { command = [ "${launch-wvkbd}/bin/launch-wvkbd" ]; } - { command = [ "${launch-lisgd}/bin/launch-lisgd" ]; } # Spawns the daemon - ]; - - hotkey-overlay = { - skip-at-startup = true; - }; - - input = { - keyboard.xkb.layout = "us"; - touchpad = { - tap = true; - natural-scroll = true; - }; - }; - - layout = { - gaps = 8; - center-focused-column = "never"; - default-column-width.proportion = 1.0; - border.enable = false; - #tab-indicator.corner-radius = 18.0; - focus-ring = { - - enable = false; - width = 2; - }; - }; - - prefer-no-csd = true; - window-rules = [ - { # All windows - geometry-corner-radius = { - bottom-left = 25.0; - bottom-right = 25.0; - top-right = 25.0; - top-left = 25.0; - }; - - draw-border-with-background = true; - clip-to-geometry = true; + #programs.niri.enable = true; + xdg.configFile."niri/config.kdl".text = lib.mkForce '' + input { + keyboard { + xkb { + layout "us" + model "" + rules "" + variant "" + } + repeat-delay 600 + repeat-rate 25 + track-layout "global" } - ]; + touchpad { + tap + natural-scroll + } + } + screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + prefer-no-csd + layout { + gaps 8 + struts { + left 0 + right 0 + top 0 + bottom 0 + } + focus-ring { off; } + border { off; } + default-column-width { proportion 1.000000; } + center-focused-column "never" + } + cursor { + xcursor-theme "default" + xcursor-size 24 + } + hotkey-overlay { skip-at-startup; } + binds { + Ctrl+Print { screenshot-screen; } + Mod+F { fullscreen-window; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } + Mod+N { focus-workspace-down; } + Mod+P { spawn "pkill" "-RTMIN" "wvkbd-mobintl"; } + Mod+Return { spawn "alacritty"; } + Mod+Shift+E { quit; } + Mod+Shift+H { move-column-left; } + Mod+Shift+J { move-column-to-workspace-down; } + Mod+Shift+K { move-column-to-workspace-up; } + Mod+Shift+L { move-column-right; } + Mod+Shift+P { toggle-overview; } + Mod+Space { spawn "dms" "ipc" "spotlight" "toggle"; } + Mod+U { focus-workspace-up; } + Mod+X { close-window; } + Print { screenshot; } + XF86AudioLowerVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-"; } + XF86AudioMute { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } + XF86AudioRaiseVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+"; } + XF86MonBrightnessDown { spawn "dms" "ipc" "call" "brightness" "decrement" "5" ""; } + XF86MonBrightnessUp { spawn "dms" "ipc" "call" "brightness" "increment" "5" ""; } + } + spawn-at-startup "dms" "run" + spawn-at-startup "/nix/store/b1kxyzg5r6644mcmjh8jwsb8rinqzsw8-launch-wvkbd/bin/launch-wvkbd" + spawn-at-startup "/nix/store/l9k161qcs6ypzzbicjhkn8b203r610j6-launch-lisgd/bin/launch-lisgd" + window-rule { + draw-border-with-background true + geometry-corner-radius 25.000000 25.000000 25.000000 25.000000 + clip-to-geometry true + } - # Vim Keybindings & Built-in Features - binds = with config.lib.niri.actions; { - # Launchers & Session Control - "Mod+Return".action.spawn = [ "alacritty" ]; - "Mod+P".action.spawn = [ "pkill" "-RTMIN" "wvkbd-mobintl" ]; - "Mod+Space".action.spawn = [ "dms" "ipc" "spotlight" "toggle" ]; - "Mod+X".action.close-window = []; - "Mod+F".action.fullscreen-window = []; - "Mod+Shift+E".action.quit = []; - "Mod+Shift+P".action.toggle-overview = []; - - # Vim Focus Movement - "Mod+H".action.focus-column-left = []; - "Mod+J".action.focus-window-down = []; - "Mod+K".action.focus-window-up = []; - "Mod+L".action.focus-column-right = []; - - # Workspace Navigation - "Mod+N".action.focus-workspace-down = []; - "Mod+U".action.focus-workspace-up = []; - - # Vim Window Reordering - "Mod+Shift+H".action.move-column-left = []; - "Mod+Shift+L".action.move-column-right = []; - "Mod+Shift+J".action.move-column-to-workspace-down = []; - "Mod+Shift+K".action.move-column-to-workspace-up = []; - - # Volume & Brightness Media Controls - "XF86AudioRaiseVolume".action.spawn = [ "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05+" ]; - "XF86AudioLowerVolume".action.spawn = [ "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.05-" ]; - "XF86AudioMute".action.spawn = [ "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle" ]; - "XF86MonBrightnessUp".action.spawn = [ "dms" "ipc" "call" "brightness" "increment" "5" "" ]; - "XF86MonBrightnessDown".action.spawn = [ "dms" "ipc" "call" "brightness" "decrement" "5" "" ]; - - # Screenshots - "Print".action.screenshot = []; - "Ctrl+Print".action.screenshot-screen = []; - }; - }; - }; + include "/home/jashton/.config/niri/dms/outputs.kdl" + ''; } - -