updated nvim input

.gitignore

@@ -1,3 +1,2 @@
 .session
-/nixos.qcow2
-/result
+modules/chataigne/squashfs-root

configs/common.nix

@@ -0,0 +1,337 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    /etc/nixos/hardware-configuration.nix
+  ];
+
+  # Nix settings
+  ## Limit Cores on rebuild and enable Flakes
+  nix = {
+    registry = {
+      voidarc = {
+        from = {
+          id = "voidarc";
+          type = "indirect";
+        };
+        to = {
+          type = "git";
+          url = "https://git.voidarc.co.uk/voidarc/flakes.git";
+        };
+      };
+    };
+    settings = {
+      cores = 6;
+      download-buffer-size = 524288000;
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+    };
+  };
+
+  ## Allow unfree packages and add pkgs.unstable
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      packageOverrides = pkgs: {
+        unstable = import inputs.nixpkgs-unstable {
+          config = {
+            allowUnfree = true;
+          };
+        };
+      };
+    };
+  };
+
+  # Set <nixpkgs> correctly
+  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+
+  ## Optimise Nix store on rebuild and collect garbage as a service
+  nix.optimise.automatic = true;
+  nix.gc = {
+    automatic = true;
+    dates = "daily";
+    options = "--delete-older-than 5d";
+  };
+
+  # Bootloader theming and plymouth
+  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;
+
+  # Bluetooth and Networking
+  hardware.bluetooth.enable = true;
+  hardware.xpadneo.enable = true;
+
+  networking.networkmanager.enable = true;
+  networking.networkmanager.dns = "none";
+  networking.nameservers = [
+    "1.1.1.1"
+    "8.8.8.8"
+  ];
+
+  # Locale
+  time.timeZone = "Europe/London";
+  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";
+  };
+
+  # Userspace Stuff
+  ## Keymap
+  services.xserver.xkb = {
+    layout = "gb";
+    variant = "";
+  };
+  console.keyMap = "uk";
+
+  ## Desktop
+  services.xserver.enable = true;
+  programs.hyprland = {
+    enable = true;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
+  security.polkit.enable = true;
+
+  ## Audio Server
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  # Local User
+  ## User config
+  users.users.user01 = {
+    isNormalUser = true;
+    shell = pkgs.zsh;
+    description = "user01";
+    extraGroups = [
+      "input"
+      "root"
+      "plugdev"
+      "bluetooth"
+      "networkmanager"
+      "docker"
+      "wheel"
+    ];
+    packages = with pkgs; let
+      input = {
+        package,
+        output ? "default",
+      }:
+        inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
+      wrap = {
+        name,
+        pkg,
+        modules,
+      }:
+        pkgs.symlinkJoin {
+          inherit name;
+          paths = [pkg];
+          nativeBuildInputs = [pkgs.makeWrapper];
+          postBuild = ''
+            wrapProgram $out/bin/${name} \
+              --prefix PATH : ${pkgs.lib.makeBinPath modules}
+          '';
+        };
+    in [
+      # Ricing
+      ## Desktop
+      bibata-cursors
+      catppuccin-gtk
+      unstable.waybar
+      hyprlock
+      dunst
+      wlogout
+      wpaperd
+      quickshell
+
+      ## Desktop Utilities
+      grimblast
+      gsettings-desktop-schemas
+      wl-clipboard
+      (wrap {
+        name = "otter-launcher";
+        pkg = (
+          input {
+            package = "otter-launcher";
+          }
+        );
+        modules = [
+          chafa
+          jq
+        ];
+      })
+      (input {package = "fsel";})
+
+      # Terminal
+      ## Styling / Functionality
+      oh-my-posh
+      carapace
+      zsh-autocomplete
+      bat
+
+      ## Tools
+      lazygit
+      git-secret
+      p7zip-rar
+      any-nix-shell
+      bluetui
+      fzf
+      ripgrep
+      wget
+      htop
+      playerctl
+      git
+      lsd
+      (input {
+        package = "doot";
+      })
+
+      ## Other CLI Apps
+      nodejs
+      fastfetch
+      opencode
+      tailscale
+      syncthing
+      jellyfin-tui
+      devenv
+      nix-output-monitor
+
+      # Apps
+      ## Actual Useful Stuff
+      nemo
+      kitty
+      firefox
+      gotify-desktop
+      pavucontrol
+      mpv
+      input-remapper
+
+      ## Other Nonsense
+      tor-browser
+      techmino
+      prismlauncher
+      delfin
+    ];
+  };
+
+  ## Zsh
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    enableBashCompletion = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+    histSize = 10000;
+    ohMyZsh = {
+      enable = true;
+      plugins = [
+        "git"
+        "dirhistory"
+        "history"
+      ];
+    };
+  };
+  users.defaultUserShell = pkgs.zsh;
+
+  ## User programs
+  programs = {
+    dconf.enable = true;
+    xfconf.enable = true;
+    gdk-pixbuf.modulePackages = [pkgs.librsvg]; # For wlogout svgs
+  };
+
+  ## User Services
+  services = {
+    gvfs.enable = true;
+    input-remapper.enable = true;
+    tailscale.enable = true;
+    printing.enable = true;
+    upower.enable = true;
+    openssh.enable = true;
+    avahi.enable = true;
+  };
+
+  ## Fonts
+  fonts.packages = with pkgs; [
+    nerd-fonts.fira-mono
+  ];
+  fonts.fontconfig.defaultFonts.serif = ["Fira Mono Nerd Font"];
+
+  # System Packages
+  environment.systemPackages = with pkgs; [
+    # Utilities
+    inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
+    vim
+    unzip
+    python315
+    usbutils
+    curlWithGnuTls
+
+    # System
+    mesa
+    pkg-config
+    vulkan-tools
+    gvfs
+    wayvnc
+    clang
+    xdg-desktop-portal
+    xdg-desktop-portal-hyprland
+    glib
+    gnutls
+    liblzf
+    librsvg
+    appimage-run
+    libnotify
+    gsettings-desktop-schemas
+  ];
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-all;
+  };
+
+  # The comment
+  system.stateVersion = "25.05"; # Did you read the comment?
+}

configs/configuration-laptop.nix

@@ -0,0 +1,49 @@
+{
+  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}.default
+
+      # Terminal
+      # Apps
+    ];
+  };
+
+  programs.steam.enable = true;
+}

configs/configuration-pc.nix

@@ -0,0 +1,190 @@
+{
+  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;
+    extraPackages = with pkgs; [
+      libva-vdpau-driver
+      libvdpau-va-gl
+      rocmPackages.clr.icd
+    ];
+    enable32Bit = true;
+  };
+
+  # For rOCM
+  systemd.tmpfiles.rules = [
+    "L+ /opt/rocm - - - - ${pkgs.rocmPackages.clr}"
+  ];
+
+  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;
+    };
+  };
+
+  # Pipewire stuff
+  services.pipewire.extraConfig.pipewire."97-null-sink" = {
+    "context.objects" = [
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Null-Sink";
+          "node.description" = "Null Sink";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "FL,FR";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Null-Source";
+          "node.description" = "Null Source";
+          "media.class" = "Audio/Source";
+          "audio.position" = "FL,FR";
+        };
+      }
+    ];
+  };
+  services.pipewire.extraConfig.pipewire."98-virtual-mic" = {
+    "context.modules" = [
+      {
+        name = "libpipewire-module-loopback";
+        args = {
+          "audio.position" = "FL,FR";
+          "node.description" = "Mumble as Microphone";
+          "capture.props" = {
+            # Mumble's output node name.
+            "node.target" = "Mumble";
+            "node.passive" = true;
+          };
+          "playback.props" = {
+            "node.name" = "Virtual-Mumble-Microphone";
+            "media.class" = "Audio/Source";
+          };
+        };
+      }
+    ];
+  };
+
+  # Mumble server
+  services.murmur = {
+    enable = true;
+    bandwidth = 540000;
+    bonjour = true;
+    password = "mumblepass";
+    autobanTime = 0;
+  };
+
+  # Local User
+  users.users.user01 = {
+    extraGroups = [
+      "docker"
+      "input"
+      "udev"
+      "wheel"
+    ];
+    packages = with pkgs; [
+      bottles
+      mumble
+      gajim
+      ferdium
+      delfin
+      docker
+      orca-slicer
+      ffmpeg
+      inputs.norgolith.packages.${pkgs.stdenv.hostPlatform.system}.default
+      inputs.cracked-davinci.packages.${pkgs.stdenv.hostPlatform.system}.default
+      inputs.woomer.packages.${pkgs.stdenv.hostPlatform.system}.default
+
+      # wine
+      wineWow64Packages.stable
+      winetricks
+      wine
+      wine64
+      freetype
+    ];
+  };
+
+  environment.systemPackages = [
+    inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.wrapped
+  ];
+
+  programs.obs-studio = {
+    enable = true;
+  };
+
+  programs.wshowkeys = {
+    enable = true;
+    package = inputs.wshowkeys.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
+
+  programs.steam = {
+    enable = true;
+    protontricks.enable = true;
+    extraCompatPackages = with pkgs; [
+      proton-ge-bin
+    ];
+    package = pkgs.steam.override {
+      extraEnv = {
+        LD_AUDIT = "${
+          inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+        }/library-inject.so:${
+          inputs.sls-steam.packages.${pkgs.stdenv.hostPlatform.system}.sls-steam
+        }/SLSsteam.so";
+      };
+    };
+  };
+
+  services.unbound = {
+    enable = true;
+  };
+
+  services.wivrn = {
+    enable = true;
+    package = pkgs.unstable.wivrn;
+    openFirewall = true;
+  };
+
+  virtualisation.docker = {
+    enable = true;
+    enableOnBoot = false;
+  };
+}

flake.nix

@@ -4,11 +4,86 @@
   inputs = {
     # System
     nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
+    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim";
+    hyprland.url = "github:hyprwm/Hyprland";
 
-    flake-parts.url = "github:hercules-ci/flake-parts";
-    import-tree.url = "github:vic/import-tree";
-    wrappers.url = "github:BirdeeHub/nix-wrapper-modules";
+    # Apps
+    sls-steam.url = "github:AceSLS/SLSsteam";
+    woomer = {
+      url = "github:voidarclabs/woomer";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    chataigne.url = "./modules/chataigne";
+    norgolith = {
+      url = "github:NTBBloodbath/norgolith";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wshowkeys = {
+      url = "github:voidarclabs/wshowkeys";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-  outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules);
+    # Utils
+    doot = {
+      url = "github:voidarclabs/nixos.doot";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    way-edges = {
+      url = "github:way-edges/way-edges";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    otter-launcher = {
+      url = "github:kuokuo123/otter-launcher";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    fsel = {
+      url = "github:Mjoyufull/fsel";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Davinci-resolve
+    cracked-davinci.url = "git+https://git.voidarc.co.uk/voidarc/nixos.davinci";
+
+    omnisearch = {
+      url = "git+https://git.voidarc.co.uk/voidarc/omnisearch";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    ...
+  } @ inputs: let
+    system = "x86_64-linux";
+
+    hardwareConfig = import /etc/nixos/hardware-configuration.nix;
+    common = import ./configs/common.nix;
+
+    mkSystem = extraModules:
+      nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = {inherit inputs;};
+        modules =
+          [
+            common
+            hardwareConfig
+          ]
+          ++ extraModules;
+      };
+  in {
+    nixosConfigurations = {
+      mobile02 = mkSystem [./configs/configuration-laptop.nix];
+      hackstation = mkSystem [
+        ./configs/configuration-pc.nix
+        # ./modules/davinci/davinci.nix
+        ./modules/i3/i3.nix
+        inputs.omnisearch.nixosModules.default
+        {
+          services.omnisearch.enable = true;
+        }
+      ];
+    };
+  };
 }

modules/chataigne/flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1780952837,
+        "narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

modules/chataigne/flake.nix

@@ -0,0 +1,82 @@
+{
+  description = "Local wrapper for Chataigne AppImage";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+  }: let
+    system = "x86_64-linux";
+    pkgs = import nixpkgs {inherit system;};
+
+    # The libraries you requested
+    deps = with pkgs; [
+      curlFull
+      gnutls
+      libxrandr
+      alsa-lib
+      freetype
+      avahi
+      libglvnd
+      curl
+      SDL2
+      hidapi
+      libpulseaudio
+      lz4
+      openssl
+      libcap
+      libxcrypt
+      libgcrypt
+      libbsd
+      zlib
+      glib
+    ];
+
+    # Wrap the local AppImage file
+    chataigne-bin = pkgs.appimageTools.wrapType2 {
+      pname = "chataigne";
+      version = "1.10.3";
+      # This points to the file in the same directory as flake.nix
+      src = ./Chataigne-linux-x64-1.10.3.AppImage;
+      extraPkgs = pkgs: deps;
+    };
+
+    # Create the Desktop Entry
+    chataigne-desktop = pkgs.makeDesktopItem {
+      name = "chataigne";
+      exec = "chataigne";
+      icon = "chataigne";
+      comment = "Modular machine for art and technology";
+      desktopName = "Chataigne";
+      categories = [
+        "AudioVideo"
+        "Development"
+      ];
+    };
+  in {
+    # packages.${system}.default = chataigne-bin;
+
+    devShells.${system}.default = pkgs.mkShell {
+      # Packages you want available in your shell
+      buildInputs = [
+        chataigne-bin
+      ];
+
+      # Environmental variables or shell hooks
+      shellHook = ''
+        echo "something"
+      '';
+    };
+    # This allows you to run 'nix run' or install it via system config
+    packages.${system}.default = pkgs.symlinkJoin {
+      name = "chataigne";
+      paths = [
+        chataigne-bin
+        chataigne-desktop
+      ];
+    };
+  };
+}

modules/features/zsh/config.toml

@@ -1,100 +0,0 @@
-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

@@ -1,53 +0,0 @@
-{
-  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

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

modules/hosts/HACKSTATION/hackstationConfiguration.nix

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

modules/i3/i3.nix

@@ -0,0 +1,27 @@
+{
+  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
+        xinit
+      ];
+    };
+  };
+}

modules/parts.nix

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

modules/system/core.nix

@@ -1,23 +0,0 @@
-{
-  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

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