Working checkpoint towards unified modules

flake.nix

@@ -44,9 +44,6 @@
             }
 
             {
-              # home-manager.extraSpecialArgs = { inherit inputs; };
-              # home-manager.useGlobalPkgs = true;
-              # home-manager.useUserPackages = true;
               home-manager.users.marc = {
                 imports = [
                   ./home/modules

home/modules/app/default.nix

@@ -2,7 +2,7 @@
 
 {
   imports = [
-   ./alacritty.nix
+   # ./alacritty.nix
    ./discord.nix
    ./spotify.nix
   ];

home/profiles/desktop.nix

@@ -32,8 +32,6 @@ in
 
         polybar.enable = true;
       };
-
-      app.alacritty.enable = true;
     };
 
     services.picom.enable = true;

modules/app/alacritty.nix

@@ -16,6 +16,6 @@ in
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
     ];
 
-    xdg.configFile."alacritty".source = ../../../config/.config/alacritty;
+    home.configFile."alacritty".source = ../../config/.config/alacritty;
   };
 }

modules/options.nix

@@ -7,7 +7,8 @@ with lib.my;
     user = mkOpt attrs {};
 
     home = {
-      file       = mkOpt' attrs {} "Files to place directly in $HOME";
+      packages   = mkOpt' (listOf package) [] "Packages to be installed at user level";
+      file       = mkOpt' attrs {} "Files to place directly in $HOME" ;
       configFile = mkOpt' attrs {} "Files to place in $XDG_CONFIG_HOME";
       dataFile   = mkOpt' attrs {} "Files to place in $XDG_DATA_HOME";
     };
@@ -26,12 +27,11 @@ with lib.my;
   };
 
   config = {
-    user = let name = "marc"; in {
+    user = {
-      inherit name;
       description = "The primary user account";
       extraGroups = [ "wheel" ];
       isNormalUser = true;
-      home = "/home/${name}";
+      home = "/home/${config.user.name}";
       group = "users";
       uid = 1000;
     };
@@ -44,6 +44,7 @@ with lib.my;
       users.${config.user.name} = {
         home = {
           file = mkAliasDefinitions options.home.file;
+          packages = mkAliasDefinitions options.home.packages;
           # Necessary for home-manager to work with flakes, otherwise it will
           # look for a nixpkgs channel.
           stateVersion = config.system.stateVersion;

system/hosts/reykjavik/default.nix

@@ -8,6 +8,7 @@
 
   # - Basic --------------------------------------
 
+  user.name = "marc";
   networking.hostName = "reykjavik";
 
   boot.loader.systemd-boot.enable = true;

system/profiles/common.nix

@@ -37,6 +37,7 @@
     pciutils
     psmisc
     vim
+    zsh
   ];
 
   # - Other --------------------------------------

system/profiles/desktop.nix

@@ -25,6 +25,8 @@ in
       i3lock-blur
     ];
 
+    samfelag.modules.app.alacritty.enable = true;
+
     # - Audio ------------------------------------
 
     sound.enable = true;