diff --git a/home/all.nix b/home/all.nix
index fc79368..4eedcc3 100755
--- a/home/all.nix
+++ b/home/all.nix
@@ -23,6 +23,56 @@
           + builtins.substring 1 (-1) config.catppuccin.flavor;
       };
     };
+    userOptions = {
+      name = lib.mkOption {
+        type = lib.types.str;
+        readOnly = true;
+        default = "Sean Kovacs";
+      };
+      username = lib.mkOption {
+        type = lib.types.str;
+        readOnly = true;
+        default = "sckova";
+      };
+      hostname = lib.mkOption {
+        type = lib.types.str;
+        readOnly = true;
+        default = config.system.name;
+      };
+      fontSans = {
+        name = lib.mkOption {
+          type = lib.types.str;
+          readOnly = true;
+          default = "Noto Sans";
+        };
+        size = lib.mkOption {
+          type = lib.types.int;
+          default = 12;
+        };
+      };
+      fontSerif = {
+        name = lib.mkOption {
+          type = lib.types.str;
+          readOnly = true;
+          default = "Noto Serif";
+        };
+        size = lib.mkOption {
+          type = lib.types.int;
+          default = 12;
+        };
+      };
+      fontMono = {
+        name = lib.mkOption {
+          type = lib.types.str;
+          readOnly = true;
+          default = "NotoSansM Nerd Font Mono";
+        };
+        size = lib.mkOption {
+          type = lib.types.int;
+          default = 10;
+        };
+      };
+    };
   };
 
   config = {
@@ -51,11 +101,11 @@
         prettierd
         nixfmt-rfc-style
         jdk21_headless
+        nerd-fonts.noto
 
         # kde and kde theming
         kde-rounded-corners
         kdePackages.partitionmanager
-        colloid-icon-theme
 
         # gui applications
         vesktop
@@ -101,6 +151,73 @@
         pkgs.catppuccin-cursors."${config.catppuccin.flavor}${config.catppuccinUpper.accent}"
       ];
 
+    home.file = {
+      ".config/qt5ct" = {
+        source = ./qt/qt5ct;
+        recursive = true;
+        force = true;
+      };
+      ".config/qt6ct" = {
+        source = ./qt/qt6ct;
+        recursive = true;
+        force = true;
+      };
+    };
+
+    gtk = {
+      enable = true;
+
+      iconTheme = {
+        name = "Colloid-Dark";
+        package = pkgs.colloid-icon-theme;
+      };
+
+      cursorTheme = {
+        name = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}-cursors";
+        package = pkgs.catppuccin-cursors."${config.catppuccin.flavor}${config.catppuccinUpper.accent}";
+        size = 24;
+      };
+
+      gtk3.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+
+      gtk4.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+    };
+
+    # qt = {
+    #   enable = true;
+    #   # the following will be possible in NixOS 26.05
+    #   # https://github.com/nix-community/home-manager/commit/f9d45d664ed06a11861d0ba29e34f390c07bf62e
+    #   # until this flake is updated, it will use the configs as implemented above
+    #   qt5ctSettings = {
+    #     Appearance = {
+    #       style = "Breeze";
+    #       icon_theme = config.gtk.iconTheme.name;
+    #       color_scheme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}";
+    #       standard_dialogs = "default";
+    #     };
+    #     Fonts = {
+    #       fixed = "\"${config.userOptions.fontMono.name},${config.userOptions.fontMono.name}\"";
+    #       general = "\"${config.userOptions.fontSans.name},${config.userOptions.fontSans.size}\"";
+    #     };
+    #   };
+    #   qt6ctSettings = {
+    #     Appearance = {
+    #       style = "Breeze";
+    #       icon_theme = config.gtk.iconTheme.name;
+    #       color_scheme = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}";
+    #       standard_dialogs = "default";
+    #     };
+    #     Fonts = {
+    #       fixed = "\"${config.userOptions.fontMono.name},${config.userOptions.fontMono.name}\"";
+    #       general = "\"${config.userOptions.fontSans.name},${config.userOptions.fontSans.size}\"";
+    #     };
+    #   };
+    # };
+
     services = {
       spotifyd = {
         enable = true;
diff --git a/home/hosts/peach.nix b/home/hosts/peach.nix
index 8bab873..eb45c61 100644
--- a/home/hosts/peach.nix
+++ b/home/hosts/peach.nix
@@ -3,7 +3,7 @@
 {
   catppuccin = {
     accent = "peach";
-    flavor = "macchiato";
+    flavor = "mocha";
   };
 
   home.packages = with pkgs; [
diff --git a/home/kde/other.nix b/home/kde/other.nix
index 1fbea89..cb8646a 100644
--- a/home/kde/other.nix
+++ b/home/kde/other.nix
@@ -1,9 +1,11 @@
+{ config, ... }:
+
 {
   programs.ghostwriter = {
     enable = true;
     font = {
-      family = "Noto Sans";
-      pointSize = 12;
+      family = config.userOptions.fontSans.name;
+      pointSize = config.userOptions.fontSans.size;
     };
   };
 
@@ -11,8 +13,8 @@
     enable = true;
     editor = {
       font = {
-        family = "NotoSansM Nerd Font Mono";
-        pointSize = 10;
+        family = config.userOptions.fontMono.name;
+        pointSize = config.userOptions.fontMono.size;
       };
     };
   };
diff --git a/home/kde/plasma.nix b/home/kde/plasma.nix
index d8bf39a..286abc5 100644
--- a/home/kde/plasma.nix
+++ b/home/kde/plasma.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
 
@@ -13,7 +13,7 @@
     };
 
     workspace = {
-      iconTheme = "Colloid-Dark";
+      iconTheme = config.gtk.iconTheme.name;
       windowDecorations = {
         library = "org.kde.breeze";
         theme = "Breeze";
diff --git a/home/tiling/niri/qt/qt5ct/qt5ct.conf b/home/qt/qt5ct/qt5ct.conf
similarity index 100%
rename from home/tiling/niri/qt/qt5ct/qt5ct.conf
rename to home/qt/qt5ct/qt5ct.conf
diff --git a/home/tiling/niri/qt/qt5ct/style-colors.conf b/home/qt/qt5ct/style-colors.conf
similarity index 100%
rename from home/tiling/niri/qt/qt5ct/style-colors.conf
rename to home/qt/qt5ct/style-colors.conf
diff --git a/home/tiling/niri/qt/qt6ct/qt6ct.conf b/home/qt/qt6ct/qt6ct.conf
similarity index 100%
rename from home/tiling/niri/qt/qt6ct/qt6ct.conf
rename to home/qt/qt6ct/qt6ct.conf
diff --git a/home/tiling/niri/qt/qt6ct/style-colors.conf b/home/qt/qt6ct/style-colors.conf
similarity index 100%
rename from home/tiling/niri/qt/qt6ct/style-colors.conf
rename to home/qt/qt6ct/style-colors.conf
diff --git a/home/terminal/kitty/default.nix b/home/terminal/kitty/default.nix
index eb41d78..1d8a6ba 100644
--- a/home/terminal/kitty/default.nix
+++ b/home/terminal/kitty/default.nix
@@ -6,8 +6,8 @@
     enableGitIntegration = true;
     themeFile = "Catppuccin-${config.catppuccinUpper.flavor}";
     font = {
-      name = "NotoSansM Nerd Font Mono";
-      size = 10;
+      name = config.userOptions.fontMono.name;
+      size = config.userOptions.fontMono.size;
     };
     shellIntegration = {
       enableFishIntegration = true;
diff --git a/home/tiling/niri/default.nix b/home/tiling/niri/default.nix
index 6e735c8..587bee9 100644
--- a/home/tiling/niri/default.nix
+++ b/home/tiling/niri/default.nix
@@ -10,9 +10,6 @@ let
 in
 {
   home.packages = with pkgs; [
-    swaybg
-    swaylock
-    fuzzel
     xdg-desktop-portal
     brightnessctl
     qt6Packages.qt6ct
@@ -26,477 +23,10 @@ in
       recursive = true;
       force = true;
     };
-    ".config/fuzzel/colors.ini" = {
-      text = builtins.readFile (
-        "${catppuccin-fuzzel}/themes/catppuccin-${config.catppuccin.flavor}/${config.catppuccin.accent}.ini"
-      );
-      force = true;
-    };
-    ".config/fuzzel/fuzzel.ini" = {
-      text = ''
-        include = /home/sckova/.config/fuzzel/colors.ini
-        font = "Noto Sans:size=12"
-        terminal = "kitty"
-        icons-enabled = yes
-        icon-theme = "Colloid-Dark"
-        layer = "overlay"
-      '';
-      force = true;
-    };
-    ".config/qt5ct" = {
-      source = ./qt/qt5ct;
-      recursive = true;
-      force = true;
-    };
-    ".config/qt6ct" = {
-      source = ./qt/qt6ct;
-      recursive = true;
-      force = true;
-    };
-  };
-
-  gtk = {
-    enable = true;
-
-    iconTheme = {
-      name = "Colloid-Dark";
-      package = pkgs.colloid-icon-theme;
-    };
-
-    cursorTheme = {
-      name = "catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}-cursors";
-      package = pkgs.catppuccin-cursors."${config.catppuccin.flavor}${config.catppuccinUpper.accent}";
-      size = 24;
-    };
-
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = true;
-    };
-
-    gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = true;
-    };
-  };
-
-  qt = {
-    enable = true;
-    # the following will be possible in NixOS 26.05
-    # https://github.com/nix-community/home-manager/commit/f9d45d664ed06a11861d0ba29e34f390c07bf62e
-    # until this flake is updated, it will use the configs as implemented above
-    # qt5ctSettings = {
-    #   Appearance = {
-    #     style = "Breeze";
-    #     icon_theme = config.gtk.iconTheme.name;
-    #     standar_dialogs = "kde";
-    #   };
-    #   Fonts = {
-    #     fixed = "\"NotoSansM Nerd Font Mono,12\"";
-    #     general = "\"Noto Sans,12\"";
-    #   };
-    # };
-    # qt6ctSettings = {
-    #   Appearance = {
-    #     style = "Breeze";
-    #     icon_theme = config.gtk.iconTheme.name;
-    #     standar_dialogs = "kde";
-    #   };
-    #   Fonts = {
-    #     fixed = "\"NotoSansM Nerd Font Mono,12\"";
-    #     general = "\"Noto Sans,12\"";
-    #   };
-    # };
   };
 
   xsession = {
-    enable = true; # only needed for session variable injection
-    windowManager.command = "niri"; # launches niri directly
+    enable = true;
+    windowManager.command = "niri";
   };
-
-  # https://github.com/sodiboo/niri-flake/blob/main/docs.md
-  programs.niri.settings = {
-    screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
-    hotkey-overlay.skip-at-startup = true;
-    prefer-no-csd = true;
-    gestures.hot-corners.enable = false;
-    spawn-at-startup = [
-      {
-        command = [
-          "swaybg"
-          "-i"
-          "/home/sckova/.local/share/dailywallpaper.jpg"
-        ];
-      }
-    ];
-    overview = {
-      backdrop-color = pkgs.catppuccin.${config.catppuccin.flavor}.crust;
-      workspace-shadow.enable = false;
-    };
-    input = {
-      focus-follows-mouse = {
-        enable = true;
-        max-scroll-amount = "0%";
-      };
-      keyboard = {
-        numlock = false;
-        repeat-delay = 600;
-        repeat-rate = 25;
-      };
-      mouse = {
-        enable = true;
-        accel-profile = "adaptive";
-        natural-scroll = true;
-      };
-      touchpad = {
-        enable = true;
-        accel-profile = "adaptive";
-        natural-scroll = true;
-        tap = false;
-        drag = false;
-      };
-    };
-    environment = {
-      QT_QPA_PLATFORM = "wayland";
-      DISPLAY = null;
-    };
-    outputs = {
-      "eDP-1" = {
-        scale = 1.75;
-      };
-      "HDMI-A-1" = {
-        scale = 2;
-      };
-    };
-    cursor = {
-      hide-when-typing = true;
-      hide-after-inactive-ms = 2000;
-      size = config.gtk.cursorTheme.size;
-      theme = config.gtk.cursorTheme.name;
-    };
-    layout = {
-      gaps = 4;
-      background-color = pkgs.catppuccin.${config.catppuccin.flavor}.mantle;
-      default-column-width = {
-        proportion = 0.5;
-      };
-      preset-column-widths = [
-        { proportion = 1.0 / 3.0; }
-        { proportion = 1.0 / 2.0; }
-        { proportion = 2.0 / 3.0; }
-      ];
-      border = {
-        enable = true;
-        width = 1;
-        active.color = pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent};
-        inactive.color = pkgs.catppuccin.${config.catppuccin.flavor}.surface0;
-        urgent.color = pkgs.catppuccin.${config.catppuccin.flavor}.maroon;
-      };
-      focus-ring = {
-        enable = false;
-        width = 1;
-        active.color = pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent};
-        inactive.color = pkgs.catppuccin.${config.catppuccin.flavor}.surface0;
-        urgent.color = pkgs.catppuccin.${config.catppuccin.flavor}.maroon;
-      };
-      shadow = {
-        enable = true;
-        spread = 5;
-        offset.x = 0;
-        offset.y = 5;
-        softness = 30;
-        color = pkgs.catppuccin.${config.catppuccin.flavor}.base + "77";
-      };
-    };
-    window-rules = [
-      {
-        matches = [
-          {
-            app-id = "firefox$";
-            title = "^Picture-in-Picture$";
-          }
-        ];
-        open-floating = true;
-        default-floating-position = {
-          x = 32;
-          y = 32;
-          relative-to = "bottom-left";
-        };
-      }
-      {
-        geometry-corner-radius = {
-          top-left = 16.0;
-          top-right = 16.0;
-          bottom-left = 16.0;
-          bottom-right = 16.0;
-        };
-        clip-to-geometry = true;
-      }
-      {
-        matches = [
-          {
-            app-id = "openmw";
-            title = "OpenMW";
-          }
-        ];
-        open-maximized = true;
-        focus-ring.enable = false;
-        border.enable = false;
-        shadow.enable = false;
-      }
-    ];
-    binds = {
-      "Mod+Shift+Slash".action.show-hotkey-overlay = { };
-
-      "Mod+T" = {
-        action.spawn = [ "kitty" ];
-        hotkey-overlay.title = "Open a Terminal: kitty";
-      };
-      "Mod+Space" = {
-        action.spawn = [
-          "sh"
-          "-c"
-          "noctalia-shell ipc call launcher toggle"
-        ];
-        hotkey-overlay.title = "Run an Application: Noctalia app launcher";
-      };
-      "Super+Alt+L" = {
-        action.spawn = [ "swaylock" ];
-        hotkey-overlay.title = "Lock the Screen: swaylock";
-      };
-
-      "Super+Alt+S" = {
-        action.spawn = [
-          "sh"
-          "-c"
-          "pkill orca || exec orca"
-        ];
-        allow-when-locked = true;
-        hotkey-overlay.title = "Orca screen reader";
-      };
-
-      "XF86AudioRaiseVolume" = {
-        action.spawn = [
-          "wpctl"
-          "set-volume"
-          "@DEFAULT_AUDIO_SINK@"
-          "0.05+"
-        ];
-        allow-when-locked = true;
-      };
-      "XF86AudioLowerVolume" = {
-        action.spawn = [
-          "wpctl"
-          "set-volume"
-          "@DEFAULT_AUDIO_SINK@"
-          "0.05-"
-        ];
-        allow-when-locked = true;
-      };
-      "Shift+XF86AudioRaiseVolume" = {
-        action.spawn = [
-          "wpctl"
-          "set-volume"
-          "@DEFAULT_AUDIO_SINK@"
-          "0.01+"
-        ];
-        allow-when-locked = true;
-      };
-      "Shift+XF86AudioLowerVolume" = {
-        action.spawn = [
-          "wpctl"
-          "set-volume"
-          "@DEFAULT_AUDIO_SINK@"
-          "0.01-"
-        ];
-        allow-when-locked = true;
-      };
-      "XF86AudioMute" = {
-        action.spawn = [
-          "wpctl"
-          "set-mute"
-          "@DEFAULT_AUDIO_SINK@"
-          "toggle"
-        ];
-        allow-when-locked = true;
-      };
-      "XF86AudioMicMute" = {
-        action.spawn = [
-          "wpctl"
-          "set-mute"
-          "@DEFAULT_AUDIO_SOURCE@"
-          "toggle"
-        ];
-        allow-when-locked = true;
-      };
-
-      "XF86MonBrightnessUp" = {
-        action.spawn = [
-          "/home/sckova/.config/niri/scripts/brightness.sh"
-          "1"
-        ];
-        allow-when-locked = true;
-      };
-      "XF86MonBrightnessDown" = {
-        action.spawn = [
-          "/home/sckova/.config/niri/scripts/brightness.sh"
-          "-1"
-        ];
-        allow-when-locked = true;
-      };
-
-      "Mod+O" = {
-        action.toggle-overview = { };
-        repeat = false;
-      };
-
-      "Mod+Q" = {
-        action.close-window = { };
-        repeat = false;
-      };
-
-      "Mod+Left".action.focus-column-left = { };
-      "Mod+Down".action.focus-window-down = { };
-      "Mod+Up".action.focus-window-up = { };
-      "Mod+Right".action.focus-column-right = { };
-      "Mod+H".action.focus-column-left = { };
-      "Mod+J".action.focus-window-down = { };
-      "Mod+K".action.focus-window-up = { };
-      "Mod+L".action.focus-column-right = { };
-
-      "Mod+Ctrl+Left".action.move-column-left = { };
-      "Mod+Ctrl+Down".action.move-window-down = { };
-      "Mod+Ctrl+Up".action.move-window-up = { };
-      "Mod+Ctrl+Right".action.move-column-right = { };
-      "Mod+Ctrl+H".action.move-column-left = { };
-      "Mod+Ctrl+J".action.move-window-down = { };
-      "Mod+Ctrl+K".action.move-window-up = { };
-      "Mod+Ctrl+L".action.move-column-right = { };
-
-      "Mod+Home".action.focus-column-first = { };
-      "Mod+End".action.focus-column-last = { };
-      "Mod+Ctrl+Home".action.move-column-to-first = { };
-      "Mod+Ctrl+End".action.move-column-to-last = { };
-
-      "Mod+Shift+Left".action.focus-monitor-left = { };
-      "Mod+Shift+Down".action.focus-monitor-down = { };
-      "Mod+Shift+Up".action.focus-monitor-up = { };
-      "Mod+Shift+Right".action.focus-monitor-right = { };
-      "Mod+Shift+H".action.focus-monitor-left = { };
-      "Mod+Shift+J".action.focus-monitor-down = { };
-      "Mod+Shift+K".action.focus-monitor-up = { };
-      "Mod+Shift+L".action.focus-monitor-right = { };
-
-      "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = { };
-      "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = { };
-      "Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = { };
-      "Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = { };
-      "Mod+Shift+Ctrl+H".action.move-column-to-monitor-left = { };
-      "Mod+Shift+Ctrl+J".action.move-column-to-monitor-down = { };
-      "Mod+Shift+Ctrl+K".action.move-column-to-monitor-up = { };
-      "Mod+Shift+Ctrl+L".action.move-column-to-monitor-right = { };
-
-      "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" = {
-        action.focus-workspace-down = { };
-        cooldown-ms = 150;
-      };
-      "Mod+WheelScrollUp" = {
-        action.focus-workspace-up = { };
-        cooldown-ms = 150;
-      };
-      "Mod+Ctrl+WheelScrollDown" = {
-        action.move-column-to-workspace-down = { };
-        cooldown-ms = 150;
-      };
-      "Mod+Ctrl+WheelScrollUp" = {
-        action.move-column-to-workspace-up = { };
-        cooldown-ms = 150;
-      };
-
-      "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 = { };
-
-      "Mod+1".action.focus-workspace = 1;
-      "Mod+2".action.focus-workspace = 2;
-      "Mod+3".action.focus-workspace = 3;
-      "Mod+4".action.focus-workspace = 4;
-      "Mod+5".action.focus-workspace = 5;
-      "Mod+6".action.focus-workspace = 6;
-      "Mod+7".action.focus-workspace = 7;
-      "Mod+8".action.focus-workspace = 8;
-      "Mod+9".action.focus-workspace = 9;
-      "Mod+Ctrl+1".action.move-column-to-workspace = 1;
-      "Mod+Ctrl+2".action.move-column-to-workspace = 2;
-      "Mod+Ctrl+3".action.move-column-to-workspace = 3;
-      "Mod+Ctrl+4".action.move-column-to-workspace = 4;
-      "Mod+Ctrl+5".action.move-column-to-workspace = 5;
-      "Mod+Ctrl+6".action.move-column-to-workspace = 6;
-      "Mod+Ctrl+7".action.move-column-to-workspace = 7;
-      "Mod+Ctrl+8".action.move-column-to-workspace = 8;
-      "Mod+Ctrl+9".action.move-column-to-workspace = 9;
-
-      "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+Shift+R".action.switch-preset-window-height = { };
-      "Mod+Ctrl+R".action.reset-window-height = { };
-      "Mod+F".action.maximize-column = { };
-      "Mod+Shift+F".action.fullscreen-window = { };
-
-      "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.screenshot = { };
-      "Ctrl+Print".action.screenshot-screen = { };
-      "Alt+Print".action.screenshot-window = { };
-
-      "Mod+Escape" = {
-        action.toggle-keyboard-shortcuts-inhibit = { };
-        allow-inhibiting = false;
-      };
-
-      "Mod+Shift+E".action.quit = { };
-      "Ctrl+Alt+Delete".action.quit = { };
-
-      "Mod+Shift+P".action.power-off-monitors = { };
-    };
-  };
-
 }
diff --git a/home/tiling/niri/niri.nix b/home/tiling/niri/niri.nix
new file mode 100644
index 0000000..75418b8
--- /dev/null
+++ b/home/tiling/niri/niri.nix
@@ -0,0 +1,376 @@
+{ config, pkgs, ... }:
+
+{
+  # https://github.com/sodiboo/niri-flake/blob/main/docs.md
+  programs.niri.settings = {
+    screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
+    hotkey-overlay.skip-at-startup = true;
+    prefer-no-csd = true;
+    gestures.hot-corners.enable = false;
+    spawn-at-startup = [
+      {
+        command = [
+          "${pkgs.swaybg}"
+          "-i"
+          "/home/${config.userOptions.username}/.local/share/dailywallpaper.jpg"
+        ];
+      }
+    ];
+    overview = {
+      backdrop-color = pkgs.catppuccin.${config.catppuccin.flavor}.crust;
+      workspace-shadow.enable = false;
+    };
+    input = {
+      focus-follows-mouse = {
+        enable = true;
+        max-scroll-amount = "0%";
+      };
+      keyboard = {
+        numlock = false;
+        repeat-delay = 600;
+        repeat-rate = 25;
+      };
+      mouse = {
+        enable = true;
+        accel-profile = "adaptive";
+        natural-scroll = true;
+      };
+      touchpad = {
+        enable = true;
+        accel-profile = "adaptive";
+        natural-scroll = true;
+        tap = false;
+        drag = false;
+      };
+    };
+    environment = {
+      QT_QPA_PLATFORM = "wayland";
+      DISPLAY = null;
+    };
+    outputs = {
+      "eDP-1" = {
+        scale = 1.75;
+      };
+      "HDMI-A-1" = {
+        scale = 2;
+      };
+    };
+    cursor = {
+      hide-when-typing = true;
+      hide-after-inactive-ms = 2000;
+      size = config.gtk.cursorTheme.size;
+      theme = config.gtk.cursorTheme.name;
+    };
+    layout = {
+      gaps = 4;
+      background-color = pkgs.catppuccin.${config.catppuccin.flavor}.mantle;
+      default-column-width = {
+        proportion = 0.5;
+      };
+      preset-column-widths = [
+        { proportion = 1.0 / 3.0; }
+        { proportion = 1.0 / 2.0; }
+        { proportion = 2.0 / 3.0; }
+      ];
+      border = {
+        enable = true;
+        width = 1;
+        active.color = pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent};
+        inactive.color = pkgs.catppuccin.${config.catppuccin.flavor}.surface0;
+        urgent.color = pkgs.catppuccin.${config.catppuccin.flavor}.maroon;
+      };
+      focus-ring = {
+        enable = false;
+        width = 1;
+        active.color = pkgs.catppuccin.${config.catppuccin.flavor}.${config.catppuccin.accent};
+        inactive.color = pkgs.catppuccin.${config.catppuccin.flavor}.surface0;
+        urgent.color = pkgs.catppuccin.${config.catppuccin.flavor}.maroon;
+      };
+      shadow = {
+        enable = true;
+        spread = 5;
+        offset.x = 0;
+        offset.y = 5;
+        softness = 30;
+        color = pkgs.catppuccin.${config.catppuccin.flavor}.base + "77";
+      };
+    };
+    window-rules = [
+      {
+        matches = [
+          {
+            app-id = "firefox$";
+            title = "^Picture-in-Picture$";
+          }
+        ];
+        open-floating = true;
+        default-floating-position = {
+          x = 32;
+          y = 32;
+          relative-to = "bottom-left";
+        };
+      }
+      {
+        geometry-corner-radius = {
+          top-left = 16.0;
+          top-right = 16.0;
+          bottom-left = 16.0;
+          bottom-right = 16.0;
+        };
+        clip-to-geometry = true;
+      }
+      {
+        matches = [
+          {
+            app-id = "openmw";
+            title = "OpenMW";
+          }
+        ];
+        open-maximized = true;
+        focus-ring.enable = false;
+        border.enable = false;
+        shadow.enable = false;
+      }
+    ];
+    binds = {
+      "Mod+Shift+Slash".action.show-hotkey-overlay = { };
+
+      "Mod+T" = {
+        action.spawn = [ "kitty" ];
+        hotkey-overlay.title = "Open a Terminal: kitty";
+      };
+      "Mod+Space" = {
+        action.spawn-sh = [
+          "noctalia-shell ipc call launcher toggle"
+        ];
+        hotkey-overlay.title = "Run an Application: Noctalia app launcher";
+      };
+
+      "XF86AudioRaiseVolume" = {
+        action.spawn-sh = [
+          "noctalia-shell ipc call volume increase"
+        ];
+        allow-when-locked = true;
+      };
+      "XF86AudioLowerVolume" = {
+        action.spawn-sh = [
+          "noctalia-shell ipc call volume decrease"
+        ];
+        allow-when-locked = true;
+      };
+      "Shift+XF86AudioRaiseVolume" = {
+        action.spawn = [
+          "wpctl"
+          "set-volume"
+          "@DEFAULT_AUDIO_SINK@"
+          "0.01+"
+        ];
+        allow-when-locked = true;
+      };
+      "Shift+XF86AudioLowerVolume" = {
+        action.spawn = [
+          "wpctl"
+          "set-volume"
+          "@DEFAULT_AUDIO_SINK@"
+          "0.01-"
+        ];
+        allow-when-locked = true;
+      };
+      "XF86AudioMute" = {
+        action.spawn-sh = [
+          "noctalia-shell ipc call volume muteOutput"
+        ];
+        allow-when-locked = true;
+      };
+      "XF86AudioMicMute" = {
+        action.spawn-sh = [
+          "noctalia-shell ipc call volume muteInput"
+        ];
+        allow-when-locked = true;
+      };
+
+      "XF86MonBrightnessUp" = {
+        action.spawn = [
+          "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh"
+          "5"
+        ];
+        allow-when-locked = true;
+      };
+      "XF86MonBrightnessDown" = {
+        action.spawn = [
+          "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh"
+          "-5"
+        ];
+        allow-when-locked = true;
+      };
+      "Shift+XF86MonBrightnessUp" = {
+        action.spawn = [
+          "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh"
+          "1"
+        ];
+        allow-when-locked = true;
+      };
+      "Shift+XF86MonBrightnessDown" = {
+        action.spawn = [
+          "/home/${config.userOptions.username}/.config/niri/scripts/brightness.sh"
+          "-1"
+        ];
+        allow-when-locked = true;
+      };
+
+      "Mod+O" = {
+        action.toggle-overview = { };
+        repeat = false;
+      };
+
+      "Mod+Q" = {
+        action.close-window = { };
+        repeat = false;
+      };
+
+      "Mod+Left".action.focus-column-left = { };
+      "Mod+Down".action.focus-window-down = { };
+      "Mod+Up".action.focus-window-up = { };
+      "Mod+Right".action.focus-column-right = { };
+      "Mod+H".action.focus-column-left = { };
+      "Mod+J".action.focus-window-down = { };
+      "Mod+K".action.focus-window-up = { };
+      "Mod+L".action.focus-column-right = { };
+
+      "Mod+Ctrl+Left".action.move-column-left = { };
+      "Mod+Ctrl+Down".action.move-window-down = { };
+      "Mod+Ctrl+Up".action.move-window-up = { };
+      "Mod+Ctrl+Right".action.move-column-right = { };
+      "Mod+Ctrl+H".action.move-column-left = { };
+      "Mod+Ctrl+J".action.move-window-down = { };
+      "Mod+Ctrl+K".action.move-window-up = { };
+      "Mod+Ctrl+L".action.move-column-right = { };
+
+      "Mod+Home".action.focus-column-first = { };
+      "Mod+End".action.focus-column-last = { };
+      "Mod+Ctrl+Home".action.move-column-to-first = { };
+      "Mod+Ctrl+End".action.move-column-to-last = { };
+
+      "Mod+Shift+Left".action.focus-monitor-left = { };
+      "Mod+Shift+Down".action.focus-monitor-down = { };
+      "Mod+Shift+Up".action.focus-monitor-up = { };
+      "Mod+Shift+Right".action.focus-monitor-right = { };
+      "Mod+Shift+H".action.focus-monitor-left = { };
+      "Mod+Shift+J".action.focus-monitor-down = { };
+      "Mod+Shift+K".action.focus-monitor-up = { };
+      "Mod+Shift+L".action.focus-monitor-right = { };
+
+      "Mod+Shift+Ctrl+Left".action.move-column-to-monitor-left = { };
+      "Mod+Shift+Ctrl+Down".action.move-column-to-monitor-down = { };
+      "Mod+Shift+Ctrl+Up".action.move-column-to-monitor-up = { };
+      "Mod+Shift+Ctrl+Right".action.move-column-to-monitor-right = { };
+      "Mod+Shift+Ctrl+H".action.move-column-to-monitor-left = { };
+      "Mod+Shift+Ctrl+J".action.move-column-to-monitor-down = { };
+      "Mod+Shift+Ctrl+K".action.move-column-to-monitor-up = { };
+      "Mod+Shift+Ctrl+L".action.move-column-to-monitor-right = { };
+
+      "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" = {
+        action.focus-workspace-down = { };
+        cooldown-ms = 150;
+      };
+      "Mod+WheelScrollUp" = {
+        action.focus-workspace-up = { };
+        cooldown-ms = 150;
+      };
+      "Mod+Ctrl+WheelScrollDown" = {
+        action.move-column-to-workspace-down = { };
+        cooldown-ms = 150;
+      };
+      "Mod+Ctrl+WheelScrollUp" = {
+        action.move-column-to-workspace-up = { };
+        cooldown-ms = 150;
+      };
+
+      "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 = { };
+
+      "Mod+1".action.focus-workspace = 1;
+      "Mod+2".action.focus-workspace = 2;
+      "Mod+3".action.focus-workspace = 3;
+      "Mod+4".action.focus-workspace = 4;
+      "Mod+5".action.focus-workspace = 5;
+      "Mod+6".action.focus-workspace = 6;
+      "Mod+7".action.focus-workspace = 7;
+      "Mod+8".action.focus-workspace = 8;
+      "Mod+9".action.focus-workspace = 9;
+      "Mod+Ctrl+1".action.move-column-to-workspace = 1;
+      "Mod+Ctrl+2".action.move-column-to-workspace = 2;
+      "Mod+Ctrl+3".action.move-column-to-workspace = 3;
+      "Mod+Ctrl+4".action.move-column-to-workspace = 4;
+      "Mod+Ctrl+5".action.move-column-to-workspace = 5;
+      "Mod+Ctrl+6".action.move-column-to-workspace = 6;
+      "Mod+Ctrl+7".action.move-column-to-workspace = 7;
+      "Mod+Ctrl+8".action.move-column-to-workspace = 8;
+      "Mod+Ctrl+9".action.move-column-to-workspace = 9;
+
+      "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+Shift+R".action.switch-preset-window-height = { };
+      "Mod+Ctrl+R".action.reset-window-height = { };
+      "Mod+F".action.maximize-column = { };
+      "Mod+Shift+F".action.fullscreen-window = { };
+
+      "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.screenshot = { };
+      "Ctrl+Print".action.screenshot-screen = { };
+      "Alt+Print".action.screenshot-window = { };
+
+      "Mod+Escape" = {
+        action.toggle-keyboard-shortcuts-inhibit = { };
+        allow-inhibiting = false;
+      };
+
+      "Mod+Shift+E".action.quit = { };
+      "Ctrl+Alt+Delete".action.quit = { };
+
+      "Mod+Shift+P".action.power-off-monitors = { };
+    };
+  };
+}
diff --git a/home/tiling/noctalia/default.nix b/home/tiling/niri/noctalia.nix
similarity index 96%
rename from home/tiling/noctalia/default.nix
rename to home/tiling/niri/noctalia.nix
index bde5fd4..055030f 100644
--- a/home/tiling/noctalia/default.nix
+++ b/home/tiling/niri/noctalia.nix
@@ -139,18 +139,15 @@ in
               hideMode = "hidden";
               hideWhenIdle = false;
               id = "MediaMini";
-              maxWidth = 350;
+              maxWidth = 275;
               scrollingMode = "always";
               showAlbumArt = false;
               showArtistFirst = true;
               showProgressRing = true;
-              showVisualizer = false;
+              showVisualizer = true;
               useFixedWidth = false;
               visualizerType = "linear";
             }
-            {
-              id = "ScreenRecorder";
-            }
             {
               id = "Tray";
             }
@@ -180,7 +177,7 @@ in
         };
       };
       general = {
-        avatarImage = "";
+        avatarImage = "/home/${config.userOptions.username}/.face";
         dimmerOpacity = 0.6;
         showScreenCorners = true;
         forceBlackScreenCorners = true;
@@ -203,8 +200,8 @@ in
         allowPanelsOnScreenWithoutBar = true;
       };
       ui = {
-        fontDefault = "Noto Sans";
-        fontFixed = "NotoSansM Nerd Font Mono";
+        fontDefault = config.userOptions.fontSans.name;
+        fontFixed = config.userOptions.fontMono.name;
         fontDefaultScale = 1;
         fontFixedScale = 1;
         tooltipsEnabled = true;
@@ -236,11 +233,11 @@ in
           }
           {
             enabled = true;
-            id = "timer-card";
+            id = "weather-card";
           }
           {
             enabled = true;
-            id = "weather-card";
+            id = "timer-card";
           }
         ];
       };
@@ -283,7 +280,7 @@ in
         wallhavenResolutionHeight = "";
       };
       appLauncher = {
-        enableClipboardHistory = false;
+        enableClipboardHistory = true;
         enableClipPreview = true;
         position = "center";
         pinnedExecs = [ ];
@@ -340,10 +337,6 @@ in
             enabled = true;
             id = "audio-card";
           }
-          {
-            enabled = true;
-            id = "weather-card";
-          }
           {
             enabled = true;
             id = "media-sysmon-card";
@@ -387,7 +380,7 @@ in
       };
       sessionMenu = {
         enableCountdown = true;
-        countdownDuration = 10000;
+        countdownDuration = 5000;
         position = "center";
         showHeader = true;
         powerOptions = [
@@ -435,7 +428,7 @@ in
           criticalSoundFile = "";
           normalSoundFile = "";
           lowSoundFile = "";
-          excludedApps = "discord,firefox,chrome,chromium,edge";
+          excludedApps = "";
         };
       };
       osd = {
@@ -501,7 +494,7 @@ in
       };
       nightLight = {
         enabled = true;
-        forced = false;
+        forced = true;
         autoSchedule = true;
         nightTemp = "4000";
         dayTemp = "6500";
diff --git a/home/tiling/wallpaper/bing-wallpaper.nix b/home/tiling/wallpaper/bing-wallpaper.nix
index fcd67d8..5247075 100644
--- a/home/tiling/wallpaper/bing-wallpaper.nix
+++ b/home/tiling/wallpaper/bing-wallpaper.nix
@@ -1,11 +1,10 @@
 { pkgs, config, ... }:
-
 let
   bingWallpaperScript = pkgs.writeShellScript "bing-wallpaper" ''
     set -euo pipefail
 
     # Configuration
-    SIZE="1920x1080"
+    SIZE="UHD"
     MARKET="en-US"
     OUTPUT_PATH="''${XDG_DATA_HOME:-$HOME/.local/share}/dailywallpaper.jpg"
     DAY="0"
@@ -30,7 +29,6 @@ let
 
     # Extract title
     TITLE=$(echo "$API_RESP" | ${pkgs.gnugrep}/bin/grep -oP 'title":"[^"]*' | ${pkgs.coreutils}/bin/cut -d '"' -f 3)
-
     echo "Bing Image of the day: $TITLE"
 
     # Check if specific size exists, fallback to default
@@ -44,7 +42,6 @@ let
     IMG_NAME="''${REQ_IMG_URL##*/}"
     IMG_NAME="''${IMG_NAME#th?id=OHR.}"
     IMG_NAME="''${IMG_NAME%&rf=*}"
-
     echo "$IMG_NAME"
 
     # Create parent directory
@@ -52,16 +49,19 @@ let
 
     # Download image, overwrite if exists
     ${pkgs.wget}/bin/wget --quiet --output-document="$OUTPUT_PATH" "$REQ_IMG_URL"
-
     echo "Wallpaper saved to $OUTPUT_PATH"
 
     # Send notification
     if command -v ${pkgs.libnotify}/bin/notify-send &> /dev/null; then
-      ${pkgs.libnotify}/bin/notify-send -u low -t 10 -i preferences-desktop-wallpaper \
+      ${pkgs.libnotify}/bin/notify-send -u low -t 10000 -i preferences-desktop-wallpaper \
         "Bing Wallpaper of the Day" "$TITLE"
     fi
 
-    echo "Wallpaper downloaded successfully."
+    # Kill existing swaybg instances and start new one
+    ${pkgs.procps}/bin/pkill swaybg || true
+    ${pkgs.swaybg}/bin/swaybg -i "/home/${config.userOptions.username}/.local/share/dailywallpaper.jpg" &
+
+    echo "Wallpaper downloaded and applied successfully."
   '';
 in
 {
diff --git a/nohup.out b/nohup.out
deleted file mode 100644
index a245621..0000000
--- a/nohup.out
+++ /dev/null
@@ -1,6 +0,0 @@
-[2025-12-12 15:14:41.470] [info] Using configuration file /home/sckova/.config/waybar/config.jsonc
-[2025-12-12 15:14:41.471] [info] Discovered appearance 'dark'
-[2025-12-12 15:14:41.483] [info] Using CSS file /home/sckova/.config/waybar/style.css
-[2025-12-12 15:14:41.490] [warning] module sway/workspaces: Disabling module "sway/workspaces", Socket path is empty
-[2025-12-12 15:14:41.490] [warning] module cpu_text: Unknown module: cpu_text
-[2025-12-12 15:14:41.602] [info] Bar configured (width: 1728, height: 40) for output: eDP-1
diff --git a/system/all.nix b/system/all.nix
index 537a1c1..7137232 100755
--- a/system/all.nix
+++ b/system/all.nix
@@ -34,10 +34,11 @@
       ../home/all.nix
       ../home/browsers/firefox/default.nix
       ../home/tiling/niri/default.nix
+      ../home/tiling/niri/niri.nix
+      ../home/tiling/niri/noctalia.nix
       ../home/tiling/quickshell/default.nix
       ../home/tiling/wallpaper/bing-wallpaper.nix
       ../home/tiling/waybar/default.nix
-      ../home/tiling/noctalia/default.nix
       ../home/systemd/default.nix
       ../home/terminal/btop/default.nix
       ../home/terminal/fish/default.nix
@@ -168,7 +169,6 @@
       git
       firefoxpwa
       distrobox
-      nerd-fonts.noto
     ];
 
     plasma6.excludePackages = with pkgs.kdePackages; [