From d04cbeceb973d9867b28921971e397b4ac5227d6 Mon Sep 17 00:00:00 2001 From: Madeline Hashcube Date: Fri, 31 Jul 2026 14:03:24 -0500 Subject: [PATCH] change from niri flake to hm --- README.md | 2 +- flake.lock | 154 ++---------- flake.nix | 6 - modules/display/niri.nix | 5 +- users/hashcube/programs/display/niri.nix | 276 +++++++++++----------- users/hashcube/xdg.nix | 1 + users/sammyg/programs/display/default.nix | 1 - 7 files changed, 158 insertions(+), 287 deletions(-) diff --git a/README.md b/README.md index 5ec75ee..00dd494 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ The important XF86 Keys just work as intended | `Mod`+`F` | Resize Focused Window to 100% | | `Mod`+`Shift`+`F` | Resize Focused Window to Fill the remaining space | | `Mod`+`L` | Toggle Stacking/Tabbed | -| `Mod`+`Z` | Open Zen Browser | +| `Mod`+`Z` | Open Helium | | `Mod`+`X` | Center Focused Window | | `Mod`+`C` | Spawn Cava | | `Mod`+`Shift`+`C` | Open Terminal Toys Menu | diff --git a/flake.lock b/flake.lock index c0d7ec6..0d2a067 100644 --- a/flake.lock +++ b/flake.lock @@ -198,11 +198,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1784489491, - "narHash": "sha256-j9maqjx1T8+ljAVntAdSI5hSGCm77QNZz64JF1rJNu0=", + "lastModified": 1785469032, + "narHash": "sha256-aB6tgXxSFT48X0Jc/v5opHUVo/B9sOoojUE6uZ7ymsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "3139deb8cafbe73b39b24451255b2fdd3426077e", + "rev": "6d25edfbd109bd6c0bb950a2fb6c37141795e3f1", "type": "github" }, "original": { @@ -310,62 +310,6 @@ "type": "github" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_10", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1784458980, - "narHash": "sha256-BWFTNPJWS9G1ME7bfjQIb7aWKWKpnjMMU1rlbw8PH/s=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "e40af292a5890c48d51bfa33d3db3d967d41784e", - "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": 1784456420, - "narHash": "sha256-38yvDuO09V/GG19oJO+B5nn38NhvvZEWKRGFE4WPUi4=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "f036de655d309edc13fef545a3809330796cbe83", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -425,22 +369,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1782847189, - "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { "locked": { "lastModified": 1784356753, @@ -458,22 +386,6 @@ } }, "nixpkgs_11": { - "locked": { - "lastModified": 1784356753, - "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { "locked": { "lastModified": 1783915482, "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", @@ -489,7 +401,7 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1774106199, "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", @@ -505,7 +417,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1775710090, "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", @@ -521,7 +433,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1777954456, "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", @@ -537,7 +449,7 @@ "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1784007870, "narHash": "sha256-djcLt/JJphyNt4eDY9XTly+/WbCK5lqWq9lSgCmJkkQ=", @@ -631,11 +543,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1783604885, - "narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=", + "lastModified": 1785141334, + "narHash": "sha256-kh35kIx7el4Jk8Ki3BH9/Pn1eZYSYLJ6LMALos0zOy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133", + "rev": "38a4887411571457d700c51c64a6e49ead2ed5ab", "type": "github" }, "original": { @@ -680,7 +592,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "systems": "systems_4" }, "locked": { @@ -722,7 +634,7 @@ }, "protonmail-bridge": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "systems": "systems_5" }, "locked": { @@ -751,8 +663,7 @@ "iosevka-hashcube": "iosevka-hashcube", "jovian": "jovian", "millennium": "millennium", - "niri": "niri", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "nixvim": "nixvim", "plasma-manager": "plasma-manager", "protonmail-bridge": "protonmail-bridge", @@ -872,7 +783,7 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "systems": "systems_6" }, "locked": { @@ -889,42 +800,9 @@ "type": "github" } }, - "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": 1783895132, - "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "ytpm": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "systems": "systems_7" }, "locked": { @@ -944,7 +822,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1784352415, diff --git a/flake.nix b/flake.nix index 9570814..89e1f0b 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,6 @@ frc-nix.url = "github:frc4451/frc-nix"; nixvim.url = "github:nix-community/nixvim"; home-manager.url = "github:nix-community/home-manager"; - niri.url = "github:sodiboo/niri-flake"; copyparty.url = "github:9001/copyparty"; elephant.url = "github:abenz1267/elephant"; walker = { @@ -43,7 +42,6 @@ home-manager, agenix, nixvim, - niri, copyparty, walker, jovian, @@ -82,7 +80,6 @@ }; modules = [ agenix.nixosModules.default - niri.nixosModules.niri copyparty.nixosModules.default ./configurations/hosts/prism/configuration.nix ./modules/network/copyparty/prism.nix @@ -98,7 +95,6 @@ nixpkgs = { inherit nixpkgsOpts; }; }; modules = [ - niri.nixosModules.niri ./configurations/hosts/slate/configuration.nix # ./modules/display/cinnamon.nix ] ++ sharedMods; @@ -114,7 +110,6 @@ modules = [ catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager - niri.nixosModules.niri jovian.nixosModules.default ./configurations/hosts/iolite/configuration.nix @@ -155,7 +150,6 @@ catppuccin.homeModules.catppuccin nixvim.homeModules.nixvim walker.homeManagerModules.default - niri.homeModules.config (import ./overlays) ]; }; diff --git a/modules/display/niri.nix b/modules/display/niri.nix index 7a33fb7..374f94d 100644 --- a/modules/display/niri.nix +++ b/modules/display/niri.nix @@ -1,8 +1,7 @@ -{ pkgs, inputs, ... }: +{ ... }: + { - nixpkgs.overlays = [ inputs.niri.overlays.niri ]; programs.niri = { enable = true; - package = pkgs.niri-stable; }; } diff --git a/users/hashcube/programs/display/niri.nix b/users/hashcube/programs/display/niri.nix index df9e16a..69099a1 100644 --- a/users/hashcube/programs/display/niri.nix +++ b/users/hashcube/programs/display/niri.nix @@ -1,106 +1,123 @@ { - config, lib, ... }: + { - programs.niri = { + wayland.windowManager.niri = { + enable = true; + checkConfig = true; settings = { hotkey-overlay = { skip-at-startup = true; hide-not-bound = true; }; clipboard.disable-primary = true; - spawn-at-startup = [ - { command = [ "indicator-sound-switcher" ]; } - ]; input = { - focus-follows-mouse.enable = true; + focus-follows-mouse = {}; keyboard.numlock = true; - warp-mouse-to-focus.enable = true; + warp-mouse-to-focus = {}; }; - outputs = { - "eDP-1" = { - position = { - x = -1600; - y = 0; + _children = [ + { spawn-at-startup = [ "indicator-sound-switcher" ]; } + + { + output = { + _args = ["eDP-1"]; + position._props = { + x = -1600; + y = 0; + }; }; - }; - "HDMI-A-1" = { - position = { - x = 0; - y = 0; + } + { + output = { + _args = ["HDMI-A-1"]; + position._props = { + x = 0; + y = 0; + }; }; - }; - "HDMI-A-2" = { - transform = { - rotation = 90; + } + { + output = { + _args = ["HDMI-A-2"]; + transform = "90"; + position._props = { + x = 1920; + y = -530; + }; }; - position = { - x = 1920; - y = -530; + } + + { + window-rule = { + draw-border-with-background = false; + geometry-corner-radius._args = + let + r = 8.0; + in + [ r r r r ]; + clip-to-geometry = true; + # background-effect.blur = true; }; - }; - }; + } + ]; overview.backdrop-color = "#11111b"; layout = { focus-ring = { - active.color = "#f5c2e7"; - inactive.color = "#313244"; - urgent.color = "#f38ba8"; + active-color = "#f5c2e7"; + inactive-color = "#313244"; + urgent-color = "#f38ba8"; }; - insert-hint.display.color = "#f5c2e744"; + insert-hint.color = "#f5c2e744"; default-column-width.proportion = 0.5; always-center-single-column = true; background-color = "#11111b"; }; prefer-no-csd = true; - binds = - with config.lib.niri.actions; - let - sh = spawn "sh" "-c"; - nu = spawn "nu" "-c"; - term = spawn "xdg-terminal-exec"; - in - { + binds = let + nu = cmd: [ "nu" "-c" ] ++ [ cmd ]; + term = cmd: [ "xdg-terminal-exec" ] ++ [ cmd ]; + in { "Mod+period" = { - hotkey-overlay.title = "Spawn Walker (App Launcher)"; - action = sh ''walker''; + _props.hotkey-overlay-title = "Spawn Walker (App Launcher)"; + spawn = [ "walker" ]; }; "Mod+N" = { - hotkey-overlay.title = "Open Notifications"; - action = sh ''sleep 0.1 && swaync-client -t -sw''; + _props.hotkey-overlay-title = "Open Notifications"; + spawn-sh = [ ''sleep 0.1 && swaync-client -t -sw'' ]; }; "Mod+T" = { - hotkey-overlay.title = "Open A Terminal"; - action = term ''nu''; + _props.hotkey-overlay-title = "Open A Terminal"; + spawn = term ''nu''; }; "Mod+E" = { - hotkey-overlay.title = "Open Aerc (Email)"; - action = term "aerc"; + _props.hotkey-overlay-title = "Open Aerc (Email)"; + spawn = term "aerc"; }; "Mod+R" = { - hotkey-overlay.title = "Open Nautilus (Files)"; - action = spawn "nautilus"; + _props.hotkey-overlay-title = "Open Nautilus (Files)"; + spawn = [ "nautilus" ]; }; "Mod+Z" = { - hotkey-overlay.title = "Open Zen Browser"; - action = spawn "zen-beta"; + _props.hotkey-overlay-title = "Open Helium"; + spawn = [ "helium" ]; }; "Mod+B" = { - hotkey-overlay.title = "Hide Waybar"; - action = sh ''pkill -USR1 waybar''; + _props.hotkey-overlay-title = "Hide Waybar"; + spawn = [ "pkill" "-USR1" "waybar" ]; }; "Mod+V" = { - hotkey-overlay.title = "View Clipboard history"; - action = sh ''walker -m clipboard''; + _props.hotkey-overlay-title = "View Clipboard history"; + spawn = [ "walker" "-m" "clipboard" ]; }; "Mod+C" = { - hotkey-overlay.title = "Open Cava"; - action = term "cava"; + _props.hotkey-overlay-title = "Open Cava"; + spawn = term "cava"; }; "Mod+Shift+C" = let toys = [ @@ -110,50 +127,50 @@ "tmatrix" "fireplace" ]; in { - hotkey-overlay.title = "Open Terminal Toys Menu"; - action = nu ''echo "${lib.concatStringsSep "\n" toys}" | - walker -dnNH --height 5 | - if $in != "" { xdg-terminal-exec $in }''; + _props.hotkey-overlay-title = "Open Terminal Toys Menu"; + spawn = nu ''echo "${lib.strings.concatLines toys}" | + walker -dnNH --height 5 | + if $in != "" { xdg-terminal-exec $in }''; }; "Mod+Escape" = { - hotkey-overlay.title = "Lock Screen"; - action = spawn "swaylock"; + _props.hotkey-overlay-title = "Lock Screen"; + spawn = [ "swaylock" ]; }; "Mod+Shift+End" = { - hotkey-overlay.title = "Show Power Options"; - action = spawn "wleave"; + _props.hotkey-overlay-title = "Show Power Options"; + spawn = [ "wleave" ]; }; - "Mod+slash".action = show-hotkey-overlay; + "Mod+slash".show-hotkey-overlay = {}; "Mod+Shift+Z" = { - hotkey-overlay.title = "Activate Woomer (Magnifying Glass)"; - action = spawn "woomer"; + _props.hotkey-overlay-title = "Activate Woomer (Magnifying Glass)"; + spawn = [ "woomer" ]; }; - "Mod+Q".action = close-window; - "Mod+Up".action = focus-window-or-workspace-up; - "Mod+Down".action = focus-window-or-workspace-down; - "Mod+Left".action = focus-column-or-monitor-left; - "Mod+Right".action = focus-column-or-monitor-right; - "Mod+Shift+Up".action = move-window-up-or-to-workspace-up; - "Mod+Shift+Down".action = move-window-down-or-to-workspace-down; - "Mod+Shift+Left".action = move-column-left-or-to-monitor-left; - "Mod+Shift+Right".action = move-column-right-or-to-monitor-right; - "Mod+Control+Left".action = consume-or-expel-window-left; - "Mod+Control+Right".action = consume-or-expel-window-right; - "Mod+bracketleft".action = focus-column-first; - "Mod+bracketright".action = focus-column-last; - "Mod+Shift+bracketleft".action = move-column-to-first; - "Mod+Shift+bracketright".action = move-column-to-last; - "Mod+Prior".action = focus-workspace-up; - "Mod+Next".action = focus-workspace-down; - "Mod+Shift+Prior".action = move-window-to-workspace-up; - "Mod+Shift+Next".action = move-window-to-workspace-down; - "Mod+Control+Prior".action = move-workspace-up; - "Mod+Control+Next".action = move-workspace-down; + "Mod+Q".close-window = {}; + "Mod+Up".focus-window-or-workspace-up = {}; + "Mod+Down".focus-window-or-workspace-down = {}; + "Mod+Left".focus-column-or-monitor-left = {}; + "Mod+Right".focus-column-or-monitor-right = {}; + "Mod+Shift+Up".move-window-up-or-to-workspace-up = {}; + "Mod+Shift+Down".move-window-down-or-to-workspace-down = {}; + "Mod+Shift+Left".move-column-left-or-to-monitor-left = {}; + "Mod+Shift+Right".move-column-right-or-to-monitor-right = {}; + "Mod+Control+Left".consume-or-expel-window-left = {}; + "Mod+Control+Right".consume-or-expel-window-right = {}; + "Mod+bracketleft".focus-column-first = {}; + "Mod+bracketright".focus-column-last = {}; + "Mod+Shift+bracketleft".move-column-to-first = {}; + "Mod+Shift+bracketright".move-column-to-last = {}; + "Mod+Prior".focus-workspace-up = {}; + "Mod+Next".focus-workspace-down = {}; + "Mod+Shift+Prior".move-window-to-workspace-up = {}; + "Mod+Shift+Next".move-window-to-workspace-down = {}; + "Mod+Control+Prior".move-workspace-up = {}; + "Mod+Control+Next".move-workspace-down = {}; - "Super+P".action = toggle-overview; # For Laptop (I have no clue either) - "Mod+W".action = toggle-overview; + "Super+P".toggle-overview = {}; # For Laptop (I have no clue either) + "Mod+W".toggle-overview = {}; "Mod+Shift+W" = let # Preset Names names = [ @@ -161,6 +178,7 @@ "Comms" "Steam" "Game" + "Music" "Eye Candy" ]; # If the passed in name is equal to one of these, the @@ -170,66 +188,48 @@ " " ]; in { - action = nu ''let title = | - echo "${lib.concatStringsSep "\n" names}" | + spawn = nu '' let title = | + echo "${lib.strings.concatLines names}" | walker -dNH --height 5; - + $title in ["${lib.concatStringsSep "\", \"" reset}"] | if $in { niri msg action unset-workspace-name } else { niri msg action set-workspace-name $title }''; - hotkey-overlay.title = "Set Workspace Name"; + _props.hotkey-overlay-title = "Set Workspace Name"; }; - "Mod+Tab".action = focus-monitor-next; - "Mod+Shift+Tab".action = move-column-to-monitor-next; + "Mod+Tab".focus-monitor-next = {}; + "Mod+Shift+Tab".move-column-to-monitor-next = {}; - "Mod+Apostrophe".action = set-column-width "+10%"; - "Mod+Semicolon".action = set-column-width "-10%"; - "Mod+Shift+Apostrophe".action = set-column-width "+5%"; - "Mod+Shift+Semicolon".action = set-column-width "-5%"; - "Mod+Control+Apostrophe".action = set-window-height "+10%"; - "Mod+Control+Semicolon".action = set-window-height "-10%"; - "Mod+Control+Shift+Apostrophe".action = set-window-height "+5%"; - "Mod+Control+Shift+Semicolon".action = set-window-height "-5%"; + "Mod+Apostrophe".set-column-width = "+10%"; + "Mod+Semicolon".set-column-width = "-10%"; + "Mod+Shift+Apostrophe".set-column-width = "+5%"; + "Mod+Shift+Semicolon".set-column-width = "-5%"; + "Mod+Control+Apostrophe".set-window-height = "+10%"; + "Mod+Control+Semicolon".set-window-height = "-10%"; + "Mod+Control+Shift+Apostrophe".set-window-height = "+5%"; + "Mod+Control+Shift+Semicolon".set-window-height = "-5%"; - "Mod+F".action = maximize-column; - "Mod+D".action = fullscreen-window; - "Mod+S".action = move-window-to-floating; - "Mod+A".action = move-window-to-tiling; - "Mod+X".action = center-visible-columns; - "Mod+Control+F".action = expand-column-to-available-width; - "Mod+L".action = toggle-column-tabbed-display; - "Mod+Print".action.screenshot.show-pointer = false; + "Mod+F".maximize-column = {}; + "Mod+D".fullscreen-window = {}; + "Mod+S".move-window-to-floating = {}; + "Mod+A".move-window-to-tiling = {}; + "Mod+X".center-visible-columns = {}; + "Mod+Control+F".expand-column-to-available-width = {}; + "Mod+L".toggle-column-tabbed-display = {}; + "Mod+Print".screenshot._props.show-pointer = false; - "XF86AudioMute".action = sh ''swayosd-client --output-volume mute-toggle''; - "XF86AudioRaiseVolume".action = sh ''swayosd-client --output-volume raise''; - "XF86AudioLowerVolume".action = sh ''swayosd-client --output-volume lower''; - "XF86MonBrightnessDown".action = sh ''swayosd-client --brightness lower''; - "XF86MonBrightnessUp".action = sh ''swayosd-client --brightness raise''; - "XF86AudioPlay".action = sh ''swayosd-client --playerctl play-pause''; - "XF86AudioPrev".action = sh ''swayosd-client --playerctl prev''; - "XF86AudioNext".action = sh ''swayosd-client --playerctl next''; + "XF86AudioMute".spawn-sh = [ ''swayosd-client --output-volume mute-toggle'' ]; + "XF86AudioRaiseVolume".spawn-sh = [ ''swayosd-client --output-volume raise'' ]; + "XF86AudioLowerVolume".spawn-sh = [ ''swayosd-client --output-volume lower'' ]; + "XF86MonBrightnessDown".spawn-sh = [ ''swayosd-client --brightness lower'' ]; + "XF86MonBrightnessUp".spawn-sh = [ ''swayosd-client --brightness raise'' ]; + "XF86AudioPlay".spawn-sh = [ ''swayosd-client --playerctl play-pause'' ]; + "XF86AudioPrev".spawn-sh = [ ''swayosd-client --playerctl prev'' ]; + "XF86AudioNext".spawn-sh = [ ''swayosd-client --playerctl next'' ]; }; - window-rules = [ - { - draw-border-with-background = false; - geometry-corner-radius = - let - r = 8.0; - in - { - top-left = r; - top-right = r; - bottom-left = r; - bottom-right = r; - }; - clip-to-geometry = true; - # TODO: Whenever this gets added to the flake, use it - # background-effect.blur = true; - } - ]; }; }; } diff --git a/users/hashcube/xdg.nix b/users/hashcube/xdg.nix index f88689e..2efa745 100644 --- a/users/hashcube/xdg.nix +++ b/users/hashcube/xdg.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { xdg = { + enable = true; terminal-exec = { enable = true; settings = { diff --git a/users/sammyg/programs/display/default.nix b/users/sammyg/programs/display/default.nix index 18edd6b..fca5958 100644 --- a/users/sammyg/programs/display/default.nix +++ b/users/sammyg/programs/display/default.nix @@ -2,6 +2,5 @@ { imports = [ - ./niri.nix ]; } -- 2.51.2