modularize hjem

diff --git a/configuration.nix b/configuration.nix
index e8270ddb7b24dc20c0ca98da36d4085d962d7c31..f9a27cf2b961658b4291f2720bd48e90a9e19cab 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -4,6 +4,7 @@
     ./hardware-configuration.nix
        ./lockscreen.nix
 ./x11.nix
+./hjem.nix
   ];
 
   # Bootloader.
@@ -25,56 +26,6 @@
 
   i18n.defaultLocale = "en_CA.UTF-8";
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.andrew = {
-    isNormalUser = true;
-
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-    packages = with pkgs; [ ];
-  };
-
-  hjem.users.andrew = {
-    directory = "/home/andrew";
-    files = {
-
-      ".config/sxhkd/sxhkdrc".text = ''
-super + space
-       ${pkgs.dmenu}/bin/dmenu_run
-
-super + Return
-       ${pkgs.st}/bin/st       
-
-super + b
-       ${pkgs.librewolf}/bin/librewolf
-
-XF86AudioRaiseVolume
-    ${pkgs.pamixer}/bin/pamixer -i 5
-
-XF86AudioLowerVolume
-    ${pkgs.pamixer}/bin/pamixer -d 5
-
-XF86AudioMute
-    ${pkgs.pamixer}/bin/pamixer -t
-
-super + s
-    ${pkgs.maim}/bin/maim -i $(${pkgs.xdotool}/bin/xdotool getactivewindow) | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png
-
-super + shift + s
-       ${pkgs.maim}/bin/maim -s | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png
-
-super + l
-       ${pkgs.lock-screen}/bin/lock-screen 
-
-      '';
-    };
-    packages = with pkgs; [
-      discord
-    ];
-  };
-
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
   nix.settings.experimental-features = [

diff --git a/hjem.nix b/hjem.nix
new file mode 100644 (file)
index 0000000..1c43cb3
--- /dev/null
+++ b/hjem.nix
@@ -0,0 +1,57 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+  ];
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.andrew = {
+    isNormalUser = true;
+
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+    packages = with pkgs; [ ];
+  };
+
+  hjem.users.andrew = {
+    directory = "/home/andrew";
+    files = {
+
+      ".config/sxhkd/sxhkdrc".text = ''
+super + space
+       ${pkgs.dmenu}/bin/dmenu_run
+
+super + Return
+       ${pkgs.st}/bin/st       
+
+super + b
+       ${pkgs.librewolf}/bin/librewolf
+
+XF86AudioRaiseVolume
+    ${pkgs.pamixer}/bin/pamixer -i 5
+
+XF86AudioLowerVolume
+    ${pkgs.pamixer}/bin/pamixer -d 5
+
+XF86AudioMute
+    ${pkgs.pamixer}/bin/pamixer -t
+
+super + s
+    ${pkgs.maim}/bin/maim -i $(${pkgs.xdotool}/bin/xdotool getactivewindow) | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png
+
+super + shift + s
+       ${pkgs.maim}/bin/maim -s | ${pkgs.xclip}/bin/xclip -selection clipboard -t image/png
+
+super + l
+       ${pkgs.lock-screen}/bin/lock-screen 
+
+      '';
+    };
+    packages = with pkgs; [
+      discord
+lazygit
+    ];
+  };
+
+}