fix: prefix color codes with '#' in mako config to fix parsing errors

2411

.gitignore

@@ -3,3 +3,5 @@
 ./secrets/secrets.yaml.priv 
 ./secrets/secrets.priv.yaml.gpg
 
+.aider*
+.env

flake.nix

@@ -2,10 +2,10 @@
   description = "My System flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-colors.url = "github:misterio77/nix-colors"; 
@@ -91,6 +91,14 @@
             ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
             ./machines/aragon/configuration.nix
             sops-nix.nixosModules.sops
+            home-manager.nixosModules.home-manager {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users."gunalx" = import ./home/gunalx/full.nix;
+              home-manager.users."root" = import ./home/root/base.nix;
+              home-manager.backupFileExtension = "bac";
+              home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
+            }
           ];
         };
         
@@ -105,6 +113,17 @@
             ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
             ./machines/galadriel/configuration.nix
             sops-nix.nixosModules.sops
+            home-manager.nixosModules.home-manager {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users."gunalx" = import ./home/gunalx/base.nix;
+              home-manager.users."root" = import ./home/root/base.nix;
+              home-manager.backupFileExtension = "bac";
+              home-manager.extraSpecialArgs = {inherit nix-colors inputs;};
+            }
+
+
+
 
             ozai.nixosModules.ozai
             ozai-webui.nixosModules.ozai-webui

home/common/atuin.nix

@@ -0,0 +1,54 @@
+{ pkgs, ... }:
+
+{
+  programs.atuin = {
+    enable = true;
+    settings = {
+      # Data files
+      db_path = "~/.history.db";
+
+      # Filtering
+      filter_mode = "host";
+      filter_mode_shell_up_key_binding = "directory";
+
+      # UI
+      max_preview_height    = 2;
+      show_help             = true;
+      prefers_reduced_motion = true;
+
+      # History storage
+      secrets_filter = true;
+      enter_accept   = true;
+
+      # Sync v2
+      sync = {
+        records = true;
+      };
+
+      # Stats
+      stats = {
+        common_subcommands = [
+          "apt" "cargo" "composer" "dnf" "docker" "git" "go" "ip"
+          "kubectl" "nix" "nmcli" "npm" "pecl" "pnpm" "podman"
+          "port" "systemctl" "tmux" "yarn"
+        ];
+        common_prefix = [ "sudo" ];
+      };
+
+      # Keys
+      keys = {
+        scroll_exits = true;
+      };
+
+      # Theme
+      theme = {
+        name = "marine";
+      };
+
+      # Search
+      search = {
+        filters = [ "directory" "host" "session" ];
+      };
+    };
+  };
+}

home/common/fonts.nix

@@ -1,23 +1,28 @@
 { pkgs, lib, ... }:
 {
   
-    home.packages = with pkgs; [
-        nerdfonts
+  home.packages = with pkgs; [
+        nerd-fonts._0xproto
+        _0xproto
         noto-fonts
-        noto-fonts-cjk
+        noto-fonts-cjk-sans
         noto-fonts-emoji
+        noto-fonts-color-emoji
+        noto-fonts-emoji-blob-bin
+        unicode-emoji
+
         liberation_ttf
         fira-code
         fira-code-symbols
-        nerdfonts
         ubuntu_font_family
         zpix-pixel-font
-        _0xproto
         font-awesome
         font-awesome_5
         font-awesome_4
+        nerd-fonts._0xproto
+
+    ]++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 
-    ];
 
   fonts.fontconfig.enable = true;
   fonts.fontconfig.defaultFonts = {

home/common/nix.nix

@@ -3,4 +3,6 @@
   imports = [
   ];
   nixpkgs.config.allowUnfree = true;
-  }
+  programs.nix-index.enable = true;
+
+}

home/common/sshconfig.nix

@@ -5,6 +5,7 @@
 
   home.packages = with pkgs; [
     openssh
+    ssh-askpass-fullscreen
     sshfs
   ];
   
@@ -16,20 +17,23 @@
 
     matchBlocks = {
       "*" = {
-
         identityFile = [
           "~/.ssh/nixos"
           "~/.ssh/id_ed25519"
         ];
       };
 
+
       "*.pvv.ntnu.no" = {
         user="adriangl";
       };
+
       "*.ntnu.no !login.pvv.ntnu.no" = {
         user="adriangl";
         proxyJump="login.pvv.ntnu.no";
       };
+
+
       "snotra" = {
         user="adriangl";
         proxyJump="adriangl@login.pvv.ntnu.no";
@@ -49,6 +53,10 @@
       "bolle.pbsds.net" = {
         user="adrlau";
         proxyJump = "login.pvv.ntnu.no";
+        extraOptions = {
+          StrictHostKeyChecking = "no";
+          UserKnownHostsFile = "/dev/null";
+        };
       };
 
       #pvv
@@ -64,30 +72,25 @@
       #home
       "aragon" = {
         port = 6969;
-        user="gunalx";
         hostname="100.74.34.149";
       };
 
       "galadriel" = {
         port = 6969;
-        user="gunalx";
         hostname="100.84.215.84";
       };
       
       "gandalf" = {
         port = 6969;
-        user="gunalx";
         hostname="100.124.183.16";
       };
 
       "elrond" = {
         port = 6969;
-        user="gunalx";
         hostname="100.101.17.39 ";
       };
 
 
-
     };
 
     extraConfig = "";

home/gunalx/assets/wallpapers/default.nix

@@ -1,23 +0,0 @@
-{ lib, stdenv, pkgs }:
-
-stdenv.mkDerivation rec {
-  pname = "wallpapers";
-  version = "1.0";
-
-  src = pkgs.fetchurl {
-    url = "file://./";
-    sha256 = lib.fakeSha256;
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/wallpapers
-    cp -r * $out/share/wallpapers/
-  '';
-
-  meta = with lib; {
-    description = "My Collection of wallpapers";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ adriangl ];
-  };
-}
-

home/gunalx/base.nix

@@ -2,25 +2,20 @@
 {
   imports = [
     ../common/sshconfig.nix
-    ../common/unfree.nix
+    ../common/nix.nix
+    ../common/atuin.nix
   ];
 
   programs.nix-index = {
     enable = true;
   };
   
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      allowUnfreePredicate = (_: true);
-    };
-  };
 
   programs.bash = {
     enable = true;
     shellAliases  = {
-        "rebuild" = "sudo nixos-rebuild switch --update-input nixpkgs --update-input unstable --no-write-lock-file --refresh --flake git+https://github.com/adrlau/nix-dotfiles.git --upgrade";
-        "nixedit" = "vim /etc/nixos/nix-dotfiles/.";
+        "rebuild" = "sudo nixos-rebuild switch -no-write-lock-file --flake git+https://github.com/adrlau/nix-dotfiles.git -L --impure";
+        "nixedit" = "sudo vim /etc/nixos/nix-dotfiles/.";
         "nixdir" = "cd /etc/nixos/nix-dotfiles";
 
 

home/gunalx/code.nix

@@ -2,12 +2,12 @@
 
   programs.vscode = {
     enable = true;
-    enableUpdateCheck = false;
-    enableExtensionUpdateCheck = false;
+    profiles.default.enableUpdateCheck = false;
+    profiles.default.enableExtensionUpdateCheck = false;
     mutableExtensionsDir = true;
 
     # Extensions
-    extensions = (with pkgs.vscode-extensions; [
+    profiles.default.extensions = (with pkgs.vscode-extensions; [
       # Stable
       ms-vscode-remote.remote-ssh
       mhutchie.git-graph
@@ -39,7 +39,7 @@
     ]);
 
     # Settings
-    userSettings = {
+    profiles.default.userSettings = {
       # General
       "editor.fontSize" = 16;
       "editor.fontFamily" = "'Jetbrains Mono', 'monospace', monospace";

home/gunalx/colors.nix

@@ -62,7 +62,7 @@ in{
       enable = true;
       theme = {
         name = "Adwaita-dark";
-        package = pkgs.gnome.gnome-themes-extra;
+        package = pkgs.gnome-themes-extra;
       };
     };
 
@@ -72,5 +72,10 @@ in{
     style.name = "adwaita-dark";
   };
 
+  # Ensure the Adwaita GTK theme is installed so wlogout can load gtk.css
+  home.packages = with pkgs; [
+    gnome-themes-extra
+  ];
+
 }
 

home/gunalx/config.kdl

@@ -0,0 +1,642 @@
+// This config is in the KDL format: https://kdl.dev
+// "/-" comments out the following node.
+// Check the wiki for a full description of the configuration:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview
+
+// Input device configuration.
+// Find the full list of options on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
+input {
+    keyboard {
+        xkb {
+            // You can set rules, model, layout, variant and options.
+            // For more information, see xkeyboard-config(7).
+
+            // For example:
+            layout "us,no"
+            //options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
+            options "grp:ctrl_space_toggle"
+        }
+    }
+
+    // Next sections include libinput settings.
+    // Omitting settings disables them, or leaves them at their default values.
+    touchpad {
+        // off
+        tap
+        // dwt
+        // dwtp
+        // drag-lock
+        natural-scroll
+        accel-speed 0.1
+        accel-profile "flat"
+        // scroll-method "two-finger"
+        // disabled-on-external-mouse
+    }
+
+    mouse {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "no-scroll"
+    }
+
+    trackpoint {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "on-button-down"
+        // scroll-button 273
+        // middle-emulation
+    }
+
+    // Uncomment this to make the mouse warp to the center of newly focused windows.
+    warp-mouse-to-focus
+
+    // Focus windows and outputs automatically when moving the mouse into them.
+    // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
+    focus-follows-mouse max-scroll-amount="0%"
+}
+
+// You can configure outputs by their name, which you can find
+// by running `niri msg outputs` while inside a niri instance.
+// The built-in laptop monitor is usually called "eDP-1".
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
+// Remember to uncomment the node by removing "/-"!
+output "AU Optronics 0x212B Unknown" {
+    // Uncomment this line to disable this output.
+    // off
+
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    mode "3840x2160@60.002"
+
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    scale 2
+
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    transform "normal"
+
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    position x=1920 y=2160
+}
+output "ASUSTek COMPUTER INC ASUS MB16AH L9LMTF068515" { //MAYBE move to be on the side of main monitor.
+    mode "1920x1080@60.000"
+    scale 1
+    transform "normal"
+    position x=1920 y=1080
+}
+output "Hewlett Packard HP ZR24w CNT01710L4" {
+    mode "1920x1200@60.000"
+    scale 1
+    transform "normal"
+    position x=960 y=960
+}
+output "Hewlett Packard HP ZR24w CNT0181039" {
+    mode "1920x1200@60.000"
+    scale 1
+    transform "normal"
+    position x=2880 y=960
+}
+
+
+
+//switch events for open closing lid.
+switch-events {
+    lid-close { spawn "swaylock"; }
+    //lid-open { spawn "notify-send" "The laptop lid is open!"; }
+    tablet-mode-on { spawn "bash" "-c" "gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true"; }
+    tablet-mode-off { spawn "bash" "-c" "gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled false"; }
+}
+
+
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+    gaps 8
+
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "on-overflow"
+
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        // Proportion sets the width as a fraction of the output width, taking gaps into account.
+        // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
+        // The default preset widths are 1/3, 1/2 and 2/3 of the output but that is annoying.
+        proportion 0.3333333
+        proportion 0.5
+        proportion 0.6666667
+        proportion 0.9
+
+        // Fixed sets the width in logical pixels exactly.
+        // fixed 1920
+    }
+
+    // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
+    // preset-window-heights { }
+
+    // You can change the default width of the new windows.
+    default-column-width { proportion 0.5; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    // default-column-width {}
+
+    // By default focus ring and border are rendered as a solid background rectangle
+    // behind windows. That is, they will show up through semitransparent windows.
+    // This is because windows using client-side decorations can have an arbitrary shape.
+    // If you don't like that, you should uncomment `prefer-no-csd` below.
+    // Niri will draw focus ring and border *around* windows that agree to omit their
+    // client-side decorations.
+    // Alternatively, you can override it with a window rule called
+    // `draw-border-with-background`.
+
+    // You can change how the focus ring looks.
+    focus-ring {
+        // Uncomment this line to disable the focus ring.
+        // off
+        
+	// How many logical pixels the ring extends out from the windows.
+        width 2
+
+        // Colors can be set in a variety of ways:
+        // - CSS named colors: "red"
+        // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
+        // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
+
+        // Color of the ring on the active monitor.
+        active-color "#7fffc8"
+
+        // Color of the ring on inactive monitors.
+        inactive-color "#505050"
+
+        // You can also use gradients. They take precedence over solid colors.
+        // Gradients are rendered the same as CSS linear-gradient(angle, from, to).
+        // The angle is the same as in linear-gradient, and is optional,
+        // defaulting to 180 (top-to-bottom gradient).
+        // You can use any CSS linear-gradient tool on the web to set these up.
+        // Changing the color space is also supported, check the wiki for more info.
+        //
+        // active-gradient from="#80c8ff" to="#bbddff" angle=45
+
+        // You can also color the gradient relative to the entire view
+        // of the workspace, rather than relative to just the window itself.
+        // To do that, set relative-to="workspace-view".
+        //
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        off
+        width 2
+        active-color "#ffc87f"
+        inactive-color "#505050"
+        // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can enable drop shadows for windows.
+    shadow {
+        // Uncomment the next line to enable shadows.
+        on
+
+        // By default, the shadow draws only around its window, and not behind it.
+        // Uncomment this setting to make the shadow draw behind its window.
+        //
+        // Note that niri has no way of knowing about the CSD window corner
+        // radius. It has to assume that windows have square corners, leading to
+        // shadow artifacts inside the CSD rounded corners. This setting fixes
+        // those artifacts.
+        // 
+        // However, instead you may want to set prefer-no-csd and/or
+        // geometry-corner-radius. Then, niri will know the corner radius and
+        // draw the shadow correctly, without having to draw it behind the
+        // window. These will also remove client-side shadows if the window
+        // draws any.
+        // 
+        //draw-behind-window false
+
+        // You can change how shadows look. The values below are in logical
+        // pixels and match the CSS box-shadow properties.
+
+        // Softness controls the shadow blur radius.
+        softness 30
+
+        // Spread expands the shadow.
+        spread 5
+
+        // Offset moves the shadow relative to the window.
+        offset x=0 y=5
+
+        // You can also change the shadow color and opacity.
+        color "#0007"
+    }
+
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixels.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        left 24
+        right 24
+        // top 64
+        // bottom 64
+    }
+}
+
+// Add lines like this to spawn processes at startup.
+// Note that running niri as a session supports xdg-desktop-autostart,
+// which may be more convenient to use.
+// See the binds section below for more spawn examples.
+// spawn-at-startup "alacritty" "-e" "fish"
+spawn-at-startup "foot" "--server"
+spawn-at-startup "xwayland-satellite"
+spawn-at-startup "mako"
+spawn-at-startup "swww-daemon"
+spawn-at-startup "waybar"
+spawn-at-startup "swayidle" "-w" "timeout" "601" "niri msg action power-off-monitors" "timeout" "600" "swaylock -f" "before-sleep" "swaylock -f"
+
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
+// This option will also fix border/focus ring drawing behind some semitransparent windows.
+// After enabling or disabling this, you need to restart the apps for this to take effect.
+prefer-no-csd
+
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/Pictures/screenshots/screenshot-%Y-%m-%d %H-%M-%S.png"
+
+// You can also set this to null to disable saving screenshots to disk.
+// screenshot-path null
+
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
+animations {
+    // Uncomment to turn off all animations.
+    off
+
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 3.0
+}
+
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
+
+// Work around WezTerm's initial configure bug
+// by setting an empty default-column-width.
+window-rule {
+    // This regular expression is intentionally made as specific as possible,
+    // since this is the default config, and we want no false positives.
+    // You can get away with just app-id="wezterm" if you want.
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    default-column-width {}
+}
+
+// Open the Firefox picture-in-picture player as floating by default.
+window-rule {
+    // This app-id regular expression will work for both:
+    // - host Firefox (app-id is "firefox")
+    // - Flatpak Firefox (app-id is "org.mozilla.firefox")
+    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    match app-id=r#"firefox$"# title="^Bitwarden$"
+    match app-id=r#"firefox$"# title="^Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox$"
+    match app-id=r#"Bitwarden$"#
+    open-floating true
+}
+
+//niri overview python script. 
+window-rule {
+    match app-id=r#"niri-overview.py"#
+    match app-id=r#"niri_overview.py"#
+    match app-id=r#"niri_overview.bin"#
+    match app-id=r#"niri_overview"#
+    open-focused true
+    open-floating true
+    default-window-height { proportion 0.5; }
+    default-column-width { proportion 0.8; }
+}
+
+//fix steam notifications to bottom rigth
+window-rule {
+    match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"#
+    default-floating-position x=10 y=10 relative-to="bottom-right"
+}
+
+
+// Example: block out two password managers from screen capture.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+    match app-id=r#"^Bitwarden$"#
+
+    block-out-from "screen-capture"
+
+    // Use this instead if you want them visible on third-party screenshot tools.
+    // block-out-from "screencast"
+}
+
+// Example: enable rounded corners for all windows.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    geometry-corner-radius 12
+    clip-to-geometry true
+}
+
+window-rule {
+    geometry-corner-radius 12
+    clip-to-geometry true
+}
+
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Slash { show-hotkey-overlay; }
+
+    // spawn niri overview script
+    Mod+Slash { spawn "/home/gunalx/.config/niri/niri_overview/niri_overview.bin"; }
+    // for next release
+    // Mod+Slash { toggle-overview; }
+
+    // Suggested binds for running programs: terminal, app launcher, screen locker.
+    Mod+Return { spawn "foot"; }
+    Mod+D { spawn "fuzzel"; }
+    Super+M { spawn "swaylock"; }
+
+    // You can also use a shell. Do this if you need pipes, multiple commands, etc.
+    // Note: the entire command goes as a single argument in the end.
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    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"; }
+
+    Mod+Shift+Q { close-window; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    Alt+Tab   { focus-window-previous; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    // Alternative commands that move across workspaces when reaching
+    // the first or last window in a column.
+    // Mod+J     { focus-window-or-workspace-down; }
+    // Mod+K     { focus-window-or-workspace-up; }
+    // Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    // Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }
+    // ...
+
+    // And you can also move a whole workspace to another monitor:
+    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    // ...
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+    // ...
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
+
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+
+    // The following binds move the focused window in and out of a column.
+    // If the window is alone, they will consume it into the nearby column to the side.
+    // If the window is already in a column, they will expel it out.
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    // Consume one window from the right to the bottom of the focused column.
+    Mod+Comma  { consume-window-into-column; }
+    // Expel the bottom window from the focused column to the right.
+    Mod+Period { expel-window-from-column; }
+
+    Mod+R { switch-preset-column-width; }
+    Mod+Shift+R { switch-preset-window-height; }
+    Mod+Ctrl+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+
+    // Expand the focused column to space not taken up by other fully visible columns.
+    // Makes the column "fill the rest of the space".
+    Mod+Ctrl+F { expand-column-to-available-width; }
+
+    Mod+C { center-column; }
+
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    // Move the focused window between the floating and the tiling layout.
+    Mod+V       { toggle-window-floating; }
+    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+
+    // Toggle tabbed column display mode.
+    // Windows in this column will appear as vertical tabs,
+    // rather than stacked on top of each other.
+    Mod+W { toggle-column-tabbed-display; }
+
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    // Applications such as remote-desktop clients and software KVM switches may
+    // request that niri stops processing the keyboard shortcuts defined here
+    // so they may, for example, forward the key presses as-is to a remote machine.
+    // It's a good idea to bind an escape hatch to toggle the inhibitor,
+    // so a buggy application can't hold your session hostage.
+    //
+    // The allow-inhibiting=false property can be applied to other binds as well,
+    // which ensures niri always processes them, even when an inhibitor is active.
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete { quit; }
+
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    Mod+Shift+P { power-off-monitors; }
+}
+
+
+//Enviroment to be set.
+environment {
+    DISPLAY ":0"
+    ELECTRON_OZONE_PLATFORM_HINT "auto"
+}

home/gunalx/fcitx5.nix

@@ -1,162 +1,45 @@
-{ pkgs, lib, config, ... }:
-let
-  im = config.i18n.inputMethod;
-  cfg = im.fcitx5;
-  fcitx5Package = pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; };
-in
+{ pkgs, lib, ... }:
+
 {
   i18n.inputMethod = {
-    enabled = "fcitx5";
-    fcitx5.addons = with pkgs; [
-      fcitx5-mozc
-      fcitx5-gtk
-      fcitx5-chinese-addons
-    ];
-  };
+    enable = true;
+    type   = "fcitx5";
 
-  
+    fcitx5 = {
+      # 1) Load the GTK bridge, the classic UI and the Catppuccin theme package
+      addons = with pkgs; [
+        fcitx5-gtk
+        fcitx5-mozc
+        catppuccin-fcitx5
+      ];
 
-  xdg.configFile = let
-    format = pkgs.formats.iniWithGlobalSection { };
-  in {
-    "fcitx5/profile" = {
-      force = true;
-      source = format.generate "fcitx5-profile" {
-        sections = {
-          "Groups/0" = {
-            Name = "Default";
-            "Default Layout" = "us";
-            DefaultIM = "mozc";
-          };
-          "Groups/0/Items/0" = {
-            Name = "keyboard-us";
-            Layout = "";
-          };
-          "Groups/0/Items/1" = {
-            Name = "keyboard-no";
-            Layout = "";
-          };
-          "Groups/0/Items/2" = {
-            Name = "mozc";
-            Layout = "";
-          };
+      # 2) Install the Catppuccin theme under $XDG_DATA_HOME/fcitx5/themes/catppuccin
+      themes = {
+        catppuccin = {
+          highlightImage = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes/catppuccin/highlight.svg";
+          panelImage     = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes/catppuccin/panel.svg";
+          theme          = "${pkgs.catppuccin-fcitx5}/share/fcitx5/themes/catppuccin/theme.conf";
+        };
+      };  # i18n.inputMethod.fcitx5.themes.<name> … [source_id=2]
 
+      settings = {
+        # 3) Tell the classic UI to use “catppuccin”
+        addons.classicui.globalSection = {
+          Theme = "catppuccin";
+        };
 
-          "Groups/1" = {
-            Name = "Default";
-            "Default Layout" = "jp";
-            DefaultIM = "mozc";
-          };
-          "Groups/1/Items/0" = {
-            Name = "keyboard-us";
-            Layout = "";
-          };
-          "Groups/1/Items/1" = {
-            Name = "keyboard-no";
-            Layout = "";
-          };
-          "Groups/1/Items/2" = {
-            Name = "mozc";
-            Layout = "";
-          };
-
-
-          GroupOrder = {
-            "0" = "Default";
-            "1" = "Secondary";
-          };
-
+        # 4) Your other config (hotkey, layouts, IM engines…)
+        globalOptions."Global" = {
+          TriggerKey = "Control+space";
+        };
+        inputMethod."Default" = {
+          Enabled = "xkb:us::eng,xkb:no::nob,xkb:jp::jpn,mozc";
         };
       };
     };
-
-    "fcitx5/config".source = format.generate "fcitx5-config" {
-      sections = {
-        Hotkey = {
-          # Enumerate when press trigger key repeatedly
-          EnumerateWithTriggerKeys = "True";
-          # Temporally switch between first and current Input Method
-          AltTriggerKeys = "";
-          # Enumerate Input Method Forward
-          EnumerateForwardKeys = "";
-          # Enumerate Input Method Backward
-          EnumerateBackwardKeys = "";
-          # Skip first input method while enumerating
-          EnumerateSkipFirst = "False";
-        };
-
-        "Hotkey/TriggerKeys" = {
-          "0" = "Control+space";
-          "1" = "Zenkaku_Hankaku";
-          "2" = "Hangul";
-        };
-
-        "Hotkey/EnumerateGroupForwardKeys"."0" = "Super+space";
-        "Hotkey/EnumerateGroupBackwardKeys"."0" = "Shift+Super+space";
-        "Hotkey/ActivateKeys"."0" = "Hangul_Hanja";
-        "Hotkey/DeactivateKeys"."0" = "Hangul_Romaja";
-        "Hotkey/PrevPage"."0" = "Up";
-        "Hotkey/NextPage"."0" = "Down";
-        "Hotkey/PrevCandidate"."0" = "Shift+Tab";
-        "Hotkey/NextCandidate"."0" = "Tab";
-        "Hotkey/TogglePreedit"."0" = "Control+Alt+P";
-
-        Behaviour = {
-          # Active By Default
-          ActiveByDefault = "False";
-          # Share Input State
-          ShareInputState = "All";
-          # Show preedit in application
-          PreeditEnabledByDefault = "True";
-          # Show Input Method Information when switch input method
-          ShowInputMethodInformation = "True";
-          # Show Input Method Information when changing focus
-          showInputMethodInformationWhenFocusIn = "False";
-          # Show compact input method information
-          CompactInputMethodInformation = "True";
-          # Show first input method information
-          ShowFirstInputMethodInformation = "True";
-          # Default page size
-          DefaultPageSize = 5;
-          # Override Xkb Option
-          OverrideXkbOption = "False";
-          # Custom Xkb Option
-          CustomXkbOption = "";
-          # Force Enabled Addons
-          EnabledAddons = "";
-          # Force Disabled Addons
-          DisabledAddons = "";
-          # Preload input method to be used by default
-          PreloadInputMethod = "True";
-          # Allow input method in the password field
-          AllowInputMethodForPassword = "False";
-          # Show preedit text when typing password
-          ShowPreeditForPassword = "False";
-          # Interval of saving user data in minutes
-          AutoSavePeriod = 30;
-        };
-      };
-    };
-
-    "fcitx5/conf/classicui.conf".source = format.generate "fcitx5-classicui.conf" {
-      globalSection = {
-        Theme = "Material-Color";
-        PerScreenDPI = "True";
-        # Font = "";
-        "Vertical Candidate List" = "True";
-      };
-    };
   };
 
-  xdg.dataFile."fcitx5/themes/Material-Color" = {
-    recursive = true;
-    source = "${pkgs.fcitx5-material-color}/share/fcitx5/themes/Material-Color-teal";
-  };
-
-  systemd.user.services.fcitx5-daemon = {
-    Service.Restart="on-failure";
-    Service.ExecStart = lib.mkForce "${fcitx5Package}/bin/fcitx5";
-    Service.ExecReload = "/bin/kill -HUP $MAINPID";
-  };
+  # 5) Force your own ExecStart so you never get “conflicting definition” errors
+  systemd.user.services.fcitx5-daemon.Service.ExecStart =
+    lib.mkForce "${pkgs.fcitx5-with-addons}/bin/fcitx5";
 }
-

home/gunalx/full.nix

@@ -4,6 +4,8 @@
     ./base.nix
     ./code.nix
     ./sway.nix
+    ./niri.nix
+    ../common/fonts.nix
     ./colors.nix
 
     #./stylix.nix

home/gunalx/fuzzel.nix

@@ -0,0 +1,32 @@
+{ config, pkgs, lib, inputs, ... }:
+
+let
+  palette = config.colorScheme.palette;
+  hex = colour: lib.removePrefix "#" colour;
+in
+
+{
+  programs.fuzzel = {
+    enable = true;
+    package = pkgs.fuzzel;
+    settings = {
+      main = {
+        terminal = "${pkgs.foot}/bin/foot";
+        layer    = "overlay";
+      };
+      colors = {
+        background = "${hex palette.base00}ff";
+        foreground = "${hex palette.base05}ff";
+        highlight  = "${hex palette.base0D}ff";
+      };
+      window = {
+        border-radius = 12;
+        x             = "center";
+        y             = "center";
+      };
+      icons = {
+        size = 48;
+      };
+    };
+  };
+}

home/gunalx/mako.nix

@@ -0,0 +1,44 @@
+{ config, pkgs, ... }:
+
+let
+  palette = config.colorscheme.palette;
+in {
+  services.mako = {
+    enable           = true;                        # Turn on mako
+    package          = pkgs.mako;                   # Which package to use
+
+    # Colors (from your colorscheme)
+    settings.background-color  = "#${palette.base00}FF";       # popup background
+    settings.text-color        = "#${palette.base05}FF";       # popup text
+    settings.border-color      = "#${palette.base03}FF";       # popup border
+    settings.progress-color    = "over #${palette.base0A}FF";  # progress bar
+
+    # Placement & layering
+    settings.anchor           = "top-right";                 # corner on screen
+    settings.layer            = "overlay";                   # appear above fullscreen
+
+    # Geometry
+    settings.width            = 320;                         # px
+    settings.height           = 120;                         # max px
+    settings.margin           = "10";                        # all edges
+    settings.padding          = "8";                         # all edges
+    settings.border-size       = 2;                           # px
+    settings.border-radius     = 12;                          # px
+
+    # Font & icons
+    settings.font             = "monospace 10";              # Pango font
+    settings.icons            = true;                        # show icons
+    settings.icon-path         = "/usr/share/icons:/usr/share/pixmaps";
+    settings.max-icon-size      = 48;                          # px
+
+    # Behavior & timing
+    settings.default-timeout   = 3000;                        # ms; 0 = no timeout
+    settings.ignore-timeout    = true;                        # use defaultTimeout always
+    settings.actions          = true;                        # clickable actions
+    settings.max-visible       = 5;                           # simultaneous popups
+    settings.sort             = "-time";                     # newest first
+    settings.group-by          = "app-name";                  # grouping criteria
+    settings.markup           = true;                        # enable Pango markup
+
+  };
+}

home/gunalx/niri.nix

@@ -0,0 +1,644 @@
+{ pkgs, config, lib, ... }:
+let
+  palette = config.colorScheme.palette;
+
+  niriConfig = ''
+    // KDL‐format niri config
+
+    input {
+      keyboard { xkb { layout "us,no"; options "grp:ctrl_space_toggle"; }; }
+      touchpad {
+        tap
+        natural-scroll
+        accel-speed 0.1
+        accel-profile "flat"
+      }
+      warp-mouse-to-focus
+      focus-follows-mouse max-scroll-amount="0%"
+    }
+
+    output "AU Optronics 0x212B Unknown" {
+      mode "3840x2160@60.002"
+      //focus-at-startup
+      scale 2
+      transform "normal"
+      position x=1920 y=2160
+    }
+    output "ASUSTek COMPUTER INC ASUS MB16AH L9LMTF068515" {
+      mode "1920x1080@60.000"
+      scale 1
+      transform "normal"
+      position x=1920 y=1080
+    }
+    output "Hewlett Packard HP ZR24w CNT01710L4" {
+      mode "1920x1200@60.000"
+      scale 1
+      transform "normal"
+      position x=960 y=960
+    }
+    output "Hewlett Packard HP ZR24w CNT0181039" {
+      mode "1920x1200@60.000"
+      scale 1
+      transform "normal"
+      position x=2880 y=960
+    }
+
+    //desktop outputs.
+    output "Dell Inc. DELL U2410 F525M06G123L" {
+      mode "2560x1440@144.000"
+      scale 1
+      transform "90"
+      position x=0 y=0
+    }
+    output "Samsung Electric Company LC27G5xT H4LR800468" {
+      mode "1920x1200@59.950"
+      variable-refresh-rate on-demand=true
+      //focus-at-startup
+      scale 1
+      transform "normal"
+      position x=1200 y=240
+    }
+
+//switch events for open closing lid.
+switch-events {
+    lid-close { spawn "swaylock"; }
+    //lid-open { spawn "notify-send" "The laptop lid is open!"; }
+    tablet-mode-on { spawn "bash" "-c" "gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled true"; }
+    tablet-mode-off { spawn "bash" "-c" "gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled false"; }
+}
+
+
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+    gaps 8
+
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "on-overflow"
+
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        // Proportion sets the width as a fraction of the output width, taking gaps into account.
+        // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
+        // The default preset widths are 1/3, 1/2 and 2/3 of the output but that is annoying.
+        proportion 0.3333333
+        proportion 0.5
+        proportion 0.6666667
+
+        // Fixed sets the width in logical pixels exactly.
+        // fixed 1920
+    }
+
+    // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
+    preset-window-heights {
+      proportion 1.0
+      proportion 0.5
+
+    }
+
+    // You can change the default width of the new windows.
+    default-column-width { proportion 1.0; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    // default-column-width {}
+
+    // By default focus ring and border are rendered as a solid background rectangle
+    // behind windows. That is, they will show up through semitransparent windows.
+    // This is because windows using client-side decorations can have an arbitrary shape.
+    // If you don't like that, you should uncomment `prefer-no-csd` below.
+    // Niri will draw focus ring and border *around* windows that agree to omit their
+    // client-side decorations.
+    // Alternatively, you can override it with a window rule called
+    // `draw-border-with-background`.
+
+    // You can change how the focus ring looks.
+    focus-ring {
+        // Uncomment this line to disable the focus ring.
+        // off
+        
+	      // How many logical pixels the ring extends out from the windows.
+        width 2
+
+        // Colors can be set in a variety of ways:
+        // - CSS named colors: "red"
+        // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
+        // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
+
+        // Color of the ring on the active monitor.
+        active-color "#7fffc8"
+
+        // Color of the ring on inactive monitors.
+        inactive-color "#505050"
+
+        // You can also use gradients. They take precedence over solid colors.
+        // Gradients are rendered the same as CSS linear-gradient(angle, from, to).
+        // The angle is the same as in linear-gradient, and is optional,
+        // defaulting to 180 (top-to-bottom gradient).
+        // You can use any CSS linear-gradient tool on the web to set these up.
+        // Changing the color space is also supported, check the wiki for more info.
+        //
+        // active-gradient from="#80c8ff" to="#bbddff" angle=45
+
+        // You can also color the gradient relative to the entire view
+        // of the workspace, rather than relative to just the window itself.
+        // To do that, set relative-to="workspace-view".
+        //
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        off
+        width 2
+        active-color "#ffc87f"
+        inactive-color "#505050"
+        // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can enable drop shadows for windows.
+    shadow {
+        // Uncomment the next line to enable shadows.
+        on
+
+        // By default, the shadow draws only around its window, and not behind it.
+        // Uncomment this setting to make the shadow draw behind its window.
+        //
+        // Note that niri has no way of knowing about the CSD window corner
+        // radius. It has to assume that windows have square corners, leading to
+        // shadow artifacts inside the CSD rounded corners. This setting fixes
+        // those artifacts.
+        // 
+        // However, instead you may want to set prefer-no-csd and/or
+        // geometry-corner-radius. Then, niri will know the corner radius and
+        // draw the shadow correctly, without having to draw it behind the
+        // window. These will also remove client-side shadows if the window
+        // draws any.
+        // 
+        //draw-behind-window false
+
+        // You can change how shadows look. The values below are in logical
+        // pixels and match the CSS box-shadow properties.
+
+        // Softness controls the shadow blur radius.
+        softness 30
+
+        // Spread expands the shadow.
+        spread 5
+
+        // Offset moves the shadow relative to the window.
+        offset x=0 y=5
+
+        // You can also change the shadow color and opacity.
+        color "#0007"
+    }
+
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixels.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        left 24
+        right 24
+        // top 64
+        // bottom 64
+    }
+}
+
+// Add lines like this to spawn processes at startup.
+// Note that running niri as a session supports xdg-desktop-autostart,
+// which may be more convenient to use.
+// See the binds section below for more spawn examples.
+// spawn-at-startup "alacritty" "-e" "fish"
+spawn-at-startup "foot" "--server"
+spawn-at-startup "xwayland-satellite"
+spawn-at-startup "mako"
+spawn-at-startup "swww-daemon"
+//spawn-at-startup "waybar" //spawns by system service instead
+spawn-at-startup "swayidle" "-w" "timeout" "601" "niri msg action power-off-monitors" "timeout" "600" "swaylock -f" "before-sleep" "swaylock -f"
+
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
+// This option will also fix border/focus ring drawing behind some semitransparent windows.
+// After enabling or disabling this, you need to restart the apps for this to take effect.
+prefer-no-csd
+
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/Pictures/screenshots/screenshot-%Y-%m-%d %H-%M-%S.png"
+
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
+animations {
+    // Uncomment to turn off all animations.
+    off
+
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 0.3
+}
+
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
+
+// Work around WezTerm's initial configure bug
+// by setting an empty default-column-width.
+window-rule {
+    // This regular expression is intentionally made as specific as possible,
+    // since this is the default config, and we want no false positives.
+    // You can get away with just app-id="wezterm" if you want.
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    default-column-width {}
+}
+
+// Open the Firefox picture-in-picture player as floating by default.
+window-rule {
+    // This app-id regular expression will work for both:
+    // - host Firefox (app-id is "firefox")
+    // - Flatpak Firefox (app-id is "org.mozilla.firefox")
+    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    match app-id=r#"firefox$"# title="^Bitwarden$"
+    match app-id=r#"firefox$"# title="^Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox$"
+    match app-id="firefox" title="Extension: (Bitwarden Password Manager) - Bitwarden — Mozilla Firefox"
+    match app-id="Bitwarden$"
+    match title="^Bitwarden"
+    open-floating true
+}
+
+//fix steam notifications to bottom rigth
+window-rule {
+    match app-id="steam" title=r#"^notificationtoasts_\d+_desktop$"#
+    default-floating-position x=10 y=10 relative-to="bottom-right"
+}
+
+
+// Example: block out two password managers from screen capture.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+    match title=r#"^Bitwarden$"#
+
+    block-out-from "screen-capture"
+
+    // Use this instead if you want them visible on third-party screenshot tools.
+    // block-out-from "screencast"
+}
+
+// Example: enable rounded corners for all windows.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    geometry-corner-radius 12
+    clip-to-geometry true
+}
+
+window-rule {
+    geometry-corner-radius 12
+    clip-to-geometry true
+}
+
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Slash { show-hotkey-overlay; }
+    Mod+Slash { toggle-overview; }
+
+    // Suggested binds for running programs: terminal, app launcher, screen locker.
+    Mod+Return { spawn "footclient"; }
+    Mod+D { spawn "fuzzel"; }
+    Super+M { spawn "swaylock"; }
+    
+
+    // You can also use a shell. Do this if you need pipes, multiple commands, etc.
+    // Note: the entire command goes as a single argument in the end.
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    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"; }
+
+    Mod+Shift+Q { close-window; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    Alt+Tab   { focus-window-previous; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    // Alternative commands that move across workspaces when reaching
+    // the first or last window in a column.
+    // Mod+J     { focus-window-or-workspace-down; }
+    // Mod+K     { focus-window-or-workspace-up; }
+    // Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    // Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }
+    // ...
+
+    // And you can also move a whole workspace to another monitor:
+    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    // ...
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+    // ...
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
+
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+
+    // The following binds move the focused window in and out of a column.
+    // If the window is alone, they will consume it into the nearby column to the side.
+    // If the window is already in a column, they will expel it out.
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    // Consume one window from the right to the bottom of the focused column.
+    Mod+Comma  { consume-window-into-column; }
+    // Expel the bottom window from the focused column to the right.
+    Mod+Period { expel-window-from-column; }
+
+    Mod+R { switch-preset-column-width; }
+    Mod+Shift+R { switch-preset-window-height; }
+    Mod+Ctrl+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+    Mod+Ctrl+Shift+F { toggle-windowed-fullscreen; }
+   
+    // Expand the focused column to space not taken up by other fully visible columns.
+    // Makes the column "fill the rest of the space".
+    Mod+Ctrl+F { expand-column-to-available-width; }
+
+    Mod+C { center-column; }
+
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    // Move the focused window between the floating and the tiling layout.
+    Mod+V       { toggle-window-floating; }
+    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+
+    // Toggle tabbed column display mode.
+    // Windows in this column will appear as vertical tabs,
+    // rather than stacked on top of each other.
+    Mod+W { toggle-column-tabbed-display; }
+
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    // Applications such as remote-desktop clients and software KVM switches may
+    // request that niri stops processing the keyboard shortcuts defined here
+    // so they may, for example, forward the key presses as-is to a remote machine.
+    // It's a good idea to bind an escape hatch to toggle the inhibitor,
+    // so a buggy application can't hold your session hostage.
+    //
+    // The allow-inhibiting=false property can be applied to other binds as well,
+    // which ensures niri always processes them, even when an inhibitor is active.
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete { quit; }
+
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    Mod+Shift+P { power-off-monitors; }
+}
+
+
+//Enviroment to be set.
+environment {
+    DISPLAY ":0"
+    ELECTRON_OZONE_PLATFORM_HINT "auto"
+}
+
+  '';
+
+
+in
+{
+    imports = [
+       ./waybar.nix
+       ./wallpapers.nix
+       ./foot.nix
+       ./swaylock.nix
+       ./wlogout.nix
+       ./mako.nix
+       ./fcitx5.nix
+       ./fuzzel.nix
+    ];
+
+
+    home.packages = with pkgs; [
+      niri
+      wl-clipboard
+      pass-wayland
+      wev
+
+      #term
+    	foot
+
+    	wdisplays
+      swww
+
+      xwayland-satellite
+
+      #bar applets and notifications
+    	waybar
+    	networkmanagerapplet
+    	networkmanager
+    	libsForQt5.networkmanager-qt
+      
+
+      mako
+
+      swayidle
+
+      #ligth and sound
+    	brightnessctl
+    	pavucontrol
+
+      fuzzel
+
+      emote
+
+
+
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal
+      xdg-desktop-portal-wlr
+      xdg-desktop-portal-gnome
+
+
+      #fonts
+      _0xproto
+      font-awesome
+      font-awesome_5
+      font-awesome_4
+
+    ];
+
+  # Drop the interpolated KDL into ~/.config/niri/config.kdl
+  home.file.".config/niri/config.kdl" = {
+    text = niriConfig;
+  };
+}

home/gunalx/sway.nix

@@ -13,10 +13,11 @@ in
     imports = [
        ./waybar.nix
        ./foot.nix
-       ./fonts.nix
        ./fcitx5.nix
        ./kanshi.nix
        ./swaylock.nix
+       ./mako.nix
+       ./wlogout.nix
        #./assets/wallpapers
     ];
 
@@ -47,7 +48,6 @@ in
       #swaybg
       swww
 
-      wleave
 
       #bar applets and notifications
     	waybar
@@ -84,17 +84,6 @@ in
     	slurp
 
       #fonts
-      nerdfonts
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-      liberation_ttf
-      fira-code
-      fira-code-symbols
-      nerdfonts
-      ubuntu_font_family
-      zpix-pixel-font
-      _0xproto
       font-awesome
       font-awesome_5
       font-awesome_4
@@ -156,7 +145,19 @@ in {
 
       #wallpaper
       {command = "swww-daemon";}
-      {command = "while true; do for wallpaper in $WALLPAPER_DIR/*; do swww img $wallpaper; sleep 15; done; done;";}
+      {command = ''sleep 3 \
+          wallpapers=("/home/gunalx/Pictures/wallpapers"/*.{jpg,jpeg,png,gif}) \
+          transitions=(fade left right top bottom wipe wave grow center outer) \
+          i=0 \
+          while true; do \
+              img="''${wallpapers[i % ''${#wallpapers[@]}]}" \
+              trans="''${transitions[i % ''${#transitions[@]}]}" \
+              swww img "$img" --transition-type "$trans" --transition-fps 60 --transition-duration 3 \
+              ((i++)) \
+              sleep 15m \
+          done
+      '';}
+      #{command = "while true; do for wallpaper in $WALLPAPER_DIR/*; do swww img $wallpaper; sleep 15; done; done;";}
 
       #idlelock
       {command = ''swayidle \
@@ -274,7 +275,7 @@ in {
         #"ctrl+space" = "exec xkb_switch_layout next"; #TODO:verify
         "${cfg.config.modifier}+tab" = "${menu}";
         "Alt+tab" = "workspace back_and_forth";
-        "XF86PowerOff" = "exec ${pkgs.wleave}/bin/wleave";
+        "XF86PowerOff" = "exec ${pkgs.wlogout}/bin/wlogout";
         };
   };
 

home/gunalx/swaylock.nix

@@ -3,33 +3,40 @@ let
   palette = config.colorScheme.palette;
 in
 {
-  imports = [
-  ];
-
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;
     settings = {
-      color = palette.base00;
-      screenshots = true;
-      grace = 15;
-      clock = true;
-      submit-on-touch = true;
-      indicator-idle-visible = true;
-      indicator-radius = 100;
-      indicator-thickness = 7;
-      ring-color = palette.base05;
-      key-hl-color = palette.base03;
-      tect-color = palette.base00;
-      line-colot = palette.base00;
-      innside-color = palette.base04;
-      seperator-color = palette.base00;
-      fade-in = 0.1;
-      effect-scale = 0.6;
-      effect-blur = "7x3";
+      # screen & indicator
+      color                    = palette.base00;       # --color
+      screenshots              = true;                 # --screenshots
+      fade-in                  = 0.1;                  # --fade-in
+      scaling                  = "fill";               # e.g. --scaling=fill
+
+      # authentication grace
+      grace                    = 3;                   # --grace
+      submit-on-touch          = true;                 # --submit-on-touch
+
+      # clock
+      clock                    = true;                 # --clock
+
+      # indicator visuals
+      indicator-idle-visible   = true;                 # --indicator-idle-visible
+      indicator-radius         = 100;                  # --indicator-radius
+      indicator-thickness      = 7;                    # --indicator-thickness
+
+      # indicator colors
+      ring-color               = palette.base05;       # --ring-color
+      key-hl-color             = palette.base03;       # --key-hl-color
+      text-color               = palette.base00;       # --text-color
+      inside-color             = palette.base04;       # --inside-color
+      line-color               = palette.base00;       # --line-color
+      separator-color          = palette.base00;       # --separator-color
+
+      # effects
+      effect-scale             = 0.6;                  # --effect-scale
+      effect-blur              = "7x3";                # --effect-blur
     };
   };
-
-
 }
 

home/gunalx/wallpapers.nix

@@ -0,0 +1,23 @@
+{ lib, config, ... }:
+
+let
+  # Path to your source folder of wallpapers
+  wallpaperSrc = ./wallpapers;
+
+  # Read all file names in that directory
+  names = lib.attrNames (builtins.readDir wallpaperSrc);
+
+  # For each name, produce an attrset mapping
+  wallpaperFiles = map (name:
+    {
+      # quoted string keys are valid attribute names
+      "Pictures/wallpapers/${name}" = {
+        source = "${wallpaperSrc}/${name}";
+      };
+    }
+  ) names;
+in
+{
+  # Merge them all under home.file
+  home.file = lib.mkMerge wallpaperFiles;
+}

home/gunalx/waybar.nix

@@ -1,376 +1,271 @@
-{ pkgs, inputs, lib, config, nix-colors, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
+let
+  # Import Base16 palette & hex→RGB helper
+  inherit (inputs.nix-colors.lib.conversions) hexToRGBString;
+  inherit (config.colorscheme) palette;
+
+  # Build "rgba(r,g,b,a)" strings
+  toRGBA = colour: alpha:
+    let rgb = hexToRGBString "," (lib.removePrefix "#" colour);
+    in "rgba(${rgb},${alpha})";
+in
 {
-  imports = [
-  ];
-
-
-
-  programs.waybar = let
-        inherit (inputs.nix-colors.lib.conversions) hexToRGBString;
-        inherit (config.colorscheme) colors;
-        inherit (config.colorscheme) palette;
-        toRGBA = color: opacity: "rgba(${hexToRGBString "," (lib.removePrefix "#" color)},${opacity})";
-      in {
-
+  programs.waybar = {
     enable = true;
 
+    # Single-bar JSON config
+    settings = [
+      (builtins.fromJSON ''
+        {
+          "height": 36,
+          "spacing": 2,
+          "modules-left": [  "custom/overview", "custom/launcher", "sway/workspaces","niri/workspaces"],
+          "modules-center": ["niri/window"],
+          "modules-right": [
+            "idle_inhibitor","backlight","pulseaudio","keyboard-state",
+            "network","cpu","memory","temperature","battery",
+            "power-profiles-daemon","clock","tray","custom/power"
+          ],
+
+          "custom/launcher": {
+            "format": "  ",
+            "on-click": "pkill fuzzel || fuzzel"
+          },
+
+          "sway/workspaces": {
+            "format": "{index}: {name} - {icon}",
+            "format-icons": {
+              "focused":"","active":"","default":""
+            },
+            "all-outputs": false,
+            "current-only": false,
+            "persistent": true,
+            "on-click": "swaymsg workspace number {index}"
+          },
+
+          "niri/workspaces": {
+            "format": "{index}: {name} - {icon}",
+            "format-icons": {
+              "focused":"","active":"","default":""
+            },
+            "all-outputs": false,
+            "current-only": false,
+            "persistent": true,
+            "on-click": "niri msg workspace {index}"
+          },
+
+          "custom:overview": {
+            "format": "",
+            "tooltip": "Toggle Overview",
+            "on-click": "niri msg action toggle-overview"
+          },
 
 
+          "niri/window": {
+            "format": "{title}"
+          },
+
+          "idle_inhibitor": {
+            "format": "{icon}",
+            "format-icons": { "activated":"","deactivated":"" }
+          },
+
+          "backlight": {
+            "format": "{percent}% {icon}",
+            "format-icons": ["","","","","","","","",""]
+          },
+
+          "pulseaudio": {
+            "format": "{volume}% {icon}",
+            "format-muted": "",
+            "format-icons": { "default": ["","",""] },
+            "on-click": "pavucontrol"
+          },
+
+          "keyboard-state": {
+            "numlock": true,
+            "capslock": true,
+            "format": "{icon}",            
+            "format-icons": { "locked":"","unlocked":"" }
+          },
+
+          "network": {
+            "format-wifi": " {essid} ({signalStrength}%)",
+            "format-ethernet": " {ipaddr}",
+            "format-disconnected": "⚠ Disconnected",
+            "format-alt": " {ipaddr}/{cidr}",
+            "format-alt-click": "click",
+            "tooltip": true,
+            "tooltip-format-wifi": "<span color='#${palette.base0C}'></span> <span color='#${palette.base05}'>WiFi</span>\n<span color='#${palette.base0A}'>SSID:</span> <span color='#${palette.base06}'>{essid}</span>\n<span color='#${palette.base0A}'>Interface:</span> <span color='#${palette.base04}'>{ifname}</span>\n<span color='#${palette.base0A}'>IP:</span> <span color='#${palette.base06}'>{ipaddr}</span>\n<span color='#${palette.base0A}'>IPv6:</span> <span color='#${palette.base04}'>{ipaddr6}</span>\n<span color='#${palette.base0A}'>Gateway:</span> <span color='#${palette.base04}'>{gwaddr}</span>\n<span color='#${palette.base0A}'>Frequency:</span> <span color='#${palette.base04}'>{frequency} MHz</span>\n<span color='#${palette.base0A}'>Signal:</span> <span color='#${palette.base0B}'>{signalStrength}%</span> <span color='#${palette.base04}'>({signaldBm} dBm)</span>",
+
+"tooltip-format-ethernet": "<span color='#${palette.base0C}'></span> <span color='#${palette.base05}'>Ethernet</span>\n<span color='#${palette.base0A}'>Interface:</span> <span color='#${palette.base04}'>{ifname}</span>\n<span color='#${palette.base0A}'>IP:</span> <span color='#${palette.base06}'>{ipaddr}</span>\n<span color='#${palette.base0A}'>IPv6:</span> <span color='#${palette.base04}'>{ipaddr6}</span>\n<span color='#${palette.base0A}'>Gateway:</span> <span color='#${palette.base04}'>{gwaddr}</span>\n<span color='#${palette.base0A}'>Netmask:</span> <span color='#${palette.base04}'>{netmask}</span>",
+
+        "tooltip-format-disconnected": "<span color='#${palette.base08}'>⚠</span> <span color='#${palette.base08}'>No Connection</span>\n<span color='#${palette.base04}'>Click to refresh network info</span>",
+
+            "on-click": "nmcli device wifi rescan && nmcli connection show --active",
+            "on-click-right": "nmcli device status",
+            "max-length": 50
+          },
+
+          "cpu":    { "format": " {usage}%" },
+          "memory": { "format": " {used:0.1f}G" },
+
+          "temperature": {
+            "format": "{temperatureC}°C ",
+            "critical-threshold": 80
+          },
+
+          "battery": {
+            "format": "{capacity}% {icon}",
+            "format-icons": ["","","","",""],
+            "format-charging": "{capacity}% ",
+            "states": { "warning": 30, "critical": 15 }
+          },
+
+
+          "power-profiles-daemon": {
+            "format": "{icon}",
+            "tooltip-format": "Power profile: {profile}nDriver: {driver}",
+            "tooltip": true,
+            "format-icons": {
+              "default": "",
+              "performance": "",
+              "balanced": "",
+              "power-saver": ""
+            }
+          },
+
+          "clock": {
+            "format": "{:%H:%M}",
+            "format-alt": "{:%Y-%m-%d}",
+              "tooltip": true,
+              "tooltip-format": "<tt><small>{calendar}</small></tt>",
+              "calendar": {
+                "mode": "month",
+                "mode-mon-col": 3,
+                "weeks-pos": "right",
+                "on-scroll": 1,
+                "format": {
+                  "months": "<span color='#${palette.base05}'><b>{}</b></span>",
+                  "days": "<span color='#${palette.base04}'>{}</span>",
+                  "weeks": "<span color='#${palette.base0C}'><b>W{}</b></span>",
+                  "weekdays": "<span color='#${palette.base0A}'><b>{}</b></span>",
+                  "today": "<span color='#${palette.base08}'><b><u>{}</u></b></span>"
+                }
+              },
+              "actions": {
+                "on-click-right": "mode",
+                "on-scroll-up": "shift_up",
+                "on-scroll-down": "shift_down"
+            }
+          },
+
+          "tray": {
+            "spacing": 8
+          },
+
+          "custom/power": {
+            "format": "⏻",
+            "tooltip": "exit",
+            "on-click": "wlogout || wleave"
+          }
+        }
+      '')
+    ];
+
+    # CSS style for Waybar
     style = ''
-* {
-    /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;
-    font-size: 13px;
-}
+      /* Base font */
+      * { font-family: FontAwesome, Roboto, sans-serif; font-size: 13px; }
 
-window#waybar {
-    background-color: #${palette.base00};
-    border-bottom: 3px solid #${palette.base03};
-    color: ${toRGBA palette.base05 "0.7"};
-    transition-property: background-color;
-    transition-duration: .5s;
-}
+      /* Bar container */
+      window#waybar {
+        background-color: ${toRGBA palette.base00 "0.5"};
+        border-radius: 12px;
+        padding: 4px 20px;
+        border: none;
+      }
 
-window#waybar.hidden {
-    opacity: 0.2;
-}
+      /* Workspace margin */
+      #sway-workspaces,#niri-workspaces { margin-left: 12px; }
 
-/*
-window#waybar.empty {
-    background-color: transparent;
-}
-window#waybar.solo {
-    background-color: #${palette.base07};
-}
-*/
+      /* Module blocks */
+      #idle_inhibitor,#backlight,#pulseaudio,#keyboard-state,
+      #network,#cpu,#memory,#temperature,#battery,
+      #power-profiles-daemon,#clock,#tray,#custom-power,#custom-launcher,#custom-overview,#niri-window {
+        background-color: ${toRGBA palette.base01 "0.4"};
+        border-radius: 8px;
+        margin: 0 6px;
+        padding: 0 10px;
+        border: 1px solid ${toRGBA palette.base07 "0.6"};
+      }
 
-window#waybar.termite {
-    background-color: #${palette.base03};
-}
+      /* Hover effect */
+      #idle_inhibitor:hover,#backlight:hover,#pulseaudio:hover,
+      #keyboard-state:hover,#network:hover,#cpu:hover,#memory:hover,
+      #temperature:hover,#battery:hover,#power-profiles-daemon:hover,
+      #clock:hover,#tray:hover,#custom-power:hover,#custom-launcher:hover,#custom-overview:hover,#niri-window:hover {
+        background-color: ${toRGBA palette.base02 "0.5"};
+      }
 
-window#waybar.chromium {
-    background-color: #${palette.base00};
-    border: none;
-}
+      /* Tooltip styling */
+      tooltip {
+        background-color: ${toRGBA palette.base00 "0.9"};
+        border: 1px solid ${toRGBA palette.base07 "0.4"};
+        border-radius: 8px;
+        color: ${toRGBA palette.base05 "0.9"};
+        padding: 8px 12px;
+        font-size: 12px;
+      }
+      
+      tooltip label {
+        color: ${toRGBA palette.base05 "0.9"};
+      }
+      
+      #clock tooltip {
+        font-family: monospace;
+      }
+      
 
-button {
-    /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
-    /* Avoid rounded borders under each button name */
-    border: none;
-    border-radius: 0;
-}
+      /* Workspace buttons */
+      #sway-workspaces button,#niri-workspaces button {
+        padding: 0 6px;
+        background: transparent;
+        color: ${toRGBA palette.base05 "0.9"};
+        border: none;
+        border-radius: 6px;
+      }
+      #sway-workspaces button:hover,#niri-workspaces button:hover {
+        background-color: ${toRGBA palette.base02 "0.5"};
+      }
+      #sway-workspaces button.focused,#niri-workspaces button.focused {
+        background-color: ${toRGBA palette.base03 "0.6"};
+        box-shadow: inset 0 -3px ${toRGBA palette.base05 "0.8"};
+      }
+      #sway-workspaces button.urgent,#niri-workspaces button.urgent {
+        background-color: ${toRGBA palette.base08 "0.7"};
+      }
 
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-    background: inherit;
-    box-shadow: inset 0 -3px #${palette.base05};
-}
+      /* Right‐hand text color */
+      #clock,#battery,#cpu,#memory,#temperature,#backlight,
+      #network,#pulseaudio,#tray,#power-profiles-daemon,#custom-power {
+        color: ${toRGBA palette.base05 "0.9"};
+      }
 
-/* you can set a style on hover for any module like this */
-#pulseaudio:hover {
-    background-color: #${palette.base0A};
-}
-
-#workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
-    color: #${palette.base05};
-}
-
-#workspaces button:hover {
-    background: #${palette.base00};
-}
-
-#workspaces button.focused {
-    background-color: #${palette.base03};
-    box-shadow: inset 0 -3px #${palette.base05};
-}
-
-#workspaces button.urgent {
-    background-color: #${palette.base08};
-}
-
-#mode {
-    background-color: #${palette.base03};
-    box-shadow: inset 0 -3px #${palette.base05};
-}
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#wireplumber,
-#custom-media,
-#tray,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#power-profiles-daemon,
-#mpd {
-    padding: 0 10px;
-    color: #${palette.base05};
-}
-
-#window,
-#workspaces {
-    margin: 0 4px;
-}
-
-/* If workspaces is the leftmost module, omit left margin */
-.modules-left > widget:first-child > #workspaces {
-    margin-left: 0;
-}
-
-/* If workspaces is the rightmost module, omit right margin */
-.modules-right > widget:last-child > #workspaces {
-    margin-right: 0;
-}
-
-#clock {
-    background-color: #${palette.base03};
-}
-
-#battery {
-    background-color: #${palette.base05};
-    color: #${palette.base00};
-}
-
-#battery.charging, #battery.plugged {
-    color: #${palette.base05};
-    background-color: #${palette.base0B};
-}
-
-@keyframes blink {
-    to {
-        background-color: #${palette.base05};
-        color: #${palette.base00};
-    }
-}
-
-/* Using steps() instead of linear as a timing function to limit cpu usage */
-#battery.critical:not(.charging) {
-    background-color: #${palette.base08};
-    color: #${palette.base05};
-    animation-name: blink;
-    animation-duration: 0.5s;
-    animation-timing-function: steps(12);
-    animation-iteration-count: infinite;
-    animation-direction: alternate;
-}
-
-#power-profiles-daemon {
-    padding-right: 15px;
-}
-
-/*0b also looked good though.  */
-#power-profiles-daemon.performance {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#power-profiles-daemon.balanced {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#power-profiles-daemon.power-saver {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-label:focus {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#cpu {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#memory {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#disk {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#backlight {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#network {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#network.disconnected {
-    background-color: #${palette.base0E};
-    color: #${palette.base00};
-}
-
-#pulseaudio {
-    background-color: #${palette.base0A};
-    color: #${palette.base00};
-}
-
-#pulseaudio.muted {
-    background-color: #${palette.base0E};
-    color: #${palette.base03};
-}
-
-#wireplumber {
-    background-color: #${palette.base07};
-    color: #${palette.base00};
-}
-
-#wireplumber.muted {
-    background-color: #${palette.base0E};
-    color: #${palette.base00};
-}
-
-#custom-media {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-    min-width: 100px;
-}
-
-#custom-media.custom-spotify {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#custom-media.custom-vlc {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#temperature {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#temperature.critical {
-    background-color: #${palette.base0E};
-    color: #${palette.base00};
-}
-
-#tray {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-    background-color: #${palette.base07};
-    color: #${palette.base00};
-}
-
-#idle_inhibitor {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#idle_inhibitor.activated {
-    background-color: #${palette.base06};
-    color: #${palette.base00};
-}
-
-#mpd {
-    background-color: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#mpd.disconnected {
-    background-color: #${palette.base06};
-    color: #${palette.base00};
-}
-
-#mpd.stopped {
-    background-color: #${palette.base0C};
-}
-
-#mpd.paused {
-    background-color: #${palette.base0B};
-}
-
-#language {
-    background: #${palette.base04};
-    color: #${palette.base00};
-    padding: 0 5px;
-    margin: 0 5px;
-    min-width: 16px;
-}
-
-#keyboard-state {
-    background: #${palette.base04};
-    color: #${palette.base00};
-    padding: 0 0px;
-    margin: 0 5px;
-    min-width: 16px;
-}
-
-#keyboard-state > label {
-    padding: 0 5px;
-}
-
-#keyboard-state > label.locked {
-    background: #${palette.base04};
-    color: #${palette.base00};
-}
-
-#scratchpad {
-    background: #${palette.base00};
-    color: #${palette.base00};
-}
-
-#scratchpad.empty {
-    background-color: transparent;
-}
-
-#privacy {
-    padding: 0;
-    color: #${palette.base04};
-}
-
-#privacy-item {
-    color: #${palette.base00};
-    padding: 0 5px;
-}
-
-#privacy-item.screenshare {
-    background-color: #${palette.base00};
-}
-
-#privacy-item.audio-in {
-    background-color: #${palette.base0B};
-}
-
-#privacy-item.audio-out {
-    background-color: #${palette.base0D};
-}
-
-      '';
+      /* Battery critical blink */
+      @keyframes blink {
+        to {
+          background: ${toRGBA palette.base05 "0.9"};
+          color: ${toRGBA palette.base00 "1"};
+        }
+      }
+      #battery.critical:not(.charging) {
+        animation: blink 0.5s steps(12) infinite alternate;
+      }
+    '';
 
+    # Keep Waybar alive in your user session
+    systemd.enable = true;
   };
-
-
-
-
 }
-

home/gunalx/wlogout.nix

@@ -0,0 +1,69 @@
+{ pkgs
+, lib
+, inputs
+, config
+, nix-colors
+, ...
+}:
+
+let
+  # Grab your palette and the hex→RGBA helper
+  palette   = config.colorscheme.palette;
+  toRGBA    = color: alpha:
+    let rgb = nix-colors.lib.conversions.hexToRGBString "," (lib.removePrefix "#" color);
+    in "rgba(${rgb},${alpha})";
+
+  # Path to the wleave-provided icons
+  iconsDir  = "${pkgs.wleave}/share/wleave/icons";
+in
+
+{
+  programs.wlogout = {
+    enable  = true;
+    package = pkgs.wlogout;
+
+    # Your button layout
+    layout = [
+      { label = "lock";      action = "swaylock";                       text = "Lock";      keybind = "l"; }
+      { label = "hibernate"; action = "systemctl hibernate";           text = "Hibernate"; keybind = "h"; }
+      { label = "logout";    action = "loginctl terminate-user $USER"; text = "Logout";    keybind = "e"; }
+      { label = "shutdown";  action = "systemctl poweroff";             text = "Shutdown";  keybind = "s"; }
+      { label = "suspend";   action = "systemctl suspend";              text = "Suspend";   keybind = "u"; }
+      { label = "reboot";    action = "systemctl reboot";               text = "Reboot";    keybind = "r"; }
+    ];
+
+    style = ''
+      * { background-image: none; }
+
+      window {
+        background-color: ${toRGBA palette.base00 "0.7"};
+      }
+
+      button {
+        color:            #${palette.base0C};
+        background-color: ${toRGBA palette.base02 "0.8"};
+        border:           2px solid #${palette.base0C};
+        border-radius:    1em;
+        margin:           0.75em;
+        background-repeat: no-repeat;
+        background-position: center;
+        box-shadow:       0 0 4px #${palette.base0C};
+        padding:          0.6em 1.2em;
+      }
+
+      button:focus,
+      button:active {
+        background-color: ${toRGBA palette.base03 "0.9"};
+        box-shadow:       0 0 6px #${palette.base0C};
+        outline:          none;
+      }
+
+      #lock      { background-image: image(url("${iconsDir}/lock.svg")); }
+      #logout    { background-image: image(url("${iconsDir}/logout.svg")); }
+      #suspend   { background-image: image(url("${iconsDir}/suspend.svg")); }
+      #hibernate { background-image: image(url("${iconsDir}/hibernate.svg")); }
+      #shutdown  { background-image: image(url("${iconsDir}/shutdown.svg")); }
+      #reboot    { background-image: image(url("${iconsDir}/reboot.svg")); }
+    '';
+  };
+}

home/root/base.nix

@@ -2,19 +2,14 @@
 {
   imports = [
     ../common/sshconfig.nix
-    ../common/unfree.nix
+    ../common/nix.nix
+    ../common/atuin.nix
   ];
 
   programs.nix-index = {
     enable = true;
   };
   
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      allowUnfreePredicate = (_: true);
-    };
-  };
 
   programs.bash = {
     enable = true;

home/root/fonts.nix

@@ -1,33 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  
-    home.packages = with pkgs; [
-        nerdfonts
-        noto-fonts
-        noto-fonts-cjk
-        noto-fonts-emoji
-        liberation_ttf
-        fira-code
-        fira-code-symbols
-        nerdfonts
-        ubuntu_font_family
-        zpix-pixel-font
-        _0xproto
-        font-awesome
-        font-awesome_5
-        font-awesome_4
-
-    ];
-
-  fonts.fontconfig.enable = true;
-  fonts.fontconfig.defaultFonts = {
-      emoji = ["noto-fonts-emoji font-awesome"];
-      monospace = ["0xproto" "zpix" "fira-code"];
-      serif = [ "Noto Serif" "Source Han Serif" ];
-      sansSerif = [ "Noto Sans" "Source Han Sans" ];
-  };
-
- 
-
-}
-

machines/aragon/configuration.nix

@@ -20,6 +20,7 @@
 	#customised applications
 	../../services/podman.nix
 	../../services/boinc.nix
+	../../services/ollama-amd.nix
     ];
 
   # Bootloader.
@@ -53,15 +54,7 @@
   # Enable the X11 windowing system.
   services.xserver.enable = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-opencl-runtime
-    amdvlk
-  ];
   
-  hardware.opengl.driSupport = true;
-  # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
 
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
@@ -70,7 +63,7 @@
   users.users.gunalx = {
     isNormalUser = true;
     description = "Adrian Gunnar Lauterer";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = [ "networkmanager" "wheel" "input" ];
     packages = with pkgs; [
     ];
   };
@@ -97,7 +90,7 @@
     
 
     #basic programming
-    kate
+    kdePackages.kate
     vscode-fhs
     gcc
     gpp
@@ -124,7 +117,7 @@
     ollama
     rpi-imager
     prismlauncher
-    cura
+    #cura #seems broken dependencies.
     prusa-slicer
     openscad
 

machines/aragon/hardware-configuration.nix

@@ -13,24 +13,48 @@
 
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
+
+  hardware.amdgpu.opencl.enable = true;
+  hardware.amdgpu.amdvlk.enable = true;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   
+  hardware.graphics = {
+    enable = true;
+  };
+
   services.xserver.videoDrivers = [ "amdgpu" ];
   systemd.tmpfiles.rules = [
     "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
   ];
-  hardware.opengl.extraPackages = with pkgs; [
-    rocmPackages.clr.icd
-    #amdvlk
-    libva-utils
-  ];
 
+  nixpkgs.config.rocmSupport = true;
+  
+  environment.variables = {
+    HSA_OVERRIDE_GFX_VERSION="10.3.0";
+
+  };
+
+  
   #hardware.opengl.extraPackages32 = with pkgs; [
   #  driversi686Linux.amdvlk
   #];
 
-  hardware.opengl.driSupport = true; # This is already enabled by default
-  hardware.opengl.driSupport32Bit = true; # For 32 bit applications
-  
+environment.systemPackages = with pkgs; [ 
+  lact 
+  rocmPackages.rocminfo
+  rocmPackages.rocm-smi
+  rocmPackages.rocm-runtime
+  rocmPackages.rocm-device-libs
+  rocmPackages.rocm-core
+  rocmPackages.rocm-cmake
+  rocmPackages.rocgdb
+  rocmPackages.rocblas
+  rocmPackages.rccl
+
+
+];
+systemd.packages = with pkgs; [ lact ];
+systemd.services.lactd.wantedBy = ["multi-user.target"];
 
 
   fileSystems."/" =

machines/elrond/configuration.nix

@@ -37,7 +37,6 @@
     wget
     tailscale
     config.services.headscale.package
-    kanidm
   ];
 
   users.users.gunalx = { # Define a user account. Don't forget to set a password with ‘passwd’.

machines/galadriel/configuration.nix

@@ -19,7 +19,7 @@
       ../../profiles/mediaserver.nix
 
       #../../services/smb.nix
-      ../../services/wordpress.nix
+      #../../services/wordpress.nix # lets not
       ../../services/torrent.nix
       #../../services/ozai.nix
       #../../services/stableDiffusion.nix

machines/galadriel/nvidia.nix

@@ -10,6 +10,10 @@
     allowUnfree = true;
     cudaSupport = true;
   };
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    "cuda_cudart"
+  ];
   
   # Load nvidia driver for Xorg and Wayland
   services.xserver.videoDrivers = ["nvidia"];
@@ -38,9 +42,9 @@
       cudaPackages.cudatoolkit
       cudaPackages.cudnn
       nvtopPackages.nvidia
-      gcc
+      #gcc
       cudaPackages.nccl
-      cmake
+      #cmake
       #llama-cpp
       #python3Packages.pip
       #cudaPackages.cuda_cudart
@@ -54,8 +58,5 @@
       
     ];
 
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-      "cuda_cudart"
-    ];
 
 }

profiles/base.nix

@@ -1,4 +1,7 @@
 { config, pkgs, lib, ... }:
+let
+  mkDefault =  lib.mkDefault;
+in
 {
 imports =
     [ 
@@ -23,12 +26,15 @@ imports =
       foot.terminfo
       tailscale
       sops
+      atuin
+      upower
+      nvtopPackages.full
     ];
 
   #just allow unfree, im fine with it. 
   nixpkgs.config.allowUnfree = true; 
 
-  zramSwap = {
+  zramSwap = mkDefault {
     enable = true;
     memoryPercent = 25;
   };
@@ -41,7 +47,7 @@ imports =
   i18n.defaultLocale = "en_US.UTF-8";
 
   # Configure console
-  console = {
+  console = mkDefault {
     font = "Lat2-Terminus16";
     keyMap = "no";
   };
@@ -68,19 +74,59 @@ imports =
       dc="cd";
       la="ls -la";
       lls="ls"; 
-  };
-  environment.interactiveShellInit = ''
-    alias gst='git status'
-    alias gcm='git commit -m'
-    alias gca='git commit --amend'
-    alias gsw='git switch'
-    alias gaa='git add -A'
-    alias gb='git branch'
-    alias dc='cd'
-    alias la='ls -la'
-    alias lls='ls'
+      battery="upower -i $(upower -e | grep 'BAT') | grep -E 'state|to full|percentage'";
+      cim="vim";
+      cbuild="mkdir build && cd build && cmake .. && make";
+      untar="tar -xvf";
+    };
+
+
+    environment.interactiveShellInit = ''
+    #atuin import auto
+        
+    # Colors
+    RESET='\[\e[0m\]'
+    BOLD='\[\e[1m\]'
+    CYAN='\[\e[36m\]'
+    GREEN='\[\e[32m\]'
+    BLUE='\[\e[34m\]'
+    YELLOW='\[\e[33m\]'
+    MAGENTA='\[\e[35m\]'
+    RED='\[\e[31m\]'
+
+    if [[ -n "$SSH_CONNECTION" ]]; then
+      REMOTE_LABEL="\[''${YELLOW}\] (ssh)\[''${RESET}\]"
+    else
+      REMOTE_LABEL=""
+    fi
+    
+    # Git branch function
+    parse_git_branch() {
+        git branch --show-current 2>/dev/null | awk '{print " (" $1 ")"}'
+    }
+    
+    
+    # Set prompt
+    if [[ $EUID -eq 0 ]]; then
+        PS1="''${BOLD}''${RED}\u''${RESET}:''${BOLD}''${RED}\h''${REMOTE_LABEL}''${RESET}:''${BOLD}''${GREEN}\w''${MAGENTA}\$(parse_git_branch) ''${BLUE}\A''${RESET}\$ "
+    else
+        PS1="''${BOLD}''${CYAN}\u''${RESET}:''${BOLD}''${CYAN}\h''${REMOTE_LABEL}''${RESET}:''${BOLD}''${GREEN}\w''${MAGENTA}\$(parse_git_branch) ''${BLUE}\A''${RESET}\$ "
+    fi
   '';
 
+
+#  environment.interactiveShellInit = ''
+#    alias gst='git status'
+#    alias gcm='git commit -m'
+#    alias gca='git commit --amend'
+#    alias gsw='git switch'
+#    alias gaa='git add -A'
+#    alias gb='git branch'
+#    alias dc='cd'
+#    alias la='ls -la'
+#    alias lls='ls'
+#  '';
+#
   
   ## some insecure packages
   nixpkgs.config.permittedInsecurePackages = [
@@ -94,9 +140,9 @@ imports =
   };
 
   #nix stuff
-  nix.gc.automatic = true;
+  nix.gc.automatic = mkDefault true;
   nix = {
-    extraOptions = ''
+    extraOptions = mkDefault ''
 	    builders-use-substitutes = true
 	    experimental-features = nix-command flakes impure-derivations ca-derivations
       !include ${config.sops.secrets."github/api".path}
@@ -123,13 +169,7 @@ imports =
   };
 
   buildMachines = [
-	#    { hostName = "bob.pvv.ntnu.no";
-	#      system = "x86_64-linux";
-	#      maxJobs = 12;
-	#      supportedFeatures = [ "big-parallel" ];
-	#      speedFactor = 129270;
-	#    }
-	    { hostName = "bolle.pbsds.net";
+      { hostName = "bolle.pbsds.net";
 	      system = "x86_64-linux";
 	      maxJobs = 6;
 	      speedFactor = 12857;
@@ -139,6 +179,14 @@ imports =
 	      maxJobs = 4;
 	      # i7-6700
 	      speedFactor = 8088;
+      }
+      { hostName = "localhost";
+	      system = "x86_64-linux";
+	      maxJobs = 4;
+	      #speedFactor = 8066;
+	      speedFactor = 8000;
+	      supportedFeatures = [ ];
+	      mandatoryFeatures = [ ];
 	    }
 	    { hostName = "aragon";
 	      system = "x86_64-linux";
@@ -176,9 +224,8 @@ imports =
     enable = true;
     flake = "git+https://github.com/adrlau/nix-dotfiles.git";
     flags = [
-      "--update-input" "nixpkgs"
-      "--update-input" "nixpkgs-unstable"
       "--no-write-lock-file"
+      "-L"
     ];
   };
   

profiles/desktop.nix

@@ -13,21 +13,27 @@ imports =
 
     ];
 
-  environment.systemPackages = with pkgs; [
-    openscad
-    cura
+    environment.systemPackages = with pkgs; [
+      libnotify
+      openscad
+      
+      #cura # broken
+      prusa-slicer
 
-    #libsForQt5.qt5ct
-    #qt6Packages.qt6ct
-    where-is-my-sddm-theme
-    
-    swww
+      #libsForQt5.qt5ct
+      #qt6Packages.qt6ct
+      where-is-my-sddm-theme
+      
+      swww
 
   ];
 
   fonts.packages = with pkgs; [
+    nerd-fonts._0xproto
+    _0xproto
+
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-emoji
     liberation_ttf
     fira-code
@@ -35,10 +41,11 @@ imports =
     mplus-outline-fonts.githubRelease
     dina-font
     proggyfonts
-    nerdfonts
+    #nerdfonts
     ubuntu_font_family
 
-  ];
+  ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
+
 
   # Enable CUPS to print documents.
   services.printing.enable = false; #temp off because of CVE
@@ -52,26 +59,16 @@ imports =
 #security.pam.services.display-manager.ly = {};
   services.displayManager = {
     enable = true;
-    sessionPackages = with pkgs; [ sway ];
+    sessionPackages = with pkgs; [ sway niri];
 
     sddm = {
       enable = true;
       autoNumlock = true;
     };
 
-    ### still really broken and neds 24.11
-    #ly = {
-    #  package = pkgs.unstable.ly;
-    #  enable = true;
-    #  settings = {
-    #    animation = "matrix";
-    #    waylandsessions = "${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"; 
-    #  };
-
-    #};
-    
   };
 
+  services.power-profiles-daemon.enable = true;
 
   services.logind.powerKey = "ignore";
 

profiles/development.nix

@@ -8,6 +8,15 @@ imports =
     ];
 
   environment.systemPackages = with pkgs; [
+    zed-editor-fhs
+    aider-chat
+
+    python3Full
+    uv
+    python3Packages.pip
+    python3Packages.uv
+    poetry
+    
 
 
     texliveFull

profiles/mediaserver.nix

@@ -3,7 +3,7 @@
     imports =
         [ 
           ./base.nix
-          ../services/podgrab.nix
+          #../services/podgrab.nix # not maintained
           ../services/jellyfin.nix
         ];
     

profiles/sound.nix

@@ -7,8 +7,7 @@ imports =
     ];
 
 
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
@@ -35,7 +34,7 @@ imports =
     vital
     picoloop
     #bespokesynth-with-vst2 #always takes ages compiling
-    fmsynth
+    #fmsynth
     polyphone #soundfont editor
 
     #vocaloids
@@ -61,7 +60,8 @@ imports =
     headset
     nuclear
     spotifyd
-    spotify-qt
+    spotify-player
+    spotify
     spotify-tray
 
     tenacity

profiles/sway.nix

@@ -41,7 +41,7 @@ imports =
 	workstyle
 	#swayest-workstyle #migth switch to this.
 	autotiling-rs
-	wleave	
+	wlogout	
 	
 	pass-wayland
 
@@ -49,7 +49,7 @@ imports =
 
   fonts.packages = with pkgs; [
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-emoji
     liberation_ttf
     fira-code

services/ollama-amd.nix

@@ -0,0 +1,54 @@
+{ config, pkgs, lib, ... }:
+
+{
+  # Add Ollama to system packages
+  environment.systemPackages = [ pkgs.unstable.ollama ];
+
+  # Ollama configuration
+  services.ollama = {
+    enable = true;
+    package = pkgs.unstable.ollama;
+    host = "0.0.0.0";
+    openFirewall = true;
+    port = 11434;
+    home = "/var/lib/ollama";
+
+    # Preloaded models
+    loadModels = [
+      "gemma3:1b"
+      "qwen3:8b"
+      "qwen3:0.6b"
+      "llama3.1"
+      "moondream"
+      "minicpm-v"
+      "qwen2.5vl:3b"
+      "gemma3:4b"
+      "granite3.2-vision"
+      "zylonai/multilingual-e5-large"
+      "nomic-embed-text"
+      "snowflake-arctic-embed2"
+    ];
+
+    # Environment variables based on hostname
+    environmentVariables = {
+      "HIP_VISIBLE_DEVICES" = "0,1";
+      "OLLAMA_LLM_LIBRARY" = "rocm";
+    };
+
+    rocmOverrideGfx = "10.3.0"; #rdna2
+
+    # Acceleration settings
+    acceleration = "rocm";
+
+  };
+
+  # NGINX reverse proxy configuration
+  services.nginx.virtualHosts."ollama.${config.networking.hostName}.${config.networking.domain}" = {
+    forceSSL = true;
+    locations."/" = {
+      proxyWebsockets = true;
+      proxyPass = "http://${config.services.ollama.listenAddress}";
+    };
+    basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
+  };
+}

services/ollama.nix

@@ -1,54 +1,48 @@
 { config, pkgs, lib, ... }:
+
+let
+  hostname = config.networking.hostName;
+in
+
 {
-  environment.systemPackages = [
-    pkgs.unstable.ollama
-  ];
+  # Add Ollama to system packages
+  environment.systemPackages = [ pkgs.unstable.ollama ];
 
+  # Ollama configuration
   services.ollama = {
-      enable = true;
-      package = pkgs.unstable.ollama;
-      host = "0.0.0.0";
-      openFirewall = true;
-      port = 11434;
-      home = "/var/lib/ollama";
+    enable = true;
+    package = pkgs.unstable.ollama;
+    host = "0.0.0.0";
+    openFirewall = true;
+    port = 11434;
+    home = "/var/lib/ollama";
 
-      loadModels = [
-        "llama3.2"
-        "gemma2:2b"
-        "qwen2.5:3b"
+    # Preloaded models
+    loadModels = [
+      "gemma3:1b"
+      "qwen3:8b"
+      "qwen3:0.6b"
+      "llama3.1"
+      "moondream"
+      "minicpm-v"
+      "qwen2.5vl:3b"
+      "gemma3:4b"
+      "granite3.2-vision"
+      "zylonai/multilingual-e5-large"
+      "nomic-embed-text"
+      "snowflake-arctic-embed2"
+    ];
 
-        "llama3.2-vision"
-        "llava-phi3"
-        "llava-llama3"
-        "moondream"
-        "minicpm-v"
+    # Acceleration settings
+    acceleration = "cuda"; 
 
-        "llama3.1"
-        "mistral-nemo"
-        "phi4"
-
-        "zylonai/multilingual-e5-large"
-        "nomic-embed-text"
-        "snowflake-arctic-embed"
-        
-      ];
-  };
-
-  #possibly a flawed idea, should just set cudaSupport and rocm support.
-  services.ollama.acceleration = lib.mkDefault (  let
-                                                    hostname = config.networking.hostName;
-                                                  in
-                                                    if hostname == "galadriel" then "cuda"
-                                                    else if hostname == "aragorn" then "rocm"
-                                                    else null);
-  
+  # NGINX reverse proxy configuration
   services.nginx.virtualHosts."ollama.${config.networking.hostName}.${config.networking.domain}" = {
-      forceSSL = true;
-      #useACMEHost = config.networking.domain; #not sure if this will work, unless
-      locations."/" = {
-        proxyWebsockets = true;
-        proxyPass = "http://${config.services.ollama.listenAddress}";
-      };
-      basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
+    forceSSL = true;
+    locations."/" = {
+      proxyWebsockets = true;
+      proxyPass = "http://${config.services.ollama.listenAddress}";
+    };
+    basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
   };
 }

services/ollamaWebui.nix

@@ -4,13 +4,16 @@
     pkgs.unstable.open-webui
     pkgs.gvisor
     pkgs.bash
+    pkgs.unstable.tika
 
   ];
 
   services.tika = {
     enable=true;
+    package = pkgs.unstable.tika;
     openFirewall=true;
-    listenAddress = "localhost";
+    listenAddress = "0.0.0.0";
+    port  = 9998;
     enableOcr = true;
   };
   
@@ -26,7 +29,6 @@
       ANONYMIZED_TELEMETRY = "False";
       DO_NOT_TRACK = "True";
       SCARF_NO_ANALYTICS = "True";
-      PDF_EXTRACT_IMAGES = "False";
     };
 
   };