77 files changed, 81 insertions, 640 deletions

diff --git a/backup-nix/configuration.nix b/backup-nix/configuration.nix
deleted file mode 100644
index 760c077..0000000
--- a/backup-nix/configuration.nix
+++ /dev/null
@@ -1,453 +0,0 @@
-{ 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
deleted file mode 100644
index ff02820..0000000
--- a/backup-nix/flake.lock
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "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
deleted file mode 100644
index f5f5b35..0000000
--- a/backup-nix/flake.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  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
deleted file mode 100644
index 5163270..0000000
--- a/backup-nix/hardware-configuration.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
deleted file mode 100644
index 98a9522..0000000
--- a/backup-nix/mi_edid.bin
+++ /dev/null
diff --git a/fastfetch/.config/fastfetch/config.jsonc b/fastfetch/.config/fastfetch/config.jsonc
index 54bac74..ac7674f 100644
--- a/fastfetch/.config/fastfetch/config.jsonc
+++ b/fastfetch/.config/fastfetch/config.jsonc
@@ -13,7 +13,7 @@
     "separator",
     {
       "type": "command",
-      "text": "curl -s 'wttr.in/Krasnoyarsk?format=%c+%t'",
+      "text": "curl -s 'wttr.in/Bern?format=%c+%t'",
       "key": "Weather"
     },
     { "type": "packages" }
diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl
index 0eb9c77..81676ea 100755
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@@ -2,7 +2,7 @@ spawn-at-startup "xwayland-satellite"
 spawn-at-startup "noctalia"
 spawn-at-startup "steam" "-autostart" "--minimized"
 spawn-at-startup "AyuGram" "-autostart"
-spawn-at-startup "legcord" "--start-minimized"
+spawn-at-startup "vesktop" "--start-minimized"
 spawn-at-startup "keepassxc" "--minimized"
 spawn-at-startup "waybar"
 spawn-at-startup "systemctl" "--user" "start" "hyprpolkitagent"
@@ -24,7 +24,7 @@ input {
     }
 
     mouse {
-        accel-speed -0.5
+        accel-speed 0
         accel-profile "flat"
     }
 }
diff --git a/nixos/hosts/opus/default.nix b/nixos/hosts/opus/default.nix
index 4143528..b56e3d0 100644
--- a/nixos/hosts/opus/default.nix
+++ b/nixos/hosts/opus/default.nix
@@ -37,6 +37,8 @@
     ../../modules/features/fonts
     ../../modules/features/desktop-apps
     ../../modules/features/dev-tools
+    ../../modules/features/wireshark
+    ../../modules/features/mouse
   ];
 
   # ────────────────────────────────────────────────────────────────────────
diff --git a/nixos/modules/features/appimage/default.nix b/nixos/modules/features/appimage/default.nix
index b291735..fba4ed7 100644
--- a/nixos/modules/features/appimage/default.nix
+++ b/nixos/modules/features/appimage/default.nix
@@ -10,4 +10,4 @@
       ];
     };
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/features/binary-compat/default.nix b/nixos/modules/features/binary-compat/default.nix
index f2ad751..e88349b 100644
--- a/nixos/modules/features/binary-compat/default.nix
+++ b/nixos/modules/features/binary-compat/default.nix
@@ -20,4 +20,4 @@
     pkg-config
     cmake
   ];
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/features/desktop-apps/default.nix b/nixos/modules/features/desktop-apps/default.nix
index 59dda45..51b8bdd 100644
--- a/nixos/modules/features/desktop-apps/default.nix
+++ b/nixos/modules/features/desktop-apps/default.nix
@@ -5,14 +5,18 @@
     inputs.helium-browser.packages.${pkgs.stdenv.hostPlatform.system}.helium
     secretspec
     claude-code
+    cryptomator
+    ente-desktop
     keepassxc
     libreoffice
     hunspellDicts.ru_RU
     opencode
     pkgs.ayugram-desktop
     pkgs.legcord
+    pkgs.vesktop
     pkgs.amnezia-vpn
     obsidian
     pkgs.qbittorrent
+    pkgs.masterpdfeditor
   ];
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/features/dev-tools/default.nix b/nixos/modules/features/dev-tools/default.nix
index 2215b49..fa19d8a 100644
--- a/nixos/modules/features/dev-tools/default.nix
+++ b/nixos/modules/features/dev-tools/default.nix
@@ -15,6 +15,5 @@
     rust-analyzer
     rustc
     tree-sitter
-    pkgs.wireshark
   ];
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/features/mouse/default.nix b/nixos/modules/features/mouse/default.nix
new file mode 100644
index 0000000..83cefc4
--- /dev/null
+++ b/nixos/modules/features/mouse/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+ services.ratbagd.enable = true;
+ environment.systemPackages = with pkgs; [
+  piper
+  input-remapper
+];
+}
diff --git a/nixos/modules/features/wireshark/default.nix b/nixos/modules/features/wireshark/default.nix
new file mode 100644
index 0000000..7b2141e
--- /dev/null
+++ b/nixos/modules/features/wireshark/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+  };
+
+  users.users.seraphim = {
+    extraGroups = [ "wireshark" ];
+  };
+}
diff --git a/nixos/modules/system/locale/default.nix b/nixos/modules/system/locale/default.nix
index da66f76..4c07d59 100644
--- a/nixos/modules/system/locale/default.nix
+++ b/nixos/modules/system/locale/default.nix
@@ -3,16 +3,16 @@
 {
   time.timeZone = "Etc/GMT-7";
 
-  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.defaultLocale = "de_CH.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_ADDRESS = "de_CH.UTF-8";
+    LC_IDENTIFICATION = "de_CH.UTF-8";
+    LC_MEASUREMENT = "de_CH.UTF-8";
+    LC_MONETARY = "de_CH.UTF-8";
+    LC_NAME = "de_CH.UTF-8";
+    LC_NUMERIC = "de_CH.UTF-8";
+    LC_PAPER = "de_CH.UTF-8";
+    LC_TELEPHONE = "de_CH.UTF-8";
     LC_TIME = "en_US.UTF-8";
   };
 }
\ No newline at end of file
diff --git a/nixos/modules/system/services/default.nix b/nixos/modules/system/services/default.nix
index 40cfa89..0f06931 100644
--- a/nixos/modules/system/services/default.nix
+++ b/nixos/modules/system/services/default.nix
@@ -10,4 +10,4 @@
     SystemMaxUse=50M
     MaxRetentionSec=1month
   '';
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/system/users/default.nix b/nixos/modules/system/users/default.nix
index 042c055..19c2b56 100644
--- a/nixos/modules/system/users/default.nix
+++ b/nixos/modules/system/users/default.nix
@@ -31,4 +31,4 @@
       ll = "eza -al --icons=auto";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/noctalia/.config/colors.json b/noctalia/.config/noctalia/colors.json
index ce24eb1..ce24eb1 100644
--- a/noctalia/.config/colors.json
+++ b/noctalia/.config/noctalia/colors.json
diff --git a/noctalia/.config/plugins.json b/noctalia/.config/noctalia/plugins.json
index 13eb24c..13eb24c 100644
--- a/noctalia/.config/plugins.json
+++ b/noctalia/.config/noctalia/plugins.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/BarWidget.qml b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/BarWidget.qml
index 349d9cc..349d9cc 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/BarWidget.qml
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/BarWidget.qml
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/CHANGELOG.md b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/CHANGELOG.md
index 1d25f80..1d25f80 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/CHANGELOG.md
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/CHANGELOG.md
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/ColorPairRow.qml b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/ColorPairRow.qml
index 7094a4a..7094a4a 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/ColorPairRow.qml
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/ColorPairRow.qml
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/ColorPill.qml b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/ColorPill.qml
index 98f21fa..98f21fa 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/ColorPill.qml
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/ColorPill.qml
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/Main.qml b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/Main.qml
index fbe79e0..fbe79e0 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/Main.qml
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/Main.qml
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/Panel.qml b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/Panel.qml
index 946431e..946431e 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/Panel.qml
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/Panel.qml
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/README.md b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/README.md
index 5c30b87..5c30b87 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/README.md
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/README.md
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/Settings.qml b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/Settings.qml
index 3690ad1..3690ad1 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/Settings.qml
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/Settings.qml
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/de.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/de.json
index b106bd6..b106bd6 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/de.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/de.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/en.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/en.json
index 483bba1..483bba1 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/en.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/en.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/es.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/es.json
index 8c3a7b6..8c3a7b6 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/es.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/es.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/fr.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/fr.json
index b70de98..b70de98 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/fr.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/fr.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/hn.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/hn.json
index f1f0a0d..f1f0a0d 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/hn.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/hn.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/hu.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/hu.json
index b1c3e96..b1c3e96 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/hu.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/hu.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/it.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/it.json
index d1f2b14..d1f2b14 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/it.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/it.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ja.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ja.json
index 8a6afde..8a6afde 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ja.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ja.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ko-KR.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ko-KR.json
index 58d2c48..58d2c48 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ko-KR.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ko-KR.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ku.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ku.json
index 78cac28..78cac28 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ku.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ku.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/nl.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/nl.json
index 2bc353b..2bc353b 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/nl.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/nl.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/nn-NO.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/nn-NO.json
index 8364715..8364715 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/nn-NO.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/nn-NO.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/pl.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/pl.json
index 049ab6b..049ab6b 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/pl.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/pl.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/pt.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/pt.json
index 716ae19..716ae19 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/pt.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/pt.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ru.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ru.json
index f38d70e..f38d70e 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/ru.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/ru.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/sv.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/sv.json
index 052ee9d..052ee9d 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/sv.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/sv.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/tr.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/tr.json
index c1f8f13..c1f8f13 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/tr.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/tr.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/uk-UA.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/uk-UA.json
index 4f85b7e..4f85b7e 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/uk-UA.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/uk-UA.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/zh-CN.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/zh-CN.json
index 9b9cbb4..9b9cbb4 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/zh-CN.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/zh-CN.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/i18n/zh-TW.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/zh-TW.json
index 161e629..161e629 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/i18n/zh-TW.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/i18n/zh-TW.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/manifest.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/manifest.json
index a4a5b6a..a4a5b6a 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/manifest.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/manifest.json
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/preview.png b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/preview.png
index c315ef6..c315ef6 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/preview.png
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/preview.png
diff --git a/noctalia/.config/plugins/keybind-cheatsheet/settings.json b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/settings.json
index 82d6cbd..82d6cbd 100644
--- a/noctalia/.config/plugins/keybind-cheatsheet/settings.json
+++ b/noctalia/.config/noctalia/plugins/keybind-cheatsheet/settings.json
diff --git a/noctalia/.config/plugins/privacy-indicator/BarWidget.qml b/noctalia/.config/noctalia/plugins/privacy-indicator/BarWidget.qml
index bdebd41..bdebd41 100644
--- a/noctalia/.config/plugins/privacy-indicator/BarWidget.qml
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/BarWidget.qml
diff --git a/noctalia/.config/plugins/privacy-indicator/Main.qml b/noctalia/.config/noctalia/plugins/privacy-indicator/Main.qml
index 29d94a0..29d94a0 100644
--- a/noctalia/.config/plugins/privacy-indicator/Main.qml
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/Main.qml
diff --git a/noctalia/.config/plugins/privacy-indicator/Panel.qml b/noctalia/.config/noctalia/plugins/privacy-indicator/Panel.qml
index 0cfcc22..0cfcc22 100644
--- a/noctalia/.config/plugins/privacy-indicator/Panel.qml
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/Panel.qml
diff --git a/noctalia/.config/plugins/privacy-indicator/README.md b/noctalia/.config/noctalia/plugins/privacy-indicator/README.md
index d192040..d192040 100644
--- a/noctalia/.config/plugins/privacy-indicator/README.md
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/README.md
diff --git a/noctalia/.config/plugins/privacy-indicator/Settings.qml b/noctalia/.config/noctalia/plugins/privacy-indicator/Settings.qml
index a6acde9..a6acde9 100644
--- a/noctalia/.config/plugins/privacy-indicator/Settings.qml
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/Settings.qml
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/de.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/de.json
index 5817042..5817042 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/de.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/de.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/en.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/en.json
index fa65418..fa65418 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/en.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/en.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/es.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/es.json
index 93a48a7..93a48a7 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/es.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/es.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/fr.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/fr.json
index 814c07d..814c07d 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/fr.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/fr.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/hu.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/hu.json
index 4a7ba8c..4a7ba8c 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/hu.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/hu.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/it.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/it.json
index d0eee79..d0eee79 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/it.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/it.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/ja.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ja.json
index ba61aeb..ba61aeb 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/ja.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ja.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/ko.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ko.json
index e104202..e104202 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/ko.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ko.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/ku.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ku.json
index 6a58f84..6a58f84 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/ku.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ku.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/nl.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/nl.json
index d0b031d..d0b031d 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/nl.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/nl.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/pl.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/pl.json
index 9e05d3a..9e05d3a 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/pl.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/pl.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/pt.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/pt.json
index 068a528..068a528 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/pt.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/pt.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/ru.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ru.json
index 152e7d8..152e7d8 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/ru.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/ru.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/tr.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/tr.json
index 016f1be..016f1be 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/tr.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/tr.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/uk-UA.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/uk-UA.json
index 5b872a7..5b872a7 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/uk-UA.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/uk-UA.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/vi.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/vi.json
index 6cd6d76..6cd6d76 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/vi.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/vi.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/zh-CN.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/zh-CN.json
index 5665d78..5665d78 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/zh-CN.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/zh-CN.json
diff --git a/noctalia/.config/plugins/privacy-indicator/i18n/zh-TW.json b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/zh-TW.json
index febeadc..febeadc 100644
--- a/noctalia/.config/plugins/privacy-indicator/i18n/zh-TW.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/i18n/zh-TW.json
diff --git a/noctalia/.config/plugins/privacy-indicator/manifest.json b/noctalia/.config/noctalia/plugins/privacy-indicator/manifest.json
index 4618fc4..4618fc4 100644
--- a/noctalia/.config/plugins/privacy-indicator/manifest.json
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/manifest.json
diff --git a/noctalia/.config/plugins/privacy-indicator/preview.png b/noctalia/.config/noctalia/plugins/privacy-indicator/preview.png
index 0db7b7c..0db7b7c 100644
--- a/noctalia/.config/plugins/privacy-indicator/preview.png
+++ b/noctalia/.config/noctalia/plugins/privacy-indicator/preview.png
diff --git a/noctalia/.config/settings.json b/noctalia/.config/noctalia/settings.json
index e39f903..e39f903 100644
--- a/noctalia/.config/settings.json
+++ b/noctalia/.config/noctalia/settings.json
diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml
index ba7d768..201392b 100644
--- a/starship/.config/starship.toml
+++ b/starship/.config/starship.toml
@@ -1,7 +1,7 @@
 palette = "noctalia"
 add_newline = true
 command_timeout = 200
-format = "$username$hostname [$directory$git_branch$git_status]($style)$character"
+format = "$username$hostname$character [$directory$git_branch$git_status]($style)"
 
 [username]
 show_always = true
@@ -11,12 +11,13 @@ style_user = "bold #8C00FF"
 [hostname]
 disabled = false
 ssh_only = false
-format = "[@$hostname]($style) "
+format = "[@$hostname]($style)"
 style = "bold #8C00FF"
 
 [character]
-error_symbol = "[✗](bold red)"
-success_symbol = "[❯](bold #AA40FF)"
+format = "$symbol" # Removes the default trailing space after #
+error_symbol = "[:~✗](bold red)"
+success_symbol = "[:~#](bold #8C00FF)"
 
 [directory]
 style = "bold #AA40FF"
@@ -44,47 +45,53 @@ stashed    = ""
 staged     = ""
 renamed    = ""
 deleted    = ""
-
 # >>> NOCTALIA STARSHIP PALETTE >>>
 # Noctalia Starship Palette
 # Generated by Noctalia - do not edit manually
-
 [palettes.noctalia]
+
 # Standard colors
-blue      = "#110914"
-red       = "#ba1a1a"
-green     = "#030e13"
-yellow    = "#5a5f62"
+blue      = "#d1c2d2"
+red       = "#ffb4ab"
+green     = "#bbc8d0"
+yellow    = "#c3c7ca"
 cyan      = "#c3c7ca"
 magenta   = "#bbc8d0"
-white     = "#1b1c1c"
-black     = "#dfe3e6"
+white     = "#e4e2e2"
+black     = "#43474a"
+
+
 
 # Extended palette (Catppuccin-compatible names)
-rosewater = "#5a5f62"
-flamingo  = "#ba1a1a"
+rosewater = "#c3c7ca"
+flamingo  = "#ffb4ab"
 pink      = "#bbc8d0"
 mauve     = "#bbc8d0"
-maroon    = "#ba1a1a"
-peach     = "#5a5f62"
+maroon    = "#ffb4ab"
+peach     = "#c3c7ca"
 teal      = "#c3c7ca"
 sky       = "#c3c7ca"
-sapphire  = "#110914"
+sapphire  = "#d1c2d2"
 lavender  = "#bbc8d0"
 
 # Text shades
-text      = "#1b1c1c"
-subtext1  = "#1b1c1c"
-subtext0  = "#73787a"
+text      = "#e4e2e2"
+subtext1  = "#e4e2e2"
+subtext0  = "#8d9194"
 
 # Surface shades
-overlay2  = "#73787a"
-overlay1  = "#73787a"
-overlay0  = "#dfe3e6"
-surface2  = "#dfe3e6"
-surface1  = "#dfe3e6"
-surface0  = "#fbf9f9"
-base      = "#fbf9f9"
-mantle    = "#fbf9f9"
-crust     = "#fbf9f9"
+overlay2  = "#8d9194"
+overlay1  = "#8d9194"
+overlay0  = "#43474a"
+surface2  = "#43474a"
+surface1  = "#43474a"
+surface0  = "#131314"
+base      = "#131314"
+mantle    = "#131314"
+crust     = "#131314"
+
 # <<< NOCTALIA STARSHIP PALETTE <<<
+
+
+
+