From b0a957394405f890f2be9ab9218f977731fbb3f5 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 11 Dec 2023 21:17:56 +0100
Subject: [PATCH] rework home manager layout

---
 .../vscode => home-manager}/code.nix          |  2 +-
 home-manager/direnv.nix                       | 10 ++++
 home-manager/gtk-theme.nix                    | 16 ++++++
 home-manager/lf.nix                           | 18 ++++++
 .../nvim => home-manager}/nvim.nix            |  4 +-
 home-manager/zsh.nix                          | 19 +++++++
 users/anon.nix                                | 25 +--------
 users/kopatz.nix                              | 56 ++-----------------
 8 files changed, 75 insertions(+), 75 deletions(-)
 rename {users/home-manager/vscode => home-manager}/code.nix (83%)
 create mode 100644 home-manager/direnv.nix
 create mode 100644 home-manager/gtk-theme.nix
 create mode 100644 home-manager/lf.nix
 rename {users/home-manager/nvim => home-manager}/nvim.nix (82%)
 create mode 100644 home-manager/zsh.nix

diff --git a/users/home-manager/vscode/code.nix b/home-manager/code.nix
similarity index 83%
rename from users/home-manager/vscode/code.nix
rename to home-manager/code.nix
index c1e2c13..26f9632 100644
--- a/users/home-manager/vscode/code.nix
+++ b/home-manager/code.nix
@@ -1,7 +1,7 @@
 
 { user, pkgs, ... }:
 {
-  home-manager.users.${user} = { pkgs, ...}: {
+  home-manager.users.${user} = {
     programs.vscode = {
       enable = true;
       package = pkgs.vscodium;
diff --git a/home-manager/direnv.nix b/home-manager/direnv.nix
new file mode 100644
index 0000000..d6e7f18
--- /dev/null
+++ b/home-manager/direnv.nix
@@ -0,0 +1,10 @@
+{ user, pkgs, ... }:
+{
+  home-manager.users.${user} = {
+    programs.direnv = {
+      enable = true;
+      enableZshIntegration = true;
+      nix-direnv.enable = true;
+    };
+  };
+}
diff --git a/home-manager/gtk-theme.nix b/home-manager/gtk-theme.nix
new file mode 100644
index 0000000..438dee9
--- /dev/null
+++ b/home-manager/gtk-theme.nix
@@ -0,0 +1,16 @@
+{ user, pkgs, ... }:
+{
+  home-manager.users.${user} = {
+    gtk = {
+      enable = true;
+      theme = { 
+        name = "palenight";
+        package = pkgs.palenight-theme;
+      };
+      cursorTheme = {
+        package = pkgs.libsForQt5.breeze-gtk;
+        name = "Breeze-gtk";
+      };
+    };
+  };
+}
diff --git a/home-manager/lf.nix b/home-manager/lf.nix
new file mode 100644
index 0000000..8071904
--- /dev/null
+++ b/home-manager/lf.nix
@@ -0,0 +1,18 @@
+{ user, pkgs, ... }:
+{
+  home-manager.users.${user} = {
+    programs.lf = {
+      enable = true;
+      previewer.source = pkgs.writeShellScript "pv.sh" ''
+        #!/bin/sh
+        case "$(${pkgs.file}/bin/file -Lb --mime-type -- "$1")" in
+          #image/*|video/*) ${pkgs.chafa}/bin/chafa -f sixel -s "$2x$3" --animate false $1;;
+          application/x-tar) tar tf "$1";;
+          application/vnd.rar) ${pkgs.p7zip}/bin/7z l "$1";;
+          application/x-7z-compressed) ${pkgs.p7zip}/bin/7z l "$1";;
+          *) ${pkgs.ctpv}/bin/ctpv "$1";;
+        esac
+      '';
+    };
+  };
+}
diff --git a/users/home-manager/nvim/nvim.nix b/home-manager/nvim.nix
similarity index 82%
rename from users/home-manager/nvim/nvim.nix
rename to home-manager/nvim.nix
index eec5abd..b8bd923 100644
--- a/users/home-manager/nvim/nvim.nix
+++ b/home-manager/nvim.nix
@@ -1,10 +1,10 @@
 { user, pkgs, ... }:
 {
-  home-manager.users.${user} = { pkgs, ...}: {
+  home-manager.users.${user} = {
     home.file.".config/nvim" = {
       enable = true;
       recursive = true;
-      source = ../../../.config/nvim;
+      source = ../.config/nvim;
       target = ".config/nvim";
     };
     programs.neovim = {
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
new file mode 100644
index 0000000..e6ba061
--- /dev/null
+++ b/home-manager/zsh.nix
@@ -0,0 +1,19 @@
+{ user, pkgs, ... }:
+{
+  home-manager.users.${user} = {
+    programs.zsh = {
+      enable = true;
+      enableCompletion = true;
+      enableAutosuggestions = true;
+      shellAliases = {
+          ll = "ls -l";
+          update = "sudo nixos-rebuild switch";
+      };
+      oh-my-zsh = {
+        enable = true;
+        plugins = [ "git" ];
+        theme = "eastwood";
+      };
+    };
+  };
+}
diff --git a/users/anon.nix b/users/anon.nix
index f075a6e..e60ce8a 100644
--- a/users/anon.nix
+++ b/users/anon.nix
@@ -4,9 +4,9 @@ let
 in
 {
   imports = [
-    (
-        import ./home-manager/nvim/nvim.nix ({ user="${user}"; pkgs=pkgs; })
-    )
+    (import ../home-manager/nvim.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
   ];
   home-manager = {
     useGlobalPkgs = true;
@@ -17,25 +17,6 @@ in
     useUserPackages = true;
     users.${user} = {
       programs.git.enable = true;
-      programs.direnv = {
-        enable = true;
-        enableZshIntegration = true;
-        nix-direnv.enable = true;
-      };
-      programs.zsh = {
-        enable = true;
-        enableCompletion = true;
-        enableAutosuggestions = true;
-        shellAliases = {
-            ll = "ls -l";
-            update = "sudo nixos-rebuild switch";
-        };
-        oh-my-zsh = {
-          enable = true;
-          plugins = [ "git" ];
-          theme = "eastwood";
-        };
-      };
       home.stateVersion = "23.05";
     };
   };
diff --git a/users/kopatz.nix b/users/kopatz.nix
index e7cf1f9..aa623b8 100644
--- a/users/kopatz.nix
+++ b/users/kopatz.nix
@@ -4,12 +4,12 @@ let
 in
 {
   imports = [
-    (
-      import ./home-manager/nvim/nvim.nix ({ user="${user}"; pkgs = pkgs; })
-    )
-    (
-      import ./home-manager/vscode/code.nix ({ user="${user}"; pkgs = pkgs; })
-    )
+    (import ../home-manager/nvim.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/code.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/zsh.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/gtk-theme.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/direnv.nix ({ user="${user}"; pkgs = pkgs; }))
+    (import ../home-manager/lf.nix ({ user="${user}"; pkgs = pkgs; }))
   ];
   home-manager = {
     useGlobalPkgs = true;
@@ -19,51 +19,7 @@ in
     };
     useUserPackages = true;
     users.${user} = {
-      gtk = {
-        enable = true;
-        theme = { 
-          name = "palenight";
-          package = pkgs.palenight-theme;
-        };
-        cursorTheme = {
-          package = pkgs.libsForQt5.breeze-gtk;
-          name = "Breeze-gtk";
-        };
-      };
-      
-      programs.zsh = {
-        enable = true;
-        enableCompletion = true;
-        enableAutosuggestions = true;
-        shellAliases = {
-            ll = "ls -l";
-            update = "sudo nixos-rebuild switch";
-        };
-        oh-my-zsh = {
-          enable = true;
-          plugins = [ "git" ];
-          theme = "eastwood";
-        };
-      };
       programs.git.enable = true;
-      programs.direnv = {
-        enable = true;
-        enableZshIntegration = true;
-        nix-direnv.enable = true;
-      };
-      programs.lf = {
-        enable = true;
-        previewer.source = pkgs.writeShellScript "pv.sh" ''
-          #!/bin/sh
-          case "$(${pkgs.file}/bin/file -Lb --mime-type -- "$1")" in
-            #image/*|video/*) ${pkgs.chafa}/bin/chafa -f sixel -s "$2x$3" --animate false $1;;
-            application/x-tar) tar tf "$1";;
-            application/vnd.rar) ${pkgs.p7zip}/bin/7z l "$1";;
-            application/x-7z-compressed) ${pkgs.p7zip}/bin/7z l "$1";;
-            *) ${pkgs.ctpv}/bin/ctpv "$1";;
-          esac
-        '';
-      };
       home.stateVersion = "23.05";
     };
   };