feat: adapt home-manager-only config for changes

SwarselSystems.org

@@ -718,9 +718,10 @@ In contrast, this defines home-manager systems, which I only have one of.
 #+begin_src nix :tangle no :noweb-ref flakehomeconf
 
   "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
-   pkgs = homepkgs;
+   pkgs = pkgsFor.x86_64-linux;
+   extraSpecialArgs = { inherit inputs outputs; };
     modules = homeModules ++ mixedModules ++ [
-      ./profiles/home-manager/home.nix
+      ./profiles/home-manager/
     ];
   };
 
@@ -1795,122 +1796,68 @@ My old laptop, replaced by a new one, since most basic functions have stopped to
 #+end_src
 
 **** Home-manager only
-***** Home manager
-:PROPERTIES:
-:CUSTOM_ID: h:483a26b5-5a40-4417-9ffb-67cc2cf07161
-:END:
 
-Special things to note here: We are running xcape to allow =CAPS= to act as =CTRL= and =ESC=. Also we are using =nixGL= in most places.
-
-#+begin_src nix :noweb yes :tangle profiles/home-manager/home.nix
 
-  { config, pkgs, ... }:
+#+begin_src nix :tangle profiles/home-manager/default.nix
 
+  { inputs, outputs, config, pkgs, ... }:
   {
-    programs.home-manager.enable = true;
-    home.username = "swarsel";
-    home.homeDirectory = "/home/swarsel";
 
-    home.stateVersion = "23.05"; # Please read the comment before changing.
-
-    stylix.image = ../../wallpaper/surfacewp.png;
-    <<theme>>
+    imports = [] ++ (builtins.attrValues outputs.homeManagerModules);
 
     nixpkgs = {
+      overlays = outputs.overlays;
       config = {
         allowUnfree = true;
-        allowUnfreePredicate = _: true;
       };
     };
+
     services.xcape = {
       enable = true;
       mapExpression = {
         Control_L = "Escape";
       };
     };
-    #keyboard config
-    home.keyboard.layout = "us";
-
-    sops.age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/sops" ];
-
-    # waybar config
-    programs.waybar.settings.mainBar.cpu.format = "{icon0} {icon1} {icon2} {icon3}";
-
-    programs.waybar.settings.mainBar.temperature.hwmon-path = "/sys/devices/platform/coretemp.0/hwmon/hwmon3/temp3_input";
-    programs.waybar.settings.mainBar.modules-right = ["custom/outer-left-arrow-dark" "mpris" "custom/left-arrow-light"
-                                                      "network"
-                                                      "custom/left-arrow-dark"
-                                                      "pulseaudio"
-                                                      "custom/left-arrow-light"
-                                                      "battery"
-                                                      "custom/left-arrow-dark"
-                                                      "temperature"
-                                                      "custom/left-arrow-light"
-                                                      "disk"
-                                                      "custom/left-arrow-dark"
-                                                      "memory"
-                                                      "custom/left-arrow-light"
-                                                      "cpu"
-                                                      "custom/left-arrow-dark"
-                                                      "tray"
-                                                      "custom/left-arrow-light"
-                                                      "clock#2"
-                                                      "custom/left-arrow-dark"
-                                                      "clock#1" ];
-    services.blueman-applet.enable = true;
-    home.packages = with pkgs; [
-      # nixgl.auto.nixGLDefault
-      evince
-      # nodejs_20
-
-      # messaging
-      # we use gomuks for RAM preservation, but keep schildi around for files and images
-    ];
 
     programs.zsh.initExtra = "
   export GPG_TTY=\"$(tty)\"
   export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
   gpgconf --launch gpg-agent
         ";
 
-    # sway config
-    wayland.windowManager.sway= {
-      config = rec {
-        input = {
-          "*" = {
-            xkb_layout = "us";
-            xkb_options = "ctrl:nocaps,grp:win_space_toggle";
-            xkb_variant = "altgr-intl";
-          };
-          "type:touchpad" = {
-            dwt = "enabled";
-            tap = "enabled";
-            natural_scroll = "enabled";
-            middle_emulation = "enabled";
-          };
-        };
-
-        output = {
-          eDP-1 = {
-            mode = "2160x1440@59.955Hz";
-            scale = "1";
-            bg = "~/.dotfiles/wallpaper/surfacewp.png fill";
-          };
+    home-manager.users.swarsel.swarselsystems = {
+      isLaptop = true;
+      isNixos = false;
+      wallpaper = ../../wallpaper/surfacewp.png;
+      temperatureHwmon = {
+        isAbsolutePath = true;
+        path = "/sys/devices/platform/thinkpad_hwmon/hwmon/";
+        input-filename = "temp1_input";
+      };
+      monitors = {
+        main = {
+          name = "California Institute of Technology 0x1407 Unknown";
+          mode = "1920x1080"; # TEMPLATE
+          scale = "1";
+          position = "2560,0";
+          workspace = "2:二";
+          output = "eDP-1";
         };
-
-        keybindings = let
-          inherit (config.wayland.windowManager.sway.config) modifier;
-        in {
+      };
+      inputs =  {
+        "1:1:AT_Translated_Set_2_keyboard" = {
+          xkb_layout = "us";
+          xkb_options = "grp:win_space_toggle";
+          xkb_variant = "altgr-intl";
         };
-
-        startup = [
-        ];
-
       };
-
+      keybindings = {
+      };
     };
+
   }
 
+
 #+end_src
 
 **** Threed (Surface Pro 3)

flake.nix

@@ -306,9 +306,10 @@
       homeConfigurations = {
 
         "swarsel@home-manager" = inputs.home-manager.lib.homeManagerConfiguration {
-          pkgs = homepkgs;
+          pkgs = pkgsFor.x86_64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
           modules = homeModules ++ mixedModules ++ [
-            ./profiles/home-manager/home.nix
+            ./profiles/home-manager/
           ];
         };
 

profiles/home-manager/default.nix

@@ -0,0 +1,55 @@
+{ inputs, outputs, config, pkgs, ... }:
+{
+
+  imports = [ ] ++ (builtins.attrValues outputs.homeManagerModules);
+
+  nixpkgs = {
+    overlays = outputs.overlays;
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  services.xcape = {
+    enable = true;
+    mapExpression = {
+      Control_L = "Escape";
+    };
+  };
+
+  programs.zsh.initExtra = "
+export GPG_TTY=\"$(tty)\"
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+gpgconf --launch gpg-agent
+      ";
+
+  home-manager.users.swarsel.swarselsystems = {
+    isLaptop = true;
+    isNixos = false;
+    wallpaper = ../../wallpaper/surfacewp.png;
+    temperatureHwmon = {
+      isAbsolutePath = true;
+      path = "/sys/devices/platform/thinkpad_hwmon/hwmon/";
+      input-filename = "temp1_input";
+    };
+    monitors = {
+      main = {
+        name = "California Institute of Technology 0x1407 Unknown";
+        mode = "1920x1080"; # TEMPLATE
+        scale = "1";
+        position = "2560,0";
+        workspace = "2:二";
+        output = "eDP-1";
+      };
+    };
+    inputs = {
+      "1:1:AT_Translated_Set_2_keyboard" = {
+        xkb_layout = "us";
+        xkb_options = "grp:win_space_toggle";
+        xkb_variant = "altgr-intl";
+      };
+    };
+    keybindings = { };
+  };
+
+}