HOME-MNGR reorganisation of home manager

Resolves #2

Signed-off-by: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>

users/default.nix

@@ -1,10 +1,11 @@
 { config, pkgs, lib,  ... }:
 {
   #imports = [ <home-manager/nixos> ];
-
+  imports = [
+    ./ellmau
+  ];
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    users.ellmau = (import ./ellmau/home.nix);
   };
 }

users/ellmau/autorandr.nix

@@ -1,5 +1,6 @@
-{ pkgs, lib, ...}:
+{ config, pkgs, lib, ...}:
 {
+  home-manager.users.ellmau = {
     programs.autorandr = {
       enable = true;
       profiles = {
@@ -117,4 +118,5 @@
         "polybar" = "systemctl --user restart polybar.service";
       };
     };
+  };
 }

users/ellmau/default.nix

@@ -0,0 +1,76 @@
+{ config, pkgs, lib, ...}:
+{
+
+  imports = [
+    ./autorandr.nix
+    ./dunst.nix
+    ./git.nix
+    ./gpg.nix
+    ./i3.nix
+    ./nextcloud.nix
+    ./polybar.nix
+    ./zsh.nix
+  ];
+
+  home-manager.users.ellmau = {
+    home.packages = [
+      pkgs.htop
+      pkgs.pavucontrol
+
+      pkgs.jabref
+      pkgs.libreoffice-fresh
+
+      pkgs.nixfmt
+      pkgs.nixpkgs-fmt
+      pkgs.nix-prefetch-github
+
+      pkgs.neofetch
+      
+      pkgs.jitsi-meet-electron
+      pkgs.skypeforlinux
+      pkgs.zoom-us
+      pkgs.element-desktop
+      pkgs.signal-desktop
+    ];
+
+    services = {
+      udiskie = {
+        enable = true;
+        automount = true;
+        notify = true;
+        tray = "auto";
+      };
+      blueman-applet.enable = true;
+      network-manager-applet.enable = true ;
+      gnome-keyring = {
+        enable = true;
+        components = [ "pkcs11" "secrets" "ssh" ];
+      };
+    };
+
+    xdg = {
+      enable = true;
+    };
+
+    programs.direnv = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    xsession = {
+      numlock.enable = true;
+      profileExtra = ''
+        if [ $(hostname) = 'stel-xps' ]; then
+          brightnessctl s 50%
+        fi
+      '';
+    };
+
+    home.file.".background-image".source = ../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
+    
+    programs.home-manager = {
+      enable = true;
+    };
+
+  };
+}

users/ellmau/dunst.nix

@@ -1,5 +1,6 @@
-{ pkgs, ...}:
+{ config, pkgs, ...}:
 {
+  home-manager.users.ellmau = {
     services.dunst = {
       enable = true;
       iconTheme = {
@@ -35,4 +36,5 @@
         };
       };
     };
+  };
 }

users/ellmau/git.nix

@@ -1,5 +1,6 @@
 { config, pkgs, ...}:
 {
+  home-manager.users.ellmau = {
     programs= {
       git = {
         enable = true;
@@ -28,4 +29,5 @@
         source = conf/gh/config.yml;
       };
     };
+  };
 }

users/ellmau/gpg.nix

@@ -1,5 +1,6 @@
 { config, pkgs, lib, ...}:
 {
+  home-manager.users.ellmau = {
     home.file = {
       ".gnupg/gpgsm.conf".text = ''
       keyserver ldap.pca.dfn.de::::o=DFN-Verein,c=DE
@@ -12,4 +13,5 @@
     
 
     programs.gpg.enable = true;
+  };
 }

users/ellmau/home.nix

@@ -1,73 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  imports =
-    [
-      ./autorandr.nix
-      ./dunst.nix
-      ./git.nix
-      ./gpg.nix
-      ./i3.nix
-      ./nextcloud.nix
-      ./polybar.nix
-      ./zsh.nix
-    ];
-  home.packages = [
-    pkgs.htop
-    pkgs.pavucontrol
-
-    pkgs.jabref
-    pkgs.libreoffice-fresh
-
-    pkgs.nixfmt
-    pkgs.nixpkgs-fmt
-    pkgs.nix-prefetch-github
-
-    pkgs.neofetch
-    
-    pkgs.jitsi-meet-electron
-    pkgs.skypeforlinux
-    pkgs.zoom-us
-    pkgs.element-desktop
-    pkgs.signal-desktop
-  ];
-
-  services = {
-    udiskie = {
-      enable = true;
-      automount = true;
-      notify = true;
-      tray = "auto";
-    };
-    blueman-applet.enable = true;
-    network-manager-applet.enable = true ;
-    gnome-keyring = {
-      enable = true;
-      components = [ "pkcs11" "secrets" "ssh" ];
-    };
-  };
-
-  xdg = {
-    enable = true;
-  };
-
-  programs.direnv = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-
-  xsession = {
-    numlock.enable = true;
-    profileExtra = ''
-      if [ $(hostname) = 'stel-xps' ]; then
-        brightnessctl s 50%
-      fi
-    '';
-  };
-
-  home.file.".background-image".source = ../common/wallpaper/nix-wallpaper-nineish-dark-gray.png;
-  
-  programs.home-manager = {
-    enable = true;
-  };
-
-}

users/ellmau/i3.nix

@@ -1,9 +1,11 @@
 { config, pkgs, lib, ...}:
 {
+  home-manager.users.ellmau = {
     xdg = {
       configFile."i3" = {
         source = conf/i3;
         recursive = true;
       };
     };
+  };
 }

users/ellmau/nextcloud.nix

@@ -1,8 +1,9 @@
 { pkgs, ... }:
 {
+  home-manager.users.ellmau = {
     services.nextcloud-client = {
       enable = true;
       startInBackground = true;
     };
-  
+  };
 }

users/ellmau/polybar.nix

@@ -1,5 +1,6 @@
 { pkgs, ...}:
 {
+  home-manager.users.ellmau = {
     services.polybar = {
       enable = true;
       package = pkgs.polybarFull;
@@ -352,4 +353,5 @@
     done;
     '';
     };
+  };
 }

users/ellmau/zsh.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }:
 {
+  home-manager.users.ellmau = {
     programs = {
       zsh = {
         enable = true;
@@ -70,4 +71,5 @@
       };
     };
 
+  };
 }