1 files changed, 57 insertions, 73 deletions
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 776b87b..74f3052 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -1,80 +1,64 @@
 # Shinji
 # System configuration for my laptop
-{
-  inputs,
-  options,
-  ...
-}:
-inputs.nixpkgs.lib.nixosSystem rec {
-  system = "x86_64-linux";
-  specialArgs = {inherit inputs;};
-  modules = [
-    options
-    ../../home
-    ../../modules
-    ../../system
-    {
-      # imports
-      imports = [
-        ./hardware.nix
-        ./sops.nix
-        ./wireguard.nix
-      ];
-
-      # options
-      hostName = "shinji";
-      monitors = [
-        {
-          name = "eDP-1";
-          scale = 1.25;
-          bitdepth = 10;
-        }
-      ];
+{pkgs, ...}: {
+  imports = [
+    ./hardware.nix
+    ./sops.nix
+    ./wireguard.nix
+  ];
 
-      # set power btn to suspend
-      services.logind.extraConfig = ''
-        HandlePowerKey=suspend
-      '';
+  # options
+  hostName = "shinji";
+  monitors = [
+    {
+      name = "eDP-1";
+      scale = 1.25;
+      bitdepth = 10;
+    }
+  ];
 
-      # packages
-      environment.systemPackages = with pkgs; [
-        # wine
-        winetricks
-        wineWowPackages.staging
-        # android
-        android-tools
-        scrcpy
-        # misc
-        foliate
-        jami
-        qbittorrent
-      ];
+  # set power btn to suspend
+  services.logind.extraConfig = ''
+    HandlePowerKey=suspend
+  '';
 
-      # modules
-      browser = {
-        firefox = true;
-      };
-      desktop = {
-        enable = true;
-        astal = true;
-        hyprland = true;
-        hyprlock = true;
-        hypridle = true;
-        hyprpaper = true;
-      };
-      development = {
-        c = true;
-        rust = true;
-        web = true;
-      };
-      gaming = {
-        homestuck = true;
-        minecraft = true;
-        steam = true;
-      };
-      terminal = {
-        kitty = true;
-      };
-    }
+  # packages
+  environment.systemPackages = with pkgs; [
+    # wine
+    winetricks
+    wineWowPackages.staging
+    # android
+    android-tools
+    scrcpy
+    # misc
+    foliate
+    jami
+    qbittorrent
   ];
+
+  # modules
+  browser = {
+    firefox = true;
+  };
+  desktop = {
+    enable = true;
+    astal = true;
+    hyprland = true;
+    hyprlock = true;
+    hypridle = true;
+    hyprpaper = true;
+  };
+  development = {
+    c = true;
+    rust = true;
+    web = true;
+  };
+  gaming = {
+    homestuck = true;
+    minecraft = true;
+    steam = true;
+  };
+  terminal = {
+    kitty = true;
+  };
 }