test

renamed macbook-air to macbook

.gitignore

@@ -1 +0,0 @@
-hosts/desktop/hardware-configuration.nix

README.md

@@ -1,58 +0,0 @@
-# Sakamoto NixOS
-
-Sakamoto NixOS is built with various profiles intended for reproducibility.
-
-## Available Hosts
-
-- MacBook M series
-- Linux
-
-## Installation
-
-1. Install [Nix](https://nixos.org/download/).
-
-2. Ensure Nix is installed properly by running the following (this also gives you `nano` for editing later):
-
-    ```sh
-    nix-shell -p nano
-    ```
-
-3. Clone the git repository:
-
-    ```sh
-    git clone https://git.sakamoto.dev/kenji/nixos.git ~/.config/nixos && cd ~/.config/nixos/
-    ```
-
-4. Copy `info.default.nix` and rename it to `info.local.nix`:
-
-    ```sh
-    cp ~/.config/nixos/info.default.nix ~/.config/nixos/info.local.nix
-    ```
-
-    🚨 **CRITICAL STEP:** Edit `info.local.nix`:
-
-    ```sh
-    nano ~/.config/nixos/info.local.nix
-    ```
-
-    Modify it to fit your system — especially your **username**.  
-    If you accidentally leave the default `biscuit`, that user will be created.  
-    **Login password for `biscuit` is `Your-generic-password`.**
-
-5. Execute the following command based on your host:
-
-    - **MacBook M series:**
-
-        ```sh
-        sudo nix run nix-darwin --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#macos
-        ```
-
-    - **Linux:**
-
-        ```sh
-        sudo nixos-rebuild --flake ~/.config/nixos#desktop --impure
-        sudo nix run home-manager -- init --switch
-        home-manager switch --flake ~/.config/nixos#desktop --impure
-        nix-channel --add https://nixos.org/channels/nixos-unstable nixos nix-channel --update 
-        reboot
-        ```

apps/firefox/home.nix

@@ -0,0 +1,113 @@
+{
+  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 = "allowed";
+        "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";
+        # };
+      };
+    };
+  };
+}

apps/fish/home.nix

@@ -3,16 +3,15 @@
   myConfig,
   ...
 }: {
-  programs.zoxide.enable = true;
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       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/gemini/home.nix

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

apps/ghostty/home.nix

@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  programs.ghostty = {
+    enable = true;
+    package =
+      if pkgs.stdenv.isDarwin
+      then pkgs.ghostty-bin
+      else pkgs.ghostty;
+    enableFishIntegration = true;
+    settings = {
+      window-padding-x = 15;
+      window-padding-y = 15;
+      window-padding-balance = true;
+    };
+  };
+}

apps/git/default.nix

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

apps/git/home.nix

@@ -0,0 +1,10 @@
+{myConfig, ...}: {
+  programs.git = {
+    enable = true;
+    extraConfig = {
+      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.termianl.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,9 @@
+{
+  imports = [
+    ./hypr/binds.nix
+    ./hypr/general.nix
+    ./hypr/exec.nix
+  ];
+  wayland.windowManager.hyprland.enable = true;
+  wayland.windowManager.hyprland.systemd.enable = false; # for UWSM support...
+}

apps/hyprland/hypr/binds.nix

@@ -0,0 +1,44 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    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"
+
+        # fullscreen
+        "SUPER, F, Toggle Fullscreen, fullscreen, 0"
+        "SUPER SHIFT, F, Toggle Maximized Fullscreen, fullscreen, 1"
+
+        # apps
+        "SUPER, W, Open browser, exec, uwsm app -- xdg-open https://duckduckgo.com" # FIXME: must be xdg-open
+
+        # [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/exec.nix

@@ -0,0 +1,7 @@
+{
+  wayland.windowManager.hyprland.settings = {
+    exec-once = [
+      "uwsm app -- waybar"
+    ];
+  };
+}

apps/hyprland/hypr/general.nix

@@ -0,0 +1,9 @@
+{myConfig, ...}: {
+  wayland.windowManager.hyprland.settings = {
+    general = {
+      gaps_in = 5;
+      gaps_out = 15;
+    };
+    monitor = myConfig.hyprland.monitors;
+  };
+}

apps/neovim/neovim.nix

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

apps/starship/home.nix

@@ -0,0 +1,59 @@
+{
+  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)
+      palette = "pro_theme";
+      palettes.pro_theme = {
+        surface0 = "#313244";
+        surface1 = "#45475a";
+        text = "#cdd6f4";
+        peach = "#fab387";
+        sapphire = "#74c7ec";
+        lavender = "#b4befe";
+        green = "#a6e3a1";
+      };
+
+      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/waybar/deps.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    pamixer
+    wiremix
+  ];
+}

apps/waybar/home.nix

@@ -0,0 +1,170 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  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 = "<span font='omarchy'>\ue900</span>";
+          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 = "omarchy-launch-or-focus-tui btop";
+          on-click-right = "alacritty";
+        };
+
+        "clock" = {
+          format = "{:L%A %H:%M}";
+          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 = "omarchy-launch-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 = "omarchy-launch-bluetooth";
+        };
+
+        "pulseaudio" = {
+          format = "{icon}";
+          on-click = "omarchy-launch-or-focus-tui wiremix";
+          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,88 @@
+{
+  programs.waybar = {
+    style = ''
+
+      * {
+        background-color: #cdd6f4;
+        color: #181824;
+
+        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

@@ -0,0 +1,9 @@
+{
+  programs.zoxide = {
+    enable = true;
+    enableFishIntegration = true;
+    options = [
+      "--cmd cd"
+    ];
+  };
+}

config.nix

@@ -1,92 +1,36 @@
 {
   myConfig = {
-    general = {
+    nixos = {
-      Hostname = "hakase";
+      username = "kenji";
-      Username = "kenji";
+      hostname = "hakase";
-      Timezone = "America/Chicago";
+      timezone = "America/Chicago";
-
+      shell = "fish";
-      allowUnfree = true; # allows installation of commercial apps.
-
-      terminal = {
-        Font = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
-        Size = "18";
-        Shell = "fish";
-        Aliases = {
-          ls = "ls --color=auto";
-          update = ''
-            sh -c '
-              if [ "$(uname)" = "Darwin" ]; then
-                sudo darwin-rebuild switch --flake ~/.config/nixos#macos
-              else
-                sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
-              fi
-            '
-          '';
-          agu = "pkill gjs & ags run ~/.config/nixos/packages/ags/biscuit/app.ts & disown (jobs -p) &";
     };
-      };
+    git = {
-      gitProfile = {
+      username = "kenji";
-        User = "kenji";
+      email = "kenji@hakase";
-        Email = "kenji@sakamoto.dev";
       defaultBranch = "master";
     };
     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
       '';
     };
-    };
+    terminal = {
-
+      default = ["ghostty.desktop"];
-    builds = {
+      aliases = {
-      builder = {
+        update = "sudo nixos-rebuild switch --flake ~/.config/nixos-new/#hakase";
-        trustedUsers = [
-          "@groups"
-          "biscuit"
-        ];
-        buildMachines = [
-          {
-            hostName = "192.168.68.81";
-            sshUser = "biscuit";
-            sshKey = "/home/biscuit/.ssh/id_rsa.pub";
-            system = "x86_64-linux";
-            supportedFeatures = ["big-parallel" "kvm" "nixos-test"];
-          }
-        ];
       };
     };
-
+    hyprland = {
-    linux = {
+      monitors = ["HDMI-A-1, 1920x1080@120, auto, 1"];
-      system = "x86_64";
-      gaming = true;
-
-      vpn = {
-        Enable = false;
-        secretFile = builtins.toPath ./secrets/.vpn.yaml;
-      };
-
-      touchpadSupport = false;
-      logitech-hardware.enable = true;
-
-      # Custom Applications
-      apps = {
-        gaming = true;
-        apps = pkgs:
-          with pkgs; [
-            jellyfin-media-player
-          ];
-      };
-      hyprconf = {
-        Monitor = [
-          # hyprctl monitors all
-          # monitor, resolution@refreshrate, position (e.g., 0x0 is middle, 0x1080 is top), scale
-          "DP-1,highres@165,0x1080,auto"
-          "DP-2,highres@highrr,0x0,auto"
-          "HDMI-A-1, preferred, 20000x20000,1"
-        ];
-      };
     };
   };
 }

flake.lock

@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "ags": {
-      "inputs": {
-        "astal": "astal",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744557573,
-        "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
-        "owner": "aylur",
-        "repo": "ags",
-        "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
     "aquamarine": {
       "inputs": {
         "hyprutils": [
@@ -41,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747864449,
+        "lastModified": 1765900596,
-        "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=",
+        "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5",
+        "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
         "type": "github"
       },
       "original": {
@@ -54,47 +33,6 @@
         "type": "github"
       }
     },
-    "astal": {
-      "inputs": {
-        "nixpkgs": [
-          "ags",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1742571008,
-        "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749194393,
-        "narHash": "sha256-vt6hM9DNywnXXuW1qPDLzECmbDcmxhh58wpb0EEQjAo=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "19346808c445f23b08652971be198b9df6c33edc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "devshell": {
       "inputs": {
         "nixpkgs": [
@@ -120,11 +58,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
+        "lastModified": 1761588595,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -151,24 +89,6 @@
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
       },
-      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
-      },
       "locked": {
         "lastModified": 1738453229,
         "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
@@ -183,7 +103,7 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "nixovim",
@@ -207,25 +127,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -321,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748979197,
+        "lastModified": 1766387499,
-        "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=",
+        "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3",
+        "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
         "type": "github"
       },
       "original": {
@@ -372,11 +274,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745948457,
+        "lastModified": 1753964049,
-        "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=",
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "ac903e80b33ba6a88df83d02232483d99f327573",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -401,11 +303,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745015490,
+        "lastModified": 1763733840,
-        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
+        "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
+        "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
         "type": "github"
       },
       "original": {
@@ -419,11 +321,12 @@
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -432,16 +335,64 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1749049255,
+        "lastModified": 1766498696,
-        "narHash": "sha256-QXg2B/bF/f9IeSiZwJuhdnz2xcnpu/hDfz4eIHWVhz8=",
+        "narHash": "sha256-74qO6ynwUav+QqNhBVn/4yoBCpU6r3/eCkX/V11uL+E=",
+        "ref": "refs/heads/main",
+        "rev": "f7f357f15f83612078eb0919ca08b71cac01c25e",
+        "revCount": 6741,
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://github.com/hyprwm/Hyprland"
+      }
+    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765643131,
+        "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
         "owner": "hyprwm",
-        "repo": "Hyprland",
+        "repo": "hyprland-guiutils",
-        "rev": "d7a87ce6e2535f1029fc93b062d2828e8549c525",
+        "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "Hyprland",
+        "repo": "hyprland-guiutils",
         "type": "github"
       }
     },
@@ -457,11 +408,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743714874,
+        "lastModified": 1765214753,
-        "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -470,74 +421,6 @@
         "type": "github"
       }
     },
-    "hyprland-qt-support": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "hyprland-qtutils",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "hyprland-qtutils",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737634706,
-        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "8810df502cdee755993cb803eba7b23f189db795",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "type": "github"
-      }
-    },
-    "hyprland-qtutils": {
-      "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745951494,
-        "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=",
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "type": "github"
-      }
-    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -554,11 +437,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747484975,
+        "lastModified": 1764612430,
-        "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=",
+        "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "163c83b3db48a17c113729c220a60b94596c9291",
+        "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
         "type": "github"
       },
       "original": {
@@ -567,6 +450,58 @@
         "type": "github"
       }
     },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1764592794,
+        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -579,11 +514,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746635225,
+        "lastModified": 1766160771,
-        "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=",
+        "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "674ea57373f08b7609ce93baff131117a0dfe70d",
+        "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
         "type": "github"
       },
       "original": {
@@ -604,11 +539,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747584298,
+        "lastModified": 1763640274,
-        "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=",
+        "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3",
+        "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
         "type": "github"
       },
       "original": {
@@ -617,6 +552,35 @@
         "type": "github"
       }
     },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1766253200,
+        "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
     "ixx": {
       "inputs": {
         "flake-utils": [
@@ -647,27 +611,6 @@
         "type": "github"
       }
     },
-    "matugen": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1745334376,
-        "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=",
-        "owner": "InioX",
-        "repo": "Matugen",
-        "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "InioX",
-        "repo": "Matugen",
-        "type": "github"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -690,42 +633,23 @@
         "type": "github"
       }
     },
-    "nix-gaming": {
+    "nixovim": {
       "inputs": {
         "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "nixvim": "nixvim",
+        "rust-overlay": [
+          "rust-overlay"
         ]
       },
       "locked": {
-        "lastModified": 1751075759,
+        "lastModified": 1764015463,
-        "narHash": "sha256-MNAlH/IlSkg5ODfLEgYuDvs4XrM8n3Ukmh6OqQxoJ6s=",
+        "narHash": "sha256-CfkyQKOVhrSENBoUiCAZbyZtS9lfLlJXUj2kw8i+xtU=",
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "rev": "622e26d86942642483e1a49d4f0dea2cbb80e6c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "type": "github"
-      }
-    },
-    "nixovim": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixvim": "nixvim",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1749068064,
-        "narHash": "sha256-pxszYA1LsrW89Z++jMshDqRpNx99QcvfpFIK5mdmneA=",
         "ref": "refs/heads/master",
-        "rev": "be2e51f4ddec2389d282280871ca484f3f1f0892",
+        "rev": "0231245a5ba7bcb9dd81373474795514d03a4c30",
-        "revCount": 60,
+        "revCount": 70,
         "type": "git",
         "url": "https://git.sakamoto.dev/kenji/nixovim.git"
       },
@@ -751,21 +675,6 @@
       }
     },
     "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1748740939,
-        "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "656a64127e9d791a334452c6b6606d17539476e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1738452942,
         "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
@@ -779,31 +688,15 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1736320768,
+        "lastModified": 1766309749,
-        "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
+        "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
+        "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1748693115,
-        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -813,7 +706,7 @@
       "inputs": {
         "devshell": "devshell",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
@@ -869,11 +762,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747372754,
+        "lastModified": 1765911976,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -882,76 +775,32 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751354716,
-        "narHash": "sha256-bLMNn3gh09gtkIEwZW3USt4ehLrmwmfnb3rqahYBI+4=",
-        "ref": "refs/heads/master",
-        "rev": "f681e2016fd71b42985bd520b3a20c62488582e9",
-        "revCount": 599,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
-      }
-    },
     "root": {
       "inputs": {
-        "ags": "ags",
-        "darwin": "darwin",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "matugen": "matugen",
-        "nix-gaming": "nix-gaming",
         "nixovim": "nixovim",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
-        "quickshell": "quickshell",
+        "rust-overlay": "rust-overlay"
-        "sops-nix": "sops-nix",
-        "unlisted-fonts": "unlisted-fonts"
       }
     },
     "rust-overlay": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1739327257,
-        "narHash": "sha256-rlGK8wxz/e50Z+PQRzuP+m03IrGkhcPGmgkBnkEZ9C8=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "e01f2c035b7b8a428c119b183f4cbc55f2eef07c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "sops-nix": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1750119275,
+        "lastModified": 1766457837,
-        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
+        "narHash": "sha256-aeBbkQ0HPFNOIsUeEsXmZHXbYq4bG8ipT9JRlCcKHgU=",
-        "owner": "Mic92",
+        "owner": "oxalica",
-        "repo": "sops-nix",
+        "repo": "rust-overlay",
-        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
+        "rev": "2c7510a559416d07242621d036847152d970612b",
         "type": "github"
       },
       "original": {
-        "owner": "Mic92",
+        "owner": "oxalica",
-        "repo": "sops-nix",
+        "repo": "rust-overlay",
         "type": "github"
       }
     },
@@ -971,36 +820,6 @@
       }
     },
     "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1037,27 +856,6 @@
         "type": "github"
       }
     },
-    "unlisted-fonts": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748987994,
-        "narHash": "sha256-13QQRwZx9tRDmL79+XBM1YaC4W68mVrVW2NCv2w25WA=",
-        "ref": "refs/heads/master",
-        "rev": "468d51f24d3dd22c543e657c359fb333ff4df726",
-        "revCount": 1,
-        "type": "git",
-        "url": "https://git.sakamoto.dev/kenji/nix-fonts.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.sakamoto.dev/kenji/nix-fonts.git"
-      }
-    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [
@@ -1086,11 +884,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745871725,
+        "lastModified": 1761431178,
-        "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=",
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,115 +1,49 @@
 {
-  description = "Sakamoto's NixOS Configuration";
+  description = "Hakase Configuration";
-
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs"; # `follows` ensure it follows nixpkgs versiona. Avoids breaking updates.
-    darwin.url = "github:lnl7/nix-darwin";
-    darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    ags.url = "github:aylur/ags";
+    rust-overlay = {
-    ags.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    hyprland.url = "github:hyprwm/Hyprland";
+    home-manager = {
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
-
+      inputs.nixpkgs.follows = "nixpkgs";
-    unlisted-fonts.url = "git+https://git.sakamoto.dev/kenji/nix-fonts.git";
+    };
-    unlisted-fonts.inputs.nixpkgs.follows = "nixpkgs";
+    hyprland = {
-
+      url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    nixovim.url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
+      inputs.nixpkgs.follows = "nixpkgs";
-    nixovim.inputs.nixpkgs.follows = "nixpkgs";
+    };
-
+    nixovim = {
-    matugen.url = "github:/InioX/Matugen";
+      url = "git+https://git.sakamoto.dev/kenji/nixovim.git";
-    matugen.inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-
+      inputs.rust-overlay.follows = "rust-overlay";
-    nix-gaming.url = "github:fufexan/nix-gaming";
+    };
-    nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
-
-    sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
-
-    quickshell.url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
-    quickshell.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = {
     self,
     nixpkgs,
     home-manager,
-    darwin,
-    ags,
-    hyprland,
-    unlisted-fonts,
     nixovim,
     ...
   } @ inputs: let
     config = import ./config.nix;
-    lib = nixpkgs.lib;
     system = "x86_64-linux";
-    # pkgs = nixpkgs.legacyPackages.${system}; # alternative, without overlays. Unused.
     args =
       {
         inherit inputs system;
       }
       // config;
   in {
-    # nixosConfiguration for linux system
     nixosConfigurations = {
-      desktop = lib.nixosSystem {
+      hakase = nixpkgs.lib.nixosSystem {
-        inherit system;
         specialArgs = args;
         modules = [
-          ./hosts/desktop/configuration.nix
+          home-manager.nixosModules.home-manager
-        ];
+          ./hosts/hakase/configuration.nix
-      };
-    };
-    homeConfigurations = {
-      desktop = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [
-            # (final: prev: {
-            #   ags_1 = prev.ags_1.overrideAttrs (old: {
-            #     buildInputs = old.buildInputs ++ [pkgs.libdbusmenu-gtk3];
-            #   });
-            # })
-          ];
-        };
-        extraSpecialArgs = args;
-        modules = [./home/desktop.nix];
-      };
-
-      gaming = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [];
-        };
-        extraSpecialArgs = args;
-        modules = [./home/gaming.nix];
-      };
-      headless = home-manager.lib.homeManagerConfiguration {
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [];
-        };
-        extraSpecialArgs = args;
-        modules = [./home/headless.nix];
-      };
-    };
-    # darwinConfiguration for macOS M series
-    darwinConfigurations = {
-      macos = darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
-        specialArgs = args;
-        modules = [
-          ./hosts/macos/darwin.nix
-          home-manager.darwinModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = args;
-          }
         ];
       };
     };

home/desktop.nix

@@ -1,22 +0,0 @@
-{
-  myConfig,
-  lib,
-  ...
-}: {
-  imports = [
-    ../modules/terminal.nix
-    ../modules/desktop.nix
-  ];
-
-  programs.home-manager.enable = true;
-
-  home = {
-    username = "${myConfig.general.Username}";
-    homeDirectory = "/home/${myConfig.general.Username}";
-    packages = [];
-    sessionVariables = {};
-  };
-
-  systemd.user.startServices = "sd-switch";
-  home.stateVersion = "23.05";
-}

home/hakase.nix

@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  imports = [
+    ../modules/home/terminal.nix
+    ../modules/home/apps.nix
+    ../modules/home/hyprland.nix
+    ../modules/home/waybar.nix
+  ];
+
+  home.stateVersion = "25.05";
+}

home/macos.nix

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

hosts/desktop/configuration.nix

@@ -1,36 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  inputs,
-  lib,
-  ...
-}: {
-  imports =
-    [
-      inputs.sops-nix.nixosModules.sops
-      ./hardware-configuration.nix
-      ../../modules/linuxDev.nix
-      ../../modules/system.nix
-      ../../modules/de.nix
-    ]
-    ++ lib.optionals (myConfig.linux.apps.gaming == true) [
-      ../../modules/gaming.nix
-    ];
-
-  environment.systemPackages = [];
-
-  nixpkgs.config.allowUnfree = true;
-
-  nix.settings = {
-    trusted-users = myConfig.builds.builder.trustedUsers;
-    experimental-features = ["nix-command" "flakes"];
-  };
-
-  programs.ssh.extraConfig = myConfig.general.ssh.extraConfig;
-
-  nix.distributedBuilds = true;
-  nix.settings.builders-use-substitutes = true;
-
-  # nix.buildMachines = builder.buildMachines;
-  system.stateVersion = "25.05";
-}

hosts/hakase/configuration.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  myConfig,
+  ...
+}: {
+  imports = [
+    ./hardware-configuration.nix
+    ../../modules/system/default.nix
+    ../../modules/system/hyprland.nix
+  ];
+}

hosts/hakase/hardware-configuration.nix

@@ -0,0 +1,33 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { 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/72BA-AF9B";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/macos/darwin.nix

@@ -1,43 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  inputs,
-  ...
-}: {
-  imports = [
-    ../../modules/macosDev.nix
-    inputs.sops-nix.darwinModules.sops
-  ];
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [
-  ];
-
-  # 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.builds.builder.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.general.Username} = {
-    name = "${myConfig.general.Username}";
-    home = "/Users/${myConfig.general.Username}";
-    # shell = pkgs.${myConfig.general.terminal.Shell}; # no support for nix-darwin, but can be changed via chsh.
-  };
-
-  home-manager.users.${myConfig.general.Username} = import ../../home/macos.nix;
-}

modules/de.nix

@@ -1,19 +0,0 @@
-{
-  lib,
-  myConfig,
-  ...
-}: {
-  imports =
-    [
-      ../system/font.nix
-      ../system/browser.nix
-      ../system/wayland.nix
-      ../system/graphics.nix
-      ../system/security.nix
-
-      # FIXME
-      ../system/amd.nix
-    ]
-    ++ lib.optionals (myConfig.linux.gaming == true) [
-    ];
-}

modules/desktop.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  myConfig,
-  ...
-}: {
-  imports =
-    [
-      ../packages/hyprland/default.nix
-      ../packages/hypridle/default.nix
-      ../packages/hyprlock/default.nix
-      ../packages/rofi/default.nix
-      ../packages/matugen/default.nix
-      ../packages/swww/default.nix
-      ../packages/quickshell/default.nix
-      ../packages/ags/default.nix
-    ]
-    ++ lib.optionals (myConfig.linux.gaming == true) [
-      ../packages/mangohud/default.nix
-    ];
-}

modules/gaming.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ../system/stream.nix
-    ../system/gaming.nix
-    ../system/appimage.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/hyprland.nix

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

modules/home/terminal.nix

@@ -0,0 +1,9 @@
+{
+  imports = [
+    ../../apps/neovim/neovim.nix
+    ../../apps/git/home.nix
+    ../../apps/zoxide/home.nix
+    ../../apps/fish/home.nix
+    ../../apps/ghostty/home.nix
+  ];
+}

modules/home/waybar.nix

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

modules/linuxDev.nix

@@ -1,7 +0,0 @@
-{...}: {
-  imports = [
-    ../system/dev/tools.nix
-    ../system/dev/python.nix
-    ../system/dev/linux.nix
-  ];
-}

modules/macosDev.nix

@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ../system/dev/tools.nix
-    ../system/dev/python.nix
-  ];
-}

modules/system.nix

@@ -1,13 +0,0 @@
-{...}: {
-  imports = [
-    ../system/users.nix
-    ../system/hardware.nix
-    ../system/locale.nix
-    ../system/network.nix
-    ../system/programs.nix
-    ../system/services.nix
-    ../system/tty.nix
-    ../system/firewall.nix
-    ../system/boot.nix
-  ];
-}

modules/system/default.nix

@@ -0,0 +1,19 @@
+{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
+  ];
+  environment.systemPackages = with pkgs; [
+    git
+    cloudflared
+  ];
+}

modules/system/hyprland.nix

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

modules/terminal.nix

@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ../packages/git/default.nix
-    ../packages/fish/default.nix
-    ../packages/kitty/default.nix
-    ../packages/neovim/default.nix
-    ../packages/starship/default.nix
-    ../packages/fastfetch/default.nix
-    ../packages/zsh/default.nix
-  ];
-}

packages/ags/biscuit/.gitignore

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

packages/ags/biscuit/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/biscuit/colors.scss

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

packages/ags/biscuit/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/biscuit/package.json

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

packages/ags/biscuit/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/biscuit/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/biscuit/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/default.nix

@@ -1,28 +0,0 @@
-{
-  inputs,
-  pkgs,
-  system,
-  ...
-}: {
-  imports = [inputs.ags.homeManagerModules.default];
-
-  programs.ags = {
-    enable = true;
-    configDir = ./biscuit;
-
-    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/fastfetch/default.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/git/default.nix

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

packages/hypridle/default.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/default.nix

@@ -1,221 +0,0 @@
-{myConfig, ...}: {
-  wayland.windowManager.hyprland = {
-    enable = true;
-    xwayland.enable = true;
-    settings = {
-      "$mod" = "SUPER";
-      "$term" = "kitty --single-instance";
-      "$browser" = "firefox";
-
-      monitor = myConfig.linux.hyprconf.Monitor;
-
-      exec-once = [
-        "[workspace 20 silent] kitty --single-insance --hold fastfetch"
-        "[workspace 20 silent] firefox"
-        "[workspace 1] kitty --single-instance --hold fastfetch"
-        "pkill gjs & ags run"
-        "matugen image /home/${myConfig.general.Username}/.config/nixos/assets/wallpapers/ultrawide-nixos-default.png"
-        "hyprctl setcursor Bibata-Original-Classic 24"
-        "solaar -w hide"
-      ];
-
-      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";
-      };
-      decoration = {
-        rounding = 0;
-        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;
-        };
-      };
-
-      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"
-        ];
-      };
-
-      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;
-      };
-
-      device = [
-        {
-          name = "epic-mouse-v1";
-          sensitivity = -0.5;
-        }
-      ];
-
-      bind =
-        [
-          "$mod, Return, exec, $term"
-          "$mod, Q, killactive,"
-          "$mod, M, exit,"
-          "$mod, E, exec, $fileManager"
-          "$mod, V, togglefloating,"
-          "$mod, R, exec, $menu"
-          "$mod, P, pseudo,"
-          "$mod, B, togglesplit,"
-          "$mod, W, exec, $browser"
-
-          "$mod, H, movefocus, l"
-          "$mod, L, movefocus, r"
-          "$mod, K, movefocus, u"
-          "$mod, J, movefocus, d"
-
-          "$mod SHIFT, K, movewindow, u"
-          "$mod SHIFT, J, movewindow, d"
-          "$mod SHIFT, H, movewindow, l"
-          "$mod SHIFT, L, movewindow, r"
-
-          "$mod CTRL, K, resizeactive, 0 -50"
-          "$mod CTRL, J, resizeactive, 0 50"
-          "$mod CTRL, H, resizeactive, -50 0"
-          "$mod CTRL, L, resizeactive, 50 0"
-
-          "$mod, S, togglespecialworkspace, magic"
-          "$mod SHIFT, S, movetoworkspace, special:magic"
-
-          "$mod, mouse_down, workspace, e+1"
-          "$mod, mouse_up, workspace, e-1"
-
-          "$mod, F, fullscreen, 0"
-
-          "$mod, Space, exec, pkill rofi || rofi -show drun"
-          "$mod, C, exec, pkill rofi || rofi -show calc -modi calc -no-show-match -no-sort"
-        ]
-        ++ (
-          # workspaces
-          builtins.concatLists (builtins.genList (
-              i: let
-                ws = i + 1;
-              in [
-                "$mod, ${toString ws}, workspace, ${toString ws}"
-                "$mod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
-              ]
-            )
-            9)
-        )
-        ++ [
-          "$mod, 0, workspace, 10"
-          "$mod, 0, movetoworkspace, 10"
-        ];
-
-      bindm = [
-        "$mod, mouse:272, movewindow"
-        "$mod, mouse:273, resizewindow"
-      ];
-
-      bindel = [
-        ",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
-        ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-        ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-        ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
-        ",XF86MonBrightnessUp, exec, brightnessctl s 10%+"
-        ",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
-      ];
-
-      bindl = [
-        ",XF86AudioNext, exec, playerctl next"
-        ",XF86AudioPause, exec, playerctl play-pause"
-        ",XF86AudioPlay, exec, playerctl play-pause"
-        ",XF86AudioPrev, exec, playerctl previous"
-      ];
-      env = [
-        "HYPRCURSOR_THEME, Bibata-Original-Classic"
-        "HYPRCURSOR_SIZE, 24"
-      ];
-    };
-  };
-}

packages/hyprlock/default.nix

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

packages/kitty/default.nix

@@ -1,25 +0,0 @@
-{myConfig, ...}: {
-  programs.kitty = {
-    enable = true;
-
-    themeFile = "kanagawa";
-    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";
-
-      # 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/default.nix

@@ -1,23 +0,0 @@
-{...}: {
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    settings = {
-      toggle_hud = "Shift_R+F12";
-
-      full = true;
-      gpu_temp = true;
-      cpu_temp = true;
-      fps_only = false;
-
-      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}};

packages/matugen/custom/templates/kitty.conf

@@ -1,41 +0,0 @@
-cursor {{colors.on_surface.default.hex}}
-cursor_text_color {{colors.on_surface_variant.default.hex}}
-
-foreground            {{colors.on_surface.default.hex}}
-background            {{colors.surface.default.hex}}
-selection_foreground  {{colors.on_secondary.default.hex}}
-selection_background  {{colors.secondary_fixed_dim.default.hex}}
-url_color             {{colors.primary.default.hex}}
-
-# black
-color8   #262626
-color0   #4c4c4c
-
-# red
-color1   #ac8a8c
-color9   #c49ea0
-
-# green
-color2   #8aac8b
-color10  #9ec49f
-
-# yellow
-color3   #aca98a
-color11  #c4c19e
-
-# blue
-/* color4  #8f8aac */
-color4  {{colors.primary.default.hex}}
-color12 #a39ec4
-
-# magenta
-color5   #ac8aac
-color13  #c49ec4
-
-# cyan
-color6   #8aacab
-color14  #9ec3c4
-
-# white
-color15   #e7e7e7
-color7  #f0f0f0

packages/matugen/default.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  inputs,
-  system,
-  ...
-}: {
-  imports = [inputs.matugen.nixosModules.default];
-  home.file.".config/matugen/config.toml" = {
-    source = builtins.toPath ./custom/config.toml;
-  };
-}

packages/neovim/default.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  nixovim = inputs.nixovim.packages.${pkgs.system}.default;
-in {
-  home.packages = [
-    nixovim
-    pkgs.lazygit
-  ];
-}

packages/quickshell/default.nix

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

packages/rofi/default.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  programs.rofi = {
-    enable = true;
-    plugins = with pkgs; [
-      rofi-calc
-    ];
-  };
-}

packages/starship/default.nix

@@ -1,62 +0,0 @@
-{lib, ...}: {
-  programs.starship = {
-    enable = true;
-    settings = {
-      format = lib.concatStrings [
-        "$username"
-        "$hostname"
-        "$directory"
-        "$git_branch"
-        "$git_state"
-        "$git_status"
-        "$cmd_duration"
-        "$line_break"
-        "$python"
-        "$character"
-      ];
-
-      directory = {
-        style = "blue";
-      };
-
-      character = {
-        success_symbol = "[→](purple)";
-        error_symbol = "[→](red)";
-        vimcmd_symbol = "[←](green)";
-      };
-
-      git_branch = {
-        format = "[$branch]($style)";
-        style = "bright-black";
-      };
-      git_status = {
-        format = "[(*$conflicted$untracked$modified$staged$renamed$deleted) $ahead_behind$stashed]($style)";
-        style = "cyan";
-        conflicted = "​";
-        untracked = "​";
-        modified = "​";
-        staged = "​";
-        renamed = "​";
-        deleted = "​";
-        stashed = "≡";
-      };
-      git_state = {
-        format = "([$state( $progress_current/$progress_total)]($style)) ";
-        style = "bright-black";
-      };
-
-      cmd_duration = {
-        format = "[$duration]($style) ";
-        style = "yellow";
-      };
-
-      python = {
-        format = "[$virtualenv]($style) ";
-        style = "bright-black";
-      };
-    };
-  };
-  # home.file.".config/starship.toml" = {
-  #   source = builtins.toPath ./pure.toml;
-  # };
-}

packages/swww/default.nix

@@ -1,3 +0,0 @@
-{...}: {
-  services.swww.enable = true;
-}

packages/zsh/default.nix

@@ -1,40 +0,0 @@
-{
-  pkgs,
-  myConfig,
-  ...
-}: {
-  home.packages = with pkgs; [
-    zoxide
-  ];
-
-  programs.zsh.enable = true;
-  programs.zoxide.enable = true;
-
-  programs.zsh = {
-    enableCompletion = false;
-    syntaxHighlighting.enable = false;
-    shellAliases = myConfig.general.terminal.Aliases;
-    history.size = 10000;
-    antidote = {
-      enable = true;
-      plugins = [
-        "MichaelAquilina/zsh-autoswitch-virtualenv"
-        "jeffreytse/zsh-vi-mode"
-        "zdharma-continuum/fast-syntax-highlighting kind:defer"
-        "zsh-users/zsh-autosuggestions kind:defer"
-        "zsh-users/zsh-history-substring-search kind:defer"
-      ];
-    };
-    initContent = ''
-      # zsh-autocomplete
-      # bindkey -M menuselect '^M' .accept-line # run code when selected completion
-
-      autoload -Uz compinit
-      if [ "$(date +'%j')" != "$(stat -f '%Sm' -t '%j' ~/.zcompdump 2>/dev/null)" ]; then
-          compinit
-      else
-          compinit -C
-      fi
-    '';
-  };
-}

secrets/secrets.sops.yaml

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

secrets/secrets.yaml

@@ -1 +0,0 @@
-abcd: hello-world

system/amd.nix

@@ -1,14 +1,3 @@
 {pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
+  hardware.amdgpu.initrd.enable = true;
-    glxinfo
-    vulkan-tools
-    lact
-  ];
-  systemd.packages = with pkgs; [
-    lact
-  ];
-  systemd.services.lactd = {
-    enable = true;
-    wantedBy = ["multi-user.target"];
-  };
 }

system/appimage.nix

@@ -1,15 +0,0 @@
-{
-  programs.appimage = {
-    enable = true;
-    binfmt = true;
-    # If moondeck-buddy.AppImage requires specific libraries not included by default
-    # you might need to add them here. For example:
-    # package = pkgs.appimage-run.override {
-    #   extraPkgs = pkgs: with pkgs; [
-    #     # Add any missing libraries here, e.g.,
-    #     # libthai
-    #     # qt5.full
-    #   ];
-    # };
-  };
-}

system/boot.nix

@@ -1,14 +1,36 @@
-{...}: {
+{pkgs, ...}: {
-  boot.loader = {
+  boot = {
+    consoleLogLevel = 3;
+    initrd.verbose = false;
+    kernelParams = [
+      "quiet"
+      "splash"
+      "intremap=on"
+      "boot.shell_on_fail"
+      "udev.log_priority=3"
+      "rd.systemd.show_status=auto"
+    ];
+    loader = {
       systemd-boot = {
-      enable = false;
+        enable = true;
       };
+
       efi = {
         canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot";
       };
-    grub = {
+    };
+    initrd = {
+      systemd.enable = true;
+    };
+    plymouth = {
       enable = true;
-      device = "nodev";
+      # themePackages = [
+      #   (pkgs.adi1090x-plymouth-themes.override {
+      #     selected_themes = ["circle_hud"];
+      #   })
+      # ];
+      # theme = "circle_hud";
     };
   };
 }

system/browser.nix

@@ -1,107 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  lock-false = {
-    Value = false;
-    Status = "locked";
-  };
-  lock-true = {
-    Value = true;
-    Status = "locked";
-  };
-in {
-  programs = {
-    firefox = {
-      enable = true;
-      languagePacks = ["en-US"];
-
-      /*
-      ---- POLICIES ----
-      */
-      # Check about:policies#documentation for options.
-      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 = "never"; # 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"; # blocks all addons except the ones specified below
-          # uBlock Origin:
-          "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";
-        };
-      };
-
-      /*
-      ---- PREFERENCES ----
-      */
-      # Check about:config for options.
-      preferences = {
-        # "browser.contentblocking.category" = {
-        #   Value = "strict";
-        #   Status = "locked";
-        # };
-        "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;
-      };
-    };
-  };
-}

system/dev/python.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    python3Full
-    python3Packages.build
-    python3Packages.pip
-    python3Packages.installer
-  ];
-}

system/dev/tools.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    git
-    p7zip
-    tldr
-    jq
-    btop
-    rar
-
-    cloudflared
-  ];
-}

system/firewall.nix

@@ -1,9 +0,0 @@
-{...}: {
-  # 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/font.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  unlisted-fonts = inputs.unlisted-fonts.packages.${pkgs.system};
-in {
-  fonts.packages = with pkgs; [
-    unlisted-fonts.rubik
-    nerd-fonts.jetbrains-mono
-    material-symbols
-  ];
-}

system/fonts.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  fonts.packages = with pkgs; [
+    nerd-fonts.fira-code
+    nerd-fonts.jetbrains-mono
+  ];
+}

system/gaming.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  programs.steam = {
-    enable = true;
-    gamescopeSession.enable = true;
-  };
-  environment.systemPackages = [
-    # inputs.nix-gaming.packages.${pkgs.system}.default
-    pkgs.protonup-qt
-    pkgs.geekbench
-  ];
-  # programs.steam.platformOptimizations.enable = true;
-}

system/graphics.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true; # Crucial for 32-bit games
-  };
-}

system/hardware.nix

@@ -1,20 +1,16 @@
-{
+{pkgs, ...}: {
-  myConfig,
-  pkgs,
-  lib,
-  ...
-}: {
   hardware = {
-    logitech.wireless.enable = myConfig.linux.logitech-hardware.enable;
     bluetooth = {
       enable = true;
       powerOnBoot = true;
     };
   };
-  environment.systemPackages = with pkgs;
+  networking = {
-    [
+    networkmanager.enable = true;
-    ]
+    firewall = {
-    ++ lib.optionals (myConfig.linux.logitech-hardware.enable == true) [
+      enable = true;
-      solaar
+      allowedTCPPorts = [22 80];
-    ];
+      allowedUDPPorts = [53];
+    };
+  };
 }

system/home-manager.nix

@@ -0,0 +1,16 @@
+{
+  specialArgs,
+  myConfig,
+  ...
+}: {
+  home-manager = {
+    backupFileExtension = "backup";
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = specialArgs;
+    users.${myConfig.nixos.username} = import ../home/hakase.nix;
+  };
+
+  imports = [
+  ];
+}

system/locale.nix

@@ -1,4 +0,0 @@
-{myConfig, ...}: {
-  i18n.defaultLocale = "en_US.UTF-8";
-  time.timeZone = "${myConfig.general.Timezone}";
-}

system/network.nix

@@ -1,4 +0,0 @@
-{myConfig, ...}: {
-  networking.hostName = "${myConfig.general.Hostname}";
-  networking.networkmanager.enable = true;
-}

system/programs.nix

@@ -1,16 +1,16 @@
-{pkgs, ...}: {
+{
-  programs.bash = {
+  pkgs,
-    interactiveShellInit = ''
+  myConfig,
-      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+  ...
-      then
+}: {
+  programs = {
+    ssh.extraConfig = myConfig.ssh.extraConfig;
+    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;
   };
 }

system/security.nix

@@ -1,12 +1,3 @@
-{...}: {
+{
-  security.polkit.enable = true;
+  security.pam.services.greetd.enableGnomeKeyring = true;
-  security.polkit.extraConfig = ''
-    polkit.addRule(function(action, subject) {
-      if ((action.id == "org.corectrl.helper.gpu.set" ||
-           action.id == "org.corectrl.helper.gpu.apply") &&
-          subject.isInGroup("wheel")) {
-        return polkit.Result.YES;
-      }
-    });
-  '';
 }

system/services.nix

@@ -1,9 +1,41 @@
-{...}: {
+{
+  pkgs,
+  myConfig,
+  ...
+}: {
   services = {
-    openssh.enable = true;
+    greetd = {
-    libinput.enable = true;
+      enable = true;
+      settings = {
+        initial_session = {
+          command = "${pkgs.hyprland}/bin/Hyprland";
+          user = "${myConfig.nixos.username}";
+        };
+        default_session = {
+          command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd Hyprland";
+        };
+      };
+    };
+
+    # essentials
+    openssh.enable = true; # FIXME: remove when done
     blueman.enable = true;
+
+    # for encryption support for unfree apps
+    gnome.gnome-keyring.enable = true;
+
+    # Complements printer support
     printing.enable = true;
-    # sensors.enable = true;
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+    pipewire = {
+      enable = true;
+      alsa = {
+        enable = true;
+      };
+    };
   };
 }

system/sound.nix

@@ -1,22 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [
-    pkgs.pavucontrol
-  ];
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-
-    lowLatency = {
-      # enable this module
-      enable = true;
-      # defaults (no need to be set unless modified)
-      quantum = 64;
-      rate = 48000;
-    };
-  };
-
-  # make pipewire realtime-capable
-  security.rtkit.enable = true;
-}

system/stream.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    sunshine
-  ];
-  services.sunshine = {
-    enable = true;
-    autoStart = true;
-    capSysAdmin = true;
-    openFirewall = true;
-  };
-}

system/time.nix

@@ -0,0 +1,3 @@
+{myConfig, ...}: {
+  time.timeZone = myConfig.nixos.timezone;
+}

system/tty.nix

@@ -1,6 +0,0 @@
-{...}: {
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true;
-  };
-}

system/user.nix

@@ -0,0 +1,15 @@
+{
+  pkgs,
+  myConfig,
+  ...
+}: {
+  users = {
+    users = {
+      ${myConfig.nixos.username} = {
+        isNormalUser = true;
+        extraGroups = ["wheel" "networkmanager" "input" "video"];
+        useDefaultShell = true;
+      };
+    };
+  };
+}