Update

Former-commit-id: 905cc9a885

hosts/laptop/configuration.nix

@@ -1,64 +1,29 @@
-{ config, pkgs, ... }: {
+{ config, ... }: {
   imports = [
-    ../modules/fonts.nix
-    ../modules/nvidia.nix
-    ../modules/prime.nix
-    ../modules/xorg.nix
-    ../modules/zsh.nix
-    ../modules/tuigreet.nix
-    ../modules/auto-upgrade.nix
-    ../modules/timezone.nix
-    ../modules/usb.nix
-    # ../modules/systemd-boot.nix
-    ../modules/grub.nix
-    ../modules/users.nix
-    ../modules/audio.nix
-    ../modules/bluetooth.nix
-    ../modules/tailscale.nix
-    ../modules/nix.nix
-    ../modules/network-manager.nix
-    ../modules/home-manager.nix
-    ../modules/power-profiles.nix
-    ../modules/utils.nix
-    ../modules/gvfs.nix
-    # ../modules/ovpn.nix
+    ../../nixos/audio.nix
+    ../../nixos/auto-upgrade.nix
+    ../../nixos/bluetooth.nix
+    ../../nixos/fonts.nix
+    ../../nixos/home-manager.nix
+    ../../nixos/network-manager.nix
+    ../../nixos/nix.nix
+    ../../nixos/nvidia.nix
+    ../../nixos/prime.nix
+    ../../nixos/systemd-boot.nix
+    ../../nixos/timezone.nix
+    ../../nixos/tuigreet.nix
+    ../../nixos/users.nix
+    ../../nixos/utils.nix
+    ../../nixos/xdg-portal.nix
+    ../../nixos/variables-config.nix
 
+    ../../themes/nixy.nix
     ./hardware-configuration.nix
     ./variables.nix
   ];
 
   home-manager.users."${config.var.username}" = import ./home.nix;
 
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Ice";
-      size = 24;
-    };
-    fonts = {
-      monospace = {
-        package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
-        name = "JetBrains Mono Nerd Font";
-      };
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
-      serif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Serif";
-      };
-    };
-    targets.nixvim.transparentBackground = {
-      main = true;
-      signColumn = true;
-    };
-    polarity = "dark";
-    image = ../../home/wallpapers/nix.png;
-  };
-
   # Don't touch this
   system.stateVersion = "24.05";
 }