kitty added

.gitignore

@@ -1 +1,3 @@
 .session
+/nixos.qcow2
+/result

configs/common.nix

@@ -1,298 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  imports = [
-    /etc/nixos/hardware-configuration.nix
-    inputs.walker.nixosModules.default
-  ];
-
-  # Allow Nix command and flakes (ofc)
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  # Allow unfree packages
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      packageOverrides = pkgs: {
-        unstable = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") {
-          config = {
-            allowUnfree = true;
-          };
-        };
-      };
-    };
-  };
-
-  # Boot
-  boot = {
-    loader = {
-      timeout = 2;
-      efi = {
-        canTouchEfiVariables = true;
-      };
-      grub = {
-        efiSupport = true;
-        device = "nodev";
-        theme = pkgs.catppuccin-grub;
-      };
-    };
-    plymouth = {
-      enable = true;
-      theme = "catppuccin-mocha";
-      themePackages = with pkgs; [
-        # By default we would install all themes
-        (catppuccin-plymouth.override {
-          variant = "mocha";
-        })
-      ];
-    };
-  };
-
-  # Use latest kernel.
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  networking.networkmanager.enable = true;
-  networking.networkmanager.dns = "none";
-  networking.nameservers = [
-    "1.1.1.1"
-    "8.8.8.8"
-  ];
-
-  # Enable bluetooth
-  hardware.bluetooth.enable = true;
-  hardware.xpadneo.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/London";
-
-  # Locale
-  i18n.defaultLocale = "en_GB.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_GB.UTF-8";
-    LC_IDENTIFICATION = "en_GB.UTF-8";
-    LC_MEASUREMENT = "en_GB.UTF-8";
-    LC_MONETARY = "en_GB.UTF-8";
-    LC_NAME = "en_GB.UTF-8";
-    LC_NUMERIC = "en_GB.UTF-8";
-    LC_PAPER = "en_GB.UTF-8";
-    LC_TELEPHONE = "en_GB.UTF-8";
-    LC_TIME = "en_GB.UTF-8";
-  };
-
-  # Windowing Systems
-  services.xserver.enable = true;
-
-  programs.hyprland = {
-    enable = true;
-    package = pkgs.unstable.hyprland;
-  };
-  security.polkit.enable = true;
-
-  # Keymap
-  services.xserver.xkb = {
-    layout = "gb";
-    variant = "";
-  };
-  console.keyMap = "uk";
-
-  # Pipewire
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # Local User
-  users.users.user01 = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    description = "user01";
-    extraGroups = [
-      "input"
-      "root"
-      "plugdev"
-      "bluetooth"
-      "networkmanager"
-      "docker"
-      "wheel"
-    ];
-    packages = with pkgs; [
-      # Ricing
-      bibata-cursors
-      catppuccin-gtk
-      waybar
-      hyprlock
-      cava
-      cmatrix
-      swaynotificationcenter
-      inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
-      wlogout
-      wpaperd
-      kando
-      oh-my-posh
-      grimblast
-
-      # Terminal
-      carapace
-      kitty
-      github-cli
-      p7zip
-      bluetuith
-      wget
-      playerctl
-      git
-      fastfetch
-      lsd
-      inputs.doot.packages.${stdenv.hostPlatform.system}.default
-      stow
-      fzf
-      ripgrep
-      zsh-autocomplete
-      nodejs
-      lazygit
-      tailscale
-
-      # Thunar stuff
-      xfce.thunar
-      xfce.thunar-volman
-      xfce.thunar-vcs-plugin
-      xfce.thunar-archive-plugin
-
-      # Apps
-      pavucontrol
-      firefox
-      htop
-      input-remapper
-      tor-browser
-      gotify-desktop
-      techmino
-      mpv
-      prismlauncher
-      delfin
-      libreoffice-qt6
-      syncthing
-      xremap
-      blueman
-    ];
-  };
-
-  # Zsh
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    enableBashCompletion = true;
-    autosuggestions.enable = true;
-    syntaxHighlighting.enable = true;
-    histSize = 10000;
-    ohMyZsh = {
-      enable = true;
-      plugins = [
-        "git"
-        "dirhistory"
-        "history"
-      ];
-    };
-  };
-
-  # User programs
-  programs.steam.enable = true;
-  programs.walker.enable = true;
-  programs.dconf.enable = true;
-  programs.xfconf.enable = true;
-
-  # User Services
-  services.gvfs.enable = true;
-  services.tailscale.enable = true;
-  services.printing.enable = true;
-  services.upower.enable = true;
-  services.openssh.enable = true;
-  services.elephant.enable = true;
-  services.avahi.enable = true;
-
-  # Fonts
-  fonts.packages = with pkgs; [
-    nerd-fonts.fira-mono
-  ];
-
-  fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ];
-  environment.systemPackages = with pkgs; [
-
-    (pkgs.symlinkJoin {
-      name = "nvim-with-lsp";
-      paths = [ pkgs.neovim ];
-      buildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        	 wrapProgram $out/bin/nvim \
-        	 --prefix PATH : ${
-            pkgs.lib.makeBinPath [
-              pkgs.lua-language-server
-              pkgs.vscode-langservers-extracted
-              (vimPlugins.nvim-treesitter.withPlugins (p: [
-                p.norg
-                p.norg-meta
-                p.lua
-                p.vim
-              ]))
-              pkgs.emmet-ls
-              pkgs.lua5_1
-              pkgs.tree-sitter
-              pkgs.tree-sitter-grammars.tree-sitter-norg
-              pkgs.prettier
-              pkgs.luarocks
-              pkgs.black
-              pkgs.nixfmt
-              pkgs.ripgrep
-              pkgs.nil
-              pkgs.nixd
-              pkgs.gcc
-              pkgs.gnumake
-              pkgs.typescript-language-server
-              pkgs.tailwindcss-language-server
-              pkgs.stylua
-            ]
-          }
-        	 '';
-    })
-    vim
-    unzip
-    python310 # Its python like come on
-    usbutils
-
-    # Graphics Drivers
-    mesa
-    vulkan-tools
-
-    # FileSystem Dependancies
-    gvfs
-
-    # C copmpiler
-    clang
-
-    # XDG Desktop Portal Etc
-    xdg-desktop-portal
-    xdg-desktop-portal-hyprland
-
-    # Other things (from gnome)
-    glib
-    gnutls
-    appimage-run
-    libnotify
-    gsettings-desktop-schemas
-  ];
-
-  # The comment
-  system.stateVersion = "25.05"; # Did you read the comment?
-
-}

configs/configuration-laptop.nix

@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  networking.hostName = "mobile02"; # Define your hostname.
-
-  # Opengl and vulkan
-  hardware.graphics = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-vaapi-driver
-      libva-vdpau-driver
-    ];
-  };
-
-  services.displayManager.sddm = {
-    enable = true;
-    theme = "catppuccin-mocha-mauve";
-    package = pkgs.kdePackages.sddm;
-  };
-
-  environment.systemPackages = with pkgs; [
-    # Catppuccin sddm theme
-    (pkgs.catppuccin-sddm.override {
-      flavor = "mocha";
-      font = "Fira Mono Nerd Font";
-      fontSize = "11";
-      background = null;
-    })
-  ];
-
-  # Local User
-  users.users.user01 = {
-    extraGroups = [ ];
-    packages = with pkgs; [
-      # Ricing
-      inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
-      inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
-
-      # Terminal
-      light
-      # Apps
-    ];
-  };
-
-}

configs/configuration-pc.nix

@@ -1,83 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-
-{
-  networking.hostName = "HACKSTATION";
-
-  # Enable nix-ld to run unpatched binaries
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    stdenv.cc.cc
-    zlib
-    libusb1
-  ];
-
-  # Add Samsung USB udev rules
-  services.udev.extraRules = ''
-    SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="plugdev"
-  '';
-
-  hardware.amdgpu.initrd.enable = true;
-
-  # Opengl and vulkan
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
-
-  hardware.amdgpu.opencl.enable = true;
-
-  boot.kernelParams = [
-    "amdgpu.ppfeaturemask=0xffffffff"
-  ];
-
-  # Wake on Lan
-  networking.interfaces.enp5s0.wakeOnLan.enable = true;
-  networking.firewall.enable = false;
-
-  systemd.services.NetworkManager-wait-online.enable = false;
-
-  services.displayManager = {
-    autoLogin.enable = true;
-    autoLogin.user = "user01";
-    sddm = {
-      enable = true;
-    };
-  };
-
-  # Local User
-  users.users.user01 = {
-    extraGroups = [
-      "adbusers"
-      "docker"
-    ];
-    packages = with pkgs; [
-      bottles
-      ferdium
-      android-tools
-      vesktop
-      wine64
-      delfin
-      docker
-      jellyfin-tui
-      orca-slicer
-    ];
-  };
-
-  services.wivrn = {
-    enable = true;
-    package = pkgs.unstable.wivrn;
-    openFirewall = true;
-    defaultRuntime = true;
-  };
-
-  virtualisation.docker = {
-    enable = true;
-    enableOnBoot = false;
-  };
-}

flake.lock

@@ -1,414 +1,108 @@
 {
   "nodes": {
-    "chataigne": {
+    "flake-parts": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "pinned-nixpkgs": "pinned-nixpkgs"
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "path": "./modules/chataigne",
-        "type": "path"
-      },
-      "original": {
-        "path": "./modules/chataigne",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "doot": {
-      "inputs": {
-        "doot-src": "doot-src",
-        "nixpkgs": "nixpkgs_2",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1767536004,
-        "narHash": "sha256-jvKYKYVUF+jQoWR5umYSaAk9IGFkV3j1n+tiOgupZjw=",
-        "owner": "voidarclabs",
-        "repo": "nixos.doot",
-        "rev": "78898e11478aad96df7d462d8d5deed99974be80",
+        "lastModified": 1778716662,
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
-        "owner": "voidarclabs",
-        "repo": "nixos.doot",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
         "type": "github"
       }
     },
-    "doot-src": {
-      "flake": false,
+    "import-tree": {
       "locked": {
-        "lastModified": 1760873580,
-        "narHash": "sha256-h7JNd6748vUpDw7wriMyN9jLV9m/BE2yan2VCQzar1Q=",
-        "owner": "pol-rivero",
-        "repo": "doot",
-        "rev": "05b1036d3457bbf49169ac161e7b62c8eb031684",
+        "lastModified": 1778781969,
+        "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=",
+        "owner": "vic",
+        "repo": "import-tree",
+        "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274",
         "type": "github"
       },
       "original": {
-        "owner": "pol-rivero",
-        "repo": "doot",
-        "type": "github"
-      }
-    },
-    "elephant": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1769329000,
-        "narHash": "sha256-0vibWqmCsG1t4xL2euR6PScB3M4QZigB5JGl+BIH4NY=",
-        "owner": "abenz1267",
-        "repo": "elephant",
-        "rev": "1988112d1f54dd76e8a90f551945df763586bdad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "abenz1267",
-        "repo": "elephant",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "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"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprfloat",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762296971,
-        "narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "34fe48801d2a5301b814eaa1efb496499d06cebc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "hyprfloat": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765567261,
-        "narHash": "sha256-OmrVyrlhyBh1WMmWwVJOQOha/tmsoliMuWQtfG7lxKc=",
-        "owner": "nevimmu",
-        "repo": "hyprfloat",
-        "rev": "6306d4f68133744e0b03ffcd7cb887ed44799397",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nevimmu",
-        "repo": "hyprfloat",
-        "type": "github"
-      }
-    },
-    "mesa-davinci": {
-      "locked": {
-        "lastModified": 1754501210,
-        "narHash": "sha256-ahTHrGs72TLVcNUR2VHckEx+t6frke0e/Ptk6AaEINk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "599ddd2b79331c1e6153e1659bdaab65d62c4c82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "599ddd2b79331c1e6153e1659bdaab65d62c4c82",
-        "repo": "nixpkgs",
+        "owner": "vic",
+        "repo": "import-tree",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770197578,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
-        "owner": "NixOS",
+        "lastModified": 1782847225,
+        "narHash": "sha256-JC9PjqKYG9ve5U8aDOLQipp3+KLANBHUvGdLZlxzdKI=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "95ca1e203c0750115fd4a6f17d5a245dfe6b1edd",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1777168982,
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1764242076,
-        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
+        "lastModified": 1780336545,
+        "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+        "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1770136044,
-        "narHash": "sha256-tlFqNG/uzz2++aAmn4v8J0vAkV3z7XngeIIB3rM3650=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e576e3c9cf9bad747afcddd9e34f51d18c855b4e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1768564909,
-        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1761597516,
-        "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pinned-nixpkgs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708756934,
-        "narHash": "sha256-WqpheJblJ901Svd5NmLJYLmZ3f4fYLkSOyx9i06+un0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5171d7b0a9fbaaf216c873622eb5115b6db97957",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5171d7b0a9fbaaf216c873622eb5115b6db97957",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "chataigne": "chataigne",
-        "doot": "doot",
-        "elephant": "elephant",
-        "hyprfloat": "hyprfloat",
-        "mesa-davinci": "mesa-davinci",
-        "nixpkgs": "nixpkgs_4",
-        "walker": "walker",
-        "way-edges": "way-edges"
+        "flake-parts": "flake-parts",
+        "import-tree": "import-tree",
+        "nixpkgs": "nixpkgs",
+        "wrappers": "wrappers"
       }
     },
-    "rust-overlay": {
+    "wrappers": {
       "inputs": {
-        "nixpkgs": [
-          "way-edges",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1761878277,
-        "narHash": "sha256-6fCtyVdTzoQejwoextAu7dCLoy5fyD3WVh+Qm7t2Nhg=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "6604534e44090c917db714faa58d47861657690c",
+        "lastModified": 1782135443,
+        "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=",
+        "owner": "BirdeeHub",
+        "repo": "nix-wrapper-modules",
+        "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f",
         "type": "github"
       },
       "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "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": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "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"
-      }
-    },
-    "walker": {
-      "inputs": {
-        "elephant": [
-          "elephant"
-        ],
-        "nixpkgs": "nixpkgs_5",
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1769093508,
-        "narHash": "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=",
-        "owner": "abenz1267",
-        "repo": "walker",
-        "rev": "e427025bdda667712b08dd56f1a0a23667f1364c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "abenz1267",
-        "repo": "walker",
-        "type": "github"
-      }
-    },
-    "way-edges": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_6",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1766153193,
-        "narHash": "sha256-E1kDfofMXNX5XjrJggSFDVid6/1ETmbp3qRXuuGd6zM=",
-        "owner": "way-edges",
-        "repo": "way-edges",
-        "rev": "03a9091642ad39345115223890000481eeac8333",
-        "type": "github"
-      },
-      "original": {
-        "owner": "way-edges",
-        "repo": "way-edges",
+        "owner": "BirdeeHub",
+        "repo": "nix-wrapper-modules",
         "type": "github"
       }
     }

flake.nix

@@ -2,62 +2,13 @@
   description = "Master flake for Voidarc nix config";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-    elephant.url = "github:abenz1267/elephant";
-    chataigne.url = "./modules/chataigne";
-    doot.url = "github:voidarclabs/nixos.doot";
-    way-edges.url = "github:way-edges/way-edges";
-    hyprfloat = {
-      url = "github:nevimmu/hyprfloat";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # System
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
 
-    walker = {
-      url = "github:abenz1267/walker";
-      inputs.elephant.follows = "elephant";
-    };
-
-    mesa-davinci.url = "github:nixos/nixpkgs?ref=599ddd2b79331c1e6153e1659bdaab65d62c4c82";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    import-tree.url = "github:vic/import-tree";
+    wrappers.url = "github:BirdeeHub/nix-wrapper-modules";
   };
 
-  outputs =
-    {
-      self,
-      nixpkgs,
-      ...
-    }@inputs:
-    let
-      system = "x86_64-linux";
-      hardwareConfig = import /etc/nixos/hardware-configuration.nix;
-    in
-    {
-      nixosConfigurations.mobile02 = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit inputs; };
-
-        modules = [
-          ./configs/configuration-laptop.nix
-          ./configs/common.nix
-          hardwareConfig
-          {
-            nixpkgs.config.allowUnfree = true;
-          }
-        ];
-      };
-      nixosConfigurations.hackstation = nixpkgs.lib.nixosSystem {
-        inherit system;
-        specialArgs = { inherit inputs; };
-
-        modules = [
-          ./configs/configuration-pc.nix
-          ./configs/common.nix
-          ./modules/davinci/davinci.nix
-          ./modules/i3/i3.nix
-          hardwareConfig
-          {
-            nixpkgs.config.allowUnfree = true;
-          }
-        ];
-      };
-    };
+  outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules);
 }

modules/chataigne/chataigne.nix

@@ -1,131 +0,0 @@
-{ pkgs, pinnedPkgs, ... }:
-
-let
-  # 1. Define the AppImage source.
-  appImageSrc = ./Chataigne-linux-x64-bleedingedge.AppImage;
-
-  # 2a. Libraries pulled from the modern, current Nixpkgs (for small size).
-  modernLibs = with pkgs; [
-    alsa-lib
-    freetype
-    avahi
-    libglvnd
-    curl
-    SDL2
-    hidapi
-    xorg.libXrandr
-  ];
-
-  # 2b. Libraries pulled from the older, pinned package set (ONLY the ones that failed).
-  pinnedCurlLibs = with pinnedPkgs; [
-    curlWithGnuTls # This is the critical component for the CURL_GNUTLS_3 symbol.
-    gnutls
-  ];
-
-  # 3. Combine the modern runtime dependencies with the pinned compatibility libraries.
-  appImageDeps = [
-    pkgs.steam-run
-    pkgs.stdenv.cc.cc.lib # Ensures the modern C++ runtime is available
-  ]
-  ++ modernLibs
-  ++ pinnedCurlLibs;
-
-  chataigneDesktopItem = {
-    desktopName = "Chataigne";
-    name = "chataigne";
-    exec = "chataigne"; # The name of the wrapper script in $out/bin
-    icon = "chataigne"; # The name of the icon file (without extension)
-    genericName = "Creative Control Software";
-    comment = "Control and experiment with creative applications, hardware, and media.";
-    categories = [
-      "AudioVideo"
-      "Development"
-    ];
-  };
-
-in
-
-# 4. Create the final runnable derivation
-pkgs.stdenv.mkDerivation {
-  pname = "chataigne-runner";
-  version = "1.0";
-
-  # --- Attributes needed for AppImage running (not compiling) ---
-  src = ./.;
-  dontUnpack = true;
-  dontBuild = true;
-  # --------------------------------------------------
-
-  # Inject the combined dependencies into the environment
-  buildInputs = appImageDeps;
-
-  # The install phase creates an executable wrapper script, extracts the AppImage,
-  # and now handles the desktop file and icon.
-  installPhase = ''
-        mkdir -p $out/bin
-        
-        # --- STRATEGY: Extract AppImage contents to bypass FUSE, then fix LD_LIBRARY_PATH ---
-        echo "Extracting AppImage contents to bypass FUSE requirement..."
-        
-        # Use the absolute Nix Store path of the AppImage
-        ${appImageSrc} --appimage-extract
-        echo "appimage extracted"
-        
-        # 2. Check if extraction worked and move the content to $out
-        if [ ! -d "squashfs-root" ]; then
-          echo "Extraction failed. The AppImage may not support --appimage-extract."
-          exit 1
-        fi
-        
-        # 2. CRITICAL FIX: Manually create and install the .desktop file
-        mkdir -p $out/share/applications
-        
-        # pkgs.lib.makeDesktopItem takes the metadata and creates a small derivation
-        # We copy the resulting .desktop file from that derivation's output path ($desktop_file_path)
-        local desktop_file_path="${pkgs.makeDesktopItem chataigneDesktopItem}"
-
-        # The file is typically named $name.desktop inside the share/applications folder of the new derivation
-        cp $desktop_file_path/share/applications/chataigne.desktop $out/share/applications/
-
-        # Copy the extracted contents into the output directory
-        cp -r squashfs-root $out/
-
-        # --- DESKTOP ENTRY & ICON (NEW) ---
-        echo "Processing icon and desktop file..."
-
-        # AppImages usually place the icon in squashfs-root/.DirIcon or similar
-        # We will assume it's in the root of the extracted content.
-        local icon_source="$out/squashfs-root/.DirIcon"
-        local icon_target="$out/share/icons/hicolor/128x128/apps/chataigne.png" # Standard location
-        
-        # Use the icon if it exists (AppImages often use a .png or .svg)
-        if [ -f "$icon_source" ]; then
-            mkdir -p "$(dirname "$icon_target")"
-            cp "$icon_source" "$icon_target"
-        else
-            echo "Warning: Could not find icon at $icon_source. Using default/no icon."
-        fi
-        # ----------------------------------
-
-        # 3. Create the 'chataigne' executable wrapper
-        cat > $out/bin/chataigne << EOF
-    #!${pkgs.stdenv.shell}
-        
-    # The LD_LIBRARY_PATH is created using all dependencies (excluding the wrapper 'steam-run').
-    # This ensures the AppImage finds the pinned CURL library.
-    export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath (pkgs.lib.remove pkgs.steam-run appImageDeps)}:$LD_LIBRARY_PATH"
-
-    # Use steam-run to launch the main execution script inside the extracted folder.
-    exec ${pkgs.steam-run}/bin/steam-run "$out/squashfs-root/AppRun" "\$@"
-    EOF
-        
-        chmod +x $out/bin/chataigne
-  '';
-
-  meta = {
-    description = "Declarative runner for the Chataigne AppImage, providing necessary dependencies.";
-    homepage = "https://chataigne.io/"; # Example: Add the actual homepage
-    license = pkgs.lib.licenses.unfree; # AppImages are often proprietary/unfree
-    platforms = [ "x86_64-linux" ];
-  };
-}

modules/chataigne/flake.nix

@@ -1,51 +0,0 @@
-{
-  description = "A flake for running the Chataigne AppImage with necessary patched dependencies.";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Modern Nixpkgs
-
-    # Pinned Nixpkgs for compatibility (the commit that fixes the CURL_GNUTLS_3 issue)
-    pinned-nixpkgs = {
-      url = "github:NixOS/nixpkgs/5171d7b0a9fbaaf216c873622eb5115b6db97957";
-      flake = false; # Treat as a tarball input, not a flake
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      pinned-nixpkgs,
-      ...
-    }:
-    let
-      # Supported systems
-      supportedSystems = [ "x86_64-linux" ];
-
-      # The main package definition logic is imported as a function
-      chataigne-appimage-runner = import ./chataigne.nix;
-
-      # Function to generate the package set for each system
-      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
-    in
-    {
-      packages = forAllSystems (
-        system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
-          pinnedPkgs = import pinned-nixpkgs { inherit system; };
-        in
-        {
-          chataigne = chataigne-appimage-runner {
-            inherit pkgs pinnedPkgs;
-          };
-
-          # Also expose the default package for convenience
-          default = self.packages.${system}.chataigne;
-        }
-      );
-    };
-}

modules/davinci/davinci.nix

@@ -1,199 +0,0 @@
-# Tested on Davinci 20.2.2. It works for loading videos and exporting in H264/5 & AV1
-# Even if following this guide https://www.reddit.com/r/LinuxCrackSupport/comments/1nfqhld/davinci_resolve_studio_202_fix_linux_crack_guide/
-# nixpkgs rev used for this tests: 4652ba995a945108fb891191c1e910b9a6ed9064
-
-{ lib, inputs, ... }:
-let
-  mesa-good-pkg = inputs.mesa-davinci.legacyPackages.x86_64-linux.mesa;
-  pkgs = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz";
-  }) { config.allowUnfree = true; };
-  pkgs-pinned =
-    import
-      (builtins.fetchTarball {
-        url = "https://github.com/NixOS/nixpkgs/archive/497ee3c70707fd71b45c37d48ae1d45e79751047.tar.gz";
-      })
-      {
-        config = {
-          allowUnfree = true;
-        };
-      };
-  ffmpeg-encoder-plugin = pkgs.stdenv.mkDerivation (finalAttrs: {
-    pname = "ffmpeg-encoder-plugin";
-    version = "1.2.1";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "EdvinNilsson";
-      repo = "ffmpeg_encoder_plugin";
-      tag = "v${finalAttrs.version}";
-      hash = "sha256-F4Q8YCXD5UldTwLbWK4nHacNPQ/B+4yLL96sq7xZurM=";
-    };
-
-    nativeBuildInputs = with pkgs; [
-      cmake
-      ffmpeg-full
-    ];
-
-    buildInputs = with pkgs; [ ffmpeg ];
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out
-      cp ffmpeg_encoder_plugin.dvcp $out/
-
-      runHook postInstall
-    '';
-  });
-
-  davinci-resolve-studio-cracked =
-    let
-      davinci-patched = pkgs-pinned.davinci-resolve-studio.davinci.overrideAttrs (old: {
-        # script based on https://www.reddit.com/r/LinuxCrackSupport/comments/1nfqhld/davinci_resolve_studio_202_fix_linux_crack_guide/
-        #
-        # Additionally, it will install ffmpeg_encoder_plugin to enable H264/5 & AV1 exports:
-        # https://github.com/EdvinNilsson/ffmpeg_encoder_plugin
-        #
-        # Note: $out IS /opt/resolve
-        postInstall = ''
-          ${old.postInstall or ""}
-          ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\xe8\x21\x23\x00\x00/\xeb\x11\xe8\x21\x23\x00\x00/g' $out/bin/resolve
-          ${lib.getExe pkgs.perl} -pi -e 's/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\x74\x11\x48\x8B\x45\xC8\x8B/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\xEB\x11\x48\x8B\x45\xC8\x8B/' $out/bin/resolve
-          ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/\xEB\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/' $out/bin/resolve
-          ${lib.getExe pkgs.perl} -pi -e 's/\x41\xb6\x01\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/\x41\xb6\x00\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/' $out/bin/resolve
-          touch $out/.license/blackmagic.lic
-          echo -e "LICENSE blackmagic davinciresolvestudio 999999 permanent uncounted\n  hostid=ANY issuer=CGP customer=CGP issued=28-dec-2023\n  akey=0000-0000-0000-0000 _ck=00 sig=\"00\"" > $out/.license/blackmagic.lic
-
-          mkdir -p $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
-          cp ${ffmpeg-encoder-plugin}/ffmpeg_encoder_plugin.dvcp $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
-        '';
-      });
-    in
-
-    # the following was copied from davinci's derivation from nixpkgs.
-    # if davinci updates, this should be updated too
-    # but remember to replace "davinci" with "davinci-patched"
-    pkgs.buildFHSEnv {
-      inherit (davinci-patched) pname version;
-
-      targetPkgs =
-        pkgs:
-        with pkgs;
-        [
-          alsa-lib
-          aprutil
-          bzip2
-          dbus
-          expat
-          fontconfig
-          freetype
-          glib
-          libGL
-          libGLU
-          libarchive
-          libcap
-          librsvg
-          libtool
-          libuuid
-          libxcrypt # provides libcrypt.so.1
-          libxkbcommon
-          nspr
-          ocl-icd
-          opencl-headers
-          python3
-          python3.pkgs.numpy
-          udev
-          xdg-utils # xdg-open needed to open URLs
-          xorg.libICE
-          xorg.libSM
-          xorg.libX11
-          xorg.libXcomposite
-          xorg.libXcursor
-          xorg.libXdamage
-          xorg.libXext
-          xorg.libXfixes
-          xorg.libXi
-          xorg.libXinerama
-          xorg.libXrandr
-          xorg.libXrender
-          xorg.libXt
-          xorg.libXtst
-          xorg.libXxf86vm
-          xorg.libxcb
-          xorg.xcbutil
-          xorg.xcbutilimage
-          xorg.xcbutilkeysyms
-          xorg.xcbutilrenderutil
-          xorg.xcbutilwm
-          xorg.xkeyboardconfig
-          zlib
-          ocl-icd
-          rocmPackages.clr.icd
-          libGL
-          libGLU
-        ]
-        ++ [
-          mesa-good-pkg
-          davinci-patched
-        ];
-
-      extraPreBwrapCmds = ''
-        mkdir -p ~/.local/share/DaVinciResolve/Extras || exit 1
-      '';
-
-      extraBwrapArgs = [
-        ''--bind "$HOME"/.local/share/DaVinciResolve/Extras ${davinci-patched}/Extras''
-      ];
-
-      runScript = "${lib.getExe pkgs.bash} ${pkgs.writeText "davinci-wrapper" ''
-          export QT_XKB_CONFIG_ROOT="${pkgs.xkeyboard_config}/share/X11/xkb"
-          export QT_PLUGIN_PATH="${davinci-patched}/libs/plugins:$QT_PLUGIN_PATH"
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib:/usr/lib32:${davinci-patched}/libs
-        	# Force Resolve to use X11 (via XWayland) to avoid Aquamarine/Hyprland conflicts
-          export QT_QPA_PLATFORM=xcb
-          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci-patched}/libs
-          
-          # Prevent Resolve from trying to talk to the Wayland socket directly
-          unset WAYLAND_DISPLAY
-          ${davinci-patched}/bin/resolve
-      ''}";
-
-      extraInstallCommands = ''
-        mkdir -p $out/share/applications $out/share/icons/hicolor/128x128/apps
-        ln -s ${davinci-patched}/share/applications/*.desktop $out/share/applications/
-        ln -s ${davinci-patched}/graphics/DV_Resolve.png $out/share/icons/hicolor/128x128/apps/davinci-resolve-studio.png
-      '';
-
-      passthru = {
-        inherit davinci-patched;
-        updateScript = lib.getExe (
-          pkgs.writeShellApplication {
-            name = "update-davinci-resolve";
-            runtimeInputs = [
-              pkgs.curl
-              pkgs.jq
-              pkgs.common-updater-scripts
-            ];
-            text = ''
-              set -o errexit
-              drv=pkgs/by-name/da/davinci-resolve/package.nix
-              currentVersion=${lib.escapeShellArg davinci-patched.version}
-              downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)"
-
-              latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)"
-              update-source-version davinci-resolve "$latestLinuxVersion" --source-key=davinci.src
-
-              # Since the standard and studio both use the same version we need to reset it before updating studio
-              sed -i -e "s/""$latestLinuxVersion""/""$currentVersion""/" "$drv"
-
-              latestStudioLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve Studio \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)"
-              update-source-version davinci-resolve-studio "$latestStudioLinuxVersion" --source-key=davinci.src
-            '';
-          }
-        );
-      };
-    };
-in
-{
-  environment.systemPackages = [ davinci-resolve-studio-cracked ];
-}

modules/features/kitty/default.nix

@@ -0,0 +1,55 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.kitty = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    programs.kitty = {
+      enable = true;
+      package = self.packages.${pkgs.stdenv.hostPlatform.system}.kitty;
+    };
+  };
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
+    packages.kitty = let
+      myFont = pkgs.nerd-fonts.fira-mono; # or any font-providing package
+      fontsConf = pkgs.makeFontsConf {
+        fontDirectories = [myFont];
+      };
+    in
+      inputs.wrappers.wrappers.kitty.wrap {
+        inherit pkgs;
+        environment = {
+          "FONTCONFIG_FILE" = "${fontsConf}";
+        };
+        font = {
+          name = "FiraMono Nerd Font";
+          size = 11;
+        };
+        settings = {
+          font_size = 11;
+          window_padding_width = 10;
+          background_opacity = 0.50;
+          confirm_os_window_close = 0;
+          enable_audio_bell = false;
+          cursor_trail = 1;
+          cursor_trail_start_threshold = 1;
+          cursor_trail_color = "#cba6f7";
+          cursor_shape = "beam";
+          allow_remote_control = true;
+        };
+        keybindings = {
+          "ctrl+backspace" = "send_text all \\x17";
+        };
+        themeFile = "Catppuccin-Mocha";
+      };
+  };
+}

modules/features/zsh/config.toml

@@ -0,0 +1,100 @@
+console_title_template = '{{ .Shell }} in {{ .Folder }}'
+version = 3
+final_space = true
+
+[secondary_prompt]
+  template = '❯❯ '
+  foreground = 'magenta'
+  background = 'transparent'
+
+[transient_prompt]
+  template = '❯ '
+  background = 'transparent'
+  foreground_templates = ['{{if gt .Code 0}}red{{end}}', '{{if eq .Code 0}}magenta{{end}}']
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+[[blocks.segments]]
+type = 'text'
+style = 'plain'
+template = '''
+{{- if .Env.DEVSHELL_NAME -}}
+  {{- $parts := split "|" .Env.DEVSHELL_NAME -}}
+  {{- range $part := $parts -}}
+    {{- if $part -}}
+      {{- $sub := split "/" $part -}}
+      {{- if eq (len $sub) 2 -}}
+        <{{ index $sub "_1" }}>{{ index $sub "_0" }}</> <#7f849c>| </>
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+'''
+
+	[[blocks.segments]] # Python venv
+  type = 'text'
+  style = 'plain'
+  template = '{{ if .Env.VIRTUAL_ENV }}<yellow>🐍 venv</> <#7f849c>|</> {{ end }}'
+
+	[[blocks.segments]] # Nix shell indicator
+  type = 'text'
+  style = 'plain'
+  template = '{{ if and .Env.IN_NIX_SHELL (not .Env.DEVSHELL_NAME) }}<blue> nsh</> <#7f849c>|</> {{ end }}'
+
+  [[blocks.segments]]
+    template = '{{ .Path }}'
+    foreground = 'blue'
+    background = 'transparent'
+    type = 'path'
+    style = 'plain'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+      style = 'full'
+
+  [[blocks.segments]]
+    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}<yellow> *</>{{ end }} <cyan>{{ if gt .Behind 0 }}󰁅{{ end }}{{ if gt .Ahead 0 }}{{ end }}</>'
+    foreground = 'green'
+    background = 'transparent'
+    type = 'git'
+    style = 'plain'
+
+    [blocks.segments.properties]
+      branch_icon = ''
+      cache_duration = 'none'
+      commit_icon = '@'
+      fetch_status = true
+
+[[blocks]]
+  type = 'rprompt'
+  overflow = 'hidden'
+
+  [[blocks.segments]]
+    template = '{{ .FormattedMs }}'
+    foreground = 'yellow'
+    background = 'transparent'
+    type = 'executiontime'
+    style = 'plain'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+      threshold = 5000
+
+[[blocks]]
+  type = 'prompt'
+  alignment = 'left'
+  newline = true
+
+  [[blocks.segments]]
+    template = '❯'
+    background = 'transparent'
+    type = 'text'
+    style = 'plain'
+    foreground_templates = ['{{if gt .Code 0}}red{{end}}', '{{if eq .Code 0}}magenta{{end}}']
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+

modules/features/zsh/default.nix

@@ -0,0 +1,53 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.zsh = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    programs.zsh = {
+      enable = true;
+      package = self.packages.${pkgs.stdenv.hostPlatform.system}.myZsh;
+    };
+  };
+  perSystem = {
+    pkgs,
+    lib,
+    self',
+    ...
+  }: {
+    packages = {
+      myZsh = inputs.wrappers.wrappers.zsh.wrap {
+        inherit pkgs;
+        zshAliases = {
+          ls = lib.getExe pkgs.lsd;
+          cat = lib.getExe pkgs.bat;
+          lg = lib.getExe pkgs.lazygit;
+          man = "man -P \"${lib.getExe pkgs.bat} -p\"";
+          nsh = "nix-shell -p";
+        };
+        zshrc.content = ''
+          export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
+          zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m'
+          source <(${pkgs.carapace}/bin/carapace _carapace)
+          setopt NO_CASE_GLOB
+          zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+          export EDITOR=nvim
+
+          eval "$(${pkgs.devenv}/bin/devenv hook zsh)"
+          eval "$(${self.packages.${pkgs.host.stdenv.hostPlatform.system}.ohMyPosh}/bin/oh-my-posh init zsh)"
+
+          ${pkgs.any-nix-shell}/bin/any-nix-shell zsh --info-right | source /dev/stdin
+        '';
+      };
+      ohMyPosh = inputs.wrappers.wrappers.oh-my-posh.wrap {
+        inherit pkgs;
+        configFile = ./config.toml;
+      };
+    };
+  };
+}

modules/hosts/HACKSTATION/default.nix

@@ -0,0 +1,12 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosConfigurations.HACKSTATION = inputs.nixpkgs.lib.nixosSystem {
+    modules = with self.nixosModules; [
+      core
+      hackstationConfiguration
+    ];
+  };
+}

modules/hosts/HACKSTATION/hackstationConfiguration.nix

@@ -0,0 +1,9 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.hackstationConfiguration = {pkgs, ...}: {
+    networking.hostName = "HACKSTATION";
+  };
+}

modules/i3/i3.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  services.libinput.enable = true;
-
-  services.displayManager.defaultSession = "hyprland";
-  services.xserver = {
-    enable = true;
-
-    desktopManager = {
-      xterm.enable = false;
-    };
-
-    windowManager.i3 = {
-      enable = true;
-      extraPackages = with pkgs; [
-        dmenu # application launcher most people use
-        i3status # gives you the default i3 status bar
-        xorg.xinit
-      ];
-    };
-  };
-}

modules/parts.nix

@@ -0,0 +1,10 @@
+{
+  config = {
+    systems = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-linux"
+      "aarch64-darwin"
+    ];
+  };
+}

modules/system/core.nix

@@ -0,0 +1,23 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.core = {
+    pkgs,
+    lib,
+    ...
+  }: let
+    modules = with self.nixosModules; [
+      userConfiguration
+    ];
+  in {
+    imports =
+      [
+        /etc/nixos/hardware-configuration.nix
+      ]
+      ++ modules;
+
+    programs.zsh.enable = true;
+  };
+}

modules/system/core/user.nix

@@ -0,0 +1,22 @@
+{
+  self,
+  inputs,
+  ...
+}: {
+  flake.nixosModules.userConfiguration = {
+    pkgs,
+    lib,
+    ...
+  }: {
+    users.users.user01 = {
+      isNormalUser = true;
+      initialPassword = "password";
+      shell = pkgs.zsh;
+      description = "user01";
+      extraGroups = [
+        "root"
+        "wheel"
+      ];
+    };
+  };
+}