minor: readabilty

This reverts commit 8ac3c21228.

.sops.yaml

@@ -0,0 +1,7 @@
+keys:
+  - &user_kenji age1dhmt5tdyxd9zam542zkr9hq4tku7lzmf6j057sjtepk80deky5fqemczs5
+creation_rules:
+  - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
+    key_groups:
+      - age:
+          - *user_kenji

README.md

@@ -1,55 +1,62 @@
-# Nix Sakamoto
-A rewrite of the original Sakamoto NixOS configuration.
+# HakaseOS
+HakaseOS is an opinionated NixOS configuration heavily inspired by OmarchyOS.
 
-## Installation
-Installing Sakamoto Nix configuration may vary on your current operating system.
+## Features
+* Vim keybindings
+* TUI applications
+* Simple Setup
+* Pre-configured Firefox
 
-| Hosts    | Description  |
-|----------|--------------|
-| hakase   | gaming desktop (linux) |
-| sakamoto | \[unavailable] server that uses containers (linux) |
-| nano | \[unavailable] windows configuration |
-| macos    | macos configuration       |
+## To-do
+* hypr animation
+* TUI for everything
 
-**Note: Replace `${Hosts}` with one of the options from the table above.**
+## How to Use SOPS
+SOPS is an important aspect of this operating system. Learning to use it is important for security and modularity. It is impertinent that you do not lose the `private key`, as it is irrecoverable.
 
-### Linux Installation
+To get started, follow the instructions below.
+1. Create a folder.
+```sh
+mkdir -p ~/.config/sops/age
+```
+2. Generate a private key using `age`
+```sh
+nix-shell -p age --run "age-keygen -o ~/.config/sops/age/keys.txt"
+```
+**OR**
+Use `ssh-to-age` to convert `id_ed22519` to `age`.
+```sh
+nix-shell -p ssh-to-age --run "ssh-to-age -private-key -i ~/.ssh/id_ed25519 > ~/.config/sops/age/keys.txt"
+```
+There are other ways of generating a private key. Refer to [sops-nix](https://github.com/Mic92/sops-nix).
+3. Get a **public key**.
+```sh
+nix-shell -p age --run "age-keygen -y ~/.config/sops/age/keys.txt"
+```
+4. On the same directory as `flake.nix`, create `.sops.yaml` and paste the following below.
+```yaml
+# This example uses YAML anchors which allows reuse of multiple keys 
+# without having to repeat yourself.
+# Also see https://github.com/Mic92/dotfiles/blob/d6114726d859df36ccaa32891c4963ae5717ef7f/nixos/.sops.yaml
+# for a more complex example.
+keys:
+  - &admin_alice 2504791468b153b8a3963cc97ba53d1919c5dfd4
+  - &admin_bob age12zlz6lvcdk6eqaewfylg35w0syh58sm7gh53q5vvn7hd7c6nngyseftjxl
+creation_rules:
+  - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
+    key_groups:
+    - pgp:
+      - *admin_alice
+      age:
+      - *admin_bob
 
-1.  Install [Nix](https://nixos.org).
-2.  Clone this directory.
-    ```sh
-    $ git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos
-    ```
-3.  Create a hardware-configuration.conf
-    ```sh
-    $ sudo nixos-generate-config --dir ~/.config/nixos/hosts/${Hosts}/
-    ```
-4.  ⚠️ Modify `config.nix` that suits your configuration. **Be sure to edit `config.nix`! Most especially `myConfig.essentials.Username`. Otherwise, your OS could break!!!**
-5.  Rebuild.
-    ```sh
-    $ sudo nixos-rebuild switch --flake ~/.config/nixos/hosts/#${Hosts}
-    ```
-6. Install unstable channel (fixes `pkgs.fish` misconfiguration).
-    ```sh
-    $ nix-channel --add https://nixos.org/channels/nixos-unstable nixos nix-channel --update 
-    ```
-7. (Optional) You can install `proton-ge` by running the following command:
-    ```sh
-    protonup
-    ```
-8. (Optional) Add Decky Loader for Steam via this command:
-    ```sh
-    touch ~/.steam/steam/.cef-enable-remote-debugging
-
-    ```
-### MacOS (Darwin) Installation
-1.  Install [Nix](https://nixos.org).
-2.  Clone this directory.
-    ```sh
-    $ git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos
-    ```
-3.  ⚠️ Modify `config.nix` that suits your configuration. **Be sure to edit `config.nix`! Most especially `myConfig.essentials.Username`. Otherwise, configuration would not work!!!**
-4. Rebuild.
-    ```sh
-    $ sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos
-    ```
+```
+Replace as according to your needs.
+5. Create a sops `.yaml` file.
+```sh
+nix-shell -p sops --run "sops secrets/example.yaml"
+```
+NOTE: If you add a new host to your `.sops.yaml`, you will need to update the keys for all secrets.
+```sh
+nix-shell -p sops --run "sops updatekeys secrets/example.yaml"
+```

apps/btop/home.nix

@@ -3,7 +3,7 @@
     enable = true;
     settings = {
       vim_keys = true;
-      theme_background = false;
+      color_theme = "TTY";
     };
   };
 }

apps/firefox/home.nix

@@ -0,0 +1,169 @@
+{
+  pkgs,
+  myConfig,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.textfox.homeManagerModules.default
+  ];
+  textfox = {
+    enable = true;
+    profile = "hakase";
+    config = {
+      # background = {
+      #   color = "#123456";
+      # };
+      # border = {
+      #   color = "#654321";
+      #   width = "4px";
+      #   transition = "1.0s ease";
+      #   radius = "3px";
+      # };
+      # displayWindowControls = true;
+      # displayNavButtons = true;
+      # displayUrlbarIcons = true;
+      # displaySidebarTools = false;
+      displayTitles = true;
+      # newtabLogo = "   __            __  ____          \A   / /____  _  __/ /_/ __/___  _  __\A  / __/ _ \\| |/_/ __/ /_/ __ \\| |/_/\A / /_/  __/>  </ /_/ __/ /_/ />  <  \A \\__/\\___/_/|_|\\__/_/  \\____/_/|_|  ";
+      # font = {
+      #   family = "Fira Code";
+      #   size = "15px";
+      #   accent = "#654321";
+      # };
+      tabs = {
+        horizontal.enable = false;
+        #   horizontal.enable = true;
+        #   vertical.enable = true;
+        #   vertical.margin = "1.0rem";
+      };
+      # navbar = {
+      #   margin = "8px 8px 2px";
+      #   padding = "4px";
+      # };
+      bookmarks = {
+        alignment = "left";
+      };
+      # icons = {
+      #   toolbar.extensions.enable = true;
+      #   context.extensions.enable = true;
+      #   context.firefox.enable = true;
+      # };
+      # textTransform = "uppercase";
+      # extraConfig = "/* custom css here */";
+    };
+  };
+
+  programs.firefox = {
+    enable = true;
+    languagePacks = ["en-US"];
+
+    profiles = {
+      hakase = {
+        search.force = true;
+        isDefault = true;
+        search.default = "ddg";
+
+        # Full declarative mode enabled.
+        # Note: Manual bookmarks added in the UI will be overwritten on next rebuild.
+        bookmarks = {
+          force = true;
+          settings = [
+            {
+              name = "Toolbar Bookmarks";
+              toolbar = true;
+              bookmarks = myConfig.firefox.bookmarks;
+            }
+          ];
+        };
+
+        settings = {
+          # --- Privacy & Hardening ---
+          "browser.contentblocking.category" = "strict";
+          "privacy.trackingprotection.enabled" = true;
+          "privacy.resistFingerprinting" = true; # Note: Spoofs timezone and caps FPS to 60
+          "geo.enabled" = false;
+          "media.peerconnection.enabled" = false; # Prevents WebRTC IP leaks
+          "network.dns.disablePrefetch" = true;
+          "network.prefetch-next" = false;
+
+          # --- NixOS / Hyprland Integration ---
+          "widget.use-xdg-desktop-portal.file-picker" = 1; # Use native file picker
+
+          # --- UI & Behavior ---
+          "browser.compactmode.show" = true;
+          "browser.tabs.closeWindowWithLastTab" = false;
+          "extensions.pocket.enabled" = false;
+          "extensions.screenshots.disabled" = true;
+          "browser.topsites.contile.enabled" = false;
+          "browser.formfill.enable" = false;
+          "browser.search.suggest.enabled" = false;
+          "browser.search.suggest.enabled.private" = false;
+          "browser.urlbar.suggest.searches" = false;
+          "browser.urlbar.showSearchSuggestionsFirst" = false;
+          "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+          "browser.newtabpage.activity-stream.feeds.snippets" = false;
+          "browser.newtabpage.activity-stream.section.highlights.includePocket" = false;
+          "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false;
+          "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false;
+          "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false;
+          "browser.newtabpage.activity-stream.showSponsored" = false;
+          "browser.newtabpage.activity-stream.system.showSponsored" = false;
+          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+
+          # --- Homepage & Navigation ---
+          "browser.startup.homepage" = "https://dash.sakamoto.dev";
+          "browser.newtabpage.pinned" = myConfig.firefox.newtabpage;
+
+          # --- DNS over HTTPS (Quad9) ---
+          "network.trr.mode" = 2; # Use DoH with system fallback
+          "network.trr.uri" = "https://dns.quad9.net/dns-query";
+        };
+      };
+    };
+
+    policies = {
+      DisableTelemetry = true;
+      DisableFirefoxStudies = true;
+      EnableTrackingProtection = {
+        Value = true;
+        Locked = false;
+        Cryptomining = true;
+        Fingerprinting = true;
+      };
+      DisablePocket = true;
+      DisableFirefoxAccounts = true;
+      DisableAccounts = true;
+      DisableFirefoxScreenshots = true;
+      OverrideFirstRunPage = "";
+      OverridePostUpdatePage = "";
+      DontCheckDefaultBrowser = true;
+      DisplayBookmarksToolbar = "always";
+      SearchBar = "unified";
+
+      # Power User Messaging
+      UserMessaging = {
+        ExtensionRecommendations = false;
+        SkipOnboarding = true;
+        FeatureRecommendations = false;
+        UrlbarInterventions = false;
+        WhatsNew = false;
+      };
+
+      ExtensionSettings = {
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+          installation_mode = "force_installed";
+        };
+        "tridactyl.vim@cmcaine.co.uk" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi";
+          installation_mode = "force_installed";
+        };
+      };
+    };
+  };
+}

apps/fish/home.nix

@@ -9,9 +9,9 @@
       set fish_greeting
       fish_vi_key_bindings
       zoxide init fish | source
-
+      zoxide init fish --cmd cd | source
     '';
-    shellAliases = myConfig.general.Terminal.aliases;
+    shellAliases = myConfig.terminal.aliases;
 
     plugins = with pkgs.fishPlugins; [
     ];

apps/fsel/config.toml

@@ -0,0 +1,17 @@
+# Colors
+# highlight_color = "LightBlue"
+# cursor = "█"
+
+# App launcher
+terminal_launcher = "ghostty -e"
+
+[app_launcher]
+filter_desktop = true              # Filter apps by desktop environment
+list_executables_in_path = false   # Show CLI tools from $PATH
+hide_before_typing = false         # Hide list until you start typing
+match_mode = "fuzzy"               # "fuzzy" or "exact"
+confirm_first_launch = false       # Confirm before launching new apps with -p
+
+# Pin/favorite settings
+# pin_color = "rgb(255,165,0)"       # Color for pin icon (orange)
+# pin_icon = "📌"                     # Icon for pinned apps

apps/fsel/home.nix

@@ -0,0 +1,15 @@
+{
+  pkgs,
+  inputs,
+  myConfig,
+  ...
+}: {
+  home.packages = [
+    inputs.fsel.packages.${pkgs.system}.default # FIXME: does not have its own homeManagerModules
+    pkgs.wl-clipboard
+  ];
+  home.file.".config/fsel/config.toml".text = ''
+    [exec]
+    terminal_launcher = "${myConfig.terminal.default} -e"
+  '';
+}

apps/gemini/home.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    solaar
+    gemini-cli
   ];
 }

apps/ghostty/home.nix

@@ -0,0 +1,65 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.ghostty = {
+    enable = true;
+    package =
+      if pkgs.stdenv.isDarwin
+      then pkgs.ghostty-bin
+      else pkgs.ghostty;
+    enableFishIntegration = true;
+
+    settings = {
+      confirm-close-surface = false;
+      window-padding-x = 15;
+      window-padding-y = 15;
+      window-padding-balance = true;
+
+      # --- The Dynamic Hook (Keep this for your script!) ---
+      # This allows your 'switch-theme' script to override the colors below on the fly.
+      # config-file = "theme.conf";
+
+      # --- Base16 Color Mapping (The "Starship Logic") ---
+      # We map the Stylix Base16 palette to Ghostty's specific keys.
+
+      # Background (surface0 in your Starship config)
+      # background = "${config.lib.stylix.colors.withHashtag.base00}";
+      #
+      # # Foreground (text in your Starship config)
+      # foreground = "${config.lib.stylix.colors.withHashtag.base05}";
+      #
+      # # Cursor (Using text color or Rosewater/Base06)
+      # cursor-color = "${config.lib.stylix.colors.withHashtag.base05}";
+      # cursor-text = "${config.lib.stylix.colors.withHashtag.base00}";
+      #
+      # # Selection (Highlight)
+      # selection-background = "${config.lib.stylix.colors.withHashtag.base02}";
+      # selection-foreground = "${config.lib.stylix.colors.withHashtag.base05}";
+      #
+      # # --- The ANSI Palette (0-15) ---
+      # # Mapping Base16 -> ANSI
+      # # This ensures your 'ls', 'grep', and Starship colors align perfectly.
+      # palette = [
+      #   "0=${config.lib.stylix.colors.withHashtag.base00}" # Black
+      #   "1=${config.lib.stylix.colors.withHashtag.base08}" # Red
+      #   "2=${config.lib.stylix.colors.withHashtag.base0B}" # Green
+      #   "3=${config.lib.stylix.colors.withHashtag.base0A}" # Yellow
+      #   "4=${config.lib.stylix.colors.withHashtag.base0D}" # Blue
+      #   "5=${config.lib.stylix.colors.withHashtag.base0E}" # Purple (Lavender)
+      #   "6=${config.lib.stylix.colors.withHashtag.base0C}" # Cyan (Sapphire)
+      #   "7=${config.lib.stylix.colors.withHashtag.base05}" # White
+      #
+      #   "8=${config.lib.stylix.colors.withHashtag.base03}" # Bright Black
+      #   "9=${config.lib.stylix.colors.withHashtag.base08}" # Bright Red
+      #   "10=${config.lib.stylix.colors.withHashtag.base0B}" # Bright Green
+      #   "11=${config.lib.stylix.colors.withHashtag.base0A}" # Bright Yellow
+      #   "12=${config.lib.stylix.colors.withHashtag.base0D}" # Bright Blue
+      #   "13=${config.lib.stylix.colors.withHashtag.base0E}" # Bright Purple
+      #   "14=${config.lib.stylix.colors.withHashtag.base0C}" # Bright Cyan
+      #   "15=${config.lib.stylix.colors.withHashtag.base07}" # Bright White
+      # ];
+    };
+  };
+}

apps/git/default.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    bottles
+    git
   ];
 }

apps/git/home.nix

@@ -0,0 +1,10 @@
+{myConfig, ...}: {
+  programs.git = {
+    enable = true;
+    settings = {
+      user.name = "${myConfig.git.username}";
+      user.email = "${myConfig.git.email}";
+      init.defaultBranch = "${myConfig.git.defaultBranch}";
+    };
+  };
+}

apps/hyprland/default.nix

@@ -0,0 +1,38 @@
+{
+  myConfig,
+  inputs,
+  pkgs,
+  ...
+}: {
+  programs.hyprland = {
+    enable = true;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    withUWSM = true;
+  };
+
+  environment.systemPackages = [
+    pkgs.hyprpicker
+    pkgs.hyprlock
+    pkgs.hypridle
+    pkgs.hyprpaper
+    pkgs.hyprsunset
+    pkgs.hyprpolkitagent
+  ];
+
+  xdg.terminal-exec = {
+    enable = true;
+    settings = {
+      default = ["${myConfig.terminal.default}"];
+    };
+  };
+
+  # systemd.user.services.hyprpolkitagent = {
+  #   description = "Hyprland Polkit Agent";
+  #   wantedBy = ["graphical-session.target"];
+  #   serviceConfig = {
+  #     ExecStart = "${pkgs.hyprpolkitagent}/libexec/hyprpolkitagent";
+  #     Restart = "on-failure";
+  #   };
+  # };
+}

apps/hyprland/home.nix

@@ -0,0 +1,13 @@
+{
+  imports = [
+    ./hypr/binds.nix
+    ./hypr/general.nix
+    ./hypr/exec.nix
+    ./hypr/rules.nix
+    ./hypr/animation.nix
+    ./hypr/misc.nix
+    ./hypr/input.nix
+  ];
+  wayland.windowManager.hyprland.enable = true;
+  wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support...
+}

apps/hyprland/hypr/animation.nix

@@ -0,0 +1,32 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    animations = {
+      enabled = true;
+
+      bezier = [
+        "easeOutQuint,0.23,1,0.32,1"
+        "easeInOutCubic,0.65,0.05,0.36,1"
+        "linear,0,0,1,1"
+        "almostLinear,0.5,0.5,0.75,1.0"
+        "quick,0.15,0,0.1,1"
+      ];
+
+      animation = [
+        "global, 1, 10, default"
+        "border, 1, 5.39, easeOutQuint"
+        "windows, 1, 4.79, easeOutQuint"
+        "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
+        "windowsOut, 1, 1.49, linear, popin 87%"
+        "fadeIn, 1, 1.73, almostLinear"
+        "fadeOut, 1, 1.46, almostLinear"
+        "fade, 1, 3.03, quick"
+        "layers, 1, 3.81, easeOutQuint"
+        "layersIn, 1, 4, easeOutQuint, fade"
+        "layersOut, 1, 1.5, linear, fade"
+        "fadeLayersIn, 1, 1.79, almostLinear"
+        "fadeLayersOut, 1, 1.39, almostLinear"
+        "workspaces, 0, 0, ease"
+      ];
+    };
+  };
+}

apps/hyprland/hypr/binds.nix

@@ -0,0 +1,68 @@
+{pkgs, ...}: {
+  services.swayosd.enable = true;
+  home.packages = [
+    pkgs.playerctl
+  ];
+  wayland.windowManager.hyprland.settings = {
+    bindel = [
+      ", XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise"
+      ", XF86AudioLowerVolume, exec, swayosd-client --output-volume lower"
+    ];
+
+    bindl = [
+      ", XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
+      ", Caps_Lock, exec, swayosd-client --caps-lock"
+      ", XF86AudioPlay, exec, playerctl play-pause && notify-send -u low -t 1000 \"Media\" \"$(playerctl status)\""
+      ", XF86AudioPrev, exec, playerctl previous && notify-send -u low -t 1000 \"Previous Track\" \"$(playerctl metadata title)\""
+      ", XF86AudioNext, exec, playerctl next && notify-send -u low -t 1000 \"Next Track\" \"$(playerctl metadata title)\""
+      ", XF86AudioMute, exec, swayosd-client --output-volume mute-toggle"
+    ]; # FIXME: not working
+    bindd =
+      [
+        # essential
+        "SUPER, Return, Open Terminal, exec, uwsm app -- xdg-terminal-exec"
+        "SUPER, Q, Kill active, killactive"
+
+        # move focus
+        "SUPER, J, Move focus down, movefocus, d"
+        "SUPER, K, Move focus up, movefocus, u"
+        "SUPER, H, Move focus left, movefocus, l"
+        "SUPER, L, Move focus right, movefocus, r"
+
+        # move window
+        "SUPER SHIFT, h, Move window left, movewindow, l"
+        "SUPER SHIFT, j, Move window down, movewindow, d"
+        "SUPER SHIFT, k, Move window up, movewindow, u"
+        "SUPER SHIFT, l, Move window right, movewindow, r"
+
+        # fullscreen
+        "SUPER, F, Toggle Fullscreen, fullscreen, 0"
+        "SUPER SHIFT, F, Toggle Maximized Fullscreen, fullscreen, 1"
+
+        # apps
+        "SUPER, W, Open Browser, exec, uwsm app -- firefox" # FIXME: must be xdg-open
+        "SUPER, SPACE, Open App Launcher, exec, uwsm app -- walker" # FIXME: pls make ghostty variable
+
+        # [Workspaces] Toggle between most recent workspaces
+        "SUPER, Tab, Cycle workspaces, workspace, previous"
+      ]
+      ++ (
+        # Generate binds for Super + [1-10] to switch workspaces
+        # and Super + Shift + [1-10] to move window to workspace
+        builtins.concatLists (builtins.genList (
+            i: let
+              ws = i + 1;
+              key = toString (
+                if ws == 10
+                then 0
+                else ws
+              );
+            in [
+              "SUPER, ${key}, Switch to workspace ${toString ws}, workspace, ${toString ws}"
+              "SUPER SHIFT, ${key}, Move window to workspace ${toString ws}, movetoworkspace, ${toString ws}"
+            ]
+          )
+          10)
+      );
+  };
+}

apps/hyprland/hypr/env.nix

@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.gum
+  ];
+  wayland.windowManager.hyprland.settings = {
+    env = [
+      "GUM_CONFIRM_PROMPT_FOREGROUND,6"
+      "GUM_CONFIRM_SELECTED_FOREGROUND,0"
+      "GUM_CONFIRM_SELECTED_BACKGROUND,2"
+      "GUM_CONFIRM_UNSELECTED_FOREGROUND,0"
+      "GUM_CONFIRM_UNSELECTED_BACKGROUND,8"
+    ];
+  };
+}

apps/hyprland/hypr/exec.nix

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    psmisc
+  ];
+  wayland.windowManager.hyprland.settings = {
+    exec-once = [
+      "uwsm app -- waybar"
+      "uwsm app -- hyprpaper"
+      "uwsm app -- elephant"
+      "uwsm app -- swayosd-server"
+    ];
+    exec = [
+      "pkill -x hyprpaper; uwsm app -- hyprpaper"
+      "killall -SIGUSR2 .ghostty-wrappe"
+    ];
+  };
+}

apps/hyprland/hypr/general.nix

@@ -0,0 +1,18 @@
+{myConfig, ...}: {
+  wayland.windowManager.hyprland.settings = {
+    general = {
+      gaps_in = 5;
+      gaps_out = 15;
+      layout = "dwindle";
+    };
+    monitor = myConfig.hyprland.monitors;
+    dwindle = {
+      pseudotile = true;
+      preserve_split = true;
+      force_split = 2;
+    };
+    master = {
+      new_status = "master";
+    };
+  };
+}

apps/hyprland/hypr/input.nix

@@ -0,0 +1,11 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    input = {
+      repeat_rate = 50;
+      repeat_delay = 300;
+    };
+    cursor = {
+      hide_on_key_press = true;
+    };
+  };
+}

apps/hyprland/hypr/misc.nix

@@ -0,0 +1,11 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    misc = {
+      disable_hyprland_logo = true;
+      disable_splash_rendering = true;
+      focus_on_activate = true;
+      anr_missed_pings = 3;
+      new_window_takes_over_fullscreen = 1;
+    };
+  };
+}

apps/hyprland/hypr/rules.nix

@@ -0,0 +1,21 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    windowrulev2 = [
+      # "float, class:^(org\.hakase\..*)$"
+      # "center, class:^(org\.hakase\..*)$"
+      # "size 80% 70%, class:^(org\.hakase\..*)$" # Example using percentages
+      # --- POPUP RULES (Wifi, BT, Audio) ---
+      # "size 602 478, class:^(org\.hakase\.popup\..*)$"
+      # "move 1312 32, class:^(org\.hakase\.popup\..*)$"
+      "float, class:^(org\.hakase\.popup\..*)$"
+      # "pin, class:^(org\.hakase\.popup\..*)$"
+      "animation slide right, class:^(org\.hakase\.popup\..*)$"
+      "dimaround, class:^(org\.hakase\.popup\..*)$"
+      # --- launcher ---
+      "float, title:^(launcher)$"
+      "size 500 430, title:^(launcher)$"
+      # Optional: Center it since it's floating
+      "center, title:^(launcher)$"
+    ];
+  };
+}

apps/hyprpaper/home.nix

@@ -0,0 +1,12 @@
+{myConfig, ...}: {
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      preload = ["../../assets/Wallpapers/${myConfig.hyprland.wallpaper}"];
+      wallpaper = [
+        "HDMI-A-1,../../assets/Wallpapers/${myConfig.hyprland.wallpaper}"
+      ];
+    };
+  };
+  systemd.user.startServices = "sd-switch";
+}

apps/jellyfin-tui/home.nix

@@ -1,5 +1,5 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    cloudflared
+    jellyfin-tui
   ];
 }

apps/neovim/neovim.nix

@@ -1,10 +1,9 @@
 {
-  pkgs,
   inputs,
   system,
   ...
 }: {
   home.packages = [
-    inputs.nixovim.packages.${system}.default
+    inputs.nixovim.packages.${system}.full
   ];
 }

apps/starship/home.nix

@@ -0,0 +1,62 @@
+{config, ...}: {
+  programs.starship = {
+    enable = true;
+    settings = {
+      # Pro layout: one-line, clear spacing
+      format = ''
+        [](surface0)$os$directory[](fg:surface0 bg:peach)$git_branch$git_status[](fg:peach bg:surface1)$c$rust$nodejs$python$golang[](fg:surface1 bg:surface0)$nix_shell[](surface0)
+        $character'';
+
+      # Palette definition (Catppuccin Mocha-inspired)
+      # Tell Starship to use the palette Stylix is already generating
+      palette = "base16";
+
+      # Map your custom names to Stylix/Base16 colors
+      # Stylix colors are available at: config.lib.stylix.colors.withHashtag.base0X
+      palettes.base16 = {
+        # Using standard Catppuccin/Base16 mapping
+        surface0 = "${config.lib.stylix.colors.withHashtag.base00}"; # Darkest BG
+        surface1 = "${config.lib.stylix.colors.withHashtag.base01}"; # Slightly lighter BG
+        text = "${config.lib.stylix.colors.withHashtag.base05}"; # Main Text
+        peach = "${config.lib.stylix.colors.withHashtag.base09}"; # Orange accent
+        lavender = "${config.lib.stylix.colors.withHashtag.base0E}"; # Purple accent
+        sapphire = "${config.lib.stylix.colors.withHashtag.base0C}"; # Cyan accent
+      };
+      os = {
+        disabled = false;
+        format = "[$symbol]($style)";
+        style = "bg:surface0 fg:text";
+        symbols = {NixOS = " ";};
+      };
+
+      directory = {
+        style = "bg:surface0 fg:lavender";
+        format = "[ $path ]($style)";
+        truncation_length = 3;
+        truncation_symbol = "…/";
+      };
+
+      git_branch = {
+        symbol = "󰊢 ";
+        style = "bg:peach fg:surface0";
+        format = "[[ $symbol $branch ]($style)]($style)";
+      };
+
+      git_status = {
+        style = "bg:peach fg:surface0";
+        format = "[[($all_status$ahead_behind )]($style)]($style)";
+      };
+
+      nix_shell = {
+        symbol = "󱄅 ";
+        style = "bg:surface0 fg:sapphire";
+        format = "[ $symbol $state ]($style)";
+      };
+
+      character = {
+        success_symbol = "[󱞩](bold green)";
+        error_symbol = "[󱞩](bold red)";
+      };
+    };
+  };
+}

apps/stylix/home.nix

@@ -0,0 +1,39 @@
+{
+  pkgs,
+  inputs,
+  myConfig,
+  lib,
+  ...
+}: {
+  imports = [
+    inputs.stylix.homeModules.stylix
+  ];
+  stylix = {
+    autoEnable = false;
+    targets = {
+      firefox = {
+        enable = true;
+        profileNames = [
+          "hakase"
+        ];
+      };
+      waybar.enable = true;
+      ghostty.enable = true;
+      hyprpaper.enable = true;
+      gtk.enable = true;
+    };
+    enable = true;
+    # autoEnable = false;
+    image = ../../assets/Wallpapers/${myConfig.hyprland.wallpaper};
+    polarity = "dark";
+    # base16Scheme = lib.mkDefault {
+    #   generator = "vibrant";
+    # };
+    iconTheme = {
+      enable = true;
+      package = pkgs.papirus-icon-theme; # The package to install
+      dark = "Papirus-Dark"; # The theme name for dark mode
+      light = "Papirus-Light"; # The theme name for light mode
+    };
+  };
+}

apps/walker/default.nix

@@ -0,0 +1,2 @@
+{
+}

apps/walker/home.nix

@@ -0,0 +1,41 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.walker.homeManagerModules.default
+    ./style.nix
+  ];
+
+  programs.walker = {
+    enable = true;
+    runAsService = true;
+
+    package = inputs.walker.packages.${pkgs.system}.default;
+
+    # CSS Implementation using Stylix Colors
+
+    config = {
+      hide_action_hints = true;
+      icons.theme = config.gtk.iconTheme.name;
+
+      placeholders.default = {
+        input = "Search";
+        list = "No Results";
+      };
+
+      providers.prefixes = [
+        {
+          provider = "websearch";
+          prefix = "+";
+        }
+        {
+          provider = "providerlist";
+          prefix = "_";
+        }
+      ];
+    };
+  };
+}

apps/walker/style.nix

@@ -0,0 +1,123 @@
+{config, ...}: let
+  # Access Stylix colors (Base16)
+  colors = config.lib.stylix.colors.withHashtag;
+in {
+  programs.walker = {
+    theme.style = ''
+      * {
+        all: unset;
+      }
+
+      * {
+        font-family: monospace;
+        font-size: 18px;
+        color: ${colors.base05};
+      }
+
+      scrollbar {
+        opacity: 0;
+      }
+
+      .normal-icons {
+        -gtk-icon-size: 16px;
+      }
+
+      .large-icons {
+        -gtk-icon-size: 32px;
+      }
+
+      .box-wrapper {
+        background: alpha(${colors.base00}, 0.95);
+        padding: 20px;
+        border: 2px solid ${colors.base0E};
+      }
+
+      .preview-box {
+      }
+
+      .box {
+      }
+
+      .search-container {
+        background: ${colors.base00};
+        padding: 10px;
+      }
+
+      .input placeholder {
+        opacity: 0.5;
+      }
+
+      .input {
+      }
+
+      .input:focus,
+      .input:active {
+        box-shadow: none;
+        outline: none;
+      }
+
+      .content-container {
+      }
+
+      .placeholder {
+      }
+
+      .scroll {
+      }
+
+      .list {
+      }
+
+      child,
+      child > * {
+      }
+
+      child:hover .item-box {
+      }
+
+      child:selected .item-box {
+      }
+
+      child:selected .item-box * {
+        color: ${colors.base0D};
+      }
+
+      .item-box {
+        padding-left: 14px;
+      }
+
+      .item-text-box {
+        all: unset;
+        padding: 14px 0;
+      }
+
+      .item-text {
+      }
+
+      .item-subtext {
+        font-size: 0px;
+        min-height: 0px;
+        margin: 0px;
+        padding: 0px;
+      }
+
+      .item-image {
+        margin-right: 14px;
+        -gtk-icon-transform: scale(0.9);
+      }
+
+      .current {
+        font-style: italic;
+      }
+
+      .keybind-hints {
+        background: ${colors.base01};
+        padding: 10px;
+        margin-top: 10px;
+      }
+
+      .preview {
+      }
+    '';
+  };
+}

apps/waybar/deps.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    lutris
   ];
 }

apps/waybar/home.nix

@@ -0,0 +1,171 @@
+{
+  config,
+  pkgs,
+  myConfig,
+  ...
+}: {
+  imports = [
+    ./style.nix
+  ];
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        reload_style_on_change = true;
+        layer = "top";
+        position = "top";
+        spacing = 0;
+        height = 26;
+
+        modules-left = ["custom/omarchy" "hyprland/workspaces"];
+        modules-center = ["clock" "custom/update" "custom/screenrecording-indicator"];
+        modules-right = [
+          "group/tray-expander"
+          "bluetooth"
+          "network"
+          "pulseaudio"
+          "cpu"
+          "battery"
+        ];
+
+        "hyprland/workspaces" = {
+          on-click = "activate";
+          format = "{icon}";
+          format-icons = {
+            "default" = "";
+            "1" = "1";
+            "2" = "2";
+            "3" = "3";
+            "4" = "4";
+            "5" = "5";
+            "6" = "6";
+            "7" = "7";
+            "8" = "8";
+            "9" = "9";
+            "10" = "0";
+            "active" = "󱓻";
+          };
+          persistent-workspaces = {
+            "1" = [];
+            "2" = [];
+            "3" = [];
+            "4" = [];
+            "5" = [];
+          };
+        };
+
+        "custom/omarchy" = {
+          format = "";
+          on-click = "omarchy-menu";
+          on-click-right = "xdg-terminal-exec";
+          tooltip-format = "Omarchy Menu\n\nSuper + Alt + Space";
+        };
+
+        # "custom/update" = {
+        #   format = "";
+        #   exec = "omarchy-update-available";
+        #   on-click = "omarchy-launch-floating-terminal-with-presentation omarchy-update";
+        #   tooltip-format = "Omarchy update available";
+        #   signal = 7;
+        #   interval = 21600;
+        # };
+
+        "cpu" = {
+          interval = 5;
+          format = "󰍛";
+          on-click = "hakase-focus-wrapper btop";
+          on-click-right = "xdg-terminal-exec";
+        };
+
+        "clock" = {
+          format = "{:%H:%M %a %b %d}";
+          format-alt = "{:L%d %B W%V %Y}";
+          tooltip = false;
+          on-click-right = "omarchy-launch-floating-terminal-with-presentation omarchy-tz-select";
+        };
+
+        "network" = {
+          format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"];
+          format = "{icon}";
+          format-wifi = "{icon}";
+          format-ethernet = "󰀂";
+          format-disconnected = "󰤮";
+          tooltip-format-wifi = "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}";
+          tooltip-format-ethernet = "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}";
+          tooltip-format-disconnected = "Disconnected";
+          interval = 3;
+          spacing = 1;
+          on-click = "hakase-popup-wifi";
+        };
+
+        "battery" = {
+          format = "{capacity}% {icon}";
+          format-discharging = "{icon}";
+          format-charging = "{icon}";
+          format-plugged = "";
+          format-icons = {
+            charging = ["󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"];
+            default = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
+          };
+          format-full = "󰂅";
+          tooltip-format-discharging = "{power:>1.0f}W↓ {capacity}%";
+          tooltip-format-charging = "{power:>1.0f}W↑ {capacity}%";
+          interval = 5;
+          on-click = "omarchy-menu power";
+          states = {
+            warning = 20;
+            critical = 10;
+          };
+        };
+
+        "bluetooth" = {
+          format = "";
+          format-disabled = "󰂲";
+          format-connected = "󰂱";
+          format-no-controller = "";
+          tooltip-format = "Devices connected: {num_connections}";
+          on-click = "hakase-popup-bluetooth";
+        };
+
+        "pulseaudio" = {
+          format = "{icon}";
+          on-click = "hakase-popup-volume";
+          on-click-right = "pamixer -t";
+          tooltip-format = "Playing at {volume}%";
+          scroll-step = 5;
+          format-muted = "";
+          format-icons = {
+            default = ["" "" ""];
+          };
+        };
+
+        "group/tray-expander" = {
+          orientation = "inherit";
+          drawer = {
+            transition-duration = 600;
+            children-class = "tray-group-item";
+          };
+          modules = ["custom/expand-icon" "tray"];
+        };
+
+        "custom/expand-icon" = {
+          format = "";
+          tooltip = false;
+        };
+
+        "custom/screenrecording-indicator" = {
+          on-click = "omarchy-cmd-screenrecord";
+          # Note: $OMARCHY_PATH must be defined in your environment
+          exec = "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh";
+          signal = 8;
+          return-type = "json";
+        };
+
+        "tray" = {
+          icon-size = 12;
+          spacing = 17;
+        };
+      };
+    };
+  };
+}

apps/waybar/style.nix

@@ -0,0 +1,89 @@
+{config, ...}: let
+  colors = config.lib.stylix.colors.withHashtag;
+in {
+  programs.waybar = {
+    style = ''
+      * {
+        background-color: ${colors.base11};
+        color: ${colors.base05};
+
+        border: none;
+        border-radius: 0;
+        min-height: 0;
+        font-family: 'JetBrainsMono Nerd Font';
+        font-size: 12px;
+      }
+
+      .modules-left {
+        margin-left: 8px;
+      }
+
+      .modules-right {
+        margin-right: 8px;
+      }
+
+      #workspaces button {
+        all: initial;
+        padding: 0 6px;
+        margin: 0 1.5px;
+        min-width: 9px;
+      }
+
+      #workspaces button.empty {
+        opacity: 0.5;
+      }
+
+      #cpu,
+      #battery,
+      #pulseaudio,
+      #custom-omarchy,
+      #custom-screenrecording-indicator,
+      #custom-update {
+        min-width: 12px;
+        margin: 0 7.5px;
+      }
+
+      #tray {
+        margin-right: 16px;
+      }
+
+      #bluetooth {
+        margin-right: 17px;
+      }
+
+      #network {
+        margin-right: 13px;
+      }
+
+      #custom-expand-icon {
+        margin-right: 18px;
+      }
+
+      tooltip {
+        padding: 2px;
+      }
+
+      #custom-update {
+        font-size: 10px;
+      }
+
+      #clock {
+        margin-left: 8.75px;
+      }
+
+      .hidden {
+        opacity: 0;
+      }
+
+      #custom-screenrecording-indicator {
+        min-width: 12px;
+        margin-left: 8.75px;
+        font-size: 10px;
+      }
+
+      #custom-screenrecording-indicator.active {
+        color: #a55555;
+      }
+    '';
+  };
+}

apps/yazi/home.nix

@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+  programs.yazi = {
+    enable = true;
+    enableFishIntegration = true;
+    settings = {
+      manager = {
+        show_hidden = true;
+        sort_by = "natural";
+        sort_dir_first = true;
+        linemode = "size";
+      };
+    };
+  };
+}

apps/zoxide/home.nix

@@ -2,7 +2,8 @@
   programs.zoxide = {
     enable = true;
     enableFishIntegration = true;
-    enableZshIntegration = true;
-    enableBashIntegration = true;
+    options = [
+      "--cmd cd"
+    ];
   };
 }

assets/Wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg

@@ -0,0 +1 @@
+/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg

assets/Wallpapers/1-everforest.jpg

@@ -0,0 +1 @@
+/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/1-everforest.jpg

assets/Wallpapers/gruvbox-1.jpg

@@ -0,0 +1 @@
+/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/gruvbox-1.jpg

assets/Wallpapers/kanagawa-1.png

@@ -0,0 +1 @@
+/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/kanagawa-1.png

assets/Wallpapers/nord-1.png

@@ -0,0 +1 @@
+/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/nord-1.png

config.nix

@@ -1,85 +1,57 @@
 {
   myConfig = {
-    essentials = {
-      # !!! replace it with your own, else system might malfunction.
-      Username = "kenji";
-    };
-    general = {
-      Terminal = {
-        font = "JetBrainsMono Nerd Font";
-        size = "18";
-        shell = "fish"; # or zsh
-        aliases = {};
-      };
-      allowUnfree = true;
-    };
-
     nixos = {
-      Hostname = "hakase";
-      Timezone = "America/Chicago";
-      enableSteamOS = true;
+      username = "kenji";
+      hostname = "hakase";
+      timezone = "America/Chicago";
+      shell = "fish"; # FIXME: unassigned variable
+    };
+    git = {
+      username = "kenji";
+      email = "kenji@hakase";
+      defaultBranch = "master";
+    };
+    ssh = {
+      # FIXME: anonymize
+      extraConfig = ''
+        Host macair
+          User biscuit
+          HostName 192.168.68.81
 
-      Boot = {
-        mode = "systemd"; # systemd or grub
-      };
-      Apps = {
-        packages = pkgs:
-          with pkgs; [
-            jellyfin-media-player
-            usbutils
-            pciutils
-            goverlay
-            geekbench_6
-            gparted
-            ntfs3g
-            todoist
-            feishin
-            discord
-            xfce.thunar
-          ];
-      };
-      Hyprland = {
-        enable = false;
-        monitors = [
-          "DP-1, highres@165,0x1080,1,vrr,1"
-          "DP-2, highres@highrr,0x0,1"
-          "HDMI-A-1, 1920x1080@120, 20000x20000,1"
-          # "HDMI-A-1, disabled"
-        ];
-      };
-      Git = {
-        user = "";
-        email = "";
-        defaultBranch = "master";
+        Host gitea.sakamoto.dev
+          User kenji
+          ProxyCommand cloudflared access ssh --hostname %h
+          HostName gitea.sakamoto.dev
+      '';
+    };
+    terminal = {
+      default = "ghostty";
+      aliases = {
+        update = "sudo nixos-rebuild switch --flake ~/.config/nixos-new/#hakase";
       };
     };
-    optionals = {
-      Builds = {
-        trustedUsers = [
-          "@groups"
-        ];
-        buildMachines = [
-          {
-            hostName = "";
-            sshUser = "";
-            sshKey = "";
-            system = "";
-            supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
-          }
-        ];
-      };
-      Ssh = {
-        extraConfig = ''
-          Host macair
-            User biscuit
-            HostName 192.168.68.81
-
-          Host gitea.sakamoto.dev
-            User kenji
-            ProxyCommand cloudflared access ssh --hostname %h
-            HostName gitea.sakamoto.dev
-        '';
-      };
+    hyprland = {
+      monitors = ["HDMI-A-1, 1920x1080@120, auto, 1"];
+      # wallpaper = "nixos_rainbow.png";
+      wallpaper = "kanagawa.jpg";
+    };
+    firefox = {
+      bookmarks = [
+        {
+          name = "Home Manager";
+          url = "https://mynixos.com/home-manager/options/programs";
+        }
+        {
+          name = "YouTube";
+          url = "https://youtube.com";
+        }
+      ];
+      newtabpage = [
+        {
+          title = "Dashboard";
+          url = "https://dash.sakamoto.dev";
+        }
+      ];
     };
   };
 }

flake.nix

@@ -1,113 +1,70 @@
 {
-  description = "A rewrite of the original Sakamoto NixOS config.";
-
+  description = "Hakase Configuration";
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
+    elephant.url = "github:abenz1267/elephant";
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-
-    nur = {
-      url = "github:nix-community/NUR";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    jovian = {
-      url = "github:Jovian-Experiments/Jovian-NixOS";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland.url = "github:hyprwm/Hyprland";
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+    textfox.url = "github:adriankarlen/textfox";
+    fsel.url = "github:Mjoyufull/fsel";
 
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    darwin = {
-      url = "github:lnl7/nix-darwin";
+    hyprland = {
+      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
     nixovim = {
+      # FIXME: treesitter does not install automatically (disabled due to read-only problems)
       url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    matugen = {
-      url = "github:/InioX/Matugen";
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    stylix = {
+      url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    quickshell = {
-      url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    caelestia-shell = {
-      url = "git+https://git.sakamoto.dev/kenji/caelestia-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+    walker = {
+      url = "github:abenz1267/walker";
+      inputs.elephant.follows = "elephant";
     };
   };
 
   outputs = {
     self,
     nixpkgs,
-    flake-utils,
     home-manager,
-    darwin,
+    stylix,
+    nixovim,
+    chaotic,
+    sops-nix,
+    fsel,
+    textfox,
     ...
   } @ inputs: let
     config = import ./config.nix;
-
-    mkArgs = system:
+    system = "x86_64-linux";
+    args =
       {
         inherit inputs system;
       }
       // config;
-
-    systems = ["x86_64-linux" "aarch64-linux"];
-  in
-    flake-utils.lib.eachSystem systems (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-      args = mkArgs system;
-    in {
-    })
-    // {
-      nixosConfigurations = {
-        hakase = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = mkArgs "x86_64-linux";
-          modules = [
-            ./hosts/hakase/configuration.nix
-          ];
-        };
-      };
-
-      homeConfigurations = {
-        hakase = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-            extraSpecialArgs = mkArgs "x86_64-linux";
-          };
-          modules = [
-            ./home/hakase.nix
-          ];
-        };
-      };
-
-      darwinConfigurations = {
-        macos = darwin.lib.darwinSystem {
-          system = "aarch64-darwin";
-          specialArgs = mkArgs "aarch64-darwin";
-          modules = [
-            ./hosts/macos/darwin.nix
-          ];
-        };
+  in {
+    nixosConfigurations = {
+      hakase = nixpkgs.lib.nixosSystem {
+        specialArgs = args;
+        modules = [
+          home-manager.nixosModules.home-manager
+          sops-nix.nixosModules.sops
+          chaotic.nixosModules.default
+          ./hosts/hakase/configuration.nix
+        ];
       };
     };
+  };
 }

home/darwin.nix

@@ -1,15 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    ../modules/home/terminal.nix
-  ];
-
-  programs.home-manager.enable = true;
-
-  home.packages = [];
-  home.stateVersion = "25.11";
-}

home/hakase.nix

@@ -1,16 +1,12 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  info = import ../config.nix;
-in {
+{pkgs, ...}: {
   imports = [
-    # inputs.chaotic.homeManagerModules.default
-    ../modules/home/desktop.nix
     ../modules/home/terminal.nix
+    ../modules/home/apps.nix
+    ../modules/home/apps-optional.nix
+    ../modules/home/hyprland.nix
+    ../modules/home/waybar.nix
+    ../modules/home/theme.nix
   ];
-  # nix.package = pkgs.nix;
-  home.packages = info.myConfig.nixos.Apps.packages pkgs;
+
   home.stateVersion = "25.05";
 }

hosts/hakase/configuration.nix

@@ -1,204 +1,12 @@
 {
   pkgs,
   myConfig,
-  inputs,
-  lib,
-  specialArgs,
   ...
 }: {
   imports = [
-    inputs.home-manager.nixosModules.home-manager
-    inputs.chaotic.nixosModules.default
     ./hardware-configuration.nix
-    ../../modules/default/desktop.nix
-    ../../modules/default/dev.nix
-    ../../modules/default/remote.nix
+    ../../modules/system/default.nix
+    ../../modules/system/hyprland.nix
+    ../../modules/system/scripts.nix
   ];
-
-  environment.systemPackages = with pkgs; [
-    pavucontrol
-    wl-clipboard
-    wget
-    protontricks
-  ];
-
-  users = {
-    defaultUserShell = pkgs.${myConfig.general.Terminal.shell};
-    users = {
-      ${myConfig.essentials.Username} = {
-        isNormalUser = true;
-        extraGroups = ["wheel" "networkmanager" "input" "video"];
-        initialHashedPassword = "$y$j9T$NHFtSwF4NJtEmgMjy4Xdg.$9WQltjEx3eEfZ7GbpGLW8lBhJtiXPOeIawrxdmx0.vB";
-        useDefaultShell = true;
-        packages = [];
-      };
-    };
-  };
-  home-manager = {
-    backupFileExtension = "backup";
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = specialArgs;
-    users.${myConfig.essentials.Username} = import ../../home/hakase.nix;
-  };
-
-  nixpkgs.config.allowUnfree = myConfig.general.allowUnfree;
-
-  hardware.logitech.wireless.enable = true;
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  hardware.bluetooth.settings = {
-    General = {
-      AutoEnable = true;
-      Experimental = true;
-      MultiProfile = "multiple";
-      FastConnectable = true;
-    };
-  };
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  time.timeZone = "${myConfig.nixos.Timezone}";
-
-  boot.loader = {
-    systemd-boot = lib.mkIf (myConfig.nixos.Boot.mode == "systemd") {
-      enable = true;
-    };
-    grub = lib.mkIf (myConfig.nixos.Boot.mode == "grub") {
-      efiSupport = true;
-      enable = true;
-      device = "nodev";
-      useOSProber = true;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot";
-    };
-  };
-
-  programs.ssh.extraConfig = myConfig.optionals.Ssh.extraConfig;
-
-  programs.bash = {
-    interactiveShellInit = ''
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
-      then
-        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
-      fi
-    '';
-  };
-
-  programs = {
-    zsh.enable = true;
-    fish.enable = true;
-  };
-
-  services = {
-    displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland];
-    # getty.autologinUser = "${myConfig.essentials.Username}";
-    # greetd = {
-    #   enable = true;
-    #   settings.default_session = {
-    #     user = "${myConfig.essentials.Username}";
-    #     command = "Hyprland";
-    #   };
-    # };
-
-    seatd.enable = true;
-    upower.enable = true;
-    scx.enable = true; # by default uses scx_rustland scheduler
-    libinput.enable = true;
-    blueman.enable = true;
-    printing.enable = true;
-    openssh.enable = true;
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-
-      # lowLatency = {
-      #   enable = true;
-      #   quantum = 64;
-      #   rate = 48000;
-      # };
-    };
-  };
-  # make pipewire realtime-capable
-  security.rtkit.enable = true;
-
-  nix = {
-    distributedBuilds = true;
-    settings = {
-      builders-use-substitutes = true;
-      trusted-users = myConfig.optionals.Builds.trustedUsers;
-      experimental-features = ["nix-command" "flakes"];
-    };
-  };
-
-  console = {
-    earlySetup = false;
-    font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
-    packages = with pkgs; [terminus_font];
-    useXkbConfig = true;
-  };
-
-  networking = {
-    # wakeOnLan.enable = true;
-    networkmanager.enable = true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [22 80];
-      allowedUDPPorts = [53];
-    };
-    proxy.default = null;
-    proxy.noProxy = null;
-  };
-
-  boot.loader.timeout = 0;
-  boot.loader.limine.maxGenerations = 5;
-  hardware.amdgpu.initrd.enable = true;
-
-  boot.kernelParams = [
-    "quiet"
-    "splash"
-    "boot.shell_on_fail"
-    "udev.log_priority=3"
-    "rd.systemd.show_status=auto"
-    "iommu=pt"
-    "amd_pstate=active"
-  ];
-  boot.kernelPackages = pkgs.linuxPackages_cachyos;
-  boot.kernel.sysctl = {
-    "kernel.split_lock_mitigate" = 0;
-    "kernel.nmi_watchdog" = 0;
-    "kernel.sched_bore" = "1";
-  };
-
-  boot.initrd = {
-    systemd.enable = true;
-    kernelModules = [];
-    verbose = false;
-  };
-  boot.plymouth.enable = true;
-  boot.plymouth.theme = "seal";
-  boot.plymouth.themePackages = with pkgs; [
-    # By default we would install all themes
-    (adi1090x-plymouth-themes.override {
-      selected_themes = ["seal"];
-    })
-  ];
-  boot.consoleLogLevel = 0;
-  systemd.extraConfig = "DefaultTimeoutStopSec=5s";
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-  system.stateVersion = "25.05";
 }

hosts/hakase/hardware-configuration.nix

@@ -8,39 +8,25 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/532ac73e-1370-4e4d-9d5a-15033de0b96d";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
+    { device = "/dev/mapper/luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714";
+      fsType = "ext4";
     };
 
+  boot.initrd.luks.devices."luks-f8bd85aa-b08e-472a-b7f6-5e190b9b9714".device = "/dev/disk/by-uuid/f8bd85aa-b08e-472a-b7f6-5e190b9b9714";
+
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1368-D3F3";
+    { device = "/dev/disk/by-uuid/72BA-AF9B";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/780aa81f-c4d6-478b-9c51-2d60362fdb07";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b02ef55c-4caf-4a24-a6a2-fb8001eafe22"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
+  swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hosts/macos/darwin.nix

@@ -1,47 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  inputs,
-  system,
-  mkArgs,
-  ...
-}: {
-  imports = [
-    ../../modules/default/darwin.nix
-    inputs.home-manager.darwinModules.home-manager
-  ];
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.systemPackages = [];
-
-  # Auto upgrade nix package and the daemon service.
-  # services.nix-daemon.enable = true;
-  # services.karabiner-elements.enable = true;
-  # nix.package = pkgs.nix;
-
-  # Necessary for using flakes on this system.
-  nix.settings.experimental-features = "nix-command flakes";
-  nix.settings.trusted-users = myConfig.optionals.Builds.trustedUsers;
-
-  # Create /etc/zshrc that loads the nix-darwin environment.
-  programs.zsh.enable = true; # default shell on catalina
-  programs.fish.enable = true;
-
-  # $ darwin-rebuild changelog
-  system.stateVersion = 5;
-
-  # The platform the configuration will be used on.
-  nixpkgs.hostPlatform = "aarch64-darwin";
-  security.pam.services.sudo_local.touchIdAuth = true;
-
-  users.users.${myConfig.essentials.Username} = {
-    name = "${myConfig.essentials.Username}";
-    home = "/Users/${myConfig.essentials.Username}";
-    # shell = pkgs.${myConfig.general.terminal.Shell}; # no support for nix-darwin, but can be changed via chsh.
-  };
-
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.extraSpecialArgs = mkArgs system;
-  home-manager.users.${myConfig.essentials.Username} = import ../../home/darwin.nix;
-}

hosts/steamos/configuration.nix

@@ -1,169 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  myConfig,
-  inputs,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
-    inputs.chaotic.nixosModules.default
-    ./hardware-configuration.nix
-  ];
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-  nixpkgs.config.allowUnfree = true;
-
-  ####################
-  # Boot & Kernel    #
-  ####################
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.timeout = 0;
-  boot.loader.limine.maxGenerations = 5;
-  hardware.amdgpu.initrd.enable = true;
-
-  boot.kernelParams = ["quiet"];
-  boot.kernelPackages = pkgs.linuxPackages_cachyos;
-  boot.kernel.sysctl = {
-    "kernel.split_lock_mitigate" = 0;
-    "kernel.nmi_watchdog" = 0;
-    "kernel.sched_bore" = "1";
-  };
-
-  boot.initrd = {
-    systemd.enable = true;
-    kernelModules = [];
-    verbose = false;
-  };
-  boot.plymouth.enable = true;
-  boot.consoleLogLevel = 0;
-  systemd.extraConfig = "DefaultTimeoutStopSec=5s";
-
-  ################
-  # FileSystems  #
-  ################
-  # fileSystems."/" = {
-  #   options = ["compress=zstd"];
-  # };
-
-  ############
-  # Network  #
-  ############
-  networking = {
-    networkmanager.enable = true;
-    firewall.enable = false;
-    hostName = "nixos";
-  };
-
-  #################
-  # Bluetooth     #
-  #################
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.settings = {
-    General = {
-      MultiProfile = "multiple";
-      FastConnectable = true;
-    };
-  };
-
-  #################
-  # Sound & RTKit #
-  #################
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  ########################
-  # Graphical & Greetd   #
-  ########################
-
-  services.xserver.enable = false;
-  services.getty.autologinUser = "steamos";
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      user = "${myConfig.essentials.Username}";
-      command = "steam-gamescope > /dev/null 2>&1";
-    };
-  };
-
-  ########################
-  # Programs & Gaming    #
-  ########################
-  services.automatic-timezoned.enable = true;
-  services.flatpak.enable = true;
-  xdg.portal.enable = true;
-  xdg.portal.config.common.default = "*";
-  xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk];
-
-  # programs.steam.gamescopeSession.args = ["-w 1920" "-h 1080" "-r 120" "--xwayland-count 2" "-e" "--hdr-enabled" "--mangoapp"];
-
-  programs = {
-    appimage = {
-      enable = true;
-      binfmt = true;
-    };
-    fish = {enable = true;};
-    mosh = {enable = true;};
-    tmux = {enable = true;};
-    gamescope.capSysNice = true;
-    steam = {
-      enable = true;
-      gamescopeSession.enable = true;
-      extraCompatPackages = with pkgs; [proton-ge-bin];
-      extraPackages = with pkgs; [
-        mangohud
-        gamescope-wsi
-      ];
-    };
-  };
-
-  environment.sessionVariables = {
-    PROTON_USE_NTSYNC = "1";
-    ENABLE_HDR_WSI = "1";
-    DXVK_HDR = "1";
-    PROTON_ENABLE_AMD_AGS = "1";
-    PROTON_ENABLE_NVAPI = "1";
-    ENABLE_GAMESCOPE_WSI = "1";
-    STEAM_MULTIPLE_XWAYLANDS = "1";
-  };
-
-  ###################
-  # Virtualization  #
-  ###################
-  virtualisation.docker.enable = true;
-  virtualisation.docker.enableOnBoot = false;
-  virtualisation.libvirtd.enable = true;
-
-  ###############
-  # Users       #
-  ###############
-  users.users.${myConfig.essentials.Username} = {
-    isNormalUser = true;
-    description = "SteamOS user";
-    extraGroups = ["networkmanager" "wheel" "docker" "video" "seat" "audio" "libvirtd"];
-    # password = "steamos";
-  };
-
-  #################
-  # Security      #
-  #################
-  security.sudo.wheelNeedsPassword = false;
-  security.polkit.enable = true;
-  services.seatd.enable = true;
-  services.openssh.enable = true;
-
-  ######################
-  ######################
-
-  ########################
-  # System State Version #
-  ########################
-  system.stateVersion = "25.05";
-}

hosts/steamos/hardware-configuration.nix

@@ -1,47 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/532ac73e-1370-4e4d-9d5a-15033de0b96d";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1368-D3F3";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/780aa81f-c4d6-478b-9c51-2d60362fdb07";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b02ef55c-4caf-4a24-a6a2-fb8001eafe22"; }
-    ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

modules/default/darwin.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ../../packages/python/default.nix
-  ];
-}

modules/default/desktop.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  myConfig,
-  ...
-}: {
-  imports =
-    [
-      ../../packages/hyprland/default.nix
-      ../../packages/matugen/default.nix
-      ../../packages/quickshell/default.nix
-      ../../packages/udev/default.nix
-    ]
-    ++ [
-      ../../packages/steam/default.nix
-      ../../packages/bottles/default.nix
-    ]
-    ++ lib.optionals (myConfig.nixos.enableSteamOS == true) [
-      ../../packages/steam/jovian.nix
-    ];
-}

modules/default/dev.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ../../packages/python/default.nix
-  ];
-}

modules/default/remote.nix

@@ -1,4 +0,0 @@
-{
-  imports = [
-  ];
-}

modules/home/apps-optional.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../apps/jellyfin-tui/home.nix
+    ../../apps/btop/home.nix
+  ];
+}

modules/home/apps.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ../../apps/yazi/home.nix
+    ../../apps/gemini/home.nix
+    ../../apps/firefox/home.nix
+    ../../apps/starship/home.nix
+  ];
+}

modules/home/desktop.nix

@@ -1,26 +0,0 @@
-{
-  imports =
-    [
-      ../../packages/fonts/home.nix
-      ../../packages/firefox/home.nix
-
-      ../../packages/hyprland/home.nix
-      ../../packages/hyprlock/home.nix
-      ../../packages/hypridle/home.nix
-      ../../packages/quickshell/home.nix
-      ../../packages/swww/home.nix
-      ../../packages/hyprsunset/home.nix
-      ../../packages/matugen/home.nix
-      ../../packages/rofi/home.nix
-      ../../packages/bibata/home.nix
-    ]
-    ++ [
-      ../../packages/solaar/home.nix
-    ]
-    ++ [
-      ../../packages/mangohud/home.nix
-      ../../packages/protonup/home.nix
-      ../../packages/lutris/home.nix
-      ../../packages/steam/home.nix
-    ];
-}

modules/home/hyprland.nix

@@ -0,0 +1,8 @@
+{
+  imports = [
+    ../../apps/hyprland/home.nix
+    ../../apps/walker/home.nix
+    # ../../apps/fsel/home.nix
+    ../../apps/hyprpaper/home.nix
+  ];
+}

modules/home/remote.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ../../packages/moondeck-buddy/appimage.nix
-    ../../packages/sunshine/default.nix
-  ];
-}

modules/home/terminal.nix

@@ -1,19 +1,9 @@
 {
   imports = [
-    ../../packages/fish/home.nix
-    ../../packages/kitty/home.nix
-    ../../packages/neovim/home.nix
-    ../../packages/starship/home.nix
-    ../../packages/fastfetch/home.nix
-    ../../packages/zsh/home.nix
-    ../../packages/zoxide/home.nix
-    ../../packages/fonts/home.nix
-
-    ../../packages/git/home.nix
-
-    ../../packages/btop/home.nix
-    ../../packages/eza/home.nix
-
-    ../../packages/cloudflared/home.nix
+    ../../apps/neovim/neovim.nix
+    ../../apps/git/home.nix
+    ../../apps/zoxide/home.nix
+    ../../apps/fish/home.nix
+    ../../apps/ghostty/home.nix
   ];
 }

modules/home/theme.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../../apps/stylix/home.nix
+  ];
+}

modules/home/waybar.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../../apps/waybar/home.nix
+    ../../apps/waybar/deps.nix
+  ];
+}

modules/system/default.nix

@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+  imports = [
+    ../../system/time.nix
+    ../../system/boot.nix
+    ../../system/amd.nix
+    ../../system/hardware.nix
+    ../../system/home-manager.nix
+    ../../system/services.nix
+    ../../system/user.nix
+    ../../system/version.nix
+    ../../system/fonts.nix
+    ../../system/programs.nix
+    ../../system/security.nix
+    ../../system/variables.nix
+    ../../system/kernel.nix
+  ];
+  environment.systemPackages = with pkgs; [
+    # FIXME: must be on their own app
+    git
+    cloudflared
+  ];
+}

modules/system/hyprland.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../../apps/hyprland/default.nix
+  ];
+}

modules/system/scripts.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ../../scripts/hakase-scripts.nix
+  ];
+}

packages/ags/custom/.gitignore

@@ -1,2 +0,0 @@
-node_modules/
-@girs/

packages/ags/custom/app.ts

@@ -1,17 +0,0 @@
-import { App } from "astal/gtk3"
-import style from "./style.scss"
-import Bar from "./widget/Bar"
-
-App.start({
-    css: style,
-    instanceName: "js",
-    requestHandler(request, res) {
-        print(request)
-        res("ok")
-    },
-    main: () => {
-        const monitors = App.get_monitors()
-        const primary = monitors.find(m => m.primary) || monitors[0]
-        return Bar(primary)
-    }
-})

packages/ags/custom/colors.scss

@@ -1,3 +0,0 @@
-$background: #131318;
-$foreground: #e4e1e9;
-$primary: #bec2ff;

packages/ags/custom/env.d.ts

@@ -1,21 +0,0 @@
-declare const SRC: string
-
-declare module "inline:*" {
-    const content: string
-    export default content
-}
-
-declare module "*.scss" {
-    const content: string
-    export default content
-}
-
-declare module "*.blp" {
-    const content: string
-    export default content
-}
-
-declare module "*.css" {
-    const content: string
-    export default content
-}

packages/ags/custom/package.json

@@ -1,6 +0,0 @@
-{
-    "name": "astal-shell",
-    "dependencies": {
-        "astal": "/home/biscuit/.local/share/ags"
-    }
-}

packages/ags/custom/style.scss

@@ -1,143 +0,0 @@
-@use "sass:color";
-@use "./colors" as *;
-
-// default
-// $bg: #212223;
-// $fg: #f1f1f1;
-// $accent: #378DF7;
-// $radius: 7px;
-
-// Kanagawa Theme
-// $bg: #1F1F28;
-// $fg: #DCD7BA;
-// $accent: #C0A36E;
-// $radius: 7px;
-
-// mstcl 
-// $bg: #121212;
-// $fg: #f1f1f1;
-// $accent: #C0A36E;
-// $radius: 7px;
-
-$bg: $background;
-$fg: $foreground;
-$accent: $primary;
-$radius: 7px;
-
-window.Bar {
-    border: none;
-    box-shadow: none;
-    background-color: $bg;
-    color: $fg;
-    font-size: 1.1em;
-    font-weight: bold;
-    font-family: "JetBrainsMono Nerd Font";
-
-    label {
-        margin: 0 8px;
-    }
-
-    .Workspaces  {
-        button {
-            all: unset;
-            background-color: transparent;
-
-            &:hover label {
-                background-color: color.adjust($fg, $alpha: -0.84);
-                border-color: color.adjust($accent, $alpha: -0.8);
-            }
-
-            &:active label {
-                background-color: color.adjust($fg, $alpha: -0.8)
-            }
-        }
-
-        label {
-            transition: 200ms;
-            padding: 0 8px;
-            margin: 2px;
-            border-radius: $radius;
-            border: 1pt solid transparent;
-        }
-
-        .focused label {
-            color: $accent;
-            border-color: $accent;
-        }
-    }
-
-    .SysTray {
-        margin-right: 8px;
-
-        button {
-            padding: 0 4px;
-        }
-    }
-
-    .Time {
-        .TimeHM {
-            font-weight: bold;
-            color: $accent;
-        }
-
-        .TimeDate {
-            // color: color.adjust($fg, $lightness: -10%);
-            color: $fg;
-            opacity: 0.85;
-            font-weight: normal;
-        }
-    }
-
-    
-    .FocusedClient {
-        color: color.adjust($fg, $lightness: -30%);
-        opacity: 0.7;
-    }
-
-    .Media .Cover {
-        min-height: 1.2em;
-        min-width: 1.2em;
-        border-radius: $radius;
-        background-position: center;
-        background-size: contain;
-    }
-
-    .Battery label {
-        padding-left: 0;
-        margin-left: 0;
-    }
-
-    .AudioSlider {
-        * {
-            all: unset;
-        }
-
-        icon {
-            margin-right: .6em;
-        }
-
-        & {
-            margin: 0 1em;
-        }
-
-        trough {
-            background-color: color.adjust($fg, $alpha: -0.8);
-            border-radius: $radius;
-        }
-
-        highlight {
-            background-color: $accent;
-            min-height: .8em;
-            border-radius: $radius;
-        }
-
-        slider {
-            background-color: $fg;
-            border-radius: $radius;
-            min-height: 1em;
-            min-width: 1em;
-            margin: -.2em;
-        }
-    }
-}
-

packages/ags/custom/tsconfig.json

@@ -1,14 +0,0 @@
-{
-    "$schema": "https://json.schemastore.org/tsconfig",
-    "compilerOptions": {
-        "experimentalDecorators": true,
-        "strict": true,
-        "target": "ES2022",
-        "module": "ES2022",
-        "moduleResolution": "Bundler",
-        // "checkJs": true,
-        // "allowJs": true,
-        "jsx": "react-jsx",
-        "jsxImportSource": "astal/gtk3",
-    }
-}

packages/ags/custom/widget/Bar.tsx

@@ -1,189 +0,0 @@
-import { App } from "astal/gtk3"
-import { Variable, GLib, bind } from "astal"
-import { Astal, Gtk, Gdk } from "astal/gtk3"
-import Hyprland from "gi://AstalHyprland"
-import Mpris from "gi://AstalMpris"
-import Battery from "gi://AstalBattery"
-import Wp from "gi://AstalWp"
-import Network from "gi://AstalNetwork"
-import Tray from "gi://AstalTray"
-
-function SysTray() {
-    const tray = Tray.get_default()
-
-    return <box className="SysTray">
-        {bind(tray, "items").as(items => items.map(item => (
-            <menubutton
-                tooltipMarkup={bind(item, "tooltipMarkup")}
-                usePopover={false}
-                actionGroup={bind(item, "actionGroup").as(ag => ["dbusmenu", ag])}
-                menuModel={bind(item, "menuModel")}>
-                <icon gicon={bind(item, "gicon")} />
-            </menubutton>
-        )))}
-    </box>
-}
-
-function Wifi() {
-    const network = Network.get_default()
-    const wifi = bind(network, "wifi")
-
-    return <box visible={wifi.as(Boolean)}>
-        {wifi.as(wifi => wifi && (
-            <icon
-                tooltipText={bind(wifi, "ssid").as(String)}
-                className="Wifi"
-                icon={bind(wifi, "iconName")}
-            />
-        ))}
-    </box>
-
-}
-
-function AudioSlider() {
-    const speaker = Wp.get_default()?.audio.defaultSpeaker!
-
-    return <box className="AudioSlider" css="min-width: 140px">
-        <icon icon={bind(speaker, "volumeIcon")} />
-        <slider
-            hexpand
-            onDragged={({ value }) => speaker.volume = value}
-            value={bind(speaker, "volume")}
-        />
-    </box>
-}
-
-function BatteryLevel() {
-    const bat = Battery.get_default()
-
-    return <box className="Battery"
-        visible={bind(bat, "isPresent")}>
-        <icon icon={bind(bat, "batteryIconName")} />
-        <label label={bind(bat, "percentage").as(p =>
-            `${Math.floor(p * 100)} %`
-        )} />
-    </box>
-}
-
-function Media() {
-    const mpris = Mpris.get_default()
-
-    return <box className="Media">
-        {bind(mpris, "players").as(ps => ps[0] ? (
-            <box>
-                <box
-                    className="Cover"
-                    valign={Gtk.Align.CENTER}
-                    css={bind(ps[0], "coverArt").as(cover =>
-                        `background-image: url('${cover}');`
-                    )}
-                />
-                <label
-                    label={bind(ps[0], "metadata").as(() =>
-                        `${ps[0].title} - ${ps[0].artist}`
-                    )}
-                />
-            </box>
-        ) : (
-            <label label="Biscuit" />
-        ))}
-    </box>
-}
-
-
-function Workspaces() {
-  const hypr = Hyprland.get_default();
-
-  return (
-    <box className="Workspaces">
-      {bind(hypr, "focusedWorkspace").as((fw) => {
-        if (!fw) return null;
-
-        // Determine the current chunk of 5 visible workspace buttons
-        const currentChunkStart = Math.floor((fw.id - 1) / 5) * 5 + 1;
-        const visibleIds = Array.from({ length: 5 }, (_, i) => currentChunkStart + i);
-
-        return visibleIds.map((id) => {
-          // Try to get the real workspace, fall back to a dummy one if it doesn't exist
-          const ws =
-            hypr.workspaces.find((w) => w.id === id) ??
-            Hyprland.Workspace.dummy(id, null);
-
-          return (
-            <button
-              className={fw.id === id ? "focused" : ""}
-              onClick={() => ws.focus()}
-            >
-              {id}
-            </button>
-          );
-        });
-      })}
-    </box>
-  );
-}
-
-function FocusedClient() {
-    const hypr = Hyprland.get_default();
-    const focused = bind(hypr, "focusedClient");
-
-    return (
-        <box className="FocusedClient" visible={focused.as(Boolean)}>
-            {focused.as(client => {
-                if (!client) return null;
-
-                return (
-                    <label
-                        label={bind(client, "title").as(title => {
-                            return title.length > 40
-                                ? title.slice(0, 37) + "..."
-                                : title;
-                        })}
-                    />
-                );
-            })}
-        </box>
-    );
-}
-function Time({ format = "%H:%M|%a %b %d" }) {
-    const time = Variable<string>("").poll(1000, () =>
-        GLib.DateTime.new_now_local().format(format)!
-    );
-
-    return bind(time).as(str => {
-        const [hm, date] = str.split("|");
-
-        return (
-            <box className="Time">
-                <label className="TimeHM" label={hm} />
-                <label className="TimeDate" label={date} />
-            </box>
-        );
-    });
-}
-
-export default function Bar(monitor: Gdk.Monitor) {
-    const { TOP, LEFT, RIGHT } = Astal.WindowAnchor
-
-    return <window
-        className="Bar"
-        gdkmonitor={monitor}
-        exclusivity={Astal.Exclusivity.EXCLUSIVE}
-        anchor={TOP | LEFT | RIGHT}>
-        <centerbox>
-            <box hexpand halign={Gtk.Align.START}>
-                <Workspaces />
-                <FocusedClient />
-            </box>
-            <box>
-                <Time />
-            </box>
-            <box hexpand halign={Gtk.Align.END} >
-                <SysTray />
-                <Wifi />
-                <AudioSlider />
-                <BatteryLevel />
-            </box>
-        </centerbox>
-    </window>
-}

packages/ags/home.nix

@@ -1,28 +0,0 @@
-{
-  inputs,
-  pkgs,
-  system,
-  ...
-}: {
-  imports = [inputs.ags.homeManagerModules.default];
-
-  programs.ags = {
-    enable = true;
-    configDir = ./custom;
-
-    extraPackages = let
-      agsPkgs = inputs.ags.packages.${system};
-    in
-      with pkgs; [
-        agsPkgs.battery
-        agsPkgs.hyprland
-        agsPkgs.mpris
-        agsPkgs.wireplumber
-        agsPkgs.notifd
-        agsPkgs.apps
-        agsPkgs.network
-        agsPkgs.tray
-        fzf
-      ];
-  };
-}

packages/bibata/home.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    bibata-cursors
-  ];
-}

packages/eza/home.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  programs.eza = {
-    enable = true;
-    git = true;
-    colors = "auto";
-    icons = "auto";
-
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-    enableBashIntegration = true;
-  };
-}

packages/fastfetch/home.nix

@@ -1,131 +0,0 @@
-{
-  programs.fastfetch = {
-    enable = true;
-
-    settings = {
-      logo = {
-        padding = {
-          top = 2;
-          left = 1;
-          right = 2;
-        };
-      };
-
-      display = {
-        separator = "  ";
-      };
-
-      modules = [
-        # Title
-        {
-          type = "title";
-          format = "{#1}╭───────────── {#}{user-name-colored}";
-        }
-
-        # System Information Header
-        {
-          type = "custom";
-          format = "{#1}│ {#}System Information";
-        }
-        {
-          type = "os";
-          key = "│  {#keys}󰍹 OS";
-        }
-        {
-          type = "kernel";
-          key = "│  {#keys}󰒋 Kernel";
-        }
-        {
-          type = "uptime";
-          key = "│  {#keys}󰅐 Uptime";
-        }
-        {
-          type = "packages";
-          key = "│  {#keys}󰏖 Packages";
-          format = "{all}";
-        }
-
-        {
-          type = "custom";
-          format = "{#1}│";
-        }
-
-        # Desktop Environment
-        {
-          type = "custom";
-          format = "{#1}│ {#}Desktop Environment";
-        }
-        {
-          type = "de";
-          key = "│  {#keys}󰧨 DE";
-        }
-        {
-          type = "wm";
-          key = "│  {#keys}󱂬 WM";
-        }
-        {
-          type = "wmtheme";
-          key = "│  {#keys}󰉼 Theme";
-        }
-        {
-          type = "display";
-          key = "│  {#keys}󰹑 Resolution";
-        }
-        {
-          type = "shell";
-          key = "│  {#keys}󰞷 Shell";
-        }
-        {
-          type = "terminalfont";
-          key = "│  {#keys}󰛖 Font";
-        }
-
-        {
-          type = "custom";
-          format = "{#1}│";
-        }
-
-        # Hardware Information
-        {
-          type = "custom";
-          format = "{#1}│ {#}Hardware Information";
-        }
-        {
-          type = "cpu";
-          key = "│  {#keys}󰻠 CPU";
-        }
-        {
-          type = "gpu";
-          key = "│  {#keys}󰢮 GPU";
-        }
-        {
-          type = "memory";
-          key = "│  {#keys}󰍛 Memory";
-        }
-        {
-          type = "disk";
-          key = "│  {#keys}󰋊 Disk (/)";
-          folders = "/";
-        }
-
-        {
-          type = "custom";
-          format = "{#1}│";
-        }
-
-        # Colors
-        {
-          type = "colors";
-          key = "│";
-          symbol = "circle";
-        }
-
-        # Footer
-        {
-          type = "custom";
-          format = "{#1}╰───────────────────────────────╯";
-        }
-      ];
-    };
-  };
-}

packages/firefox/home.nix

@@ -1,113 +0,0 @@
-{
-  programs.firefox = {
-    enable = true;
-    languagePacks = [
-      "en-US"
-    ];
-    profiles = {
-      hakase = {
-        search.force = true;
-        isDefault = true;
-        search.default = "ddg";
-        settings = {
-          "browser.contentblocking.category" = "strict";
-          "extensions.pocket.enabled" = false;
-          "extensions.screenshots.disabled" = true;
-          "browser.topsites.contile.enabled" = false;
-          "browser.formfill.enable" = false;
-          "browser.search.suggest.enabled" = false;
-          "browser.search.suggest.enabled.private" = false;
-          "browser.urlbar.suggest.searches" = false;
-          "browser.urlbar.showSearchSuggestionsFirst" = false;
-          "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-          "browser.newtabpage.activity-stream.feeds.snippets" = false;
-          "browser.newtabpage.activity-stream.section.highlights.includePocket" = false;
-          "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = false;
-          "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = false;
-          "browser.newtabpage.activity-stream.section.highlights.includeVisited" = false;
-          "browser.newtabpage.activity-stream.showSponsored" = false;
-          "browser.newtabpage.activity-stream.system.showSponsored" = false;
-          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-          "browser.startup.homepage" = "https://dash.sakamoto.dev";
-          "browser.newtabpage.pinned" = [
-            {
-              title = "Dashboard";
-              url = "https://dash.sakamoto.dev";
-            }
-          ];
-        };
-        bookmarks = {
-          force = true;
-          settings = [
-            {
-              toolbar = true;
-              bookmarks = [
-                {
-                  name = "Home Manager";
-                  url = "https://mynixos.com/home-manager/options/programs";
-                }
-                {
-                  name = "YouTube";
-                  url = "https://youtube.com";
-                }
-              ];
-            }
-          ];
-        };
-      };
-    };
-
-    policies = {
-      DisableTelemetry = true;
-      DisableFirefoxStudies = true;
-      EnableTrackingProtection = {
-        Value = true;
-        Locked = true;
-        Cryptomining = true;
-        Fingerprinting = true;
-      };
-      DisablePocket = true;
-      DisableFirefoxAccounts = true;
-      DisableAccounts = true;
-      DisableFirefoxScreenshots = true;
-      OverrideFirstRunPage = "";
-      OverridePostUpdatePage = "";
-      DontCheckDefaultBrowser = true;
-      DisplayBookmarksToolbar = "always"; # alternatives: "always" or "newtab"
-      DisplayMenuBar = "default-off"; # alternatives: "always", "never" or "default-on"
-      SearchBar = "unified"; # alternative: "separate"
-
-      /*
-      ---- EXTENSIONS ----
-      */
-      # Check about:support for extension/add-on ID strings.
-      # Valid strings for installation_mode are "allowed", "blocked",
-      # "force_installed" and "normal_installed".
-      ExtensionSettings = {
-        "*".installation_mode = "blocked";
-        "uBlock0@raymondhill.net" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
-          installation_mode = "force_installed";
-        };
-        "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/file/4493940/bitwarden_password_manager-2025.5.0.xpi";
-          installation_mode = "force_installed";
-        };
-        "tridactyl.vim@cmcaine.co.uk" = {
-          install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi";
-          installation_mode = "force_installed";
-        };
-        # Privacy Badger:
-        # "jid1-MnnxcxisBPnSXQ@jetpack" = {
-        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
-        #   installation_mode = "force_installed";
-        # };
-        # 1Password:
-        # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = {
-        #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi";
-        #   installation_mode = "force_installed";
-        # };
-      };
-    };
-  };
-}

packages/fonts/home.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  fonts = {
-    fontconfig.enable = true;
-  };
-  home.packages = with pkgs; [
-    nerd-fonts.jetbrains-mono
-  ];
-}

packages/git/home.nix

@@ -1,10 +0,0 @@
-{myConfig, ...}: {
-  programs.git = {
-    enable = true;
-    extraConfig = {
-      user.name = "${myConfig.nixos.Git.user}";
-      user.email = "${myConfig.nixos.Git.email}";
-      init.defaultBranch = "${myConfig.nixos.Git.defaultBranch}";
-    };
-  };
-}

packages/hypridle/home.nix

@@ -1,38 +0,0 @@
-{...}: {
-  services.hypridle = {
-    enable = true;
-    settings = {
-      general = {
-        lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
-        before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
-        after_sleep_cmd = "hyprctl dispatch dpms on && agu"; # avoid needing to press a key twice to turn on the display.
-      };
-
-      listener = [
-        # {
-        #   timeout = 150;
-        #   on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
-        #   on-resume = "brightnessctl -r"; # restore monitor backlight.
-        # }
-        # {
-        #   timeout = 150;
-        #   on-timeout = "brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight.
-        #   on-resume = "brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight.
-        # }
-        # {
-        #   timeout = 300;
-        #   on-timeout = "loginctl lock-session"; # lock screen when timeout has passed.
-        # }
-        # {
-        #   timeout = 330;
-        #   on-timeout = "hyprctl dispatch dpms off"; # screen off after 5.5min.
-        #   on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on and restore brightness on resume.
-        # }
-        {
-          timeout = 500;
-          on-timeout = "systemctl suspend"; # suspend PC after 30min.
-        }
-      ];
-    };
-  };
-}

packages/hyprland/config/animation.nix

@@ -1,42 +0,0 @@
-{
-  config,
-  pkgs,
-  myConfig,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    animations = {
-      enabled = true;
-      bezier = [
-        "linear, 0, 0, 1, 1"
-        "md3_standard, 0.2, 0, 0, 1"
-        "md3_decel, 0.05, 0.7, 0.1, 1"
-        "md3_accel, 0.3, 0, 0.8, 0.15"
-        "overshot, 0.05, 0.9, 0.1, 1.1"
-        "crazyshot, 0.1, 1.5, 0.76, 0.92"
-        "hyprnostretch, 0.05, 0.9, 0.1, 1.0"
-        "menu_decel, 0.1, 1, 0, 1"
-        "menu_accel, 0.38, 0.04, 1, 0.07"
-        "easeInOutCirc, 0.85, 0, 0.15, 1"
-        "easeOutCirc, 0, 0.55, 0.45, 1"
-        "easeOutExpo, 0.16, 1, 0.3, 1"
-        "softAcDecel, 0.26, 0.26, 0.15, 1"
-        "md2, 0.4, 0, 0.2, 1"
-      ];
-
-      animation = [
-        "windows, 1, 3, md3_decel, popin 60%"
-        "windowsIn, 1, 3, md3_decel, popin 60%"
-        "windowsOut, 1, 3, md3_accel, popin 60%"
-        "border, 1, 10, default"
-        "fade, 1, 3, md3_decel"
-        "layersIn, 1, 3, menu_decel, slide"
-        "layersOut, 1, 1.6, menu_accel"
-        "fadeLayersIn, 1, 2, menu_decel"
-        "fadeLayersOut, 1, 0.5, menu_accel"
-        "workspaces, 1, 7, menu_decel, slide"
-        "specialWorkspace, 1, 3, md3_decel, slidevert"
-      ];
-    };
-  };
-}

packages/hyprland/config/binds.nix

@@ -1,297 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    exec = [
-      "hyprctl dispatch submap global"
-    ];
-
-    submap = [
-      "global"
-    ];
-
-    # Shell keybinds
-    bindi = [
-      "$mod, Super_L, global, caelestia:launcher" # bind to `bind` because `bindi` maps to it
-      # Launcher
-    ];
-    bindin =
-      [
-        "$mod, catchall, global, caelestia:launcherInterrupt"
-        "$mod, mouse:272, global, caelestia:launcherInterrupt"
-        "$mod, mouse:273, global, caelestia:launcherInterrupt"
-        "$mod, mouse:274, global, caelestia:launcherInterrupt"
-        "$mod, mouse:275, global, caelestia:launcherInterrupt"
-        "$mod, mouse:276, global, caelestia:launcherInterrupt"
-        "$mod, mouse:277, global, caelestia:launcherInterrupt"
-        "$mod, mouse_up, global, caelestia:launcherInterrupt"
-        "$mod, mouse_down, global, caelestia:launcherInterrupt"
-
-        "$mod, K, global, caelestia:launcherInterrupt"
-        "$mod, H, global, caelestia:launcherInterrupt"
-        "$mod, J, global, caelestia:launcherInterrupt"
-        "$mod, L, global, caelestia:launcherInterrupt"
-
-        "$mod, S, global, caelestia:launcherInterrupt"
-        "$mod, G, global, caelestia:launcherInterrupt"
-        "$mod, T, global, caelestia:launcherInterrupt"
-        "$mod, D, global, caelestia:launcherInterrupt"
-        "$mod, Escape, global, caelestia:launcherInterrupt"
-        "$mod, PERIOD, global, caelestia:launcherInterrupt"
-        "$mod, E, global, caelestia:launcherInterrupt"
-        "$mod, V, global, caelestia:launcherInterrupt"
-
-        "$mod, W, global, caelestia:launcherInterrupt"
-        "$mod, Q, global, caelestia:launcherInterrupt"
-        "$mod, C, global, caelestia:launcherInterrupt"
-        "$mod, Return, global, caelestia:launcherInterrupt"
-      ]
-      ++ (
-        # Go to workspace group #
-        builtins.concatLists (builtins.genList (
-            i: let
-              ws = i + 1;
-            in [
-              "$mod, ${toString ws}, global, caelestia:launcherInterrupt"
-            ]
-          )
-          9)
-      )
-      ++ [
-        "$mod, 0, global, caelestia:launcherInterrupt"
-      ];
-    bind =
-      [
-        # Misc
-        "Control+Alt, Delete, exec, caelestia:session"
-        "$mod ALT, A, global, caelestia:showall"
-        "$mod ALT, L, global, caelestia:lock"
-
-        # Restore lock - these are `bindl` in your original, but `exec` should be fine here.
-        # However, `bindl` is typically for a *release* event. If `caelestia shell -d` is a daemon,
-        # and `caelestia:lock` is a quickshell internal, you might need to reconsider.
-        # For direct translation, they go into `bindl` list.
-
-        # Media - handled by bindl below
-
-        # Apps
-        "$mod, Return, exec, app2unit -- kitty"
-        "$mod, W, exec, app2unit -- firefox"
-        "$mod, E, exec, app2unit -- thunar"
-        "$mod, Q, killactive"
-        "$mod ALT, E, exec, app2unit -- nemo"
-        "Control+Alt, Escape, exec, app2unit -- qps"
-        "Control+Alt, V, exec, app2unit -- pavucontrol"
-
-        # Utilities
-        "$mod SHIFT, S, global, caelestia:screenshotFreeze"
-        "$mod SHIFT ALT, S, global, caelestia:screenshot"
-        "$mod ALT, R, exec, caelestia record -s"
-        "Control+Alt, R, exec, caelestia record"
-        "$mod SHIFT ALT, R, exec, caelestia record -r"
-        "$mod SHIFT, C, exec, hyprpicker -a" # Colour picker
-
-        # Sleep
-        "$mod SHIFT, PRINT, exec, systemctl suspend-then-hibernate"
-
-        # Clipboard and emoji picker
-        "$mod, V, exec, pkill fuzzel || caelestia clipboard"
-        "$mod ALT, V, exec, pkill fuzzel || caelestia clipboard -d"
-        "$mod, Period, exec, pkill fuzzel || caelestia emoji -p"
-
-        # Testing
-        # This is a `bindl` (key release), so move it to `bindl` list below.
-
-        # Window actions
-        "$mod, H, movefocus, l"
-        "$mod, L, movefocus, r"
-        "$mod, K, movefocus, u"
-        "$mod, J, movefocus, d"
-        "$mod SHIFT, H, movewindow, l"
-        "$mod SHIFT, L, movewindow, r"
-        "$mod SHIFT, K, movewindow, u"
-        "$mod SHIFT, J, movewindow, d"
-        "$mod CTRL, Backslash, centerwindow, 1"
-        "$mod CTRL ALT, Backslash, resizeactive, exact 55% 70%"
-        "$mod CTRL ALT, Backslash, centerwindow, 1"
-        "$mod ALT, Backslash, exec, caelestia pip"
-        "$mod, P, pin"
-        "$mod, F, fullscreen, 0"
-        "$mod ALT, F, fullscreen, 1"
-
-        # Special workspace toggles
-        "Control+Shift, Escape, exec, caelestia toggle sysmon"
-        "$mod, Escape, exec, caelestia toggle sysmon"
-        "$mod, M, exec, caelestia toggle music"
-        "$mod, D, exec, caelestia toggle communication"
-        "$mod, R, exec, caelestia toggle todo"
-
-        "$mod, G, togglespecialworkspace, gaming"
-        "$mod SHIFT, G, movetoworkspace, special:gaming"
-
-        "$mod, T, exec, caelestia toggle steam"
-
-        # "$mod, T, togglespecialworkspace, special:steam"
-        # "$mod SHIFT, T, movetoworkspace, special:steam"
-
-        # Toggle special workspace
-        "$mod, S, exec, caelestia toggle specialws"
-
-        # Window groups
-        "$mod, Comma, togglegroup"
-        "$mod SHIFT, Comma, lockactivegroup, toggle"
-
-        # Go to workspace -1/+1 (mouse binds are `bind` for mouse-wheel)
-        "$mod, mouse_down, workspace, -1"
-        "$mod, mouse_up, workspace, +1"
-
-        # Move window to workspace -1/+1
-        "$mod ALT, mouse_down, movetoworkspace, -1"
-        "$mod ALT, mouse_up, movetoworkspace, +1"
-
-        # Move window to/from special workspace
-        "$mod CTRL SHIFT, up, movetoworkspace, special:special"
-        "$mod CTRL SHIFT, down, movetoworkspace, e+0"
-        "$mod ALT, S, movetoworkspace, special:special"
-      ]
-      ++ (
-        # Go to workspace #
-        let
-          wsaction = "~/.config/hypr/scripts/wsaction.fish";
-        in
-          builtins.concatLists (builtins.genList (
-              i: let
-                ws = i + 1;
-              in [
-                "$mod, ${toString ws}, exec, ${wsaction} workspace ${toString ws}"
-              ]
-            )
-            9) # For workspaces 1-9
-      )
-      ++ [
-        # "$mod, 0, exec, ${config.wayland.windowManager.hyprland.settings.workspaceRule."0".exec} workspace 10" # Workaround for workspace 0
-        # Re-adding `wsaction` since it's used here.
-        "$mod, 0, exec, ~/.config/hypr/scripts/wsaction.fish workspace 10"
-      ]
-      ++ (
-        # Go to workspace group #
-        let
-          wsaction = "~/.config/hypr/scripts/wsaction.fish";
-        in
-          builtins.concatLists (builtins.genList (
-              i: let
-                ws = i + 1;
-              in [
-                "Control+$mod, ${toString ws}, exec, ${wsaction} -g workspace ${toString ws}"
-              ]
-            )
-            9)
-      )
-      ++ [
-        "Control+$mod, 0, exec, ~/.config/hypr/scripts/wsaction.fish -g workspace 10"
-      ]
-      ++ (
-        # Move window to workspace #
-        let
-          wsaction = "~/.config/hypr/scripts/wsaction.fish";
-        in
-          builtins.concatLists (builtins.genList (
-              i: let
-                ws = i + 1;
-              in [
-                "$mod SHIFT, ${toString ws}, exec, ${wsaction} movetoworkspace ${toString ws}"
-              ]
-            )
-            9)
-      )
-      ++ [
-        "$mod SHIFT, 0, exec, ~/.config/hypr/scripts/wsaction.fish movetoworkspace 10"
-      ]
-      ++ (
-        # Move window to workspace group #
-        let
-          wsaction = "~/.config/hypr/scripts/wsaction.fish";
-        in
-          builtins.concatLists (builtins.genList (
-              i: let
-                ws = i + 1;
-              in [
-                "Control+$mod ALT, ${toString ws}, exec, ${wsaction} -g movetoworkspace ${toString ws}"
-              ]
-            )
-            9)
-      )
-      ++ [
-        "Control+$mod ALT, 0, exec, ~/.config/hypr/scripts/wsaction.fish -g movetoworkspace 10"
-      ];
-
-    binde = [
-      "$mod, Minus, splitratio, -0.1"
-      "$mod, Equal, splitratio, 0.1"
-      "Control+$mod, left, workspace, -1"
-      "$mod, Page_Up, workspace, -1"
-      "Control+$mod, right, workspace, +1"
-      "$mod, Page_Down, workspace, +1"
-      "$mod ALT, Page_Up, movetoworkspace, -1"
-      "$mod ALT, Page_Down, movetoworkspace, +1"
-      "Control+$mod SHIFT, right, movetoworkspace, +1"
-      "Control+$mod SHIFT, left, movetoworkspace, -1"
-      "Alt, Tab, cyclenext, activewindow" # `binde` for cycle next
-      "Control+Alt, Tab, changegroupactive, f" # `binde` for change group active
-    ];
-
-    bindm = [
-      "$mod, mouse:272, movewindow"
-      "$mod, Z, movewindow"
-      "$mod, mouse:273, resizewindow"
-      "$mod, X, resizewindow"
-    ];
-
-    bindl = [
-      # Restore lock
-      "$mod ALT, L, exec, caelestia shell -d"
-      "$mod ALT, L, global, caelestia:lock" # This is a Hyprland `global` command, not an `exec`
-
-      # Brightness
-      ", XF86MonBrightnessUp, global, caelestia:brightnessUp"
-      ", XF86MonBrightnessDown, global, caelestia:brightnessDown"
-
-      # Media
-      "Control+$mod, Space, global, caelestia:mediaToggle"
-      ", XF86AudioPlay, global, caelestia:mediaToggle"
-      ", XF86AudioPause, global, caelestia:mediaToggle"
-      "Control+$mod, Equal, global, caelestia:mediaNext"
-      ", XF86AudioNext, global, caelestia:mediaNext"
-      "Control+$mod, Minus, global, caelestia:mediaPrev"
-      ", XF86AudioPrev, global, caelestia:mediaPrev"
-      ", XF86AudioStop, global, caelestia:mediaStop"
-
-      # Utilities (screenshot is `bindl` in your original)
-      ", Print, exec, caelestia screenshot" # Full screen capture > clipboard
-
-      # Volume
-      ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-      "$mod SHIFT, M, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-
-      # Clipboard and emoji picker (alternate paste is `bindl`)
-      "Control+Shift+Alt, V, exec, sleep 0.5s && ydotool type -d 1 \"$(cliphist list | head -1 | cliphist decode)\""
-
-      # Testing
-      "$mod ALT, f12, exec, notify-send -u low -i dialog-information-symbolic 'Test notification' \"Here's a really long message to test truncation and wrapping\\nYou can middle click or flick this notification to dismiss it!\" -a 'Shell' -A \"Test1=I got it!\" -A \"Test2=Another action\""
-    ];
-
-    bindel = [
-      # Volume
-      ", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 10%+"
-      ", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-"
-    ];
-
-    bindr = [
-      # Kill/restart
-      "Control+$mod SHIFT, R, exec, qs -c caelestia kill"
-      "Control+$mod ALT, R, exec, qs -c caelestia kill; caelestia shell -d"
-    ];
-  };
-}

packages/hyprland/config/colours.nix

@@ -1,27 +0,0 @@
-{
-  config,
-  pkgs,
-  myConfig,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    exec = [
-      "cp -L --no-preserve=mode --update=none ~/.config/hypr/scheme/default.conf ~/.config/hypr/scheme/current.conf"
-    ];
-    source = [
-      "~/.config/hypr/scheme/current.conf"
-    ];
-    group = {
-      groupbar = {
-        "text_color" = "rgb($onPrimary)";
-        "col.active" = "rgba($primaryd4)";
-        "col.inactive" = "rgba($outlined4)";
-        "col.locked_active" = "rgba($primaryd4)";
-        "col.locked_inactive" = "rgba($secondaryd4)";
-      };
-    };
-    misc = {
-      background_color = "rgb($surfaceVariant)";
-    };
-  };
-}

packages/hyprland/config/decoration.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  pkgs,
-  myConfig,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    decoration = {
-      rounding = 10;
-      rounding_power = 2;
-      active_opacity = 1.0;
-      inactive_opacity = 1.0;
-
-      dim_inactive = true;
-      dim_strength = 0.1;
-      dim_special = 0.8;
-
-      shadow = {
-        enabled = true;
-        range = 4;
-        render_power = 3;
-        color = "rgba(1a1a1aee)";
-      };
-
-      blur = {
-        enabled = true;
-        size = 3;
-        passes = 1;
-        vibrancy = 0.1696;
-      };
-    };
-  };
-}

packages/hyprland/config/env.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  pkgs,
-  myConfig,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    env = [
-      "HYPRCURSOR_THEME, Bibata-Original-Classic"
-      "HYPRCURSOR_SIZE, 24"
-
-      "QT_QPA_PLATFORMTHEME, qt5ct"
-      "QT_WAYLAND_DISABLE_WINDOWDECORATION, 1"
-      "QT_AUTO_SCREEN_SCALE_FACTOR, 1"
-      "XCURSOR_THEME, sweet-rainbow"
-      "XCURSOR_SIZE, 24"
-
-      "GDK_BACKEND, wayland,x11"
-      "QT_QPA_PLATFORM, wayland;xcb"
-      "SDL_VIDEODRIVER, wayland,x11"
-      "CLUTTER_BACKEND, wayland"
-      "ELECTRON_OZONE_PLATFORM_HINT, auto"
-
-      "XDG_CURRENT_DESKTOP, Hyprland"
-      "XDG_SESSION_TYPE, wayland"
-      "XDG_SESSION_DESKTOP, Hyprland"
-
-      "_JAVA_AWT_WM_NONREPARENTING, 1"
-    ];
-  };
-}

packages/hyprland/config/execs.nix

@@ -1,27 +0,0 @@
-{
-  config,
-  pkgs,
-  myConfig,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    exec-once = [
-      # "[workspace special:communication silent] discord"
-      "[workspace special:steam silent] steam"
-      "[workspace special:preload silent] kitty --single-instance --hold fastfetch"
-      "[workspace special:preload silent] firefox"
-      "[workspace 1] kitty --single-instance --hold -e fish -C fastfetch"
-
-      "hyprctl setcursor Bibata-Modern-Ice 24"
-
-      "solaar -w hide"
-      # "sunshine"
-      # "moondeck-buddy"
-
-      "wl-paste --type text --watch cliphist store"
-      "wl-paste --type image --watch cliphist store"
-
-      "sleep 3 && caelestia shell"
-    ];
-  };
-}

packages/hyprland/config/rules.nix

@@ -1,128 +0,0 @@
-{
-  config,
-  pkgs,
-  myConfig,
-  ...
-}: {
-  wayland.windowManager.hyprland.settings = {
-    # ######## Window rules ########
-    windowrule = [
-      "opaque, class:foot|equibop"
-      "center 1, floating:1, xwayland:0"
-
-      # Float
-      "float, class:guifetch"
-      "float, class:yad"
-      "float, class:zenity"
-      "float, class:wev"
-      "float, class:org\\.gnome\\.FileRoller" # Escaped backslash
-      "float, class:file-roller"
-      "float, class:blueman-manager"
-      "float, class:com\\.github\\.GradienceTeam\\.Gradience" # Escaped backslash
-      "float, class:feh"
-      "float, class:imv"
-      "float, class:system-config-printer"
-      "float, class:quickshell"
-
-      # Float, resize and center
-      "float, class:foot, title:nmtui"
-      "size 60% 70%, class:foot, title:nmtui"
-      "center 1, class:foot, title:nmtui"
-      "float, class:org\\.gnome\\.Settings"
-      "size 70% 80%, class:org\\.gnome\\.Settings"
-      "center 1, class:org\\.gnome\\.Settings"
-      "float, class:org\\.pulseaudio\\.pavucontrol|yad-icon-browser"
-      "size 60% 70%, class:org\\.pulseaudio\\.pavucontrol|yad-icon-browser"
-      "center 1, class:org\\.pulseaudio\\.pavucontrol|yad-icon-browser"
-      "float, class:nwg-look"
-      "size 50% 60%, class:nwg-look"
-      "center 1, class:nwg-look"
-
-      # Special workspaces
-      "workspace special:sysmon, class:btop"
-      "workspace special:music, class:feishin|Spotify|Supersonic"
-      "workspace special:music, initialTitle:Spotify( Free)?"
-      "workspace special:communication, class:discord|equibop|vesktop|whatsapp"
-      "workspace special:todo, class:Todoist"
-      "workspace special:steam, class:^(steam_app_.*)$"
-
-      "noinitialfocus, class:discord"
-      "focusonactivate 0, class:discord"
-
-      # Always full screen
-      # "fullscreen, title:^(Steam Big Picture Mode)$"
-      # "fullscreen, title:^(steam_app_.*)$"
-
-      # Dialogs
-      "float, title:(Select|Open)( a)? (File|Folder)(s)?"
-      "float, title:File (Operation|Upload)( Progress)?"
-      "float, title:.* Properties"
-      "float, title:Export Image as PNG"
-      "float, title:GIMP Crash Debug"
-      "float, title:Save As"
-      "float, title:Library"
-
-      # Picture in picture (resize and move done via script)
-      "move 100%-w-2% 100%-w-3%, title:Picture(-| )in(-| )[Pp]icture"
-      "keepaspectratio, title:Picture(-| )in(-| )[Pp]icture"
-      "float, title:Picture(-| )in(-| )[Pp]icture"
-      "pin, title:Picture(-| )in(-| )[Pp]icture"
-
-      # Steam
-      "workspace special:steam, class:steam"
-      "rounding 10, title:, class:steam"
-      "float, title:Friends List, class:steam"
-      "immediate, class:steam_app_[0-9]+"
-      "idleinhibit always, class:steam_app_[0-9]+"
-
-      # ATLauncher console
-      "float, class:com-atlauncher-App, title:ATLauncher Console"
-
-      # Autodesk Fusion 360
-      "noblur, title:Fusion360|(Marking Menu), class:fusion360\\.exe" # Escaped backslash
-
-      # Ugh xwayland popups
-      "nodim, xwayland:1, title:win[0-9]+"
-      "noshadow, xwayland:1, title:win[0-9]+"
-      "rounding 10, xwayland:1, title:win[0-9]+"
-    ];
-
-    # ######## Workspace rules ########
-    workspace = [
-      "w[tv1]s[false], gapsout:20, gapsin:20"
-      "f[1]s[false], gapsout:20, gapsin:20"
-      "1, monitor:DP-1, default:true"
-      "2, monitor:DP-1"
-      "3, monitor:DP-1"
-      "4, monitor:DP-2"
-      "5, monitor:DP-2"
-      "6, monitor:DP-2"
-
-      "special:gaming, monitor:DP-1, persistent:true"
-      "special:steam, monitor:DP-1, persistent:true, on-created-empty:steam"
-    ];
-
-    # ######## Layer rules ########
-    layerrule = [
-      "animation fade, hyprpicker"
-      "animation fade, logout_dialog"
-      "animation fade, selection"
-      "animation fade, wayfreeze"
-
-      # Fuzzel
-      "animation popin 80%, launcher"
-      "blur, launcher"
-
-      # Shell
-      "noanim, caelestia-(launcher|osd|notifications|border-exclusion|area-picker)"
-      "animation fade, caelestia-(drawers|background)"
-      "order 1, caelestia-border-exclusion"
-      "order 2, caelestia-bar"
-      # The commented out lines below need to remain commented if you don't want them active
-      #"xray 1, caelestia-(border|launcher|bar|sidebar|navbar|mediadisplay|screencorners)"
-      #"blur, caelestia-.*"
-      #"blurpopups, caelestia-.*"
-      #"ignorealpha 0.57, caelestia-.*"
-    ];
-  };
-}

packages/hyprland/default.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  inputs,
-  myConfig,
-  lib,
-  ...
-}: {
-  programs.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-  };
-}

packages/hyprland/home.nix

@@ -1,86 +0,0 @@
-{
-  myConfig,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./config/binds.nix
-    ./config/execs.nix
-    ./config/rules.nix
-    ./config/animation.nix
-    ./config/decoration.nix
-    ./config/env.nix
-    ./config/colours.nix
-  ];
-
-  home.file.".config/hypr/scripts/wsaction.fish" = {
-    source = builtins.toPath ./scripts/wsaction.fish;
-    executable = true;
-  };
-  wayland.windowManager.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    systemd.enable = true;
-    settings = {
-      "$mod" = "SUPER";
-      "$term" = "kitty --single-instance";
-      "$browser" = "firefox";
-      "$wsaction" = "fish -c ./scripts/wsaction.fish";
-      "$widget" = "qs -c caelestia";
-
-      monitor = myConfig.nixos.Hyprland.monitors;
-      general = {
-        gaps_in = 2;
-        gaps_out = 5;
-        border_size = 2;
-        # col.active_border = "#0DB7D4FF";
-        # col.inactive_border = "#31313600";
-        # col = {
-        #    "inactive_border" = "rgba(595959aa)";
-        #    "active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
-        # };
-        resize_on_border = false;
-        allow_tearing = false;
-        layout = "dwindle";
-      };
-
-      dwindle = {
-        pseudotile = true;
-        preserve_split = true;
-      };
-
-      master = {
-        new_status = "master";
-      };
-
-      misc = {
-        force_default_wallpaper = -1;
-        disable_hyprland_logo = true;
-      };
-
-      input = {
-        kb_layout = "us";
-        follow_mouse = 1;
-        sensitivity = 0;
-        force_no_accel = true;
-        repeat_delay = 250;
-        repeat_rate = 35;
-
-        touchpad = {
-          natural_scroll = false;
-        };
-
-        numlock_by_default = true;
-      };
-
-      gestures = {
-        workspace_swipe = false;
-      };
-
-      binds = {
-        workspace_back_and_forth = true;
-        scroll_event_delay = 0;
-      };
-    };
-  };
-}

packages/hyprland/scripts/wsaction.fish

@@ -1,21 +0,0 @@
-#!/usr/bin/env fish
-
-if test "$argv[1]" = '-g'
-    set group
-    set -e $argv[1]
-end
-
-if test (count $argv) -ne 2
-    echo 'Wrong number of arguments. Usage: ./wsaction.fish [-g] <dispatcher> <workspace>'
-    exit 1
-end
-
-set -l active_ws (hyprctl activeworkspace -j | jq -r '.id')
-
-if set -q group
-    # Move to group
-    hyprctl dispatch $argv[1] (math "($argv[2] - 1) * 10 + $active_ws % 10")
-else
-    # Move to ws in group
-    hyprctl dispatch $argv[1] (math "floor(($active_ws - 1) / 10) * 10 + $argv[2]")
-end

packages/hyprlock/home.nix

@@ -1,7 +0,0 @@
-{...}: {
-  programs.hyprlock = {
-    enable = true;
-    settings = {
-    };
-  };
-}

packages/hyprsunset/home.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  # home.packages = with pkgs; [
-  #   hyprsunset
-  # ];
-  services.hyprsunset = {
-    enable = true;
-  };
-}

packages/kitty/home.nix

@@ -1,31 +0,0 @@
-{
-  myConfig,
-  pkgs,
-  ...
-}: {
-  programs.kitty = {
-    enable = true;
-
-    # themeFile = "kanagawa";
-    themeFile = "Catppuccin-Mocha";
-    settings = {
-      confirm_os_window_close = 0;
-      window_padding_width = 10;
-
-      font_size = myConfig.general.Terminal.size;
-      font_family = myConfig.general.Terminal.font;
-      bold_font = "auto";
-      italic_font = "auto";
-      bold_italic_font = "auto";
-      shell = "${pkgs.${myConfig.general.Terminal.shell}}/bin/${myConfig.general.Terminal.shell}";
-
-      # optimization
-      input_delay = 0;
-      repaint_delay = 2;
-      sync_to_monitor = false;
-      wayland_enable_ime = false;
-      allow_remote_control = true;
-    };
-    # extraConfig = "include colors.conf";
-  };
-}

packages/mangohud/home.nix

@@ -1,88 +0,0 @@
-{myConfig, ...}: {
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    settings = {
-      legacy_layout = false;
-      horizontal = true;
-      background_alpha = 0.6;
-      round_corners = 10;
-      background_color = "000000";
-      font_size = 24;
-      text_color = "FFFFFF";
-      position = "top-left";
-      toggle_hud = "Shift_R+F12";
-      no_display = true;
-      pci_dev = "0:03:00.0";
-      table_columns = 3;
-
-      gpu_text = "GPU";
-      gpu_stats = true;
-      gpu_load_change = true;
-      gpu_load_value = [50 90];
-      gpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"];
-      gpu_temp = true;
-      gpu_power = true;
-      gpu_color = "2E9762";
-
-      cpu_text = "CPU";
-      cpu_stats = true;
-      cpu_load_change = true;
-      cpu_load_value = [50 90];
-      cpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"];
-      cpu_temp = true;
-      cpu_power = true;
-      cpu_color = "2E97CB";
-
-      vram = true;
-      vram_color = "AD64C1";
-      ram = true;
-      ram_color = "C26693";
-      battery = true;
-      battery_color = "00FF00";
-
-      fps = true;
-      fps_metrics = ["avg" "0.01"];
-      engine_version = true;
-      engine_color = "EB5B5B";
-      arch = true;
-      frame_timing = true;
-      frametime_color = "FA8000";
-      fps_limit_method = "late";
-      toggle_fps_limit = "Shift_L+F1";
-      fps_limit = 0;
-      resolution = true;
-      refresh_rate = true;
-
-      # custom_text = [
-      #   "-"
-      #   "$(cat /home/kenji/.config/goverlay/distro)"
-      #   "-"
-      #   "$(uname -r)"
-      #   "Session:"
-      #   "$(echo $XDG_SESSION_TYPE)"
-      # ];
-
-      fps_color_change = true;
-      fps_color = ["B22222" "FDFD09" "39F900"];
-      fps_value = [30 60];
-
-      time = true;
-
-      output_folder = "/home/${myConfig.essentials.Username}/.mangohud/";
-      log_duration = 30;
-      autostart_log = false;
-      log_interval = 100;
-      toggle_logging = "Shift_L+F2";
-
-      blacklist = [
-        "pamac-manager"
-        "lact"
-        "ghb"
-        "bitwig-studio"
-        "ptyxis"
-        "yumex"
-      ];
-    };
-  };
-}

packages/matugen/custom/config.toml

@@ -1,70 +0,0 @@
-[config]
-# If set to enabled, it will check for updates when you run the matugen command, notifying you that an update is avaiable.
-# WARNING: Matugen needs to be compiled with the `update-informer` feature for this to work.
-version_check = false
-
-[config.wallpaper]
-# The base command to run for applying the wallpaper, shouldn't have spaces in it.
-command = "swww"
-
-# The arguments that will be provided to the command.
-# Keywords like {{ mode }} or anything that works inside of hooks doesn't work here.
-# The last argument will be the image path.
-arguments = ["img", "--transition-type", "center", "--transition-fps", "120"]
-
-# For example, killing the wallpaper daemon. Usage is like a normal hook.
-# pre_hook = ""
-
-[config.custom_keywords]
-test = "aaaa"
-
-[templates.name1]
-# Relative paths will be resolved from the path `config.toml` is in.
-input_path = "./colors.whatever-extension"
-output_path = "./a/colors-generated.whatever-extension"
-
-# This will use a different input path depending on what mode you use.
-# input_path_modes = { dark = "./colors.whatever-extension", light = "./colors.whatever-extension" }
-
-# This will compare all of the colors inside the array with the color you set as `compare_to`, and returns the closest color to it.
-# You can then use `{{closest_color}}` inside templates and hooks.
-colors_to_compare = [
-    { name = "black", color = "#000000" },
-    { name = "red", color = "#ff0000" },
-    { name = "maroon", color = "#800000" },
-    { name = "yellow", color = "#ffff00" },
-    { name = "olive", color = "#808000" },
-    { name = "lime", color = "#00ff00" },
-    { name = "green", color = "#008000" },
-    { name = "aqua", color = "#00ffff" },
-    { name = "teal", color = "#008080" },
-    { name = "blue", color = "#0000ff" },
-    { name = "navy", color = "#000080" },
-    { name = "fuchsia", color = "#ff00ff" },
-    { name = "purple", color = "#800080" },
-]
-compare_to = "{{colors.primary.default.hex}}"
-
-# Runs before the template is exported. You can use keywords here,
-pre_hook = 'echo "source color {{colors.source_color.default.hex}}, source image {{image}}, closest color {{closest_color}}"'
-# Runs after the template is exported. You can use keywords here.
-post_hook = 'echo "after gen"'
-
-# Only hex values
-# https://m3.material.io/styles/color/advanced/adjust-existing-colors#1cc12e43-237b-45b9-8fe0-9a3549c1f61e
-# Blend is set to true by default. 
-[config.custom_colors]
-green = "#00ff00"
-red = "#ff0000"
-blue = { color = "#0000ff", blend = false }
-
-### --- my config 
-[templates.kitty]
-input_path = '~/.config/nixos/pkgs/matugen/custom/templates/kitty.conf'
-output_path = '~/.config/kitty/colors.conf'
-post_hook = "kitty @ set-colors -a -c ~/.config/kitty/colors.conf"
-
-[templates.ags]
-input_path = '~/.config/nixos/pkgs/matugen/custom/templates/ags.scss'
-output_path = '~/.config/nixos/pkgs/ags/biscuit/colors.scss'
-post_hook = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &"

packages/matugen/custom/templates/ags.scss

@@ -1,3 +0,0 @@
-$background: {{colors.surface.dark.hex}};
-$foreground: {{colors.on_surface.dark.hex}};
-$primary: {{colors.primary.dark.hex}};