.

11 files changed, 728 insertions, 132 deletions

diff --git a/backup-nix/configuration.nix b/backup-nix/configuration.nix
new file mode 100644
index 0000000..760c077
--- /dev/null
+++ b/backup-nix/configuration.nix
@@ -0,0 +1,453 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  # =========================================================================
+  # IMPORTS & NIX CONFIGURATION
+  # =========================================================================
+  imports = [
+    ./hardware-configuration.nix
+    inputs.noctalia-greeter.nixosModules.default
+  ];
+
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nixpkgs.config.allowUnfree = true;
+
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 7d";
+  };
+
+  # Dynamic binary execution & FHS compatibility
+  programs.nix-ld.enable = true;
+  services.envfs.enable = true;
+  security.polkit.enable = true;
+  
+  # =========================================================================
+  # BOOT & KERNEL CONFIGURATION
+  # =========================================================================
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+#  boot.kernelParams = [
+#    "drm.edid_firmware=DP-1:edid/mi_edid.bin"
+#    "video=DP-1:2560x1440@180"
+#  ];
+
+  # Custom EDID firmware loading for monitor
+  hardware.firmware = [
+    (pkgs.runCommand "custom-edid" {} ''
+      mkdir -p $out/lib/firmware/edid
+      cp ${./mi_edid.bin} $out/lib/firmware/edid/mi_edid.bin
+    '')
+  ];
+
+  # =========================================================================
+  # HARDWARE, FILESYSTEMS & GRAPHICS
+  # =========================================================================
+  fileSystems."/mnt/giga" = {
+    device = "/dev/disk/by-uuid/bfed3a37-05e1-465b-a4b7-d74cd31bf937";
+    fsType = "ext4";
+    options = [ "defaults" "user" "rw" ];
+  };
+
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = false;
+    open = false;
+    nvidiaSettings = true;
+    package = config.boot.kernelPackages.nvidiaPackages.latest;
+  };
+
+  # Appimage settings
+  programs.appimage = {
+    enable = true;
+    binfmt = true;
+    package = pkgs.appimage-run.override {
+      extraPkgs = pkgs: [
+        pkgs.webkitgtk_4_1
+      ];
+    };
+  };
+
+  # =========================================================================
+  # NETWORKING, DNS & VPN
+  # =========================================================================
+  networking.hostName = "opus";
+  networking.networkmanager.enable = true;
+  programs.amnezia-vpn.enable = true;
+  # Primary DNS Server: Mullvad DoT (Base Mode)
+  networking.nameservers = [
+    "194.242.2.4#base.dns.mullvad.net"
+    "194.242.2.2#dns.mullvad.net"
+  ];
+
+  # systemd-resolved Configuration (Mullvad Base Primary -> Quad9 Fallback)
+  services.resolved = {
+    enable = true;
+    dnsovertls = "opportunistic"; # Encrypts DNS via DoT, falls back if port 853 is blocked
+    dnssec = "false";             # Disables DNSSEC validation drops
+    domains = [ "~." ];           # Forces systemd-resolved to use global DNS, ignoring DHCP DNS
+    fallbackDns = [
+      "9.9.9.9#dns.quad9.net"
+      "149.112.112.112#dns.quad9.net"
+    ];
+  };
+
+
+  # Avahi (Printer / Network Discovery)
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+
+  # =========================================================================
+  # LOCALIZATION & TIMEZONE
+  # =========================================================================
+  time.timeZone = "Etc/GMT-7";
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # =========================================================================
+  # USER ACCOUNTS & PRIVILEGES
+  # =========================================================================
+  users.users."seraphim" = {
+    isNormalUser = true;
+    description = "seraphim";
+    shell = pkgs.fish; # Sets Fish as your default user shell
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [];
+  };
+
+  security.doas = {
+    enable = true;
+    extraRules = [
+      {
+        users = [ "seraphim" ];
+        keepEnv = true;
+        persist = true;
+      }
+    ];
+  };
+
+  # =========================================================================
+  # SHELLS & ENHANCEMENTS
+  # =========================================================================
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set -g fish_greeting "" # Disables the welcome message
+      fzf --fish |
+      source
+    '';
+    shellAliases = {
+      ls = "eza -al --icons=auto";
+      ll = "eza -al --icons=auto";
+    };
+  };
+
+  programs.starship.enable = true;
+
+  # =========================================================================
+  # DISPLAY, WAYLAND & DESKTOP ENVIRONMENT
+  # =========================================================================
+  programs.niri.enable = true;
+  programs.noctalia-greeter = {
+    enable = true;
+    settings = {
+      cursor = {
+        theme = "Bibata-Modern-Ice";
+        size = 24;
+        path = "${pkgs.bibata-cursors}/share/icons";
+      };
+    };
+  };
+
+  qt = {
+    enable = true;
+    platformTheme = "qt5ct";
+    style = "breeze";
+  };
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gnome
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+
+  # Environment Variables
+  environment.variables = {
+    SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
+    NIX_SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
+  };
+
+  environment.sessionVariables = {
+    SHELL = "${pkgs.fish}/bin/fish";
+    LIBVA_DRIVER_NAME = "nvidia";
+    XCURSOR_THEME = "Bibata-Modern-Ice";
+    XCURSOR_SIZE = "20";
+    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
+    NIXOS_OZONE_WL = "1";
+    CC = "clang";
+    ELECTRON_OZONE_PLATFORM_HINT = "auto";
+    GSK_RENDERER = "ngl";
+    QT_QPA_PLATFORM = "wayland;xcb";
+    QT_ENABLE_HIGHDPI_SCALING = "1";
+    QT_AUTO_SCREEN_SCALE_FACTOR = "1";
+    QT_SCREEN_SCALE_FACTORS = "1.5";
+  };
+
+  # Fonts Configuration
+  fonts.fontconfig.enable = true;
+  fonts.packages = with pkgs; [
+    font-awesome
+    nerd-fonts.jetbrains-mono
+    nerd-fonts.symbols-only
+    jetbrains-mono
+    noto-fonts-color-emoji
+  ];
+
+  # =========================================================================
+  # AUDIO & SERVICES
+  # =========================================================================
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+  # printer service
+  services.printing = {
+    enable = true;
+    drivers = with pkgs; [
+      brlaser
+      cups-filters
+      gutenprint
+    ];
+  };
+
+  # MPD Music Server
+  services.mpd = {
+    enable = true;
+    user = "seraphim";
+    openFirewall = false;
+    settings = {
+      music_directory = "/mnt/giga/music";
+      bind_to_address = "any";
+      port = 6600;
+      auto_update = "yes";
+      audio_output = [
+        {
+          type = "pulse";
+          name = "PipeWire Output";
+          mixer_type = "hardware";
+        }
+      ];
+    };
+  };
+
+  systemd.services.mpd.environment = {
+    XDG_RUNTIME_DIR = "/run/user/1000";
+  };
+
+  # System Utilities & Gaming
+  services.gvfs.enable = true;
+  services.tumbler.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+  programs.dconf.enable = true;
+
+  services.journald.extraConfig = ''
+    SystemMaxUse=50M
+    MaxRetentionSec=1month
+  '';
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+  };
+
+  programs.throne = {
+    enable = true;
+    tunMode.enable = true;
+  };
+
+  # =========================================================================
+  # USER SERVICES
+  # =========================================================================
+  systemd.user.services.swingmusic = {
+    description = "Swing Music Local Server";
+    wantedBy = [ "graphical-session.target" ];
+    after = [ "graphical-session.target" ];
+    serviceConfig = {
+      ExecStart = "/home/seraphim/.swingmusic/swingmusic";
+      Restart = "on-failure";
+      WorkingDirectory = "/home/seraphim";
+      NoNewPrivileges = true;
+      PrivateTmp = true;
+      ProtectSystem = "strict";
+      ProtectHome = "false";
+      RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+    };
+  };
+
+  systemd.user.services.mpd-mpris = {
+    description = "MPD MPRIS Service for Waybar";
+    wantedBy = [ "default.target" ];
+    after = [ "graphical-session.target" ];
+    serviceConfig = {
+      ExecStart = "${pkgs.mpd-mpris}/bin/mpd-mpris -network tcp -host 127.0.0.1 -port 6600";
+      Restart = "on-failure";
+    };
+  };
+
+  systemd.user.services.niri.enableDefaultPath = false;
+
+  # =========================================================================
+  # SYSTEM PACKAGES
+  # =========================================================================
+  environment.systemPackages = with pkgs;
+  [
+    # Flake Inputs & Hardware Overrides
+    inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
+    (btop.override { cudaSupport = true; })
+
+    # Terminals & CLI Utilities
+    cacert
+    tree
+    pkgs.libsixel
+    libGL
+    nss
+    cups
+    libdrm
+    glib
+    pango
+    gtk3
+    zlib
+    expat
+    alsa-lib
+    libxkbcommon
+    atk
+    pkg-config
+    cmake
+
+    nftables
+    pkgs.rsync
+    duf
+    eza
+    fastfetch
+    fd
+    foot
+    fzf
+    ghfetch
+    ghostty
+    hyfetch
+    stow
+    util-linux
+    pkgs.vimPlugins.im-select-nvim
+
+    # Audio & Music Controls
+    brightnessctl
+    mpc
+    mpd
+    mpd-mpris
+    mpv
+    pamixer
+    pavucontrol
+    playerctl
+    rmpc
+
+    # Text Editors
+    micro
+    neovim
+    (emacs.override {
+      withNativeCompilation = true;
+    })
+
+    # File Managers & Archiving
+    file-roller
+    kdePackages.ark
+    kdePackages.qt6ct
+    loupe
+    nautilus
+    sushi
+    yazi
+
+    # Utilities & Disk Tools
+    caligula
+    cryptsetup
+    yt-dlp
+
+    # GStreamer Codecs
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
+
+    # Wayland, Desktop UI & Utilities
+    adwaita-icon-theme
+    bibata-cursors
+    cliphist
+    fuzzel
+    grim
+    hicolor-icon-theme
+    hyprpolkitagent
+    noctalia-shell
+    slurp
+    wl-clipboard
+    wtype
+    xwayland-satellite
+
+    # Desktop Applications & Office
+    claude-code
+    keepassxc
+    libreoffice
+    hunspellDicts.ru_RU
+    nvidia-vaapi-driver
+    opencode
+    pkgs.ayugram-desktop
+    pkgs.legcord
+    pkgs.amnezia-vpn
+    obsidian
+    pkgs.lutris
+    pkgs.qbittorrent
+    pkgs.prismlauncher
+    pkgs.wireshark
+    # Software Development & Toolchains
+    black
+    cargo
+    clang
+    clippy
+    gcc
+    git
+    gnumake
+    nodejs
+    pyright
+    python3
+    rust-analyzer
+    rustc
+    tree-sitter
+  ];
+
+  system.stateVersion = "26.05";
+}
diff --git a/backup-nix/flake.lock b/backup-nix/flake.lock
new file mode 100644
index 0000000..ff02820
--- /dev/null
+++ b/backup-nix/flake.lock
@@ -0,0 +1,80 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1784796856,
+        "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e2587caef70cea85dd97d7daab492899902dbf5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1784356753,
+        "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=",
+        "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1784974993,
+        "narHash": "sha256-RmVxiI/YkZigIB5uBuMZqdjaABtiyPejT+JEFAC8ras=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia",
+        "rev": "89ad48e73af8ad4e8b42707912b12833443d819c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia",
+        "type": "github"
+      }
+    },
+    "noctalia-greeter": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1784707224,
+        "narHash": "sha256-K8yyxX/sShhVznU/3ejZgriayg8Fyac+bR4dCTB1864=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-greeter",
+        "rev": "8e53bb30f1d1179c0bd2275b02915258827d62eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-greeter",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "noctalia": "noctalia",
+        "noctalia-greeter": "noctalia-greeter"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/backup-nix/flake.nix b/backup-nix/flake.nix
new file mode 100644
index 0000000..f5f5b35
--- /dev/null
+++ b/backup-nix/flake.nix
@@ -0,0 +1,26 @@
+{
+  description = "Noctalia shell conf";
+
+  inputs = {
+    # Main tree
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    # Noctalia v5
+    noctalia.url = "github:noctalia-dev/noctalia";
+    noctalia-greeter = {
+      url = "github:noctalia-dev/noctalia-greeter";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+  };
+
+  outputs = { self, nixpkgs, noctalia, ... }@inputs: {
+    nixosConfigurations.opus = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; }; 
+      modules = [
+        ./configuration.nix
+      ];
+    };
+  };
+}
diff --git a/backup-nix/hardware-configuration.nix b/backup-nix/hardware-configuration.nix
new file mode 100644
index 0000000..5163270
--- /dev/null
+++ b/backup-nix/hardware-configuration.nix
@@ -0,0 +1,33 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/363e0f04-0494-4bf5-96e7-33326d8b8a5c";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/DD1F-3DEF";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/75ef05e5-75fb-4c5c-9a4d-e5e50f4b6438"; }
+    ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/backup-nix/mi_edid.bin b/backup-nix/mi_edid.bin
new file mode 100644
index 0000000..98a9522
--- /dev/null
+++ b/backup-nix/mi_edid.bin
diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index 3514782..635096f 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -1,5 +1,3 @@
-
-
 ;; Place your private configuration here! Remember, you do not need to run 'doom
 ;; sync' after modifying this file!
 
@@ -42,7 +40,6 @@
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/org/")
-(pixel-scroll-precision-mode 1)
 
 ;; Whenever you reconfigure a package, make sure to wrap your config in an
 ;; `with-eval-after-load' block, otherwise Doom's defaults may override your
@@ -80,19 +77,26 @@
       org-gcal-client-secret "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"
       org-gcal-fetch-file-alist '(("maksimkokh6@gmail.com" . "~/org/gcal.org")))
 (setq org-agenda-files '("~/org/gcal.org"))
-(pixel-scroll-precision-mode -1)
+
 ;; Scroll fixing, 'cause it's broken a little bit.
 (setq inhibit-compacting-font-caches t)
 (setq scroll-conservatively 101 ;
       scroll-margin 0
       auto-window-vscroll nil)
+
+;; Prevent PGTK 100% CPU core spinning on Wayland
+;; Changed from nil to 0.001 to stop the event loop from going crazy
 (when (boundp 'pgtk-wait-for-event-timeout)
-  (setq pgtk-wait-for-event-timeout nil))
-;; Smooth scrolling without CPU spikes
+  (setq pgtk-wait-for-event-timeout 0.01))
+
+;; Scroll settings (Consolidated)
+;; Smooth scrolling is currently disabled to save CPU on your 180Hz monitor. 
+;; If you want smooth scrolling back, change -1 to 1 and change nil to t below.
+(pixel-scroll-precision-mode -1)
 (setq pixel-scroll-precision-mode nil)
 
 ;; Reduce redraw frequency
 (setq redisplay-dont-pause t
       fast-but-imprecise-scrolling t)
-(setq gc-cons-threshold 100000000)
+;; (setq gc-cons-threshold 100000000)
 (setq read-process-output-max (* 1024 1024)) ; 1MB
diff --git a/doom/.config/doom/themes/noctalia-theme.el b/doom/.config/doom/themes/noctalia-theme.el
index 8a7cbf8..99e6d3e 100644
--- a/doom/.config/doom/themes/noctalia-theme.el
+++ b/doom/.config/doom/themes/noctalia-theme.el
@@ -21,75 +21,75 @@
 (deftheme noctalia "Theme using Template variables with quality of life improvements.")
 
 ;; Define all the color variables (replaced by template processor)
-(let* ((bg "#fbfaf1")
-      (err "#ba1a1a")
-      (err-container "#ffdad6")
-      (on-background "#1b1c17")
-      (on-err "#ffffff")
-      (on-err-container "#93000a")
-      (on-primary "#ffffff")
-      (on-primary-container "#fffff4")
-      (on-secondary "#ffffff")
-      (on-secondary-container "#5e684d")
-      (on-surface "#1b1c17")
-      (on-surface-variant "#45483d")
-      (on-tertiary "#ffffff")
-      (on-tertiary-container "#ffffff")
-      (outline-color "#75786b")
-      (outline-variant "#c5c8b9")
-      (primary "#4f642c")
-      (primary-container "#677d42")
-      (secondary "#586247")
-      (secondary-container "#dde7c5")
+(let* ((bg "#16130c")
+      (err "#ffb4ab")
+      (err-container "#93000a")
+      (on-background "#e9e2d5")
+      (on-err "#690005")
+      (on-err-container "#ffdad6")
+      (on-primary "#3c2f00")
+      (on-primary-container "#2a2000")
+      (on-secondary "#3b2f07")
+      (on-secondary-container "#c6b47f")
+      (on-surface "#e9e2d5")
+      (on-surface-variant "#cfc6b0")
+      (on-tertiary "#213600")
+      (on-tertiary-container "#162600")
+      (outline-color "#98907c")
+      (outline-variant "#4d4636")
+      (primary "#e6c34f")
+      (primary-container "#ac8e1b")
+      (secondary "#d8c58f")
+      (secondary-container "#53461b")
       (shadow "#000000")
-      (surface "#fbfaf1")
-      (surface-container "#efeee6")
-      (surface-container-high "#e9e8e0")
-      (surface-container-highest "#e4e3db")
-      (surface-container-low "#f5f4ec")
-      (surface-container-lowest "#ffffff")
-      (surface-variant "#e1e4d4")
-      (tertiary "#26694f")
-      (tertiary-container "#418267")
+      (surface "#16130c")
+      (surface-container "#221f17")
+      (surface-container-high "#2d2a21")
+      (surface-container-highest "#38342c")
+      (surface-container-low "#1e1b13")
+      (surface-container-lowest "#110e07")
+      (surface-variant "#4d4636")
+      (tertiary "#add374")
+      (tertiary-container "#789c44")
       ;; Map success colors to tertiary (as used in other templates)
-      (success "#26694f")
-      (on-success "#ffffff")
-      (success-container "#418267")
-      (on-success-container "#ffffff")
+      (success "#add374")
+      (on-success "#213600")
+      (success-container "#789c44")
+      (on-success-container "#162600")
       ;; Map fixed colors to regular colors
-      (primary-fixed "#4f642c")
-      (primary-fixed-dim "#677d42")
-      (secondary-fixed "#586247")
-      (secondary-fixed-dim "#dde7c5")
-      (tertiary-fixed "#26694f")
-      (tertiary-fixed-dim "#418267")
-      (on-primary-fixed "#ffffff")
-      (on-primary-fixed-variant "#fffff4")
-      (on-secondary-fixed "#ffffff")
-      (on-secondary-fixed-variant "#5e684d")
-      (on-tertiary-fixed "#ffffff")
-      (on-tertiary-fixed-variant "#ffffff")
+      (primary-fixed "#e6c34f")
+      (primary-fixed-dim "#ac8e1b")
+      (secondary-fixed "#d8c58f")
+      (secondary-fixed-dim "#53461b")
+      (tertiary-fixed "#add374")
+      (tertiary-fixed-dim "#789c44")
+      (on-primary-fixed "#3c2f00")
+      (on-primary-fixed-variant "#2a2000")
+      (on-secondary-fixed "#3b2f07")
+      (on-secondary-fixed-variant "#c6b47f")
+      (on-tertiary-fixed "#213600")
+      (on-tertiary-fixed-variant "#162600")
       ;; Map inverse colors to surface variants
-      (inverse-on-surface "#1b1c17")
-      (inverse-primary "#4f642c")
-      (inverse-surface "#fbfaf1")
+      (inverse-on-surface "#e9e2d5")
+      (inverse-primary "#e6c34f")
+      (inverse-surface "#16130c")
       ;; ANSI terminal colors
-      (term0 "#e1e4d4")
-      (term1 "#ba1a1a")
-      (term2 "#4f642c")
-      (term3 "#586247")
-      (term4 "#26694f")
-      (term5 "#b7cf8b")
-      (term6 "#c1cbaa")
-      (term7 "#1b1c17")
-      (term8 "#75786b")
-      (term9 "#ba1a1a")
-      (term10 "#4f642c")
-      (term11 "#586247")
-      (term12 "#26694f")
-      (term13 "#b7cf8b")
-      (term14 "#c1cbaa")
-      (term15 "#1b1c17"))
+      (term0 "#4d4636")
+      (term1 "#ffb4ab")
+      (term2 "#e6c34f")
+      (term3 "#d8c58f")
+      (term4 "#add374")
+      (term5 "#e6c34f")
+      (term6 "#d8c58f")
+      (term7 "#e9e2d5")
+      (term8 "#98907c")
+      (term9 "#ffb4ab")
+      (term10 "#e6c34f")
+      (term11 "#d8c58f")
+      (term12 "#add374")
+      (term13 "#e6c34f")
+      (term14 "#d8c58f")
+      (term15 "#e9e2d5"))
 
   (custom-theme-set-faces
    'noctalia
diff --git a/foot/.config/foot/themes/noctalia b/foot/.config/foot/themes/noctalia
index eb1a070..746cdb6 100644
--- a/foot/.config/foot/themes/noctalia
+++ b/foot/.config/foot/themes/noctalia
@@ -1,22 +1,22 @@
 [colors-dark]
-foreground=1b1c17
-background=fbfaf1
-regular0=e1e4d4
-regular1=ba1a1a
-regular2=4f642c
-regular3=586247
-regular4=26694f
-regular5=b7cf8b
-regular6=c1cbaa
-regular7=1b1c17
-bright0=75786b
-bright1=ba1a1a
-bright2=4f642c
-bright3=586247
-bright4=26694f
-bright5=b7cf8b
-bright6=c1cbaa
-bright7=1b1c17
-selection-foreground=45483d
-selection-background=e1e4d4
-cursor=fbfaf1 1b1c17
+foreground=e9e2d5
+background=16130c
+regular0=4d4636
+regular1=ffb4ab
+regular2=e6c34f
+regular3=d8c58f
+regular4=add374
+regular5=e6c34f
+regular6=d8c58f
+regular7=e9e2d5
+bright0=98907c
+bright1=ffb4ab
+bright2=e6c34f
+bright3=d8c58f
+bright4=add374
+bright5=e6c34f
+bright6=d8c58f
+bright7=e9e2d5
+selection-foreground=cfc6b0
+selection-background=4d4636
+cursor=16130c e9e2d5
diff --git a/ghostty/.config/ghostty/themes/noctalia b/ghostty/.config/ghostty/themes/noctalia
index e10a128..aee539c 100644
--- a/ghostty/.config/ghostty/themes/noctalia
+++ b/ghostty/.config/ghostty/themes/noctalia
@@ -1,22 +1,22 @@
-palette = 0=#e1e4d4
-palette = 1=#ba1a1a
-palette = 2=#4f642c
-palette = 3=#586247
-palette = 4=#26694f
-palette = 5=#b7cf8b
-palette = 6=#c1cbaa
-palette = 7=#1b1c17
-palette = 8=#75786b
-palette = 9=#ba1a1a
-palette = 10=#4f642c
-palette = 11=#586247
-palette = 12=#26694f
-palette = 13=#b7cf8b
-palette = 14=#c1cbaa
-palette = 15=#1b1c17
-background = #fbfaf1
-foreground = #1b1c17
-cursor-color = #1b1c17
-cursor-text = #fbfaf1
-selection-background = #e1e4d4
-selection-foreground = #45483d
+palette = 0=#4d4636
+palette = 1=#ffb4ab
+palette = 2=#e6c34f
+palette = 3=#d8c58f
+palette = 4=#add374
+palette = 5=#e6c34f
+palette = 6=#d8c58f
+palette = 7=#e9e2d5
+palette = 8=#98907c
+palette = 9=#ffb4ab
+palette = 10=#e6c34f
+palette = 11=#d8c58f
+palette = 12=#add374
+palette = 13=#e6c34f
+palette = 14=#d8c58f
+palette = 15=#e9e2d5
+background = #16130c
+foreground = #e9e2d5
+cursor-color = #e9e2d5
+cursor-text = #16130c
+selection-background = #4d4636
+selection-foreground = #cfc6b0
diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl
index 33dc34e..0eb9c77 100755
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@@ -1,8 +1,8 @@
 spawn-at-startup "xwayland-satellite"
 spawn-at-startup "noctalia"
 spawn-at-startup "steam" "-autostart" "--minimized"
-spawn-at-startup "Telegram" "-autostart"
-spawn-at-startup "vesktop" "--start-minimized"
+spawn-at-startup "AyuGram" "-autostart"
+spawn-at-startup "legcord" "--start-minimized"
 spawn-at-startup "keepassxc" "--minimized"
 spawn-at-startup "waybar"
 spawn-at-startup "systemctl" "--user" "start" "hyprpolkitagent"
@@ -41,7 +41,7 @@ output "HDMI-A-1" {
 }
 
 layout {
-    gaps 2
+    gaps 0.5
     center-focused-column "never"
 
     preset-column-widths {
@@ -53,13 +53,13 @@ layout {
     default-column-width { proportion 0.5; }
 
     focus-ring {
-        width 1
+        width 2
         active-color "#7fc8ff"
         inactive-color "#505050"
     }
 
     border {
-        //off
+        off
         width 0.5
         active-color "#ffc87f"
         inactive-color "#505050"
@@ -173,7 +173,7 @@ layer-rule {
 
 binds {
     // Noctalia & Application Launchers
-    Mod+Shift+T { spawn "Telegram"; }
+    Mod+Shift+T { spawn "AyuGram"; }
     Mod+Shift+B { spawn "helium"; }
     Mod+D hotkey-overlay-title="App Launcher" { spawn "noctalia" "msg" "panel-toggle" "launcher"; }
     Ctrl+Mod+V hotkey-overlay-title="Clipboard History" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
diff --git a/niri/.config/niri/noctalia.kdl b/niri/.config/niri/noctalia.kdl
index 29c9247..110bdab 100644
--- a/niri/.config/niri/noctalia.kdl
+++ b/niri/.config/niri/noctalia.kdl
@@ -1,15 +1,15 @@
 layout {
 
     focus-ring {
-        active-color   "#4f642c"
-        inactive-color "#fbfaf1"
-        urgent-color   "#ba1a1a"
+        active-color   "#e6c34f"
+        inactive-color "#16130c"
+        urgent-color   "#ffb4ab"
     }
 
     border {
-        active-color   "#4f642c"
-        inactive-color "#fbfaf1"
-        urgent-color   "#ba1a1a"
+        active-color   "#e6c34f"
+        inactive-color "#16130c"
+        urgent-color   "#ffb4ab"
     }
 
     shadow {
@@ -17,19 +17,19 @@ layout {
     }
 
     tab-indicator {
-        active-color   "#4f642c"
-        inactive-color "#677d42"
-        urgent-color   "#ba1a1a"
+        active-color   "#e6c34f"
+        inactive-color "#ac8e1b"
+        urgent-color   "#ffb4ab"
     }
 
     insert-hint {
-        color "#4f642c80"
+        color "#e6c34f80"
     }
 }
 
 recent-windows {
     highlight {
-        active-color "#4f642c"
-        urgent-color "#ba1a1a"
+        active-color "#e6c34f"
+        urgent-color "#ffb4ab"
     }
 }