From cfcc374a69fad066bece9db1d258ff875ed8fdb8 Mon Sep 17 00:00:00 2001
From: marc <marc@sastre.cat>
Date: Wed, 16 Nov 2022 23:51:57 +0100
Subject: [PATCH] Working checkpoint towards unified modules

---
 flake.nix                                   | 3 ---
 home/modules/app/default.nix                | 2 +-
 home/profiles/desktop.nix                   | 2 --
 {home/modules => modules}/app/alacritty.nix | 4 ++--
 modules/options.nix                         | 9 +++++----
 system/hosts/reykjavik/default.nix          | 1 +
 system/profiles/common.nix                  | 1 +
 system/profiles/desktop.nix                 | 2 ++
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename {home/modules => modules}/app/alacritty.nix (74%)

diff --git a/flake.nix b/flake.nix
index c13ca68..cb62139 100644
--- a/flake.nix
+++ b/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
diff --git a/home/modules/app/default.nix b/home/modules/app/default.nix
index cef464b..034fc4a 100644
--- a/home/modules/app/default.nix
+++ b/home/modules/app/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-   ./alacritty.nix
+   # ./alacritty.nix
    ./discord.nix
    ./spotify.nix
   ];
diff --git a/home/profiles/desktop.nix b/home/profiles/desktop.nix
index 1eea300..330650d 100644
--- a/home/profiles/desktop.nix
+++ b/home/profiles/desktop.nix
@@ -32,8 +32,6 @@ in
 
         polybar.enable = true;
       };
-
-      app.alacritty.enable = true;
     };
 
     services.picom.enable = true;
diff --git a/home/modules/app/alacritty.nix b/modules/app/alacritty.nix
similarity index 74%
rename from home/modules/app/alacritty.nix
rename to modules/app/alacritty.nix
index 49b4874..24a64ea 100644
--- a/home/modules/app/alacritty.nix
+++ b/modules/app/alacritty.nix
@@ -10,12 +10,12 @@ in
   };
 
   config = mkIf cfg.enable {
-    fonts.fontconfig.enable = true;    
+    fonts.fontconfig.enable = true;
     home.packages = with pkgs; [
       alacritty
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
     ];
 
-    xdg.configFile."alacritty".source = ../../../config/.config/alacritty;
+    home.configFile."alacritty".source = ../../config/.config/alacritty;
   };
 }
diff --git a/modules/options.nix b/modules/options.nix
index fbd921f..40f222b 100644
--- a/modules/options.nix
+++ b/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 {
-      inherit name;
+    user = {
       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;
diff --git a/system/hosts/reykjavik/default.nix b/system/hosts/reykjavik/default.nix
index 2c6d054..05c124b 100644
--- a/system/hosts/reykjavik/default.nix
+++ b/system/hosts/reykjavik/default.nix
@@ -8,6 +8,7 @@
 
   # - Basic --------------------------------------
 
+  user.name = "marc";
   networking.hostName = "reykjavik";
 
   boot.loader.systemd-boot.enable = true;
diff --git a/system/profiles/common.nix b/system/profiles/common.nix
index 143c145..605e6f6 100644
--- a/system/profiles/common.nix
+++ b/system/profiles/common.nix
@@ -37,6 +37,7 @@
     pciutils
     psmisc
     vim
+    zsh
   ];
 
   # - Other --------------------------------------
diff --git a/system/profiles/desktop.nix b/system/profiles/desktop.nix
index 0fd6570..4b3367c 100644
--- a/system/profiles/desktop.nix
+++ b/system/profiles/desktop.nix
@@ -25,6 +25,8 @@ in
       i3lock-blur
     ];
 
+    samfelag.modules.app.alacritty.enable = true;
+
     # - Audio ------------------------------------
 
     sound.enable = true;