home update (1st draft)

mobsenpai · Aug 19, 2023 · 677b66c · 677b66c
1 parent a483ac4
commit 677b66c
Show file tree

Hide file tree

Showing 39 changed files with 43 additions and 33 deletions.
diff --git a/flake.nix b/flake.nix
@@ -45,11 +45,18 @@
 
     homeConfigurations = {
       # PC
-      "yashraj@acer" = home-manager.lib.homeManagerConfiguration {
+      "yuki@acer" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
         extraSpecialArgs = {inherit inputs outputs;};
-        modules = [./home/yashraj];
+        modules = [./home/yashraj/yuki];
       };
+
+      # Add more modules
+      # "name@acer" = home-manager.lib.homeManagerConfiguration {
+      #   pkgs = nixpkgs.legacyPackages."x86_64-linux";
+      #   extraSpecialArgs = {inherit inputs outputs;};
+      #   modules = [./home/yashraj/name];
+      # };
     };
   };
 }
diff --git a/home/yashraj/default.nix b/home/yashraj/default.nix
diff --git a/.../yashraj/modules/colorschemes/default.nix → home/yashraj/shared/colorschemes/default.nix b/.../yashraj/modules/colorschemes/default.nix → home/yashraj/shared/colorschemes/default.nix
diff --git a/...j/modules/colorschemes/gruvbox-medium.nix → ...aj/shared/colorschemes/gruvbox-medium.nix b/...j/modules/colorschemes/gruvbox-medium.nix → ...aj/shared/colorschemes/gruvbox-medium.nix
diff --git a/home/yashraj/home.nix → home/yashraj/shared/default.nix b/home/yashraj/home.nix → home/yashraj/shared/default.nix
@@ -6,6 +6,14 @@
   outputs,
   ...
 }: {
+  imports =
+    [
+      ./colorschemes
+      ./pkgs
+      ./shell
+    ]
+    ++ (builtins.attrValues outputs.homeManagerModules);
+
   systemd.user.startServices = "sd-switch";
 
   manual = {

diff --git a/home/yashraj/packages.nix → home/yashraj/shared/pkgs/default.nix b/home/yashraj/packages.nix → home/yashraj/shared/pkgs/default.nix
diff --git a/home/yashraj/modules/programs/alacritty.nix → home/yashraj/shared/programs/alacritty.nix b/home/yashraj/modules/programs/alacritty.nix → home/yashraj/shared/programs/alacritty.nix
diff --git a/home/yashraj/modules/programs/firefox.nix → home/yashraj/shared/programs/firefox.nix b/home/yashraj/modules/programs/firefox.nix → home/yashraj/shared/programs/firefox.nix
diff --git a/home/yashraj/modules/programs/neofetch.nix → home/yashraj/shared/programs/neofetch.nix b/home/yashraj/modules/programs/neofetch.nix → home/yashraj/shared/programs/neofetch.nix
diff --git a/home/yashraj/modules/programs/nvim.nix → home/yashraj/shared/programs/nvim.nix b/home/yashraj/modules/programs/nvim.nix → home/yashraj/shared/programs/nvim.nix
diff --git a/home/yashraj/modules/programs/vivaldi.nix → home/yashraj/shared/programs/vivaldi.nix b/home/yashraj/modules/programs/vivaldi.nix → home/yashraj/shared/programs/vivaldi.nix
diff --git a/home/yashraj/modules/programs/vscode.nix → home/yashraj/shared/programs/vscode.nix b/home/yashraj/modules/programs/vscode.nix → home/yashraj/shared/programs/vscode.nix
diff --git a/home/yashraj/shared/services/default.nix b/home/yashraj/shared/services/default.nix
@@ -0,0 +1,5 @@
+{
+  services = {
+    playerctld.enable = true;
+  };
+}
diff --git a/home/yashraj/modules/shell/bash.nix → home/yashraj/shared/shell/bash.nix b/home/yashraj/modules/shell/bash.nix → home/yashraj/shared/shell/bash.nix
diff --git a/home/yashraj/modules/shell/cli.nix → home/yashraj/shared/shell/cli.nix b/home/yashraj/modules/shell/cli.nix → home/yashraj/shared/shell/cli.nix
@@ -32,10 +32,6 @@
       ;
   };
 
-  services = {
-    playerctld.enable = true;
-  };
-
   programs = {
     exa.enable = true;
     man.enable = true;

diff --git a/home/yashraj/modules/shell/default.nix → home/yashraj/shared/shell/default.nix b/home/yashraj/modules/shell/default.nix → home/yashraj/shared/shell/default.nix
diff --git a/home/yashraj/modules/shell/git.nix → home/yashraj/shared/shell/git.nix b/home/yashraj/modules/shell/git.nix → home/yashraj/shared/shell/git.nix
diff --git a/home/yashraj/modules/shell/nix.nix → home/yashraj/shared/shell/nix.nix b/home/yashraj/modules/shell/nix.nix → home/yashraj/shared/shell/nix.nix
diff --git a/home/yashraj/modules/shell/starship.nix → home/yashraj/shared/shell/starship.nix b/home/yashraj/modules/shell/starship.nix → home/yashraj/shared/shell/starship.nix
diff --git a/home/yashraj/modules/shell/xdg.nix → home/yashraj/shared/shell/xdg.nix b/home/yashraj/modules/shell/xdg.nix → home/yashraj/shared/shell/xdg.nix
diff --git a/home/yashraj/yuki/default.nix b/home/yashraj/yuki/default.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    # Shared configuration
+    ../shared
+    ../shared/programs/alacritty.nix
+    ../shared/programs/vivaldi.nix
+    ../shared/programs/vscode.nix
+    ../shared/programs/nvim.nix
+    ../shared/programs/neofetch.nix
+
+    # Specific configuration
+    ./desktop/wm/awesome
+  ];
+}
diff --git a/home/yashraj/modules/desktop/clipmenu.nix → home/yashraj/yuki/desktop/clipmenu.nix b/home/yashraj/modules/desktop/clipmenu.nix → home/yashraj/yuki/desktop/clipmenu.nix
diff --git a/home/yashraj/modules/desktop/flameshot.nix → home/yashraj/yuki/desktop/flameshot.nix b/home/yashraj/modules/desktop/flameshot.nix → home/yashraj/yuki/desktop/flameshot.nix
diff --git a/home/yashraj/modules/desktop/gtk.nix → home/yashraj/yuki/desktop/gtk.nix b/home/yashraj/modules/desktop/gtk.nix → home/yashraj/yuki/desktop/gtk.nix
diff --git a/home/yashraj/modules/desktop/nm-applet.nix → home/yashraj/yuki/desktop/nm-applet.nix b/home/yashraj/modules/desktop/nm-applet.nix → home/yashraj/yuki/desktop/nm-applet.nix
diff --git a/home/yashraj/modules/desktop/picom.nix → home/yashraj/yuki/desktop/picom.nix b/home/yashraj/modules/desktop/picom.nix → home/yashraj/yuki/desktop/picom.nix
diff --git a/home/yashraj/modules/desktop/rofi.nix → home/yashraj/yuki/desktop/rofi.nix b/home/yashraj/modules/desktop/rofi.nix → home/yashraj/yuki/desktop/rofi.nix
diff --git a/...aj/modules/desktop/wm/awesome/default.nix → ...shraj/yuki/desktop/wm/awesome/default.nix b/...aj/modules/desktop/wm/awesome/default.nix → ...shraj/yuki/desktop/wm/awesome/default.nix
diff --git a/...dules/desktop/wm/awesome/default/init.lua → .../yuki/desktop/wm/awesome/default/init.lua b/...dules/desktop/wm/awesome/default/init.lua → .../yuki/desktop/wm/awesome/default/init.lua
diff --git a/...ules/desktop/wm/awesome/default/theme.lua → ...yuki/desktop/wm/awesome/default/theme.lua b/...ules/desktop/wm/awesome/default/theme.lua → ...yuki/desktop/wm/awesome/default/theme.lua
diff --git a/...aj/modules/desktop/wm/awesome/helpers.lua → ...shraj/yuki/desktop/wm/awesome/helpers.lua b/...aj/modules/desktop/wm/awesome/helpers.lua → ...shraj/yuki/desktop/wm/awesome/helpers.lua
diff --git a/...shraj/modules/desktop/wm/awesome/keys.lua → .../yashraj/yuki/desktop/wm/awesome/keys.lua b/...shraj/modules/desktop/wm/awesome/keys.lua → .../yashraj/yuki/desktop/wm/awesome/keys.lua
diff --git a/...odules/desktop/wm/awesome/module/json.lua → ...j/yuki/desktop/wm/awesome/module/json.lua b/...odules/desktop/wm/awesome/module/json.lua → ...j/yuki/desktop/wm/awesome/module/json.lua
diff --git a/...top/wm/awesome/module/lockscreen/init.lua → ...top/wm/awesome/module/lockscreen/init.lua b/...top/wm/awesome/module/lockscreen/init.lua → ...top/wm/awesome/module/lockscreen/init.lua
diff --git a/...esome/module/lockscreen/lib/liblua_pam.so → ...esome/module/lockscreen/lib/liblua_pam.so b/...esome/module/lockscreen/lib/liblua_pam.so → ...esome/module/lockscreen/lib/liblua_pam.so
diff --git a/.../awesome/module/lockscreen/lockscreen.lua → .../awesome/module/lockscreen/lockscreen.lua b/.../awesome/module/lockscreen/lockscreen.lua → .../awesome/module/lockscreen/lockscreen.lua
diff --git a/...top/wm/awesome/module/window_switcher.lua → ...top/wm/awesome/module/window_switcher.lua b/...top/wm/awesome/module/window_switcher.lua → ...top/wm/awesome/module/window_switcher.lua
diff --git a/...yashraj/modules/desktop/wm/awesome/rc.lua → home/yashraj/yuki/desktop/wm/awesome/rc.lua b/...yashraj/modules/desktop/wm/awesome/rc.lua → home/yashraj/yuki/desktop/wm/awesome/rc.lua
diff --git a/hosts/shared/users/yashraj.nix b/hosts/shared/users/yashraj.nix
@@ -28,5 +28,6 @@ in {
     packages = [pkgs.home-manager];
   };
 
-  home-manager.users.yashraj = import ../../../home/yashraj;
+  # home-manager.users.yashraj = import ../../../home/yashraj/${config.networking.hostName};
+  home-manager.users.yashraj = import ../../../home/yashraj/yuki;
 }