Modularize NixOS config

flake.nix

@@ -10,35 +10,29 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    ############################################
-    base16.url = "github:SenchoPens/base16.nix";
-    tt-schemes = {
-      url = "github:tinted-theming/schemes";
-      flake = false;
-    };
-    base16-vim = {
-      url = "github:tinted-theming/base16-vim";
-      flake = false;
-    };
-    ############################################
-
-    ############################################
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
-    ############################################
+    stylix.url = "github:danth/stylix";
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
   outputs = inputs @ {
     nixpkgs,
     nixpkgs-unstable,
     home-manager,
-    base16,
-    tt-schemes,
-    nixvim,
     ...
   }: let
+    shell = import ./modules/shell;
+    neovim = import ./modules/neovim;
+    styling = import ./modules/styling;
+    eww = import ./modules/eww;
+    hyprland = import ./modules/hyprland;
+    terminal = import ./modules/terminal;
+    browser = import ./modules/browser;
+
     system = "x86_64-linux";
     unstable-overlay = final: prev: {
       unstable = nixpkgs-unstable.legacyPackages."${system}";
@@ -56,26 +50,41 @@
         modules = [
           {nixpkgs.config.allowUnfree = true;}
           add-overlay
-          base16.nixosModule
-          nixvim.homeManagerModules.nixvim
-          {scheme = "${tt-schemes}/base16/kanagawa.yaml";}
+
+          neovim.homeManagerModules.default
+          shell.homeManagerModules.default
+          styling.homeManagerModules.default
+          eww.homeManagerModules.default
+          hyprland.homeManagerModules.default
+          terminal.homeManagerModules.default
+          browser.homeManagerModules.default
+
           ./home
         ];
       };
     };
     nixosConfigurations = {
       dcxo = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = {inherit inputs;};
-        modules = [
+        specialArgs = {
+          inherit inputs;
+          username = "dcxo";
+        };
+        modules = let
+          hardwareModules = inputs.nixos-hardware.nixosModules;
+        in [
           add-overlay
+          shell.nixosModules.default
+
+          hardwareModules.msi-b550-a-pro
+          hardwareModules.common-pc-ssd
+          hardwareModules.common-hidpi
+          hardwareModules.common-cpu-amd
+          hardwareModules.common-cpu-amd-pstate
+
+          # inputs.nixos-hardware.nixosModules.common-gpu-nvidia-nonprime
           ./system
-          # home-manager.nixosModules.home-manager
-          # {
-          #   home-manager.useGlobalPkgs = true;
-          #   home-manager.useUserPackages = true;
-          #   home-manager.users.dcxo = import ./home;
-          # }
+          ./system/hardware-configuration.nix
         ];
       };
     };

home/default.nix

@@ -4,37 +4,26 @@
   ...
 }: {
   imports = [
-    ./modules/browser
-    ./modules/desktop
-    ./modules/editor/neovim
-    ./modules/shell
-    ./modules/terminal
-
     ./modules/utils/eza.nix
     ./modules/utils/spotify.nix
     ./modules/utils/ssh.nix
     ./modules/utils/power.nix
     ./modules/utils/direnv.nix
   ];
 
-  desktop = "hyprland";
-  terminal = "alacritty";
-  browser = "firefox";
-  shell = "fish";
-
   home.username = "dcxo";
   home.homeDirectory = "/home/${config.home.username}";
 
   home.packages = with pkgs; [
     neovide
   ];
 
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 24;
-  };
+  # home.pointerCursor = {
+  #   gtk.enable = true;
+  #   package = pkgs.bibata-cursors;
+  #   name = "Bibata-Modern-Classic";
+  #   size = 24;
+  # };
 
   programs.git = {
     enable = true;
@@ -43,16 +32,27 @@
     userName = "David Castilla Ortiz";
     userEmail = "dcxo@proton.me";
 
+    aliases = {
+      lg1 = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all";
+      lg2 = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'";
+      lg = "lg1";
+    };
+
     extraConfig = {
       init = {
         defaultBranch = "main";
       };
     };
   };
 
+  services.gammastep = {
+    enable = true;
+    longitude = "-4";
+    latitude = "37";
+  };
+
   dconf = {
     enable = true;
-    settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
   };
 
   ########## DO NOT REMOVE ###########