re-structure

mobsenpai · Nov 29, 2023 · 47ab320 · 47ab320
1 parent 5d363cc
commit 47ab320
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 43 deletions.
diff --git a/flake.nix b/flake.nix
@@ -30,10 +30,16 @@
     # NixOS configuration entrypoint
     # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
+      # Main desktop
+      acer = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs outputs;};
+        # Our main nixos configuration file
+        modules = [./hosts/acer];
+      };
+
       # Work laptop
       hp = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
-        # Our main nixos configuration file
         modules = [./hosts/hp];
       };
     };

diff --git a/home/yashraj/hp.nix b/home/yashraj/hp.nix
@@ -1,11 +1,8 @@
 {inputs, ...}: {
   imports = [
-    # Global
     ./shared
 
-    # Optionals
     ./shared/optional/desktop/hyprland
-
     ./shared/optional/programs/wezterm.nix
     ./shared/optional/programs/helix.nix
     ./shared/optional/programs/vivaldi.nix

diff --git a/home/yashraj/shared/colorschemes/default.nix b/home/yashraj/shared/colorschemes/default.nix
diff --git a/home/yashraj/shared/default.nix b/home/yashraj/shared/default.nix
@@ -4,11 +4,11 @@
   config,
   pkgs,
   ...
-}: {
+}: let
+  inherit (inputs.nix-colors) colorSchemes;
+in {
   imports = [
-    ./colorschemes
-    ./pkgs
-    ./services
+    inputs.nix-colors.homeManagerModule
     ./shell
   ];
 
@@ -42,4 +42,7 @@
     homeDirectory = "/home/${config.home.username}";
     stateVersion = "23.05";
   };
+
+  # Use the colorscheme available at https://github.com/tinted-theming/base16-schemes
+  colorscheme = colorSchemes.gruvbox-dark-medium;
 }
diff --git a/home/yashraj/shared/optional/desktop/gtk.nix b/home/yashraj/shared/optional/desktop/gtk.nix
@@ -18,7 +18,6 @@ in {
     package = pkgs.yaru-theme;
     size = 24;
     gtk.enable = true;
-    x11.enable = true;
   };
 
   gtk = {

diff --git a/home/yashraj/shared/optional/desktop/hyprland/default.nix b/home/yashraj/shared/optional/desktop/hyprland/default.nix
@@ -14,6 +14,7 @@
     inherit
       (pkgs)
       waybar
+      pcmanfm
       ;
   };
 }
diff --git a/home/yashraj/shared/pkgs/default.nix b/home/yashraj/shared/pkgs/default.nix
diff --git a/home/yashraj/shared/services/default.nix b/home/yashraj/shared/services/default.nix
diff --git a/home/yashraj/shared/shell/cli.nix b/home/yashraj/shared/shell/cli.nix
@@ -10,6 +10,7 @@
       bottom
       catimg
       curl
+      cmatrix
       file
       jq
       killall

diff --git a/hosts/hp/default.nix b/hosts/hp/default.nix
@@ -4,12 +4,12 @@
   ...
 }: {
   imports = [
-    # Shared configuration across all machines
+    ./hardware-configuration.nix
+
     ../shared
     ../shared/users/yashraj.nix
 
-    # Specific configuration
-    ./hardware-configuration.nix
+    ../shared/optional/hyprland.nix
   ];
 
   boot = {
@@ -25,8 +25,6 @@
     useDHCP = false;
   };
 
-  programs.hyprland.enable = true;
-
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "23.05";
 }
diff --git a/hosts/shared/optional/hyprland.nix b/hosts/shared/optional/hyprland.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  programs.hyprland.enable = true;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
         inherit
           (pkgs)
           waybar
+          pcmanfm
           ;
       };
     }