start fresh rewrite

2026-05-07 02:16:33 +05:30 · 2026-05-02 14:47:06 +05:30
parent 31d65fafa8
commit a62346367f
208 changed files with 0 additions and 10017 deletions
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./nix.nix
-    ./nixpkgs.nix
-    ./nh.nix
-    ./overlays.nix
-    ./sops.nix
-    ./substituters.nix
-    ./user.nix
-  ];
-}
--- a/modules/base/nh.nix
+++ b/modules/base/nh.nix
@@ -1,16 +0,0 @@
-{
-  config,
-  username,
-  ...
-}: {
-  programs.nh = {
-    enable = true;
-
-    clean = {
-      enable = !config.nix.gc.automatic;
-      dates = "weekly";
-    };
-
-    flake = "/home/${username}/Projects/nixos-config";
-  };
-}
--- a/modules/base/nix.nix
+++ b/modules/base/nix.nix
@@ -1,37 +0,0 @@
-{
-  pkgs,
-  username,
-  ...
-}: {
-  nix = {
-    # @TODO enable when lix is patched
-    # package = pkgs.lix;
-
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
-    };
-
-    optimise = {
-      automatic = true;
-      dates = ["weekly"];
-    };
-
-    channel.enable = false;
-
-    settings = {
-      extra-platforms = [
-        "aarch64-linux"
-        "arm-linux"
-      ];
-      auto-optimise-store = true;
-      allowed-users = ["${username}"];
-      trusted-users = ["${username}"];
-      experimental-features = "nix-command flakes";
-      keep-going = true;
-      warn-dirty = false;
-      http-connections = 50;
-    };
-  };
-}
--- a/modules/base/nixpkgs.nix
+++ b/modules/base/nixpkgs.nix
@@ -1,8 +0,0 @@
-{
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      joypixels.acceptLicense = true;
-    };
-  };
-}
--- a/modules/base/overlays.nix
+++ b/modules/base/overlays.nix
@@ -1,9 +0,0 @@
-{outputs, ...}: {
-  nixpkgs.overlays = [
-    outputs.overlays.additions
-    outputs.overlays.modifications
-    outputs.overlays.stable-packages
-    outputs.overlays.nur
-    outputs.overlays.nix-vscode-extensions
-  ];
-}
--- a/modules/base/sops.nix
+++ b/modules/base/sops.nix
@@ -1,20 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}: let
-  isEd25519 = k: k.type == "ed25519";
-  getKeyPath = k: k.path;
-  keys = builtins.filter isEd25519 config.services.openssh.hostKeys;
-in {
-  imports = [inputs.sops-nix.nixosModules.sops];
-
-  sops.age = {
-    sshKeyPaths = map getKeyPath keys;
-    keyFile = "/var/lib/sops-nix/key.txt";
-    generateKey = true;
-  };
-
-  environment.systemPackages = with pkgs; [sops];
-}
--- a/modules/base/substituters.nix
+++ b/modules/base/substituters.nix
@@ -1,27 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://cache.nixos.org?priority=10"
-      "https://anyrun.cachix.org"
-      "https://fufexan.cachix.org"
-      "https://helix.cachix.org"
-      "https://hyprland.cachix.org"
-      "https://nix-community.cachix.org"
-      "https://nix-gaming.cachix.org"
-      "https://yazi.cachix.org"
-      "https://nix-on-droid.cachix.org"
-    ];
-    trusted-substituters = ["https://nix-on-droid.cachix.org"];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
-      "fufexan.cachix.org-1:LwCDjCJNJQf5XD2BV+yamQIMZfcKWR9ISIFy5curUsY="
-      "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
-      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-      "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k="
-      "nix-on-droid.cachix.org-1:56snoMJTXmDRC1Ei24CmKoUqvHJ9XCp+nidK7qkMQrU="
-    ];
-  };
-}
--- a/modules/base/user.nix
+++ b/modules/base/user.nix
@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  username,
-  email,
-  ...
-}: {
-  users = {
-    mutableUsers = false;
-    defaultUserShell = pkgs.zsh;
-    users.${username} = {
-      hashedPasswordFile = config.sops.secrets.tux-password.path;
-      isNormalUser = true;
-      extraGroups = ["networkmanager" "wheel" "storage"];
-      openssh.authorizedKeys.keys = [
-        ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+OzPUe2ECPC929DqpkM39tl/vdNAXfsRnmrGfR+X3D ${email}''
-      ];
-    };
-  };
-}
--- a/modules/droid/sshd.nix
+++ b/modules/droid/sshd.nix
@@ -1,106 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  # utility functions
-  concatLines = list: builtins.concatStringsSep "\n" list;
-
-  prefixLines = mapper: list: concatLines (map mapper list);
-
-  # could be put in the config
-  configPath = "ssh/sshd_config";
-
-  keysFolder = "/etc/ssh";
-
-  authorizedKeysFolder = "/etc/ssh/authorized_keys.d";
-
-  supportedKeysTypes = [
-    "rsa"
-    "ed25519"
-  ];
-
-  sshd-start-bin = "sshd-start";
-
-  # real config
-  cfg = config.tux.services.openssh;
-
-  pathOfKeyOf = type: "${keysFolder}/ssh_host_${type}_key";
-
-  generateKeyOf = type: ''
-    ${lib.getExe' pkgs.openssh "ssh-keygen"} \
-      -t "${type}" \
-      -f "${pathOfKeyOf type}" \
-      -N ""
-  '';
-
-  generateKeyWhenNeededOf = type: ''
-    if [ ! -f ${pathOfKeyOf type} ]; then
-      mkdir --parents ${keysFolder}
-      ${generateKeyOf type}
-    fi
-  '';
-
-  sshd-start = pkgs.writeScriptBin sshd-start-bin ''
-    #!${pkgs.runtimeShell}
-    ${prefixLines generateKeyWhenNeededOf supportedKeysTypes}
-
-    mkdir --parents "${authorizedKeysFolder}"
-    echo "${lib.concatStringsSep "\n" cfg.authorizedKeys}" > ${authorizedKeysFolder}/${config.user.userName}
-
-    echo "Starting sshd in non-daemonized way on port ${lib.concatMapStrings toString cfg.ports}"
-    ${lib.getExe' pkgs.openssh "sshd"} \
-      -f "/etc/${configPath}" \
-      -D # don't detach into a daemon process
-  '';
-in {
-  options = {
-    tux.services.openssh = {
-      enable = lib.mkEnableOption ''
-        Whether to enable the OpenSSH secure shell daemon, which
-        allows secure remote logins.
-      '';
-
-      ports = lib.mkOption {
-        type = lib.types.listOf lib.types.port;
-        default = [22];
-        description = ''
-          Specifies on which ports the SSH daemon listens.
-        '';
-      };
-
-      authorizedKeys = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [];
-        description = ''
-          Specify a list of public keys to be added to the authorized_keys file.
-        '';
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.etc = {
-      "${configPath}".text = ''
-        ${prefixLines (port: "Port ${toString port}") cfg.ports}
-
-        AuthorizedKeysFile ${authorizedKeysFolder}/%u
-
-        LogLevel VERBOSE
-      '';
-    };
-
-    environment.packages = [
-      sshd-start
-      pkgs.openssh
-    ];
-
-    build.activationAfter.sshd = ''
-      SERVER_PID=$(${lib.getExe' pkgs.procps "ps"} -a | ${lib.getExe' pkgs.toybox "grep"} sshd || true)
-      if [ -z "$SERVER_PID" ]; then
-        $DRY_RUN_CMD ${lib.getExe sshd-start}
-      fi
-    '';
-  };
-}
--- a/modules/home/alacritty/default.nix
+++ b/modules/home/alacritty/default.nix
@@ -1,69 +0,0 @@
-{...}: {
-  programs.alacritty = {
-    enable = true;
-
-    settings = {
-      font = {
-        normal.family = "JetBrainsMono Nerd Font";
-        bold.family = "JetBrainsMono Nerd Font";
-        italic.family = "JetBrainsMono Nerd Font";
-        bold_italic.family = "JetBrainsMono Nerd Font";
-        size = 12;
-      };
-
-      window = {
-        padding = {
-          x = 15;
-          y = 15;
-        };
-
-        decorations = "none";
-        opacity = 1.0;
-        dynamic_title = true;
-      };
-
-      selection.save_to_clipboard = false;
-
-      general.live_config_reload = true;
-
-      colors = {
-        primary = {
-          background = "#0f0f0f";
-          foreground = "#a5b6cf";
-        };
-        normal = {
-          black = "#1c1e27";
-          blue = "#8baff1";
-          cyan = "#98d3ee";
-          green = "#95d3af";
-          magenta = "#c79bf0";
-          red = "#e26c7c";
-          white = "#d0d3d8";
-          yellow = "#f1d8a5";
-        };
-        bright = {
-          black = "#151720";
-          blue = "#86aaec";
-          cyan = "#93cee9";
-          green = "#90ceaa";
-          magenta = "#c296eb";
-          red = "#dd6777";
-          white = "#cbced3";
-          yellow = "#ecd3a0";
-        };
-        cursor = {
-          cursor = "#a5b6cf";
-          text = "CellForeground";
-        };
-        selection = {
-          text = "CellForeground";
-          background = "0x303340";
-        };
-        vi_mode_cursor = {
-          text = "CellBackground";
-          cursor = "CellForeground";
-        };
-      };
-    };
-  };
-}
--- a/modules/home/aria2/default.nix
+++ b/modules/home/aria2/default.nix
@@ -1,44 +0,0 @@
-{...}: {
-  programs.aria2 = {
-    enable = true;
-    settings = {
-      file-allocation = "none";
-      log-level = "warn";
-      max-connection-per-server = 16;
-      min-split-size = "1M";
-      human-readable = true;
-      reuse-uri = true;
-      rpc-save-upload-metadata = true;
-      max-file-not-found = 0;
-      remote-time = true;
-      async-dns = true;
-      stop = 0;
-      allow-piece-length-change = true;
-      optimize-concurrent-downloads = true;
-      deferred-input = true;
-      continue = true;
-      check-integrity = true;
-      realtime-chunk-checksum = true;
-      piece-length = "1M";
-      split = 16;
-      # Seconds:
-      save-session-interval = 60;
-      # Caches in memory
-      disk-cache = "32M";
-      save-not-found = true;
-      download-result = "full";
-      truncate-console-readout = true;
-      retry-wait = 30;
-      max-tries = 15;
-      enable-color = true;
-      enable-http-keep-alive = true;
-      enable-http-pipelining = true;
-      http-accept-gzip = true;
-      follow-torrent = true;
-      bt-save-metadata = true;
-      seed-time = 0;
-      bt-load-saved-metadata = true;
-      metalink-preferred-protocol = "https";
-    };
-  };
-}
--- a/modules/home/bitwarden/default.nix
+++ b/modules/home/bitwarden/default.nix
@@ -1,17 +0,0 @@
-{
-  pkgs,
-  email,
-  ...
-}: {
-  programs.rbw = {
-    enable = true;
-    settings = {
-      base_url = "https://bw.tux.rs";
-      email = "${email}";
-    };
-  };
-
-  home.packages = with pkgs; [
-    bitwarden
-  ];
-}
--- a/modules/home/brave/default.nix
+++ b/modules/home/brave/default.nix
@@ -1,33 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  configDir = "${config.xdg.configHome}/BraveSoftware/Brave-Browser";
-
-  extensionJson = ext: {
-    name = "${configDir}/External Extensions/${ext.id}.json";
-    value.text = builtins.toJSON {
-      external_update_url = "https://clients2.google.com/service/update2/crx";
-    };
-  };
-
-  extensions = [
-    {id = "nkbihfbeogaeaoehlefnkodbefgpgknn";} # Metamask
-    {id = "gppongmhjkpfnbhagpmjfkannfbllamg";} # Wappalyzer
-    {id = "nngceckbapebfimnlniiiahkandclblb";} # Bitwarden
-    {id = "bfnaelmomeimhlpmgjnjophhpkkoljpa";} # Phantom
-    {id = "eimadpbcbfnmbkopoojfekhnkhdbieeh";} # DarkReader
-  ];
-in {
-  programs.chromium = {
-    enable = true;
-    package = pkgs.brave;
-    commandLineArgs = [
-      "--disable-features=WebRtcAllowInputVolumeAdjustment"
-      "--force-device-scale-factor=1.0"
-    ];
-  };
-
-  home.file = builtins.listToAttrs (map extensionJson extensions);
-}
--- a/modules/home/desktop/awesome/default.nix
+++ b/modules/home/desktop/awesome/default.nix
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  home.file = {
-    ".config/awesome" = {
-      recursive = true;
-      source = "${pkgs.tawm}";
-    };
-  };
-}
--- a/modules/home/desktop/hyprland/default.nix
+++ b/modules/home/desktop/hyprland/default.nix
@@ -1,306 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./hyprlock.nix
-  ];
-
-  home.packages = with pkgs; [
-    ags
-    awww
-  ];
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    package = null;
-    portalPackage = null;
-    xwayland.enable = true;
-    systemd.variables = ["--all"];
-
-    plugins = with pkgs.hyprland-plugins; [
-      # hyprexpo
-    ];
-
-    settings = let
-      # Hyprland
-      border_size = 0;
-      gaps_in = 5;
-      gaps_out = 10;
-      gaps_ws = -10;
-      rounding = 8;
-      active_border_col = "rgba(90ceaaff) rgba(ecd3a0ff) 45deg";
-      inactive_border_col = "rgba(86aaeccc) rgba(93cee9cc) 45deg";
-
-      # Apps
-      terminal = "wezterm";
-      floating_terminal = "wezterm start --class wezterm-floating";
-      editor = "wezterm -e nvim";
-      browser = "brave --new-window";
-      spotify = "wezterm start --class wezterm-floating -e spotify_player";
-      filemanager = "wezterm -e superfile";
-    in {
-      # See https://wiki.hyprland.org/Configuring/Multi-GPU
-      env = "AQ_DRM_DEVICES,/dev/dri/card2";
-
-      #-- Output
-      # See https://wiki.hyprland.org/Configuring/Monitors
-      monitor = [
-        "eDP-1,2560x1440@90,0x0,1"
-        "HDMI-A-1,preferred,0x-1440,1"
-      ];
-
-      #-- Input: Keyboard, Mouse, Touchpad
-      input = {
-        sensitivity = -0.7;
-        scroll_method = "2 fg";
-        touchpad = {
-          natural_scroll = true;
-          clickfinger_behavior = false;
-        };
-      };
-
-      device = {
-        name = "asue1209:00-04f3:319f-touchpad";
-        sensitivity = 0;
-      };
-
-      #-- General
-      # See https://wiki.hyprland.org/Configuring/Variables
-      general = {
-        border_size = border_size;
-        gaps_in = gaps_in;
-        gaps_out = gaps_out;
-        gaps_workspaces = gaps_ws;
-        layout = "master";
-        resize_on_border = true;
-
-        "col.active_border" = active_border_col;
-        "col.inactive_border" = inactive_border_col;
-      };
-
-      misc = {
-        disable_hyprland_logo = true;
-        force_default_wallpaper = 1;
-        vrr = 0;
-      };
-
-      cursor = {
-        no_hardware_cursors = 1;
-      };
-
-      ecosystem = {
-        no_update_news = true;
-        no_donation_nag = true;
-      };
-
-      #-- Decoration
-      # See https://wiki.hyprland.org/Configuring/Variables/#decoration
-      decoration = {
-        rounding = rounding;
-        active_opacity = 1.0;
-        inactive_opacity = 1.0;
-        fullscreen_opacity = 1.0;
-
-        blur = {
-          enabled = false;
-          size = 4;
-          passes = 3;
-          new_optimizations = true;
-          xray = false;
-          special = true;
-          brightness = 1;
-          noise = 0.02;
-          contrast = 1;
-          popups = true;
-          popups_ignorealpha = 0.6;
-        };
-
-        shadow = {
-          enabled = false;
-        };
-      };
-
-      #-- Animations
-      # See https://wiki.hyprland.org/Configuring/Animations
-      animations = {
-        enabled = true;
-
-        bezier = [
-          "zoom, 0.05, 0.7, 0.1, 1.0"
-        ];
-
-        animation = [
-          "windows, 1, 1, zoom, slide"
-          "windowsIn, 1, 1, zoom, slide"
-          "windowsOut, 1, 1, zoom, slidevert"
-          "windowsMove, 1, 1, zoom, slide"
-          "fade, 1, 2, zoom"
-          "workspaces, 1, 1, zoom, slide"
-        ];
-      };
-
-      #-- Layout : Master
-      # See https://wiki.hyprland.org/Configuring/Master-Layout
-      master = {
-        allow_small_split = false;
-        special_scale_factor = 0.8;
-        mfact = 0.5;
-        new_on_top = false;
-        orientation = "left";
-        smart_resizing = true;
-        drop_at_cursor = true;
-      };
-
-      #-- Window Rules
-      # See https://wiki.hyprland.org/Configuring/Window-Rules
-      windowrule = [
-        "float on, center on, size 800 600, match:class org.pulseaudio.pavucontrol"
-
-        # Wezterm and Ghostty floating terminal
-        "float on, center on, size 1200 800, match:class (com.ghostty.floating|wezterm-floating)"
-
-        "float on, center on, size 900 700, match:class GalaxyBudsClient"
-
-        # KDE Connect
-        "float on, center on, size 900 700, match:class (org.kde.kdeconnect.sms|org.kde.kdeconnect.app)"
-
-        "workspace 7 silent, match:class (discord|org.telegram.desktop)"
-      ];
-
-      # plugin = {
-      #   hyprexpo = {
-      #     columns = 3;
-      #     gap_size = 5;
-      #     bg_col = "rgb(111111)";
-      #     workspace_method = "first 1";
-      #     gesture_distance = 300;
-      #   };
-      # };
-
-      gesture = [
-        "3, horizontal, workspace"
-        "3, up, dispatcher, exec, brightnessctl s +20%"
-        "3, down, dispatcher, exec, brightnessctl s +20%-"
-      ];
-
-      bindm = [
-        "SUPER,mouse:273,resizewindow"
-        "SUPER,mouse:272,movewindow"
-      ];
-
-      bind = [
-        # apps
-        "SUPER, Return, exec, ${terminal}"
-        "SUPER, Space, exec, vicinae toggle"
-        "SUPER, F, exec, ${filemanager}"
-        "SUPER, E, exec, ${editor}"
-        "SUPER, B, exec, ${browser}"
-        "SUPER, G, exec, GalaxyBudsClient"
-        "SUPER, D, exec, discord"
-        "SUPER, T, exec, Telegram"
-        "SUPER, S, exec, ${spotify}"
-        "SUPER, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history"
-
-        "SUPER_SHIFT, Return, exec, ${floating_terminal}"
-        "SUPER_SHIFT, S, exec, hypr-screenshot"
-        "SUPER_SHIFT, W, exec, vicinae vicinae://extensions/sovereign/awww-switcher/wpgrid"
-
-        # tpanel
-        "SUPER_SHIFT, B, exec, ags toggle bar"
-        "SUPER_SHIFT, C, exec, ags toggle control-center"
-        "SUPER_SHIFT, R, exec, ags quit; ${pkgs.tpanel}/bin/tpanel"
-
-        # hyprland
-        "SUPER, Q, killactive"
-        # "SUPER, grave, hyprexpo:expo, toggle"
-        "SUPER_SHIFT, Q, forcekillactive"
-        "SUPER_SHIFT, F, fullscreen, 0"
-        "SUPER_SHIFT, Space, exec, hyprctl dispatch togglefloating; hyprctl dispatch resizeactive exact 1200 800; hyprctl dispatch centerwindow;"
-        "SUPER_SHIFT, P, exec, hyprctl dispatch pin"
-
-        # lock
-        "SUPER_SHIFT, L, exec, hyprlock"
-
-        # change focus
-        "SUPER, left,  movefocus, l"
-        "SUPER, right, movefocus, r"
-        "SUPER, up,    movefocus, u"
-        "SUPER, down,  movefocus, d"
-
-        # move active
-        "SUPER_SHIFT, left,  movewindow, l"
-        "SUPER_SHIFT, right, movewindow, r"
-        "SUPER_SHIFT, up,    movewindow, u"
-        "SUPER_SHIFT, down,  movewindow, d"
-
-        # workspaces
-        "SUPER, 1, workspace, 1"
-        "SUPER, 2, workspace, 2"
-        "SUPER, 3, workspace, 3"
-        "SUPER, 4, workspace, 4"
-        "SUPER, 5, workspace, 5"
-        "SUPER, 6, workspace, 6"
-        "SUPER, 7, workspace, 7"
-
-        # send to workspaces
-        "SUPER_SHIFT, 1, movetoworkspacesilent, 1"
-        "SUPER_SHIFT, 2, movetoworkspacesilent, 2"
-        "SUPER_SHIFT, 3, movetoworkspacesilent, 3"
-        "SUPER_SHIFT, 4, movetoworkspacesilent, 4"
-        "SUPER_SHIFT, 5, movetoworkspacesilent, 5"
-        "SUPER_SHIFT, 6, movetoworkspacesilent, 6"
-        "SUPER_SHIFT, 7, movetoworkspacesilent, 7"
-      ];
-
-      workspace = [
-        "1, monitor:HDMI-A-1, default:true"
-        "2, monitor:HDMI-A-1"
-        "3, monitor:HDMI-A-1"
-        "4, monitor:HDMI-A-1"
-        "5, monitor:HDMI-A-1"
-        "6, monitor:eDP-1"
-        "7, monitor:eDP-1"
-      ];
-
-      binde = [
-        # resize active
-        "SUPER_CTRL, left,  resizeactive, -20 0"
-        "SUPER_CTRL, right, resizeactive, 20 0"
-        "SUPER_CTRL, up,    resizeactive, 0 -20"
-        "SUPER_CTRL, down,  resizeactive, 0 20"
-        "SUPER_CTRL, equal, exec, hyprctl dispatch layoutmsg mfact exact 0.5;"
-
-        # move active (Floating Only)
-        "SUPER_ALT, left,  moveactive, -20 0"
-        "SUPER_ALT, right, moveactive, 20 0"
-        "SUPER_ALT, up,    moveactive, 0 -20"
-        "SUPER_ALT, down,  moveactive, 0 20"
-        "SUPER_ALT, equal, exec, hyprctl dispatch centerwindow;"
-
-        # speaker and mic volume control
-        " , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+"
-        " , XF86AudioLowerVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%-"
-        " , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-        " , XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
-
-        # display and keyboard brightness control
-        " , XF86MonBrightnessUp, exec, brightnessctl s +20%"
-        " , XF86MonBrightnessDown, exec, brightnessctl s 20%-"
-        " , XF86KbdBrightnessUp, exec, asusctl -n"
-        " , XF86KbdBrightnessDown, exec, asusctl -p"
-
-        # performance
-        " , XF86Launch4, exec, asusctl profile -n"
-      ];
-
-      "exec-once" = [
-        # load hyprland plugins
-        # "hyprctl plugin load '$HYPR_PLUGIN_DIR/lib/libhyprexpo.so'"
-
-        "easyeffects --w"
-        "awww-daemon"
-        "${pkgs.tpanel}/bin/tpanel"
-        "kdeconnectd"
-        "kdeconnect-indicator"
-      ];
-    };
-  };
-}
--- a/modules/home/desktop/hyprland/hyprlock.nix
+++ b/modules/home/desktop/hyprland/hyprlock.nix
@@ -1,47 +0,0 @@
-{
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-      general = {
-        hide_cursor = true;
-        ignore_empty_input = true;
-      };
-
-      animations = {
-        enabled = true;
-        fade_in = {
-          duration = 300;
-          bezier = "easeOutQuint";
-        };
-        fade_out = {
-          duration = 300;
-          bezier = "easeOutQuint";
-        };
-      };
-
-      background = [
-        {
-          path = "screenshot";
-          blur_passes = 3;
-          blur_size = 8;
-        }
-      ];
-
-      input-field = [
-        {
-          size = "200, 50";
-          position = "0, -80";
-          monitor = "";
-          dots_center = true;
-          fade_on_empty = false;
-          font_color = "rgb(202, 211, 245)";
-          inner_color = "rgb(91, 96, 120)";
-          outer_color = "rgb(24, 25, 38)";
-          outline_thickness = 5;
-          placeholder_text = "Password";
-          shadow_passes = 2;
-        }
-      ];
-    };
-  };
-}
--- a/modules/home/desktop/hyprland/hyprpaper.nix
+++ b/modules/home/desktop/hyprland/hyprpaper.nix
@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  services.hyprpaper = {
-    enable = true;
-
-    settings = {
-      ipc = "on";
-      splash = false;
-      splash_offset = 20;
-
-      wallpaper = {
-        monitor = "";
-        path = "~/Wallpapers/new/sunset-pixel.png";
-        fit_mode = "";
-      };
-    };
-  };
-
-  home.packages = with pkgs; [hyprpaper];
-}
--- a/modules/home/desktop/mango/default.nix
+++ b/modules/home/desktop/mango/default.nix
@@ -1,225 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    inputs.mango.hmModules.mango
-  ];
-
-  wayland.windowManager.mango = {
-    enable = true;
-    settings = {
-      # Monitors
-      monitorrule = [
-        "name:eDP-1, width:2560, height:1440, refresh:165, x:0, y:10, vrr:1"
-        "name:HDMI-A-1, width:2560, height:1440, refresh:100, x:0, y:-1440, vrr:1"
-      ];
-
-      # Keyboard
-      repeat_rate = 25;
-      repeat_delay = 600;
-      numlockon = 0;
-      xkb_rules_layout = "us";
-
-      # Trackpad
-      disable_trackpad = 0;
-      tap_to_click = 1;
-      tap_and_drag = 1;
-      drag_lock = 1;
-      trackpad_natural_scrolling = 1;
-      disable_while_typing = 1;
-      left_handed = 0;
-      middle_button_emulation = 0;
-      swipe_min_threshold = 1;
-
-      # Mouse
-      mouse_natural_scrolling = 0;
-      accel_profile = 0;
-
-      # Theme
-      border_radius = 8;
-      no_radius_when_single = 0;
-      focused_opacity = 1.0;
-      unfocused_opacity = 1.0;
-
-      # Scroller Layout Setting
-      scroller_structs = 0;
-      scroller_default_proportion = 0.5;
-      scroller_ignore_proportion_single = 0;
-      scroller_default_proportion_single = 1.0;
-
-      # Master-Stack Layout Setting
-      new_is_master = 0;
-      default_mfact = 0.5;
-      default_nmaster = 1;
-      smartgaps = 0;
-
-      # Overview Setting
-      hotarea_size = 10;
-      enable_hotarea = 1;
-      ov_tab_mode = 0;
-      overviewgappi = 15;
-      overviewgappo = 15;
-
-      # layouts
-      tagrule = [
-        "id:1, layout_name:tile"
-        "id:2, layout_name:tile"
-        "id:3, layout_name:tile"
-        "id:4, layout_name:tile"
-        "id:5, layout_name:tile"
-        "id:6, layout_name:scroller"
-      ];
-
-      # Keybindings
-      mousebind = [
-        "SUPER, btn_left, moveresize, curmove"
-        "SUPER, btn_right, moveresize, curresize"
-      ];
-
-      gesturebind = [
-        "none, right, 3, viewtoleft_have_client"
-        "none, up, 3, toggleoverview"
-        "none, down, 3, toggleoverview"
-      ];
-
-      bind = [
-        # apps
-        "SUPER, Return, spawn, wezterm"
-        "SUPER, Space, spawn, vicinae toggle"
-        "SUPER, B, spawn, brave"
-        "SUPER, V, spawn, vicinae vicinae://extensions/vicinae/clipboard/history"
-        "SUPER+SHIFT, W, spawn, vicinae vicinae://extensions/sovereign/awww-switcher/wpgrid"
-
-        # WM
-        "SUPER, Q, killclient"
-        "SUPER+SHIFT, R, reload_config"
-        "SUPER+SHIFT, F, togglefullscreen"
-        "SUPER+SHIFT, Space, togglefloating"
-
-        "ALT, Tab, toggleoverview"
-        "ALT+SHIFT, minus, incgaps, -1"
-        "ALT+SHIFT, equal, incgaps, 1"
-        "ALT+SHIFT, R, togglegaps"
-
-        # switch layout
-        "SUPER+SHIFT, H, setlayout, tile"
-        "SUPER+SHIFT, V, setlayout, vertical_tile"
-        "SUPER+SHIFT, S, setlayout, scroller"
-
-        # resize client
-        "SUPER+CTRL, Up, resizewin, +0, -50"
-        "SUPER+CTRL, Down, resizewin, +0, +50"
-        "SUPER+CTRL, Left, resizewin, -50, +0"
-        "SUPER+CTRL, Right, resizewin, +50, +0"
-
-        # swap client
-        "SUPER+SHIFT, Up, exchange_client, up"
-        "SUPER+SHIFT, Down, exchange_client, down"
-        "SUPER+SHIFT, Left, exchange_client, left"
-        "SUPER+SHIFT, Right, exchange_client, right"
-
-        # switch client focus
-        "SUPER, Tab, focusstack, next"
-        "SUPER, Left, focusdir, left"
-        "SUPER, Right, focusdir, right"
-        "SUPER, Up, focusdir, up"
-        "SUPER, Down, focusdir, down"
-
-        # switch view
-        "SUPER, 1, view, 1, 0"
-        "SUPER, 2, view, 2, 0"
-        "SUPER, 3, view, 3, 0"
-        "SUPER, 4, view, 4, 0"
-        "SUPER, 5, view, 5, 0"
-        "SUPER, 6, view, 6, 0"
-
-        # move client to the tag with focus
-        "SUPER+SHIFT, 1, tagsilent, 1, 0"
-        "SUPER+SHIFT, 2, tagsilent, 2, 0"
-        "SUPER+SHIFT, 3, tagsilent, 3, 0"
-        "SUPER+SHIFT, 4, tagsilent, 4, 0"
-        "SUPER+SHIFT, 5, tagsilent, 5, 0"
-        "SUPER+SHIFT, 6, tagsilent, 6, 0"
-
-        # move client to the tag without focus
-        "SUPER+ALT, 1, tag, 1, 0"
-        "SUPER+ALT, 2, tag, 2, 0"
-        "SUPER+ALT, 3, tag, 3, 0"
-        "SUPER+ALT, 4, tag, 4, 0"
-        "SUPER+ALT, 5, tag, 5, 0"
-        "SUPER+ALT, 6, tag, 6, 0"
-      ];
-
-      # Window effect
-      blur = 0;
-      blur_layer = 0;
-      blur_optimized = 1;
-      blur_params_num_passes = 2;
-      blur_params_radius = 5;
-      blur_params_noise = 0.02;
-      blur_params_brightness = 0.9;
-      blur_params_contrast = 0.9;
-      blur_params_saturation = 1.2;
-
-      shadows = 0;
-      layer_shadows = 0;
-      shadow_only_floating = 1;
-      shadows_size = 10;
-      shadows_blur = 15;
-      shadows_position_x = 0;
-      shadows_position_y = 0;
-      shadowscolor = "0x000000ff";
-
-      # Animation
-      animations = 1;
-      layer_animations = 1;
-      animation_type_open = "slide";
-      animation_type_close = "fade";
-      animation_fade_in = 1;
-      animation_fade_out = 1;
-      tag_animation_direction = 1;
-      zoom_initial_ratio = 0.3;
-      zoom_end_ratio = 0.8;
-      fadein_begin_opacity = 0.5;
-      fadeout_begin_opacity = 0.8;
-
-      animation_duration_move = 100;
-      animation_duration_open = 100;
-      animation_duration_close = 100;
-      animation_duration_tag = 200;
-      animation_duration_focus = 0;
-
-      animation_curve_open = "0.46, 1.0, 0.29, 1";
-      animation_curve_move = "0.46, 1.0, 0.29, 1";
-      animation_curve_tag = "0.46, 1.0, 0.29, 1";
-      animation_curve_close = "0.08, 0.92, 0, 1";
-      animation_curve_focus = "0.46, 1.0, 0.29, 1";
-      animation_curve_opafadeout = "0.5, 0.5, 0.5, 0.5";
-      animation_curve_opafadein = "0.46, 1.0, 0.29, 1";
-
-      # Appearance
-      borderpx = 0;
-      gappih = 10;
-      gappiv = 10;
-      gappoh = 10;
-      gappov = 10;
-
-      rootcolor = "0x201b14ff";
-      bordercolor = "0x444444ff";
-      focuscolor = "0xc9b890ff";
-      maximizescreencolor = "0x89aa61ff";
-      urgentcolor = "0xad401fff";
-      scratchpadcolor = "0x516c93ff";
-      globalcolor = "0xb153a7ff";
-      overlaycolor = "0x14a57cff";
-
-      # Misc
-      syncobj_enable = 1;
-
-      exec-once = [
-        "awww-daemon"
-        "kdeconnectd"
-        "kdeconnect-indicator"
-        "dbus-update-activation-environment --systemd --all; systemctl --user reset-failed && systemctl --user start mango-session.target"
-      ];
-    };
-  };
-}
--- a/modules/home/desktop/rofi/default.nix
+++ b/modules/home/desktop/rofi/default.nix
@@ -1,317 +0,0 @@
-{config, ...}: {
-  programs.rofi = {
-    enable = true;
-    extraConfig = {
-      terminal = "alacritty";
-
-      modes = "combi,keys";
-
-      display-window = "window";
-      display-drun = "run";
-      display-windowcd = "windowcd";
-      display-run = "run";
-      display-ssh = "ssh";
-      display-combi = "combi";
-      display-keys = "keys";
-      display-filebrowser = "filebrowser";
-
-      combi-modes = "window,drun";
-      combi-hide-mode-prefix = false;
-      combi-display-format = "<i>{mode}</i> {text}";
-
-      window-format = "<span fgalpha='65%'>[{w=-1}] </span><b>{c=-1}</b> <span weight='light' fgalpha='65%' size='small'>{t=-1}</span>";
-      window-thumbnail = false;
-
-      drun-url-launcher = "xdg-open";
-      drun-match-fields = "name,generic,exec,categories,keywords";
-      drun-display-format = "<b>{name}</b>[ <span weight='light' size='small'><i>({generic})</i></span>][ <span weight='light' fgalpha='65%' size='small'>{exec}</span>]";
-      drun-show-actions = true;
-
-      run-command = "{cmd}";
-      run-list-command = "";
-      run-shell-command = "{terminal} -e {cmd}";
-
-      matching = "normal";
-      font = "JetBrains Mono 11";
-      show-icons = true;
-      scroll-method = 0;
-      cycle = false;
-      fixed-num-lines = false;
-    };
-    theme = let
-      inherit (config.lib.formats.rasi) mkLiteral;
-    in {
-      "*" = {
-        font = "JetBrains Mono 11";
-
-        black = mkLiteral "#1d1f21";
-        white = mkLiteral "#c5c8c6";
-        red = mkLiteral "#cc6666";
-        orange = mkLiteral "#de935f";
-        yellow = mkLiteral "#f0c674";
-        green = mkLiteral "#7cb36b";
-        cyan = mkLiteral "#78bab9";
-        blue = mkLiteral "#81a2be";
-        magenta = mkLiteral "#b294bb";
-
-        black-bright = mkLiteral "#3c4044";
-        white-bright = mkLiteral "#eaeaea";
-        red-bright = mkLiteral "#d54e53";
-        orange-bright = mkLiteral "#e78c45";
-        yellow-bright = mkLiteral "#e7c547";
-        green-bright = mkLiteral "#71c464";
-        cyan-bright = mkLiteral "#6acdcc";
-        blue-bright = mkLiteral "#7aa6da";
-        magenta-bright = mkLiteral "#c397d8";
-
-        black-66 = mkLiteral "#131415";
-        white-66 = mkLiteral "#828382";
-        red-66 = mkLiteral "#864343";
-        orange-66 = mkLiteral "#92613e";
-        yellow-66 = mkLiteral "#9e824c";
-        green-66 = mkLiteral "#517646";
-        cyan-66 = mkLiteral "#4f7a7a";
-        blue-66 = mkLiteral "#556a7d";
-        magenta-66 = mkLiteral "#75617b";
-
-        black-33 = mkLiteral "#090a0a";
-        white-33 = mkLiteral "#414141";
-        red-33 = mkLiteral "#432121";
-        orange-33 = mkLiteral "#49301f";
-        yellow-33 = mkLiteral "#4f4126";
-        green-33 = mkLiteral "#283b23";
-        cyan-33 = mkLiteral "#273d3d";
-        blue-33 = mkLiteral "#2a353e";
-        magenta-33 = mkLiteral "#3a303d";
-
-        common-background = mkLiteral "@black";
-        common-background-bright = mkLiteral "@black-bright";
-        common-background-66 = " @black-66";
-        common-foreground = mkLiteral "@white";
-        common-foreground-bright = mkLiteral "@white-bright";
-        common-foreground-66 = mkLiteral "@white-66";
-        common-primary = mkLiteral "@yellow";
-        common-primary-bright = mkLiteral "@yellow-bright";
-        common-primary-66 = mkLiteral "@yellow-66";
-        common-primary-33 = mkLiteral "@yellow-33";
-        common-secondary = mkLiteral "@blue";
-        common-secondary-bright = mkLiteral "@blue-bright";
-        common-secondary-66 = mkLiteral "@blue-66";
-        common-secondary-33 = mkLiteral "@blue-33";
-        common-urgent = mkLiteral "@red";
-        common-urgent-bright = mkLiteral "@red-bright";
-        common-urgent-66 = mkLiteral "@red-66";
-        common-urgent-33 = mkLiteral "@red-33";
-
-        background-color = mkLiteral "transparent";
-
-        normal-normal-background = mkLiteral "transparent";
-        normal-normal-foreground = mkLiteral "@common-foreground";
-        normal-normal-border-color = mkLiteral "transparent";
-        normal-active-background = mkLiteral "transparent";
-        normal-active-foreground = mkLiteral "@common-secondary-bright";
-        normal-active-border-color = mkLiteral "transparent";
-        normal-urgent-background = mkLiteral "transparent";
-        normal-urgent-foreground = mkLiteral "@common-urgent-bright";
-        normal-urgent-border-color = mkLiteral "transparent";
-
-        selected-normal-background = mkLiteral "@common-primary-33";
-        selected-normal-foreground = mkLiteral "@common-primary-bright";
-        selected-normal-border-color = mkLiteral "@common-primary-66";
-        selected-active-background = mkLiteral "@common-secondary-33";
-        selected-active-foreground = mkLiteral "@common-secondary-bright";
-        selected-active-border-color = mkLiteral "@common-secondary-66";
-        selected-urgent-background = mkLiteral "@common-urgent-33";
-        selected-urgent-foreground = mkLiteral "@common-urgent-bright";
-        selected-urgent-border-color = mkLiteral "@common-urgent-66";
-
-        alternate-normal-background = mkLiteral "@normal-normal-background";
-        alternate-normal-foreground = mkLiteral "@normal-normal-foreground";
-        alternate-normal-border-color = mkLiteral "@normal-normal-border-color";
-        alternate-active-background = mkLiteral "@normal-active-background";
-        alternate-active-foreground = mkLiteral "@normal-active-foreground";
-        alternate-active-border-color = mkLiteral "@normal-active-border-color";
-        alternate-urgent-background = mkLiteral "@normal-urgent-background";
-        alternate-urgent-foreground = mkLiteral "@normal-urgent-foreground";
-        alternate-urgent-border-color = mkLiteral "@normal-urgent-border-color";
-      };
-
-      "window" = {
-        background-color = mkLiteral "#1d1f21e6"; #// @black + 0.85 alpha
-        border = 3;
-        border-color = mkLiteral "@black-bright";
-        border-radius = 16;
-        width = 1024;
-        height = 460;
-      };
-
-      "mainbox" = {
-        padding = 16;
-        spacing = 16;
-      };
-
-      "inputbar" = {
-        background-color = mkLiteral "#333537"; #// @black-110
-        border = 1;
-        border-color = mkLiteral "#606263"; #// @black-130
-        border-radius = 8;
-        padding = mkLiteral "12 16";
-        spacing = 0;
-        text-color = mkLiteral "@common-foreground";
-        children = mkLiteral "[ entry, case-indicator, num-filtered-rows, textbox-num-sep, num-rows ]";
-      };
-
-      "prompt" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "@common-foreground-bright";
-        spacing = 0;
-        text-transform = mkLiteral "bold";
-      };
-
-      "textbox-prompt-colon" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-        margin = mkLiteral "0 0.3em 0 0";
-        expand = false;
-        str = "=";
-      };
-
-      "entry" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "@common-foreground-bright";
-        cursor = "text";
-        placeholder-color = mkLiteral "@common-foreground-66";
-        placeholder = "Type to filter";
-      };
-
-      "case-indicator" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-      };
-
-      "num-filtered-rows" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-        expand = false;
-      };
-
-      "textbox-num-sep" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-        expand = false;
-        str = "/";
-      };
-
-      "num-rows" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-        expand = false;
-      };
-
-      "message" = {
-        background-color = mkLiteral "@cyan-33";
-        border = 1;
-        border-color = mkLiteral "@cyan-66";
-        border-radius = 8;
-        padding = 16;
-      };
-
-      "textbox" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "@cyan-bright";
-      };
-
-      "listview" = {
-        dynamic = true;
-        scrollbar = true;
-        spacing = 0;
-      };
-
-      "scrollbar" = {
-        background-color = mkLiteral "transparent";
-        padding = 0;
-        margin = mkLiteral "0 0 0 4";
-        handle-width = 8;
-        border = 0;
-        handle-color = mkLiteral "#626463"; #// @white-50
-      };
-
-      "element" = {
-        border = 1;
-        border-radius = 8;
-        padding = mkLiteral "6 12";
-        margin = mkLiteral "1 0";
-        spacing = 12;
-        children = mkLiteral "[ element-icon, element-text ]";
-      };
-
-      "element-icon" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-        size = mkLiteral "1.0em";
-        cursor = mkLiteral "inherit";
-      };
-
-      "element-text" = {
-        background-color = mkLiteral "transparent";
-        text-color = mkLiteral "inherit";
-        highlight = mkLiteral "inherit";
-        cursor = mkLiteral "inherit";
-      };
-
-      "element normal.normal" = {
-        background-color = mkLiteral "@normal-normal-background";
-        text-color = mkLiteral "@normal-normal-foreground";
-        border-color = mkLiteral "@normal-normal-border-color";
-      };
-
-      "element normal.urgent" = {
-        background-color = mkLiteral "@normal-urgent-background";
-        text-color = mkLiteral "@normal-urgent-foreground";
-        border-color = mkLiteral "@normal-urgent-border-color";
-      };
-
-      "element normal.active" = {
-        background-color = mkLiteral "@normal-active-background";
-        text-color = mkLiteral "@normal-active-foreground";
-        border-color = mkLiteral "@normal-active-border-color";
-      };
-
-      "element selected.normal" = {
-        background-color = mkLiteral "@selected-normal-background";
-        text-color = mkLiteral "@selected-normal-foreground";
-        border-color = mkLiteral "@selected-normal-border-color";
-      };
-
-      "element selected.urgent" = {
-        background-color = mkLiteral "@selected-urgent-background";
-        text-color = mkLiteral "@selected-urgent-foreground";
-        border-color = mkLiteral "@selected-urgent-border-color";
-      };
-
-      "element selected.active" = {
-        background-color = mkLiteral "@selected-active-background";
-        text-color = mkLiteral "@selected-active-foreground";
-        border-color = mkLiteral "@selected-active-border-color";
-      };
-
-      "element alternate.normal" = {
-        background-color = mkLiteral "@alternate-normal-background";
-        text-color = mkLiteral "@alternate-normal-foreground";
-        border-color = mkLiteral "@alternate-normal-border-color";
-      };
-
-      "element alternate.urgent" = {
-        background-color = mkLiteral "@alternate-urgent-background";
-        text-color = mkLiteral "@alternate-urgent-foreground";
-        border-color = mkLiteral "@alternate-urgent-border-color";
-      };
-
-      "element alternate.active" = {
-        background-color = mkLiteral "@alternate-active-background";
-        text-color = mkLiteral "@alternate-active-foreground";
-        border-color = mkLiteral "@alternate-active-border-color";
-      };
-    };
-  };
-}
--- a/modules/home/desktop/utils/default.nix
+++ b/modules/home/desktop/utils/default.nix
@@ -1,32 +0,0 @@
-{pkgs, ...}: {
-  programs.satty = {
-    enable = true;
-    settings = {
-      general = {
-        corner-roundness = 12;
-        initial-tool = "arrow";
-        early-exit = true;
-        copy-command = "wl-copy";
-      };
-
-      font = {
-        family = "JetBrainsMono NerdFont";
-      };
-    };
-  };
-
-  home.packages = with pkgs; [
-    grim
-    slurp
-    hyprshot
-    wl-clipboard
-    wl-screenrec
-    (writeShellScriptBin "hypr-screenshot" ''
-      hyprshot -m region -r ppm - | satty --filename -
-    '')
-
-    (writeShellScriptBin "hypr-screenrecord" ''
-      wl-screenrec -g "$(slurp)"
-    '')
-  ];
-}
--- a/modules/home/desktop/vicinae/default.nix
+++ b/modules/home/desktop/vicinae/default.nix
@@ -1,70 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  programs.vicinae = {
-    enable = true;
-    systemd = {
-      enable = true;
-      autoStart = true;
-    };
-    useLayerShell = true;
-
-    extensions = with pkgs.vicinae-extensions; [
-      bluetooth
-      nix
-      ssh
-      awww-switcher
-      process-manager
-      pulseaudio
-      wifi-commander
-      port-killer
-      silverbullet
-    ];
-
-    settings = {
-      close_on_focus_loss = false;
-      consider_preedit = true;
-      pop_to_root_on_close = true;
-      favicon_service = "twenty";
-      search_files_in_root = true;
-      font = {
-        normal = {
-          size = 10;
-          family = "JetBrainsMono Nerd Font";
-        };
-      };
-      theme = {
-        light = {
-          name = "vicinae-light";
-          icon_theme = "default";
-        };
-        dark = {
-          name = "vicinae-dark";
-          icon_theme = "default";
-        };
-      };
-      launcher_window = {
-        opacity = 0.98;
-      };
-
-      imports = ["/run/secrets/vicinae.json"];
-
-      providers = {
-        "@samlinville/store.raycast.tailscale" = {
-          "preferences" = {
-            "tailscalePath" = "${pkgs.tailscale}/bin/tailscale";
-          };
-        };
-        "@sovereign/vicinae-extension-awww-switcher-0" = {
-          "preferences" = {
-            "transitionDuration" = "1";
-            "transitionType" = "center";
-            "wallpaperPath" = "/home/tux/Wallpapers/";
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/home/desktop/waybar/default.nix
+++ b/modules/home/desktop/waybar/default.nix
@@ -1,338 +0,0 @@
-{...}: {
-  programs = {
-    waybar = {
-      enable = true;
-      settings = {
-        mainBar = {
-          position = "top";
-          layer = "top";
-          height = 35;
-          margin-top = 0;
-          margin-bottom = 0;
-          margin-left = 0;
-          margin-right = 0;
-          exclusive = true;
-          passthrough = false;
-
-          modules-left = [
-            "custom/l_end"
-            "cpu"
-            "memory"
-            "custom/r_end"
-          ];
-          modules-center = [
-            "custom/l_end"
-            "hyprland/workspaces"
-            "custom/r_end"
-          ];
-          modules-right = [
-            "custom/l_end"
-            "network"
-            "bluetooth"
-            "battery"
-            "tray"
-            "custom/r_end"
-          ];
-
-          "hyprland/workspaces" = {
-            "disable-scroll" = true;
-            "all-outputs" = true;
-            "active-only" = false;
-            "on-click" = "activate";
-            "persistent-workspaces" = {
-              "1" = [];
-              "2" = [];
-              "3" = [];
-              "4" = [];
-            };
-          };
-
-          "network" = {
-            "tooltip" = true;
-            "format-wifi" = "  <span foreground='#99ffdd'> {bandwidthDownBytes}</span> <span foreground='#ffcc66'> {bandwidthUpBytes}</span>";
-            "format-ethernet" = "󰈀 <span foreground='#99ffdd'> {bandwidthDownBytes}</span> <span foreground='#ffcc66'> {bandwidthUpBytes}</span>";
-            "tooltip-format" = "Network= <big><b>{essid}</b></big>\nSignal strength= <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency= <b>{frequency}MHz</b>\nInterface= <b>{ifname}</b>\nIP= <b>{ipaddr}/{cidr}</b>\nGateway= <b>{gwaddr}</b>\nNetmask= <b>{netmask}</b>";
-            "format-linked" = "󰈀 {ifname} (No IP)";
-            "format-disconnected" = "󰖪 ";
-            "tooltip-format-disconnected" = "Disconnected";
-            "interval" = 2;
-          };
-
-          "battery" = {
-            "states" = {
-              "good" = 95;
-              "warning" = 30;
-              "critical" = 20;
-            };
-            "format" = "{icon} {capacity}%";
-            "format-charging" = " {capacity}%";
-            "format-plugged" = " {capacity}%";
-            "format-alt" = "{time} {icon}";
-            "format-icons" = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
-          };
-
-          "bluetooth" = {
-            "format" = "";
-            "format-disabled" = "";
-            "format-connected" = " {num_connections}";
-            "format-connected-battery" = "{icon} {num_connections}";
-            # "format-connected-battery"= "{icon} {device_alias}-{device_battery_percentage}%";
-            "format-icons" = ["󰥇" "󰤾" "󰤿" "󰥀" "󰥁" "󰥂" "󰥃" "󰥄" "󰥅" "󰥆" "󰥈"];
-            # "format-device-preference"= [ "device1"; "device2" ]; // preference list deciding the displayed device If this config option is not defined or none of the devices in the list are connected; it will fall back to showing the last connected device.
-            "tooltip-format" = "{controller_alias}\n{num_connections} connected";
-            "tooltip-format-connected" = "{controller_alias}\n{num_connections} connected\n\n{device_enumerate}";
-            "tooltip-format-enumerate-connected" = "{device_alias}";
-            "tooltip-format-enumerate-connected-battery" = "{device_alias}\t{icon} {device_battery_percentage}%";
-          };
-
-          "memory" = {
-            "states" = {
-              "c" = 90; # critical
-              "h" = 60; # high
-              "m" = 30; # medium
-            };
-            "interval" = 30;
-            "format" = "󰾆 {used}GB";
-            "format-m" = "󰾅 {used}GB";
-            "format-h" = "󰓅 {used}GB";
-            "format-c" = " {used}GB";
-            "format-alt" = "󰾆 {percentage}%";
-            "max-length" = 10;
-            "tooltip" = true;
-            "tooltip-format" = "󰾆 {percentage}%\n {used=0.1f}GB/{total=0.1f}GB";
-          };
-
-          "cpu" = {
-            "interval" = 10;
-            "format" = "󰍛 {usage}%";
-            "format-alt" = "{icon0}{icon1}{icon2}{icon3}";
-            "format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
-          };
-
-          "tray" = {
-            "icon-size" = 14;
-            "spacing" = 5;
-          };
-
-          "custom/l_end" = {
-            "format" = " ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-
-          "custom/r_end" = {
-            "format" = " ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-
-          "custom/sl_end" = {
-            "format" = " ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-
-          "custom/sr_end" = {
-            "format" = " ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-
-          "custom/rl_end" = {
-            "format" = " ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-
-          "custom/rr_end" = {
-            "format" = " ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-
-          "custom/padd" = {
-            "format" = "  ";
-            "interval" = "once";
-            "tooltip" = false;
-          };
-        };
-      };
-      style = let
-        bar_bg = "rgba(23, 28, 34, 0.95)";
-        main_bg = "#101419";
-        main_fg = "#93cee9";
-
-        wb_act_bg = "#90ceaa";
-        wb_act_fg = "#1f2328";
-
-        wb_hvr_bg = "#90ceaa";
-        wb_hvr_fg = "#1f2328";
-      in ''
-        * {
-            border: none;
-            border-radius: 0px;
-            font-family: "JetBrainsMono Nerd Font";
-            font-weight: bold;
-            font-size: 20px;
-            min-height: 10px;
-        }
-
-        window#waybar {
-            background: ${bar_bg};
-        }
-
-        tooltip {
-            background: ${main_bg};
-            color: ${main_fg};
-            border-radius: 7px;
-            border-width: 0px;
-        }
-
-        #workspaces button {
-            box-shadow: none;
-        	text-shadow: none;
-            padding: 0px;
-            border-radius: 9px;
-            margin-top: 3px;
-            margin-bottom: 3px;
-            margin-left: 0px;
-            padding-left: 3px;
-            padding-right: 3px;
-            margin-right: 0px;
-            color: ${main_fg};
-            animation: ws_normal 20s ease-in-out 1;
-        }
-
-        #workspaces button.active {
-            background: ${wb_act_bg};
-            color: ${wb_act_fg};
-            margin-left: 3px;
-            padding-left: 12px;
-            padding-right: 12px;
-            margin-right: 3px;
-            animation: ws_active 20s ease-in-out 1;
-            transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
-        }
-
-        #workspaces button:hover {
-            background: ${wb_hvr_bg};
-            color: ${wb_hvr_fg};
-            animation: ws_hover 20s ease-in-out 1;
-            transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-        }
-
-        #taskbar button {
-            box-shadow: none;
-        	  text-shadow: none;
-            padding: 0px;
-            border-radius: 9px;
-            margin-top: 3px;
-            margin-bottom: 3px;
-            margin-left: 0px;
-            padding-left: 3px;
-            padding-right: 3px;
-            margin-right: 0px;
-            color: @wb-color;
-            animation: tb_normal 20s ease-in-out 1;
-        }
-
-        #taskbar button.active {
-            background: ${wb_act_bg};
-            color: @wb-act-color;
-            margin-left: 3px;
-            padding-left: 12px;
-            padding-right: 12px;
-            margin-right: 3px;
-            animation: tb_active 20s ease-in-out 1;
-            transition: all 0.4s cubic-bezier(.55,-0.68,.48,1.682);
-        }
-
-        #taskbar button:hover {
-            background: ${wb_hvr_bg};
-            color: @wb-hvr-color;
-            animation: tb_hover 20s ease-in-out 1;
-            transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-        }
-
-        #backlight,
-        #battery,
-        #bluetooth,
-        #custom-cliphist,
-        #clock,
-        #custom-cpuinfo,
-        #cpu,
-        #custom-gpuinfo,
-        #idle_inhibitor,
-        #language,
-        #memory,
-        #custom-mode,
-        #mpris,
-        #network,
-        #custom-power,
-        #pulseaudio,
-        #custom-spotify,
-        #taskbar,
-        #tray,
-        #custom-updates,
-        #custom-wallchange,
-        #custom-wbar,
-        #window,
-        #workspaces,
-        #custom-l_end,
-        #custom-r_end,
-        #custom-sl_end,
-        #custom-sr_end,
-        #custom-rl_end,
-        #custom-rr_end {
-            color: ${main_fg};
-            background: ${main_bg};
-            opacity: 1;
-            margin: 4px 0px 4px 0px;
-            padding-left: 4px;
-            padding-right: 4px;
-        }
-
-        #workspaces,
-        #taskbar {
-            padding: 0px;
-        }
-
-        #custom-r_end {
-            border-radius: 0px 21px 21px 0px;
-            margin-right: 9px;
-            padding-right: 3px;
-        }
-
-        #custom-l_end {
-            border-radius: 21px 0px 0px 21px;
-            margin-left: 9px;
-            padding-left: 3px;
-        }
-
-        #custom-sr_end {
-            border-radius: 0px;
-            margin-right: 9px;
-            padding-right: 3px;
-        }
-
-        #custom-sl_end {
-            border-radius: 0px;
-            margin-left: 9px;
-            padding-left: 3px;
-        }
-
-        #custom-rr_end {
-            border-radius: 0px 7px 7px 0px;
-            margin-right: 9px;
-            padding-right: 3px;
-        }
-
-        #custom-rl_end {
-            border-radius: 7px 0px 0px 7px;
-            margin-left: 9px;
-            padding-left: 3px;
-        }
-      '';
-    };
-  };
-}
--- a/modules/home/discord/default.nix
+++ b/modules/home/discord/default.nix
@@ -1,40 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    inputs.nixcord.homeModules.nixcord
-  ];
-
-  programs.nixcord = {
-    enable = true;
-    vesktop.enable = true;
-    dorion.enable = true;
-    config = {
-      themeLinks = [
-        "https://raw.githubusercontent.com/refact0r/system24/refs/heads/main/archive/flavors/spotify-text.theme.css"
-      ];
-      frameless = true;
-      plugins = {
-        hideMedia.enable = true;
-        ignoreActivities = {
-          enable = true;
-          ignorePlaying = true;
-          ignoreWatching = true;
-        };
-      };
-    };
-    dorion = {
-      theme = "dark";
-      zoom = "1.1";
-      blur = "acrylic";
-      sysTray = true;
-      openOnStartup = true;
-      autoClearCache = true;
-      disableHardwareAccel = false;
-      rpcServer = true;
-      rpcProcessScanner = true;
-      pushToTalk = true;
-      pushToTalkKeys = ["RControl"];
-      desktopNotifications = true;
-      unreadBadge = true;
-    };
-  };
-}
--- a/modules/home/easyeffects/default.nix
+++ b/modules/home/easyeffects/default.nix
@@ -1,3 +0,0 @@
-{...}: {
-  services.easyeffects.enable = true;
-}
--- a/modules/home/fastfetch/default.nix
+++ b/modules/home/fastfetch/default.nix
@@ -1,69 +0,0 @@
-{...}: {
-  home.file.".config/fastfetch/config.jsonc".text = ''
-    {
-      "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-      "logo": {
-        "type": "none",
-      },
-      "display": {
-        "separator": " ",
-        "key": {
-          "width": 18,
-        },
-      },
-      "modules": [
-        {
-          "key": "  ╭───────────╮",
-          "type": "custom",
-        },
-        {
-          "key": "  │           │\u001b[11D{#31}  user",
-          "type": "title",
-          "format": "{1}",
-        },
-        {
-          "key": "  │           │\u001b[11D{#34}  hname",
-          "type": "command",
-          "text": "hostname",
-        },
-        {
-          "key": "  │           │\u001b[11D{#34}󰻀  distro",
-          "type": "os",
-        },
-        {
-          "key": "  │           │\u001b[11D{#35}󰌢  kernel",
-          "type": "kernel",
-        },
-        {
-          "key": "  │           │\u001b[11D{#31}  uptime",
-          "type": "uptime",
-        },
-        {
-          "key": "  │           │\u001b[11D{#32}  shell",
-          "type": "shell",
-        },
-        {
-          "key": "  │           │\u001b[11D{#35}  memory",
-          "type": "memory",
-        },
-        {
-          "key": "  ├───────────┤",
-          "type": "custom",
-        },
-        {
-          "key": "  │           │\u001b[11D{#39}  colors",
-          "type": "colors",
-          "symbol": "circle",
-        },
-        {
-          "key": "  ╰───────────╯",
-          "type": "custom",
-        },
-      ],
-    }
-  '';
-
-  programs.fastfetch = {
-    enable = true;
-  };
-}
--- a/modules/home/firefox/default.nix
+++ b/modules/home/firefox/default.nix
@@ -1,73 +0,0 @@
-{
-  pkgs,
-  username,
-  ...
-}: {
-  home.file.".mozilla/firefox/${username}/chrome".source = pkgs.firefox-mod-blur;
-
-  programs.firefox = {
-    enable = true;
-
-    package = pkgs.firefox.override {
-      extraPolicies = {
-        CaptivePortal = false;
-        DisableFirefoxStudies = true;
-        DisablePocket = true;
-        DisableTelemetry = true;
-        DisableFirefoxAccounts = false;
-        NoDefaultBookmarks = true;
-        OfferToSaveLogins = false;
-        OfferToSaveLoginsDefault = false;
-        PasswordManagerEnabled = false;
-        FirefoxHome = {
-          Search = true;
-          Pocket = false;
-          Snippets = false;
-          TopSites = false;
-          Highlights = false;
-        };
-        UserMessaging = {
-          ExtensionRecommendations = false;
-          SkipOnboarding = true;
-        };
-      };
-    };
-
-    profiles = {
-      ${username} = {
-        id = 0;
-        name = "tux";
-        search = {
-          force = true;
-          default = "google";
-        };
-        settings = {
-          "general.smoothScroll" = true;
-          "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
-          "layout.css.prefers-color-scheme.content-override" = 0;
-          "browser.compactmode.show" = true;
-          "browser.tabs.firefox-view" = false;
-          "browser.bookmarks.addedImportButton" = false;
-          "extensions.pocket.enabled" = false;
-          "browser.fullscreen.autohide" = false;
-        };
-        extraConfig = ''
-          user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
-          user_pref("full-screen-api.ignore-widgets", true);
-          user_pref("media.ffmpeg.vaapi.enabled", true);
-          user_pref("media.rdd-vpx.enabled", true);
-        '';
-
-        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin
-          facebook-container
-          metamask
-          darkreader
-          bitwarden
-          wappalyzer
-          clearurls
-        ];
-      };
-    };
-  };
-}
--- a/modules/home/floorp/default.nix
+++ b/modules/home/floorp/default.nix
@@ -1,46 +0,0 @@
-{
-  username,
-  pkgs,
-  ...
-}: {
-  programs.floorp = {
-    enable = true;
-
-    profiles = {
-      ${username} = {
-        id = 0;
-        name = "${username}";
-        search = {
-          force = true;
-          default = "Google";
-        };
-        settings = {
-          "general.smoothScroll" = true;
-          "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";
-          "layout.css.prefers-color-scheme.content-override" = 0;
-          "browser.compactmode.show" = true;
-          "browser.tabs.firefox-view" = false;
-          "browser.bookmarks.addedImportButton" = false;
-          "extensions.pocket.enabled" = false;
-          "browser.fullscreen.autohide" = false;
-        };
-        extraConfig = ''
-          user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
-          user_pref("full-screen-api.ignore-widgets", true);
-          user_pref("media.ffmpeg.vaapi.enabled", true);
-          user_pref("media.rdd-vpx.enabled", true);
-        '';
-
-        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin
-          facebook-container
-          metamask
-          darkreader
-          bitwarden
-          wappalyzer
-          clearurls
-        ];
-      };
-    };
-  };
-}
--- a/modules/home/ghostty/default.nix
+++ b/modules/home/ghostty/default.nix
@@ -1,40 +0,0 @@
-{pkgs, ...}: {
-  home.file = {
-    ".config/ghostty/config" = {
-      text = ''
-        confirm-close-surface = false
-        gtk-titlebar = false
-        window-padding-x = 10
-        window-padding-y = 10
-        background-opacity = 0.9
-        font-size = 12
-
-        palette = 0=#252b37
-        palette = 1=#d0679d
-        palette = 2=#5de4c7
-        palette = 3=#fffac2
-        palette = 4=#89ddff
-        palette = 5=#fae4fc
-        palette = 6=#add7ff
-        palette = 7=#ffffff
-        palette = 8=#a6accd
-        palette = 9=#d0679d
-        palette = 10=#5de4c7
-        palette = 11=#fffac2
-        palette = 12=#add7ff
-        palette = 13=#89ddff
-        palette = 14=#fcc5e9
-        palette = 15=#ffffff
-        background = #0f0f0f
-        foreground = #a6accd
-        cursor-color = #f2eacf
-        selection-background = #1a1a1a
-        selection-foreground = #f1f1f1
-      '';
-    };
-  };
-
-  home.packages = with pkgs; [
-    ghostty
-  ];
-}
--- a/modules/home/git/default.nix
+++ b/modules/home/git/default.nix
@@ -1,22 +0,0 @@
-{
-  email,
-  username,
-  ...
-}: {
-  programs.git = {
-    enable = true;
-    signing = {
-      key = "~/.ssh/id_ed25519.pub";
-      signByDefault = true;
-    };
-    settings = {
-      user = {
-        name = "${username}";
-        email = "${email}";
-      };
-      init.defaultBranch = "main";
-      commit.gpgSign = true;
-      gpg.format = "ssh";
-    };
-  };
-}
--- a/modules/home/helix/default.nix
+++ b/modules/home/helix/default.nix
@@ -1,37 +0,0 @@
-{pkgs, ...}: {
-  programs.helix = {
-    enable = true;
-    settings = {
-      theme = "gruvbox";
-      editor = {
-        line-number = "relative";
-        cursorline = true;
-        color-modes = true;
-        bufferline = "multiple";
-
-        "cursor-shape" = {
-          insert = "bar";
-          normal = "block";
-          select = "underline";
-        };
-      };
-    };
-    languages = {
-      language = [
-        {
-          name = "nix";
-          auto-format = true;
-        }
-      ];
-
-      language-server = {
-        nil = {
-          command = "${pkgs.nil}/bin/nil";
-          config.nil.formatting = {
-            command = "${pkgs.alejandra}/bin/alejandra";
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/home/kdeconnect/default.nix
+++ b/modules/home/kdeconnect/default.nix
@@ -1,6 +0,0 @@
-{...}: {
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
-}
--- a/modules/home/lan-mouse/default.nix
+++ b/modules/home/lan-mouse/default.nix
@@ -1,19 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    inputs.lan-mouse.homeManagerModules.default
-  ];
-
-  programs.lan-mouse = {
-    enable = true;
-    systemd = true;
-    settings = {
-      # release_bind = ["KeyA" "KeyS" "KeyD" "KeyF"];
-
-      port = 4242;
-
-      authorized_fingerprints = {
-        "30:66:b3:95:dc:6b:55:a4:9f:30:31:9c:3e:4d:70:03:33:c3:f0:6f:df:31:35:58:36:6e:80:2f:32:b2:ce:48" = "pc";
-      };
-    };
-  };
-}
--- a/modules/home/librewolf/default.nix
+++ b/modules/home/librewolf/default.nix
@@ -1,5 +0,0 @@
-{...}: {
-  programs.librewolf = {
-    enable = true;
-  };
-}
--- a/modules/home/mopidy/default.nix
+++ b/modules/home/mopidy/default.nix
@@ -1,38 +0,0 @@
-{pkgs, ...}: {
-  programs.ncmpcpp = {
-    enable = true;
-    package = pkgs.ncmpcpp.override {
-      visualizerSupport = true;
-      clockSupport = true;
-    };
-    mpdMusicDir = "~/Music/";
-
-    settings = {
-      mpd_host = "127.0.0.1";
-      mpd_port = 6600;
-      mpd_connection_timeout = 20;
-      visualizer_data_source = "localhost:5555";
-      visualizer_fps = 60;
-      visualizer_output_name = "feed";
-      visualizer_in_stereo = "yes";
-      visualizer_type = "spectrum";
-      visualizer_look = "▄▍";
-      visualizer_spectrum_smooth_look = "yes";
-      song_status_format = "$b$7♫ $2%a $4⟫$3⟫ $8%t $4⟫$3⟫ $5%b ";
-      header_visibility = "no";
-      color1 = "white";
-      color2 = "green";
-    };
-  };
-
-  services.mopidy = {
-    enable = true;
-
-    extensionPackages = with pkgs; [
-      mopidy-mpd
-      mopidy-spotify
-      mopidy-soundcloud
-      mopidy-iris
-    ];
-  };
-}
--- a/modules/home/nvim/default.nix
+++ b/modules/home/nvim/default.nix
@@ -1,40 +0,0 @@
-{pkgs, ...}: {
-  home.file = {
-    ".config/nvim" = {
-      recursive = true;
-      source = "${pkgs.tnvim}";
-    };
-  };
-
-  programs = {
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      vimAlias = true;
-      withPython3 = true;
-      withNodeJs = true;
-    };
-  };
-
-  home = {
-    packages = with pkgs; [
-      gcc
-      neovide
-
-      # nix
-      nil # Language Server
-      statix # Lints and suggestions
-      deadnix # Find and remove unused
-      alejandra # Code Formatter
-
-      # lua
-      luarocks
-
-      # ts
-      typescript
-
-      gdu
-      ripgrep
-    ];
-  };
-}
--- a/modules/home/picom/default.nix
+++ b/modules/home/picom/default.nix
@@ -1,64 +0,0 @@
-{pkgs, ...}: {
-  services.picom = {
-    enable = true;
-    package = pkgs.picom;
-
-    backend = "glx";
-    vSync = true;
-
-    fade = true;
-    fadeDelta = 10;
-    fadeSteps = [0.05 0.05];
-    fadeExclude = [
-      "window_type *= 'menu'"
-    ];
-
-    activeOpacity = 1;
-    inactiveOpacity = 1;
-    opacityRules = [
-      "90:class_g = 'rofi'"
-      "90:class_g = 'thunar'"
-      "90:class_g = 'spotify'"
-      "90:class_g = 'discord'"
-      "90:class_g = 'code'"
-      "90:class_g = 'org.wezfurlong.wezterm'"
-      "90:class_g = 'wezterm-floating'"
-    ];
-
-    settings = {
-      glx-no-stencil = true;
-      glx-copy-from-font = false;
-      use-damage = false;
-
-      frame-opacity = 1;
-      blur-background = true;
-      blur-method = "dual_kawase";
-      blur-strength = 10;
-
-      corner-radius = 8;
-
-      rounded-corners-exclude = [
-        "window_type = 'dock'"
-      ];
-
-      # pijulius specifics
-      animations = true;
-      animation-stiffness = 500;
-      animation-window-mass = 1.0;
-      animation-dampening = 26;
-      animation-delta = 10;
-      animation-force_steps = false;
-      animation-clamping = true;
-
-      animation-for-open-window = "slide-up";
-      animation-for-menu-window = "slide-down";
-      animation-for-transient-window = "slide-down";
-      animation-for-unmap-window = "slide-up";
-
-      animation-for-next-tag = "slide-right";
-      animation-for-prev-tag = "slide-left";
-      enable-fading-next-tag = true;
-      enable-fading-prev-tag = true;
-    };
-  };
-}
--- a/modules/home/shell/default.nix
+++ b/modules/home/shell/default.nix
@@ -1,100 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./lazygit.nix
-    ./superfile.nix
-    ./open-code.nix
-  ];
-
-  programs = {
-    bat.enable = true;
-    zsh = {
-      enable = true;
-      history = {
-        append = true;
-        share = true;
-        expireDuplicatesFirst = true;
-        ignoreDups = true;
-        size = 1000000;
-        save = 1000000;
-        path = "$HOME/.local/share/zsh/.zsh_history";
-      };
-      syntaxHighlighting.enable = true;
-      autosuggestion.enable = true;
-      initContent = ''
-        fastfetch
-        export WINIT_X11_SCALE_FACTOR=1
-        PATH=$PATH:~/.cargo/bin:~/.local/bin
-
-        bindkey "^A" vi-beginning-of-line
-        bindkey "^E" vi-end-of-line
-        bindkey '^R' fzf-history-widget
-      '';
-    };
-    zoxide = {
-      enable = true;
-      options = ["--cmd cd"];
-      enableZshIntegration = true;
-    };
-    ripgrep.enable = true;
-    btop = {
-      enable = true;
-      settings = {
-        theme_background = false;
-        update_ms = 1000;
-        presets = "cpu:0:default mem:0:default net:0:default";
-      };
-    };
-    go.enable = true;
-    yazi = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-    fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-    lsd = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-  };
-
-  home.packages = with pkgs; [
-    systemctl-tui
-    ranger
-    wget
-    portal
-    bore-cli
-    zip
-    unzip
-    pciutils
-    gnumake
-    nvtopPackages.full
-    zellij
-    nix-output-monitor
-    duf
-    jq
-    atac
-    termshark
-    solc
-    dig
-    lsof
-
-    python312
-    python312Packages.pipx
-    nodejs
-    pnpm
-    yarn
-    rustup
-    bun
-    nixpkgs-fmt
-
-    hunspell
-    hunspellDicts.en_US
-    air
-    templ
-    ffmpeg
-    deploy-rs
-    trok
-  ];
-}
--- a/modules/home/shell/lazygit.nix
+++ b/modules/home/shell/lazygit.nix
@@ -1,171 +0,0 @@
-{...}: {
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      gui = {
-        showIcons = true;
-        nerdFontsVersion = "3";
-      };
-      customCommands = [
-        {
-          key = "<c-a>";
-          description = "AI-powered conventional commit";
-          context = "global";
-          command = "git commit -m \"{{.Form.CommitMsg}}\"";
-          loadingText = "Generating commit messages...";
-          prompts = [
-            {
-              type = "menu";
-              key = "Type";
-              title = "Type of change";
-              options = [
-                {
-                  name = "AI defined";
-                  description = "Let AI analyze and determine the best commit type";
-                  value = "ai-defined";
-                }
-                {
-                  name = "build";
-                  description = "Changes that affect the build system or external dependencies";
-                  value = "build";
-                }
-                {
-                  name = "feat";
-                  description = "A new feature";
-                  value = "feat";
-                }
-                {
-                  name = "fix";
-                  description = "A bug fix";
-                  value = "fix";
-                }
-                {
-                  name = "chore";
-                  description = "Other changes that don't modify src or test files";
-                  value = "chore";
-                }
-                {
-                  name = "ci";
-                  description = "Changes to CI configuration files and scripts";
-                  value = "ci";
-                }
-                {
-                  name = "docs";
-                  description = "Documentation only changes";
-                  value = "docs";
-                }
-                {
-                  name = "perf";
-                  description = "A code change that improves performance";
-                  value = "perf";
-                }
-                {
-                  name = "refactor";
-                  description = "A code change that neither fixes a bug nor adds a feature";
-                  value = "refactor";
-                }
-                {
-                  name = "revert";
-                  description = "Reverts a previous commit";
-                  value = "revert";
-                }
-                {
-                  name = "style";
-                  description = "Changes that do not affect the meaning of the code";
-                  value = "style";
-                }
-                {
-                  name = "test";
-                  description = "Adding missing tests or correcting existing tests";
-                  value = "test";
-                }
-              ];
-            }
-            {
-              type = "menuFromCommand";
-              title = "AI Generated Commit Messages";
-              key = "CommitMsg";
-              command = ''
-                bash -c "
-                # Check for staged changes
-                diff=\$(git diff --cached | head -n 10)
-                if [ -z \"\$diff\" ]; then
-                  echo \"No changes in staging. Add changes first.\"
-                  exit 1
-                fi
-
-                SELECTED_TYPE=\"{{.Form.Type}}\"
-                COMMITS_TO_SUGGEST=8
-
-                opencode run -m \"google/gemini-2.5-flash-lite\" \"
-                  You are an expert at writing Git commits. Your job is to write commit messages that follow the Conventional Commits format.
-
-                  The user has selected: \$SELECTED_TYPE
-
-                  Your task is to:
-                  1. Analyze the code changes
-                  2. Determine the most appropriate commit type (if user selected 'ai-defined')
-                  3. Determine an appropriate scope (component/area affected)
-                  4. Decide if this is a breaking change
-                  5. Write clear, concise commit messages
-
-                  Available commit types:
-                  - feat: A new feature
-                  - fix: A bug fix
-                  - docs: Documentation only changes
-                  - style: Changes that do not affect the meaning of the code
-                  - refactor: A code change that neither fixes a bug nor adds a feature
-                  - perf: A code change that improves performance
-                  - test: Adding missing tests or correcting existing tests
-                  - build: Changes that affect the build system or external dependencies
-                  - ci: Changes to CI configuration files and scripts
-                  - chore: Other changes that don't modify src or test files
-                  - revert: Reverts a previous commit
-
-                  Follow these guidelines:
-                  - Structure: <type>(<scope>): <description>
-                  - If user selected 'ai-defined', analyze the changes and pick the most suitable type
-                  - If user selected a specific type, use that type: \$SELECTED_TYPE
-                  - Add scope in parentheses if applicable (e.g., auth, api, ui, config)
-                  - Use exclamation mark (!) after type/scope for breaking changes: type(scope)!: description
-                  - Use lowercase for description (except proper nouns)
-                  - Use imperative mood (\\\"add\\\", not \\\"added\\\")
-                  - Keep description under 50 characters when possible
-                  - No period at the end of subject line
-
-                  Examples:
-                  - feat(auth): add OAuth login support
-                  - fix(api): handle null response in user endpoint
-                  - docs(readme): update installation instructions
-                  - style(ui): improve button spacing consistency
-                  - refactor(database): simplify query builder logic
-                  - test(auth): add unit tests for login flow
-                  - build(deps): upgrade React to version 18
-                  - ci(github): fix deployment workflow
-                  - chore(config): update ESLint rules
-                  - perf(api)!: optimize database queries
-
-                  IMPORTANT:
-                  - Generate exactly \$COMMITS_TO_SUGGEST different commit message options
-                  - If user selected 'ai-defined', you can use different types for different options
-                  - If user selected a specific type, all messages must use that type
-                  - Only return commit messages, no explanations
-                  - Do not use markdown code blocks
-                  - One message per line
-
-                  Previous commits for context:
-                  \$(git log --oneline -10)
-
-                  Changes to analyze:
-                  \$(git diff --cached --stat)
-                  \$(git diff --cached)
-                  \"
-                "
-              '';
-            }
-          ];
-        }
-      ];
-    };
-  };
-}
--- a/modules/home/shell/open-code.nix
+++ b/modules/home/shell/open-code.nix
@@ -1,22 +0,0 @@
-{
-  programs.opencode = {
-    enable = true;
-    tui = {
-      theme = "system";
-    };
-    settings = {
-      provider = {
-        google = {
-          options = {
-            apiKey = "{file:/run/secrets/gemini_api_key}";
-          };
-        };
-        openrouter = {
-          options = {
-            apiKey = "{file:/run/secrets/open_router_api_key}";
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/home/shell/superfile.nix
+++ b/modules/home/shell/superfile.nix
@@ -1,41 +0,0 @@
-{
-  programs.superfile = {
-    enable = true;
-    settings = {
-      theme = "poimandres";
-      editor = "";
-      dir_editor = "";
-      auto_check_update = false;
-      cd_on_quit = false;
-      default_open_file_preview = true;
-      show_image_preview = true;
-      show_panel_footer_info = true;
-      default_directory = "~";
-      file_size_use_si = false;
-      default_sort_type = 0;
-      sort_order_reversed = false;
-      case_sensitive_sort = false;
-      shell_close_on_success = false;
-      debug = false;
-      ignore_missing_fields = false;
-      nerdfont = true;
-      transparent_background = true;
-      file_preview_width = 0;
-      code_previewer = "bat";
-      sidebar_width = 20;
-      border_top = "─";
-      border_bottom = "─";
-      border_left = "│";
-      border_right = "│";
-      border_top_left = "╭";
-      border_top_right = "╮";
-      border_bottom_left = "╰";
-      border_bottom_right = "╯";
-      border_middle_left = "├";
-      border_middle_right = "┤";
-      metadata = true;
-      zoxide_support = true;
-      enable_md5_checksum = false;
-    };
-  };
-}
--- a/modules/home/spotify/default.nix
+++ b/modules/home/spotify/default.nix
@@ -1,32 +0,0 @@
-{
-  services.spotifyd = {
-    enable = true;
-    settings = {
-      global = {
-        device_name = "canopus";
-        device_type = "computer";
-        bitrate = 320;
-        initial_volume = 100;
-        autoplay = true;
-      };
-    };
-  };
-
-  programs.spotify-player = {
-    enable = true;
-    settings = {
-      theme = "default";
-      client_id = "c54c06bacd3642c68d981474dadd3a53";
-      login_redirect_uri = "http://127.0.0.1:8989/login";
-      device = {
-        name = "spotify-player";
-        device_type = "speaker";
-        volume = 100;
-        bitrate = 320;
-        audio_cache = false;
-        normalization = false;
-        autoplay = false;
-      };
-    };
-  };
-}
--- a/modules/home/starship/default.nix
+++ b/modules/home/starship/default.nix
@@ -1,50 +0,0 @@
-{...}: {
-  programs.starship = {
-    enable = true;
-    settings = {
-      format = ''$os$hostname$directory$rust$golang$solidity$nodejs(bold blue)$git_branch$git_status[❯](bold yellow)[❯](bold purple)[❯](bold blue) '';
-      scan_timeout = 60;
-      add_newline = false;
-      line_break.disabled = true;
-
-      os = {
-        format = "[$symbol  ]($style)";
-        style = "bold green";
-        disabled = false;
-        symbols.NixOS = "󰊠";
-        symbols.Linux = "󰊠";
-        symbols.Arch = "󰣇";
-        symbols.Ubuntu = "󰕈";
-      };
-      directory = {
-        format = "[$path]($style)[$read_only ]($read_only_style)";
-        read_only = " 󰌾";
-        style = "bold blue";
-      };
-      git_branch.format = "[$symbol$branch]($style) ";
-      hostname = {
-        ssh_only = false;
-        format = "[$ssh_symbol$hostname]($style) ";
-        style = "bold green";
-        ssh_symbol = "󰇧 ";
-        disabled = false;
-      };
-      rust = {
-        format = "[$symbol]($style)";
-        symbol = " ";
-      };
-      golang = {
-        format = "[$symbol]($style)";
-        symbol = " ";
-      };
-      solidity = {
-        format = "[$symbol]($style)";
-        symbol = "󰡪 ";
-      };
-      nodejs = {
-        format = "[$symbol]($style)";
-        symbol = "󰎙 ";
-      };
-    };
-  };
-}
--- a/modules/home/thunderbird/default.nix
+++ b/modules/home/thunderbird/default.nix
@@ -1,9 +0,0 @@
-{username, ...}: {
-  programs.thunderbird = {
-    enable = true;
-
-    profiles."${username}" = {
-      isDefault = true;
-    };
-  };
-}
--- a/modules/home/tmux/default.nix
+++ b/modules/home/tmux/default.nix
@@ -1,136 +0,0 @@
-{pkgs, ...}: let
-  bg = "default";
-  fg = "default";
-  bg2 = "brightblack";
-  fg2 = "white";
-  color = c: "#{@${c}}";
-
-  indicator = let
-    accent = color "indicator_color";
-    content = "  ";
-  in "#[reverse,fg=${accent}]#{?client_prefix,${content},}";
-
-  current_window = let
-    accent = color "main_accent";
-    index = "#[reverse,fg=${accent},bg=${fg}] #I ";
-    name = "#[fg=${bg2},bg=${fg2}] #W ";
-    # flags = "#{?window_flags,#{window_flags}, }";
-  in "${index}${name}";
-
-  window_status = let
-    accent = color "window_color";
-    index = "#[reverse,fg=${accent},bg=${fg}] #I ";
-    name = "#[fg=${bg2},bg=${fg2}] #W ";
-    # flags = "#{?window_flags,#{window_flags}, }";
-  in "${index}${name}";
-
-  battery = let
-    percentage = pkgs.writeShellScript "percentage" (
-      if pkgs.stdenv.isDarwin
-      then ''
-        echo $(pmset -g batt | grep -o "[0-9]\+%" | tr '%' ' ')
-      ''
-      else ''
-        path="/org/freedesktop/UPower/devices/DisplayDevice"
-        echo $(${pkgs.upower}/bin/upower -i $path | grep -o "[0-9]\+%" | tr '%' ' ')
-      ''
-    );
-    state = pkgs.writeShellScript "state" (
-      if pkgs.stdenv.isDarwin
-      then ''
-        echo $(pmset -g batt | awk '{print $4}')
-      ''
-      else ''
-        path="/org/freedesktop/UPower/devices/DisplayDevice"
-        echo $(${pkgs.upower}/bin/upower -i $path | grep state | awk '{print $2}')
-      ''
-    );
-    icon = pkgs.writeShellScript "icon" ''
-      percentage=$(${percentage})
-      state=$(${state})
-      if [ "$state" == "charging" ] || [ "$state" == "fully-charged" ]; then echo "󰂄"
-      elif [ $percentage -ge 75 ]; then echo "󱊣"
-      elif [ $percentage -ge 50 ]; then echo "󱊢"
-      elif [ $percentage -ge 25 ]; then echo "󱊡"
-      elif [ $percentage -ge 0  ]; then echo "󰂎"
-      fi
-    '';
-    color = pkgs.writeShellScript "color" ''
-      percentage=$(${percentage})
-      state=$(${state})
-      if [ "$state" == "charging" ] || [ "$state" == "fully-charged" ]; then echo "green"
-      elif [ $percentage -ge 75 ]; then echo "green"
-      elif [ $percentage -ge 50 ]; then echo "${fg2}"
-      elif [ $percentage -ge 30 ]; then echo "yellow"
-      elif [ $percentage -ge 0  ]; then echo "red"
-      fi
-    '';
-  in "#[fg=#(${color})]#(${icon}) #[fg=${fg}]#(${percentage})%";
-
-  pwd = let
-    accent = color "main_accent";
-    icon = "#[fg=${accent}] ";
-    format = "#[fg=${fg}]#{b:pane_current_path}";
-  in "${icon}${format}";
-
-  git = let
-    icon = pkgs.writeShellScript "branch" ''
-      git -C "$1" branch && echo " "
-    '';
-    branch = pkgs.writeShellScript "branch" ''
-      git -C "$1" rev-parse --abbrev-ref HEAD
-    '';
-  in "#[fg=magenta]#(${icon} #{pane_current_path})#(${branch} #{pane_current_path})";
-
-  separator = "#[fg=${fg}]|";
-in {
-  programs.tmux = {
-    enable = true;
-    baseIndex = 1;
-    escapeTime = 0;
-    mouse = true;
-    extraConfig = ''
-      set-option -sa terminal-overrides ",xterm*:Tc"
-      set-option -g status-position top
-      unbind r
-      bind r source-file ~/.config/tmux/tmux.conf
-
-      # remap prefix from C-b to C-Space
-      # unbind C-b
-      # set -g prefix C-Space
-      # bind C-Space send-prefix
-
-      # split panes using | and -
-      unbind '"'
-      unbind %
-      bind | split-window -h
-      bind - split-window -v
-
-      # Start windows and panes at 1, not 0
-      set -g base-index 1
-      set -g pane-base-index 1
-      set-window-option -g pane-base-index 1
-      set-option -g renumber-windows on
-
-      # switch panes using Alt-arrow without prefix
-      bind -n M-Left select-pane -L
-      bind -n M-Right select-pane -R
-      bind -n M-Up select-pane -U
-      bind -n M-Down select-pane -D
-
-      set-option -g default-terminal "screen-256color"
-      set-option -g status-right-length 100
-      set-option -g @indicator_color "yellow"
-      set-option -g @window_color "magenta"
-      set-option -g @main_accent "blue"
-      set-option -g pane-active-border fg=black
-      set-option -g pane-border-style fg=black
-      set-option -g status-style "bg=${bg} fg=${fg}"
-      set-option -g status-left "${indicator}"
-      set-option -g status-right "${git} ${pwd} ${separator} ${battery}"
-      set-option -g window-status-current-format "${current_window}"
-      set-option -g window-status-format "${window_status}"
-      set-option -g window-status-separator ""
-    '';
-  };
-}
--- a/modules/home/vs-code/default.nix
+++ b/modules/home/vs-code/default.nix
@@ -1,76 +0,0 @@
-{pkgs, ...}: {
-  programs.vscode = {
-    enable = true;
-    package = pkgs.vscodium;
-
-    profiles.default = {
-      keybindings = [
-        {
-          "key" = "f7";
-          "command" = "-editor.action.wordHighlight.next";
-          "when" = "editorTextFocus && hasWordHighlights";
-        }
-        {
-          "key" = "f7";
-          "command" = "-editor.action.accessibleDiffViewer.next";
-          "when" = "isInDiffEditor";
-        }
-        {
-          "key" = "f7";
-          "command" = "workbench.action.terminal.toggleTerminal";
-          "when" = "terminal.active";
-        }
-        {
-          "key" = "ctrl+`";
-          "command" = "-workbench.action.terminal.toggleTerminal";
-          "when" = "terminal.active";
-        }
-      ];
-
-      userSettings = {
-        "window.zoomLevel" = 2;
-        "window.menuBarVisibility" = "toggle";
-
-        "workbench.colorTheme" = "Poimandres Alternate";
-        "workbench.startupEditor" = "none";
-
-        "editor.fontFamily" = "FiraCode NF, FiraCode Nerd Font";
-        "editor.fontLigatures" = true;
-        "editor.cursorBlinking" = "smooth";
-        "editor.minimap.enabled" = false;
-
-        "terminal.integrated.fontFamily" = "FiraCode NF, FiraCode Nerd Font , FiraCode";
-      };
-
-      extensions =
-        (with pkgs.vscode-extensions; [
-          wakatime.vscode-wakatime
-          ms-dotnettools.csharp
-          naumovs.color-highlight
-          ms-vscode-remote.remote-containers
-          ms-azuretools.vscode-docker
-          mikestead.dotenv
-          golang.go
-          wix.vscode-import-cost
-          sumneko.lua
-          yzhang.markdown-all-in-one
-          jnoortheen.nix-ide
-          esbenp.prettier-vscode
-          prisma.prisma
-          ms-python.python
-          ms-vscode-remote.remote-ssh
-          humao.rest-client
-          bradlc.vscode-tailwindcss
-          gruntfuggly.todo-tree
-        ])
-        ++ (with pkgs.vscode-marketplace; [
-          danielpriestley.poimandres-alternate
-          pufferbommy.pretty-poimandres
-          yoavbls.pretty-ts-errors
-          formulahendry.auto-rename-tag
-          chakrounanas.turbo-console-log
-          streetsidesoftware.code-spell-checker
-        ]);
-    };
-  };
-}
--- a/modules/home/wezterm/default.nix
+++ b/modules/home/wezterm/default.nix
@@ -1,29 +0,0 @@
-{pkgs, ...}: {
-  programs.wezterm = {
-    enable = true;
-    package = pkgs.wezterm-git;
-    enableZshIntegration = false;
-
-    extraConfig = ''
-      local wezterm = require 'wezterm'
-      local config = {}
-
-      config.check_for_updates = false
-
-      config.window_close_confirmation = 'NeverPrompt'
-      config.color_scheme = 'Poimandres'
-      config.colors = {
-        background = "#0f0f0f"
-      }
-      config.enable_tab_bar = false
-      config.font = wezterm.font_with_fallback {
-        'JetBrainsMono Nerd Font',
-      }
-      config.font_size = 12.0
-      config.window_background_opacity = 1
-      config.audible_bell = "Disabled"
-
-      return config
-    '';
-  };
-}
--- a/modules/home/zed/default.nix
+++ b/modules/home/zed/default.nix
@@ -1,28 +0,0 @@
-{
-  programs.zed-editor = {
-    enable = true;
-    extensions = ["lua" "nix" "C#" "solidity"];
-    userKeymaps = [
-      {
-        context = "Workspace";
-        bindings = {
-          F7 = "workspace::NewTerminal";
-        };
-      }
-    ];
-    userSettings = {
-      ui_font_size = 18;
-      buffer_font_size = 18;
-      theme = {
-        mode = "dark";
-        light = "Ayu Light";
-        dark = "Ayu Dark";
-      };
-      vim_mode = true;
-      telemetry = {
-        diagnostics = false;
-        metrics = false;
-      };
-    };
-  };
-}
--- a/modules/nixos/desktop/awesome/default.nix
+++ b/modules/nixos/desktop/awesome/default.nix
@@ -1,70 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  services = {
-    displayManager = {
-      defaultSession = "none+awesome";
-      ly = {
-        enable = true;
-        settings = {
-          session_log = "null";
-        };
-      };
-    };
-
-    xserver = {
-      enable = true;
-      windowManager.awesome = {
-        enable = true;
-        luaModules = lib.attrValues {
-          inherit
-            (pkgs.luajitPackages)
-            lgi
-            ldbus
-            luadbi-mysql
-            luaposix
-            dkjson
-            ;
-        };
-      };
-    };
-
-    acpid.enable = true;
-    picom.enable = true;
-    upower.enable = true;
-    blueman.enable = true;
-  };
-
-  programs.dconf.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    luajit
-    acpi
-    linuxKernel.packages.linux_zen.acpi_call
-    lxappearance
-    inotify-tools
-    polkit_gnome
-    xdotool
-    xclip
-    xbacklight
-    gpick
-    alsa-utils
-    pavucontrol
-    brightnessctl
-    libnotify
-    feh
-    maim
-    mpdris2
-    python311Packages.mutagen
-    xdg-utils
-    playerctl
-    pulsemixer
-    easyeffects
-    procps
-    sct
-    slop
-    sddm-sugar-dark
-  ];
-}
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -1,55 +0,0 @@
-{pkgs, ...}: {
-  services = {
-    displayManager = {
-      defaultSession = "none+awesome";
-      ly = {
-        enable = true;
-        settings = {
-          session_log = "null";
-        };
-      };
-    };
-
-    acpid.enable = true;
-    picom.enable = true;
-    upower.enable = true;
-    blueman.enable = true;
-  };
-
-  programs.dconf.enable = true;
-
-  xdg.mime = {
-    enable = true;
-    defaultApplications = {
-      "application/pdf" = ["brave-browser.desktop"];
-      "text/html" = ["brave-browser.desktop"];
-      "x-scheme-handler/http" = ["brave-browser.desktop"];
-      "x-scheme-handler/https" = ["brave-browser.desktop"];
-      "x-scheme-handler/about" = ["brave-browser.desktop"];
-      "x-scheme-handler/unknown" = ["brave-browser.desktop"];
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    acpi
-    linuxKernel.packages.linux_zen.acpi_call
-    inotify-tools
-    polkit_gnome
-    xdotool
-    xclip
-    xbacklight
-    gpick
-    alsa-utils
-    pavucontrol
-    brightnessctl
-    libnotify
-    feh
-    maim
-    mpdris2
-    xdg-utils
-    playerctl
-    pulsemixer
-    easyeffects
-    procps
-  ];
-}
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -1,28 +0,0 @@
-{pkgs, ...}: {
-  programs.hyprland = {
-    enable = true;
-    package = pkgs.hyprland-git.hyprland;
-    portalPackage = pkgs.hyprland-git.xdg-desktop-portal-hyprland;
-  };
-
-  environment.systemPackages = [
-    (pkgs.writeShellScriptBin "mirror-display" ''
-      hyprctl keyword monitor "eDP-1,2560x1440@90,0x0,1" \
-        && hyprctl keyword monitor "HDMI-A-1,preferred,0x0,1,mirror,eDP-1" \
-        && ags quit \
-        && ${pkgs.tpanel}/bin/tpanel &
-    '')
-    (pkgs.writeShellScriptBin "extend-display" ''
-      hyprctl keyword monitor "eDP-1,2560x1440@90,0x0,1" \
-        && hyprctl keyword monitor "HDMI-A-1,preferred,0x-1440,1" \
-        && ags quit \
-        && ${pkgs.tpanel}/bin/tpanel &
-    '')
-    (pkgs.writeShellScriptBin "dock-display" ''
-      hyprctl keyword monitor "eDP-1,disable" \
-        && hyprctl keyword monitor "HDMI-A-1,preferred,0x0,1" \
-        && ags quit \
-        && ${pkgs.tpanel}/bin/tpanel &
-    '')
-  ];
-}
--- a/modules/nixos/desktop/mango/default.nix
+++ b/modules/nixos/desktop/mango/default.nix
@@ -1,26 +0,0 @@
-{
-  inputs,
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    inputs.mango.nixosModules.mango
-  ];
-
-  programs.mango.enable = true;
-
-  xdg.portal = {
-    enable = lib.mkDefault true;
-    extraPortals = with pkgs; [
-      hyprland-git.xdg-desktop-portal-hyprland
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-    ];
-    config.mango = {
-      default = lib.mkForce ["hyprland" "gtk"];
-      "org.freedesktop.impl.portal.ScreenCast" = lib.mkForce ["hyprland"];
-      "org.freedesktop.impl.portal.ScreenShot" = lib.mkForce ["hyprland"];
-    };
-  };
-}
--- a/modules/nixos/distrobox.nix
+++ b/modules/nixos/distrobox.nix
@@ -1,112 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.tux.packages.distrobox;
-in {
-  options.tux.packages.distrobox = {
-    enable = mkEnableOption "Enable DistroBox";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      distrobox
-
-      (writeShellScriptBin "dbox-create" ''
-        #!/usr/bin/env bash
-
-        # 1. Initialize variables
-        IMAGE=""
-        NAME=""
-
-        # Array to hold optional arguments (like volumes)
-        declare -a EXTRA_ARGS
-
-        # 2. Parse arguments
-        while [[ $# -gt 0 ]]; do
-          case $1 in
-            -i|--image)
-              IMAGE="$2"
-              shift 2
-              ;;
-            -n|--name)
-              NAME="$2"
-              shift 2
-              ;;
-            -p|--profile)
-              echo ":: Profile mode enabled: Mounting Nix store and user profiles (Read-Only)"
-              # Add volume flags to the array
-              EXTRA_ARGS+=( "--volume" "/nix/store:/nix/store:ro" )
-              EXTRA_ARGS+=( "--volume" "/etc/profiles/per-user:/etc/profiles/per-user:ro" )
-              EXTRA_ARGS+=( "--volume" "/etc/static/profiles/per-user:/etc/static/profiles/per-user:ro" )
-              shift 1
-              ;;
-            *)
-              echo "Unknown option $1"
-              exit 1
-              ;;
-          esac
-        done
-
-        if [ -z "$IMAGE" ] || [ -z "$NAME" ]; then
-            echo "Usage: dbox-create -i <image> -n <name> [-p]"
-            exit 1
-        fi
-
-        # 3. Define the custom home path
-        CUSTOM_HOME="$HOME/Distrobox/$NAME"
-
-        echo "------------------------------------------------"
-        echo "Creating Distrobox: $NAME"
-        echo "Location: $CUSTOM_HOME"
-        echo "------------------------------------------------"
-
-        # 4. Run Distrobox Create
-        # We expand "''${EXTRA_ARGS[@]}" to properly pass the volume arguments
-        ${pkgs.distrobox}/bin/distrobox create \
-          --image "$IMAGE" \
-          --name "$NAME" \
-          --home "$CUSTOM_HOME" \
-          "''${EXTRA_ARGS[@]}"
-
-        # Check exit code
-        if [ $? -ne 0 ]; then
-            echo "Error: Distrobox creation failed."
-            exit 1
-        fi
-
-        # 5. Post-Creation: Symlink Config Files
-        echo "--> Linking configurations to $NAME..."
-
-        # Helper function to symlink
-        link_config() {
-            SRC="$1"
-            DEST="$2"
-            DEST_DIR=$(dirname "$DEST")
-
-            # Create parent directory if it doesn't exist
-            mkdir -p "$DEST_DIR"
-
-            if [ -e "$SRC" ]; then
-                # ln -sf: symbolic link, force overwrite
-                ln -sf "$SRC" "$DEST"
-                echo "    [LINK] $DEST -> $SRC"
-            else
-                echo "    [SKIP] $SRC not found on host"
-            fi
-        }
-
-        # Create Symlinks
-        link_config "$HOME/.zshrc"                "$CUSTOM_HOME/.zshrc"
-        link_config "$HOME/.zshenv"               "$CUSTOM_HOME/.zshenv"
-        link_config "$HOME/.config/fastfetch"     "$CUSTOM_HOME/.config/fastfetch"
-        link_config "$HOME/.config/starship.toml" "$CUSTOM_HOME/.config/starship.toml"
-
-        echo "--> Done! Enter via: distrobox enter $NAME"
-      '')
-    ];
-  };
-}
--- a/modules/nixos/fail2ban.nix
+++ b/modules/nixos/fail2ban.nix
@@ -1,32 +0,0 @@
-{config, ...}: let
-  isFirewallEnabled = config.networking.firewall.enable;
-in {
-  services.fail2ban = {
-    enable = isFirewallEnabled;
-    maxretry = 5;
-    banaction = "iptables-multiport[blocktype=DROP]";
-    ignoreIP = [
-      "127.0.0.0/8"
-      "10.0.0.0/8"
-      "192.168.0.0/16"
-    ];
-    bantime = "24h";
-
-    bantime-increment = {
-      enable = true;
-      rndtime = "12m";
-      overalljails = true;
-      multipliers = "4 8 16 32 64 128 256 512 1024 2048";
-      maxtime = "192h";
-    };
-
-    jails = {
-      sshd.settings = {
-        enabled = true;
-        port = toString config.services.openssh.ports;
-        mode = "aggressive";
-        filter = "sshd";
-      };
-    };
-  };
-}
--- a/modules/nixos/networking/ssh.nix
+++ b/modules/nixos/networking/ssh.nix
@@ -1,69 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.tux.services.openssh;
-
-  # Sops needs acess to the keys before the persist dirs are even mounted; so
-  # just persisting the keys won't work, we must point at /persist
-  hasOptinPersistence = config.environment.persistence."/persist".enable;
-in {
-  options.tux.services.openssh = {
-    enable = mkEnableOption "Enable OpenSSH server";
-
-    ports = mkOption {
-      type = types.listOf types.port;
-      default = [22];
-      description = ''
-        Specifies on which ports the SSH daemon listens.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.openssh = {
-      enable = true;
-      startWhenNeeded = true;
-      allowSFTP = true;
-      ports = cfg.ports;
-
-      settings = {
-        PermitRootLogin = "no";
-        PasswordAuthentication = false;
-        KbdInteractiveAuthentication = false;
-        AuthenticationMethods = "publickey";
-        PubkeyAuthentication = "yes";
-        ChallengeResponseAuthentication = "no";
-        UsePAM = false;
-        UseDns = false;
-        X11Forwarding = false;
-        KexAlgorithms = [
-          "curve25519-sha256"
-          "curve25519-sha256@libssh.org"
-          "diffie-hellman-group16-sha512"
-          "diffie-hellman-group18-sha512"
-          "sntrup761x25519-sha512@openssh.com"
-          "diffie-hellman-group-exchange-sha256"
-          "mlkem768x25519-sha256"
-          "sntrup761x25519-sha512"
-        ];
-        Macs = [
-          "hmac-sha2-512-etm@openssh.com"
-          "hmac-sha2-256-etm@openssh.com"
-          "umac-128-etm@openssh.com"
-        ];
-        ClientAliveCountMax = 5;
-        ClientAliveInterval = 60;
-      };
-
-      hostKeys = [
-        {
-          path = "${lib.optionalString hasOptinPersistence "/persist"}/etc/ssh/ssh_host_ed25519_key";
-          type = "ed25519";
-        }
-      ];
-    };
-  };
-}
--- a/modules/nixos/obs-studio.nix
+++ b/modules/nixos/obs-studio.nix
@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  programs.obs-studio = {
-    enable = true;
-    enableVirtualCamera = true;
-    plugins = with pkgs.obs-studio-plugins; [obs-vaapi wlrobs obs-source-record];
-  };
-}
--- a/modules/nixos/selfhosted/adguard.nix
+++ b/modules/nixos/selfhosted/adguard.nix
@@ -1,8 +0,0 @@
-{...}: {
-  services = {
-    adguardhome = {
-      enable = true;
-      openFirewall = true;
-    };
-  };
-}
--- a/modules/nixos/selfhosted/containers/aiostreams.nix
+++ b/modules/nixos/selfhosted/containers/aiostreams.nix
@@ -1,61 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.tux.containers.aiostreams;
-in {
-  options.tux.containers.aiostreams = {
-    enable = mkEnableOption "Enable AIOStreams";
-
-    port = mkOption {
-      type = types.int;
-      default = 3000;
-    };
-
-    dataDir = mkOption {
-      type = types.path;
-      default = "/var/lib/aiostreams";
-      description = "Directory to store persistent AIOStreams data";
-    };
-
-    environment = mkOption {
-      type = with types; attrsOf str;
-      default = {};
-    };
-
-    environmentFiles = mkOption {
-      type = with types; listOf path;
-      default = [];
-    };
-  };
-
-  config = mkIf cfg.enable {
-    virtualisation.oci-containers.containers.aiostreams = {
-      autoStart = true;
-      image = "ghcr.io/viren070/aiostreams:latest";
-      ports = [
-        "${toString cfg.port}:3000"
-      ];
-
-      environment = cfg.environment;
-      environmentFiles = cfg.environmentFiles;
-      volumes = [
-        "${cfg.dataDir}:/app/data"
-      ];
-    };
-
-    services.nginx.virtualHosts = {
-      "${cfg.environment.ADDON_ID}" = {
-        forceSSL = true;
-        useACMEHost = "tux.rs";
-        locations = {
-          "/" = {
-            proxyPass = "http://localhost:${toString cfg.port}";
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/containers/cs2.nix
+++ b/modules/nixos/selfhosted/containers/cs2.nix
@@ -1,61 +0,0 @@
-{config, ...}: {
-  virtualisation.oci-containers.containers.cs2-server = {
-    image = "joedwards32/cs2";
-    environmentFiles = [
-      config.sops.secrets."cs2_secrets/SRCDS_TOKEN".path
-      config.sops.secrets."cs2_secrets/CS2_RCONPW".path
-      config.sops.secrets."cs2_secrets/CS2_PW".path
-    ];
-
-    environment = {
-      # Server configuration
-      STEAMAPPVALIDATE = "0";
-      CS2_SERVERNAME = "tux's CS-2 Server";
-      CS2_CHEATS = "0";
-      CS2_PORT = "27015";
-      CS2_SERVER_HIBERNATE = "1";
-      CS2_RCON_PORT = "";
-      CS2_LAN = "0";
-      CS2_MAXPLAYERS = "10";
-      CS2_ADDITIONAL_ARGS = "";
-      CS2_CFG_URL = "";
-      # Game modes
-      CS2_GAMEALIAS = "competitive";
-      CS2_GAMETYPE = "0";
-      CS2_GAMEMODE = "1";
-      CS2_MAPGROUP = "mg_active";
-      CS2_STARTMAP = "de_mirage";
-      # Workshop Maps
-      CS2_HOST_WORKSHOP_COLLECTION = "";
-      CS2_HOST_WORKSHOP_MAP = "";
-      # Bots
-      CS2_BOT_DIFFICULTY = "3";
-      CS2_BOT_QUOTA = "";
-      CS2_BOT_QUOTA_MODE = "";
-      # TV
-      TV_AUTORECORD = "0";
-      TV_ENABLE = "0";
-      TV_PORT = "27020";
-      TV_PW = "changeme";
-      TV_RELAY_PW = "changeme";
-      TV_MAXRATE = "0";
-      TV_DELAY = "0";
-      # Logs
-      CS2_LOG = "on";
-      CS2_LOG_MONEY = "0";
-      CS2_LOG_DETAIL = "0";
-      CS2_LOG_ITEMS = "0";
-    };
-    volumes = [
-      "cs2:/home/steam/cs2-dedicated"
-    ];
-    ports = [
-      "27015:27015/tcp"
-      "27015:27015/udp"
-      "27020:27020/udp"
-    ];
-    extraOptions = [
-      "--interactive"
-    ];
-  };
-}
--- a/modules/nixos/selfhosted/cyber-tux.nix
+++ b/modules/nixos/selfhosted/cyber-tux.nix
@@ -1,86 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.tux.services.cyber-tux;
-in {
-  options.tux.services.cyber-tux = {
-    enable = mkEnableOption "Enable CyberTux Discord bot";
-
-    user = mkOption {
-      type = types.str;
-      default = "cyber-tux";
-      description = "User under which the CyberTux service runs.";
-    };
-
-    group = mkOption {
-      type = types.str;
-      default = "cyber-tux";
-      description = "Group under which the CyberTux service runs.";
-    };
-
-    environmentFile = mkOption {
-      type = types.path;
-      description = "Environment file containing DISCORD_TOKEN";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services = {
-      cyber-tux = {
-        description = "A discord bot for my server";
-        after = ["network.target"];
-        wantedBy = ["multi-user.target"];
-
-        serviceConfig = {
-          Type = "simple";
-          User = "cyber-tux";
-          Group = "cyber-tux";
-          EnvironmentFile = cfg.environmentFile;
-          ExecStart = getExe pkgs.cyber-tux;
-          Restart = "always";
-
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateIPC = true;
-          PrivateTmp = true;
-          PrivateUsers = true;
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = true;
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          ProtectSystem = "strict";
-          RestrictNamespaces = "uts ipc pid user cgroup";
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          SystemCallArchitectures = "native";
-          SystemCallFilter = ["@system-service"];
-          UMask = "0077";
-        };
-      };
-    };
-    # Ensure the user and group exist
-    users.users = mkIf (cfg.user == "cyber-tux") {
-      ${cfg.user} = {
-        isSystemUser = true;
-        group = cfg.group;
-        description = "CyberTux service user";
-        home = "/var/lib/cyber-tux";
-        createHome = true;
-      };
-    };
-
-    users.groups = mkIf (cfg.group == "cyber-tux") {
-      ${cfg.group} = {};
-    };
-  };
-}
--- a/modules/nixos/selfhosted/gitea.nix
+++ b/modules/nixos/selfhosted/gitea.nix
@@ -1,29 +0,0 @@
-{lib, ...}: {
-  services = {
-    gitea = {
-      enable = true;
-      settings = {
-        service.DISABLE_REGISTRATION = true;
-        server = {
-          DOMAIN = "git.tux.rs";
-          ROOT_URL = "https://git.tux.rs";
-        };
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "git.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:3000";
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/glance/default.nix
+++ b/modules/nixos/selfhosted/glance/default.nix
@@ -1,43 +0,0 @@
-{
-  username,
-  lib,
-  config,
-  ...
-}: let
-  home = import ./home.nix;
-in {
-  services = {
-    glance = {
-      enable = true;
-      openFirewall = true;
-      settings = {
-        server = {
-          host = "0.0.0.0";
-          port = 5678;
-        };
-        branding = {
-          custom-footer = "<p><a href='https://tux.rs'>${username}</a></p>";
-        };
-        pages = [
-          home.page
-        ];
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "home.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://${config.services.glance.settings.server.host}:${toString config.services.glance.settings.server.port}";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/glance/home.nix
+++ b/modules/nixos/selfhosted/glance/home.nix
@@ -1,86 +0,0 @@
-{
-  page = {
-    name = "Dashboard - tux";
-    width = "slim";
-    hide-desktop-navigation = true;
-    center-vertically = true;
-    columns = [
-      {
-        size = "full";
-        widgets = [
-          {
-            type = "search";
-            autofocus = true;
-          }
-          {
-            type = "markets";
-            markets = [
-              {
-                symbol = "BTC-USD";
-                name = "Bitcoin";
-                chart-link = "https://www.tradingview.com/chart/?symbol=INDEX:BTCUSD";
-              }
-              {
-                symbol = "ETH-USD";
-                name = "Ethereum";
-                chart-link = "https://www.tradingview.com/chart/?symbol=INDEX:ETHUSD";
-              }
-              {
-                symbol = "SOL-USD";
-                name = "Solana";
-                chart-link = "https://www.tradingview.com/chart/?symbol=INDEX:SOLUSD";
-              }
-            ];
-          }
-          {
-            type = "monitor";
-            cache = "1m";
-            title = "Services";
-            sites = [
-              {
-                title = "Gitea";
-                url = "https://git.tux.rs";
-                icon = "si:gitea";
-              }
-              {
-                title = "Vaultwarden";
-                url = "https://bw.tux.rs";
-                icon = "si:vaultwarden";
-              }
-              {
-                title = "Ntfy";
-                url = "https://ntfy.tux.rs";
-                icon = "si:ntfy";
-              }
-              {
-                title = "Grafana";
-                url = "https://grafana.tux.rs";
-                icon = "si:grafana";
-              }
-              {
-                title = "SearXNG";
-                url = "https://sx.tux.rs";
-                icon = "si:searxng";
-              }
-              {
-                title = "Wakapi";
-                url = "https://wakapi.tux.rs";
-                icon = "si:wakatime";
-              }
-            ];
-          }
-          {
-            type = "reddit";
-            subreddit = "selfhosted";
-            style = "horizontal-cards";
-          }
-          {
-            type = "reddit";
-            subreddit = "homelab";
-            style = "horizontal-cards";
-          }
-        ];
-      }
-    ];
-  };
-}
--- a/modules/nixos/selfhosted/headscale.nix
+++ b/modules/nixos/selfhosted/headscale.nix
@@ -1,65 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  email,
-  ...
-}: {
-  security = {
-    acme = {
-      defaults.email = "${email}";
-      acceptTerms = true;
-    };
-  };
-
-  services = {
-    headscale = {
-      enable = true;
-      port = 8080;
-      address = "0.0.0.0";
-      settings = {
-        dns = {
-          base_domain = "hs.tux.rs";
-          search_domains = ["tux.rs"];
-          magic_dns = true;
-          nameservers.global = [
-            "9.9.9.9"
-          ];
-        };
-        # server_url = "https://hs.tux.rs:443";
-        metrics_listen_addr = "0.0.0.0:8095";
-        logtail = {
-          enabled = false;
-        };
-        log = {
-          level = "warn";
-        };
-        ip_prefixes = [
-          "100.64.0.0/10"
-          "fd7a:115c:a1e0::/48"
-        ];
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "hs.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:${toString config.services.headscale.port}";
-              proxyWebsockets = true;
-            };
-            "/metrics" = {
-              proxyPass = "http://${config.services.headscale.settings.metrics_listen_addr}/metrics";
-            };
-          };
-        };
-      };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [headscale];
-}
--- a/modules/nixos/selfhosted/kasmweb.nix
+++ b/modules/nixos/selfhosted/kasmweb.nix
@@ -1,24 +0,0 @@
-{lib, ...}: {
-  services = {
-    kasmweb = {
-      enable = true;
-      listenPort = 8843;
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "kasm.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "https://127.0.0.1:8843";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/monitoring/grafana.nix
+++ b/modules/nixos/selfhosted/monitoring/grafana.nix
@@ -1,45 +0,0 @@
-{
-  lib,
-  username,
-  email,
-  ...
-}: {
-  services = {
-    grafana = {
-      enable = true;
-      settings = {
-        server.http_port = 8888;
-        security = {
-          admin_user = "${username}";
-          admin_email = "${email}";
-        };
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "grafana.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:8888";
-              proxyWebsockets = true;
-            };
-
-            "/api/live/" = {
-              proxyPass = "http://localhost:8888";
-              extraConfig = ''
-                proxy_http_version 1.1;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection $connection_upgrade;
-                proxy_set_header Host $host;
-              '';
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/monitoring/loki.nix
+++ b/modules/nixos/selfhosted/monitoring/loki.nix
@@ -1,77 +0,0 @@
-{lib, ...}: {
-  services = {
-    loki = {
-      enable = true;
-      configuration = {
-        auth_enabled = false;
-        server = {
-          http_listen_port = 3100;
-        };
-        common = {
-          ring = {
-            instance_addr = "127.0.0.1";
-            kvstore = {
-              store = "inmemory";
-            };
-          };
-          replication_factor = 1;
-          path_prefix = "/tmp/loki";
-        };
-        schema_config = {
-          configs = [
-            {
-              from = "2020-05-15";
-              store = "tsdb";
-              object_store = "filesystem";
-              schema = "v13";
-              index = {
-                prefix = "index_";
-                period = "24h";
-              };
-            }
-          ];
-        };
-        storage_config = {
-          filesystem = {
-            directory = "/tmp/loki/chunks";
-          };
-        };
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "loki.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:3100";
-              extraConfig = ''
-                proxy_http_version 1.1;
-                proxy_read_timeout 1800s;
-                proxy_connect_timeout 1600s;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection $connection_upgrade;
-                proxy_set_header Connection "Keep-Alive";
-                proxy_set_header Proxy-Connection "Keep-Alive";
-                proxy_redirect off;
-              '';
-            };
-
-            "/ready" = {
-              proxyPass = "http://localhost:3100";
-              extraConfig = ''
-                proxy_http_version 1.1;
-                proxy_set_header Connection "Keep-Alive";
-                proxy_set_header Proxy-Connection "Keep-Alive";
-                proxy_redirect off;
-              '';
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/monitoring/promtail.nix
+++ b/modules/nixos/selfhosted/monitoring/promtail.nix
@@ -1,55 +0,0 @@
-{lib, ...}: {
-  services = {
-    promtail = {
-      enable = true;
-      configuration = {
-        server = {
-          http_listen_port = 9080;
-          grpc_listen_port = 0;
-        };
-        positions = {
-          filename = "/var/lib/promtail/positions.yaml";
-        };
-        clients = [
-          {
-            url = "https://loki.tux.rs/loki/api/v1/push";
-          }
-        ];
-        scrape_configs = [
-          {
-            job_name = "journal";
-            journal = {
-              max_age = "12h";
-              labels = {
-                job = "systemd-journal";
-              };
-            };
-            relabel_configs = [
-              {
-                source_labels = [
-                  "__journal__systemd_unit"
-                ];
-                target_label = "unit";
-              }
-            ];
-          }
-        ];
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "promtail.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:9080";
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/nextcloud.nix
+++ b/modules/nixos/selfhosted/nextcloud.nix
@@ -1,50 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  username,
-  ...
-}: {
-  services = {
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "cloud.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-        };
-      };
-    };
-
-    nextcloud = {
-      enable = true;
-      hostName = "cloud.tux.rs";
-      package = pkgs.nextcloud32;
-      database.createLocally = true;
-      configureRedis = true;
-      maxUploadSize = "16G";
-      https = true;
-
-      autoUpdateApps.enable = true;
-      extraAppsEnable = true;
-      extraApps = with config.services.nextcloud.package.packages.apps; {
-        inherit mail spreed;
-      };
-
-      config = {
-        dbtype = "sqlite";
-        adminuser = "${username}";
-        adminpassFile = config.sops.secrets.nextcloud_password.path;
-      };
-
-      settings = {
-        overwriteProtocol = "https";
-        default_phone_region = "IN";
-      };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    nextcloud32
-  ];
-}
--- a/modules/nixos/selfhosted/ntfy-sh.nix
+++ b/modules/nixos/selfhosted/ntfy-sh.nix
@@ -1,28 +0,0 @@
-{lib, ...}: {
-  services = {
-    ntfy-sh = {
-      enable = true;
-      settings = {
-        listen-http = ":7070";
-        base-url = "https://ntfy.tux.rs";
-        behind-proxy = true;
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "ntfy.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:7070";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/open-webui.nix
+++ b/modules/nixos/selfhosted/open-webui.nix
@@ -1,35 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  services = {
-    open-webui = {
-      enable = true;
-      openFirewall = true;
-      host = "0.0.0.0";
-      port = 1111;
-      environment = {
-        WEBUI_URL = "https://chat.tux.rs";
-        ENABLE_OLLAMA_API = "True";
-        OLLAMA_BASE_URL = "http://pc:11434";
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "chat.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://${config.services.open-webui.host}:${toString config.services.open-webui.port}";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/plausible.nix
+++ b/modules/nixos/selfhosted/plausible.nix
@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  services = {
-    plausible = {
-      enable = true;
-
-      server = {
-        baseUrl = "https://plausible.tux.rs";
-        port = 2100;
-        disableRegistration = true;
-        secretKeybaseFile = config.sops.secrets.plausible_key.path;
-      };
-
-      database.postgres = {
-        dbname = "plausible";
-        socket = "/run/postgresql";
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "plausible.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:2100";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/postgresql.nix
+++ b/modules/nixos/selfhosted/postgresql.nix
@@ -1,97 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  services.postgresql = {
-    enable = true;
-    package = pkgs.postgresql_16;
-
-    ensureDatabases = [
-      "plausible"
-      "wakapi"
-    ];
-    ensureUsers = [
-      {
-        name = "postgres";
-        ensureClauses = {
-          superuser = true;
-          login = true;
-          createrole = true;
-          createdb = true;
-          replication = true;
-        };
-      }
-      {
-        name = "plausible";
-        ensureDBOwnership = true;
-      }
-      {
-        name = "wakapi";
-        ensureDBOwnership = true;
-      }
-    ];
-
-    checkConfig = true;
-    enableTCPIP = false;
-
-    settings = {
-      max_connections = 100;
-      superuser_reserved_connections = 3;
-
-      shared_buffers = "1024 MB";
-      work_mem = "32 MB";
-      maintenance_work_mem = "320 MB";
-      huge_pages = "off";
-      effective_cache_size = "3 GB";
-      effective_io_concurrency = 100;
-      random_page_cost = 1.25;
-
-      shared_preload_libraries = "pg_stat_statements";
-      track_io_timing = "on";
-      track_functions = "pl";
-
-      wal_level = "replica";
-      max_wal_senders = 0;
-      synchronous_commit = "on";
-
-      checkpoint_timeout = "15 min";
-      checkpoint_completion_target = 0.9;
-      max_wal_size = "1024 MB";
-      min_wal_size = "512 MB";
-
-      wal_compression = "on";
-      wal_buffers = -1;
-      wal_writer_delay = "200ms";
-      wal_writer_flush_after = "1MB";
-
-      bgwriter_delay = "200ms";
-      bgwriter_lru_maxpages = 100;
-      bgwriter_lru_multiplier = 2.0;
-      bgwriter_flush_after = 0;
-
-      max_worker_processes = 3;
-      max_parallel_workers_per_gather = 2;
-      max_parallel_maintenance_workers = 2;
-      max_parallel_workers = 3;
-      parallel_leader_participation = "on";
-
-      enable_partitionwise_join = "on";
-      enable_partitionwise_aggregate = "on";
-      jit = "on";
-
-      jit_above_cost = 100000;
-      jit_inline_above_cost = 150000;
-      jit_optimize_above_cost = 500000;
-
-      log_min_duration_statement = 100;
-      "auto_explain.log_min_duration" = 100;
-
-      log_connections = true;
-      log_statement = "all";
-      logging_collector = true;
-      log_disconnections = true;
-      log_destination = lib.mkForce "syslog";
-    };
-  };
-}
--- a/modules/nixos/selfhosted/rustdesk-server.nix
+++ b/modules/nixos/selfhosted/rustdesk-server.nix
@@ -1,9 +0,0 @@
-{...}: {
-  services = {
-    rustdesk-server = {
-      enable = true;
-      openFirewall = true;
-      signal.relayHosts = ["156.67.105.203"];
-    };
-  };
-}
--- a/modules/nixos/selfhosted/searx.nix
+++ b/modules/nixos/selfhosted/searx.nix
@@ -1,43 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  services = {
-    searx = {
-      enable = true;
-      package = pkgs.searxng;
-      environmentFile = config.sops.secrets.searx_secret_key.path;
-      settings = {
-        general = {
-          instance_name = "SearXNG";
-        };
-        server = {
-          bind_address = "0.0.0.0";
-          port = 3415;
-          base_url = "https://sx.tux.rs";
-          secret_key = "@secret_key@";
-        };
-        search = {
-          autocomplete = "google";
-        };
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "sx.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:3415";
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/send.nix
+++ b/modules/nixos/selfhosted/send.nix
@@ -1,33 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  services = {
-    send = {
-      enable = true;
-      port = 1443;
-
-      environment = {
-        DEFAULT_DOWNLOADS = 5;
-        DETECT_BASE_URL = true;
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "share.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://${config.services.send.host}:${toString config.services.send.port}";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/silver-bullet.nix
+++ b/modules/nixos/selfhosted/silver-bullet.nix
@@ -1,28 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  services = {
-    silverbullet = {
-      enable = true;
-      listenPort = 9876;
-      envFile = config.sops.secrets.silver_bullet.path;
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "notes.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:9876";
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/tfolio.nix
+++ b/modules/nixos/selfhosted/tfolio.nix
@@ -1,102 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.tux.services.tfolio;
-in {
-  options.tux.services.tfolio = {
-    enable = mkEnableOption "Enable tfolio";
-
-    host = mkOption {
-      type = lib.types.str;
-      default = "0.0.0.0";
-      description = "IP address or hostname on which the tfolio service will listen.";
-    };
-
-    port = mkOption {
-      type = lib.types.port;
-      default = 22;
-      description = "Port number on which the tfolio service will listen.";
-    };
-
-    dataDir = mkOption {
-      type = lib.types.str;
-      default = "/var/lib/tfolio/";
-      description = "Directory where tfolio will store its data files.";
-    };
-
-    user = mkOption {
-      type = types.str;
-      default = "tfolio";
-      description = "User under which the tfolio service runs.";
-    };
-
-    group = mkOption {
-      type = types.str;
-      default = "tfolio";
-      description = "Group under which the tfolio service runs.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services = {
-      tfolio = {
-        description = "my portfolio in a ssh session";
-        after = ["network.target"];
-        wantedBy = ["multi-user.target"];
-
-        serviceConfig = {
-          Type = "simple";
-          User = cfg.user;
-          Group = cfg.group;
-          ExecStart = "${getExe pkgs.tfolio} -l ${cfg.host} -p ${toString cfg.port} -d ${cfg.dataDir}";
-          Restart = "always";
-          StateDirectory = "tfolio";
-
-          # Allow binding to privileged ports
-          AmbientCapabilities = "CAP_NET_BIND_SERVICE";
-          CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
-
-          LockPersonality = true;
-          MemoryDenyWriteExecute = true;
-          NoNewPrivileges = true;
-          PrivateDevices = true;
-          PrivateIPC = true;
-          PrivateTmp = true;
-          ProtectClock = true;
-          ProtectControlGroups = true;
-          ProtectHome = "read-only";
-          ProtectHostname = true;
-          ProtectKernelLogs = true;
-          ProtectKernelModules = true;
-          ProtectKernelTunables = true;
-          ProtectProc = "invisible";
-          ProtectSystem = "full";
-          RestrictNamespaces = "uts ipc pid user cgroup";
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          SystemCallArchitectures = "native";
-          SystemCallFilter = ["@system-service"];
-          UMask = "0077";
-        };
-      };
-    };
-    # Ensure the user and group exist
-    users.users = mkIf (cfg.user == "tfolio") {
-      ${cfg.user} = {
-        isSystemUser = true;
-        group = cfg.group;
-        description = "tfolio service user";
-        home = "/var/lib/tfolio";
-        createHome = true;
-      };
-    };
-
-    users.groups = mkIf (cfg.group == "tfolio") {
-      ${cfg.group} = {};
-    };
-  };
-}
--- a/modules/nixos/selfhosted/umami.nix
+++ b/modules/nixos/selfhosted/umami.nix
@@ -1,32 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  services = {
-    umami = {
-      enable = true;
-      settings = {
-        APP_SECRET_FILE = config.sops.secrets.umami.path;
-        PORT = 4645;
-      };
-      createPostgresqlDatabase = true;
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "umami.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:${toString config.services.umami.settings.PORT}";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/upstream-proxy.nix
+++ b/modules/nixos/selfhosted/upstream-proxy.nix
@@ -1,60 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.tux.services.nginxStreamProxy;
-
-  upstreamServerType = lib.types.submodule ({config, ...}: {
-    options = {
-      address = lib.mkOption {
-        type = lib.types.str;
-        description = "IP address or hostname of the upstream server";
-      };
-      port = lib.mkOption {
-        type = lib.types.port;
-        default = 9999;
-        description = "Port number of the upstream server";
-      };
-      listenPort = lib.mkOption {
-        type = lib.types.port;
-        default = config.port;
-        defaultText = lib.literalExpression "port";
-        description = "Local port to listen for incoming connections (defaults to port)";
-      };
-    };
-  });
-in {
-  options.tux.services.nginxStreamProxy = {
-    enable = lib.mkEnableOption "Enable nginx TCP stream proxy";
-
-    upstreamServers = lib.mkOption {
-      type = lib.types.listOf upstreamServerType;
-      default = [
-        {
-          address = "0.0.0.0";
-          port = 9999;
-        }
-      ];
-      description = "List of upstream servers to proxy to, each with its own listen port";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    networking.firewall.allowedTCPPorts = map (server: server.listenPort) cfg.upstreamServers;
-
-    services.nginx = {
-      enable = lib.mkForce true;
-      package = pkgs.nginx.override {withStream = true;};
-      streamConfig =
-        lib.concatMapStringsSep "\n" (server: ''
-          server {
-            listen ${toString server.listenPort};
-            proxy_pass ${server.address}:${toString server.port};
-          }
-        '')
-        cfg.upstreamServers;
-    };
-  };
-}
--- a/modules/nixos/selfhosted/uptime-kuma.nix
+++ b/modules/nixos/selfhosted/uptime-kuma.nix
@@ -1,22 +0,0 @@
-{lib, ...}: {
-  services = {
-    uptime-kuma = {
-      enable = true;
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "uptime.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:3001";
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/vaultwarden.nix
+++ b/modules/nixos/selfhosted/vaultwarden.nix
@@ -1,29 +0,0 @@
-{lib, ...}: {
-  services = {
-    vaultwarden = {
-      enable = true;
-      config = {
-        domain = "https://bw.tux.rs";
-        enableWebsocket = true;
-        signupsAllowed = true;
-        disableIconDownload = true;
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "bw.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:8000";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/selfhosted/wakapi.nix
+++ b/modules/nixos/selfhosted/wakapi.nix
@@ -1,50 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: {
-  services = {
-    wakapi = {
-      enable = true;
-      passwordSaltFile = config.sops.secrets.wakapi_salt.path;
-      database.createLocally = true;
-      settings = {
-        app.avatar_url_template = "https://www.gravatar.com/avatar/{email_hash}.png";
-
-        server = {
-          port = 15999;
-          public_url = "https://wakapi.tux.rs";
-        };
-
-        db = {
-          dialect = "postgres";
-          host = "/run/postgresql";
-          port = 5432;
-          name = "wakapi";
-          user = "wakapi";
-        };
-
-        security = {
-          allow_signup = false;
-          disable_frontpage = true;
-        };
-      };
-    };
-
-    nginx = {
-      enable = lib.mkForce true;
-      virtualHosts = {
-        "wakapi.tux.rs" = {
-          forceSSL = true;
-          useACMEHost = "tux.rs";
-          locations = {
-            "/" = {
-              proxyPass = "http://localhost:15999";
-              proxyWebsockets = true;
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/nixos/steam.nix
+++ b/modules/nixos/steam.nix
@@ -1,7 +0,0 @@
-{...}: {
-  programs.steam = {
-    enable = true;
-  };
-
-  hardware.graphics.enable32Bit = true;
-}
--- a/modules/nixos/virtualisation/default.nix
+++ b/modules/nixos/virtualisation/default.nix
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./docker.nix
-    ./waydroid.nix
-    ./qemu.nix
-  ];
-}
--- a/modules/nixos/virtualisation/docker.nix
+++ b/modules/nixos/virtualisation/docker.nix
@@ -1,14 +0,0 @@
-{
-  username,
-  pkgs,
-  ...
-}: {
-  virtualisation = {
-    oci-containers.backend = "docker";
-    docker.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [lazydocker];
-
-  users.users.${username}.extraGroups = ["docker"];
-}
--- a/modules/nixos/virtualisation/qemu.nix
+++ b/modules/nixos/virtualisation/qemu.nix
@@ -1,22 +0,0 @@
-{
-  pkgs,
-  username,
-  ...
-}: {
-  virtualisation = {
-    libvirtd = {
-      enable = true;
-      qemu = {
-        swtpm.enable = true;
-      };
-    };
-    spiceUSBRedirection.enable = true;
-  };
-
-  users.users.${username}.extraGroups = ["libvirtd"];
-
-  environment.systemPackages = with pkgs; [
-    virt-manager
-    virt-viewer
-  ];
-}
--- a/modules/nixos/virtualisation/waydroid.nix
+++ b/modules/nixos/virtualisation/waydroid.nix
@@ -1,5 +0,0 @@
-{...}: {
-  virtualisation = {
-    waydroid.enable = true;
-  };
-}