From ca29b542865fe06938b8b19fb8d345fb678df3a1 Mon Sep 17 00:00:00 2001 From: mrfluffy-dev Date: Tue, 27 Jan 2026 10:00:41 +0000 Subject: [PATCH] fuck you and your mom --- CLAUDE.md | 2 +- dots/doom/config.el | 1 - dots/niri.nix | 5 +++-- dots/xdg.nix | 26 +++++++++++++++----------- system/specialisation/main-system.nix | 5 ++++- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 5ae89f4..eff37ae 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -60,7 +60,7 @@ assets/Wallpapers/ # Wallpaper images ### Window Manager Selection -Set in `flake.nix` via `window_manager` variable (options: `"hyprland"`, `"river"`, `"niri"`, `"all"`). Currently set to `"hyprland"`. This variable is passed to modules for conditional WM configuration. +Set in `flake.nix` via `window_manager` variable (options: `"hyprland"`, `"niri"`, `"all"`). Currently set to `"hyprland"`. This variable is passed to modules for conditional WM configuration. ### Theming diff --git a/dots/doom/config.el b/dots/doom/config.el index 95c8b20..4845580 100644 --- a/dots/doom/config.el +++ b/dots/doom/config.el @@ -44,7 +44,6 @@ ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/org/") -(require 'direnv) ;; Whenever you reconfigure a package, make sure to wrap your config in an diff --git a/dots/niri.nix b/dots/niri.nix index 39b6932..e241344 100755 --- a/dots/niri.nix +++ b/dots/niri.nix @@ -50,15 +50,16 @@ in # Layout settings (aligned with hyprland gaps) layout = { gaps = 10; # hyprland: gaps_out = 10 - center-focused-column = "never"; + center-focused-column = "on-overflow"; preset-column-widths = [ { proportion = 1.0 / 3.0; } { proportion = 1.0 / 2.0; } { proportion = 2.0 / 3.0; } + { proportion = 0.9; } ]; - default-column-width = { proportion = 1.0 / 2.0; }; + default-column-width = { proportion = 0.9; }; focus-ring = { enable = true; # Hyprland doesn't have separate focus ring diff --git a/dots/xdg.nix b/dots/xdg.nix index f6f361d..24a3b1b 100755 --- a/dots/xdg.nix +++ b/dots/xdg.nix @@ -14,20 +14,24 @@ portal = { enable = true; - config.common.default = [ - "hyprland;kde" - "kde" - "gtk" - ]; + config = { + common.default = [ "gtk" ]; + } // lib.optionalAttrs (window_manager == "hyprland" || window_manager == "all") { + hyprland.default = [ "hyprland" "gtk" ]; + } // lib.optionalAttrs (window_manager == "niri" || window_manager == "all") { + niri.default = [ "gnome" "gtk" ]; + }; xdgOpenUsePortal = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland - kdePackages.xdg-desktop-portal-kde - ]; + extraPortals = with pkgs; + [ xdg-desktop-portal-gtk ] + ++ lib.optionals (window_manager == "hyprland" || window_manager == "all") [ + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland + ] + ++ lib.optionals (window_manager == "niri" || window_manager == "all") [ + xdg-desktop-portal-gnome + ]; }; mime.enable = true; diff --git a/system/specialisation/main-system.nix b/system/specialisation/main-system.nix index 6acb8d8..3291bb1 100644 --- a/system/specialisation/main-system.nix +++ b/system/specialisation/main-system.nix @@ -50,7 +50,10 @@ in builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; # Niri - programs.niri.enable = useNiri; + programs.niri = { + enable = useNiri; + #package = inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.niri-stable; + }; # Hyprland programs.hyprland = {