From bafcb6cb213bb42ae76966c471a870276d0cf901 Mon Sep 17 00:00:00 2001
From: Nathan Anderson <n8r@tuta.io>
Date: Sun, 17 Mar 2024 22:52:07 -0600
Subject: [PATCH] fix luci home.nix

---
 luci/modules/home-manager/home.nix | 175 +++++++++++++++--------------
 1 file changed, 88 insertions(+), 87 deletions(-)

diff --git a/luci/modules/home-manager/home.nix b/luci/modules/home-manager/home.nix
index 91e414a..873c04d 100644
--- a/luci/modules/home-manager/home.nix
+++ b/luci/modules/home-manager/home.nix
@@ -1,6 +1,8 @@
 { lib, config, pkgs, ... }:
 let
-  homeConfig = config.homeConfig;
+  userName = "jaci";
+  fullName = "Jaci Anderson";
+  email = "jaci.s.anderson@gmail.com";
 in
 {
   # nixpkgs.overlays = [
@@ -9,99 +11,98 @@ in
 
   # nixpkgs.config.allowUnfree = true;
   # inputs.nixpkgs-stable.config.allowUnfree = true;
-  options.homeConfig = {
-    userName = lib.mkOption {
-        type = lib.types.str;
-        description = "Main username for system";
-    };
-    hostName = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for system";
-    };
-    fullName = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for system";
-    };
+  # options.homeConfig = {
+  #   userName = lib.mkOption {
+  #       type = lib.types.str;
+  #       description = "Main username for system";
+  #   };
+  #   hostName = lib.mkOption {
+  #       type = lib.types.str;
+  #       description = "Hostname for system";
+  #   };
+  #   fullName = lib.mkOption {
+  #       type = lib.types.str;
+  #       description = "Hostname for system";
+  #   };
+  # };
+
+  home.username = userName;
+  home.homeDirectory = "/home/${userName}";
+
+  programs.home-manager.enable = true;
+
+  home.stateVersion = "23.11"; # Please read the comment before changing.
+
+  fonts.fontconfig.enable = true;
+  home.packages = with pkgs; [
+    helix
+    jq
+
+    #
+    # Better Unix
+    #
+    bat
+    duf
+    fd
+    fzf
+    lsd
+    ripgrep
+    tre-command
+    gtop
+    htop
+    neofetch
+
+    # Normies
+    unzip
+
+    imv
+    mpv
+    ffmpeg
+  ];
+
+  home.file."${config.xdg.configHome}" = {
+    source = ../../dotfiles;
+    recursive = true;
   };
 
-  config = {
-    home.username = homeConfig.userName;
-    home.homeDirectory = "/home/${homeConfig.userName}";
+  home.sessionVariables = {
+    EDITOR = "hx";
+  };
 
-    programs.home-manager.enable = true;
+  # Git setup
+  programs.git = {
+      enable = true;
+      userEmail = email;
+      userName = fullName;
+  };
 
-    home.stateVersion = "23.11"; # Please read the comment before changing.
-
-    fonts.fontconfig.enable = true;
-    home.packages = with pkgs; [
-      helix
-      jq
-
-      #
-      # Better Unix
-      #
-      bat
-      duf
-      fd
-      fzf
-      lsd
-      ripgrep
-      tre-command
-      gtop
-      htop
-      neofetch
-
-      # Normies
-      unzip
-
-      imv
-      mpv
-      ffmpeg
-    ];
-
-    home.file."${config.xdg.configHome}" = {
-      source = ../../dotfiles;
-      recursive = true;
+  programs = {
+    direnv = {
+      enable = true;
+      enableZshIntegration = true; # see note on other shells below
+      nix-direnv.enable = true;
     };
+    bash.enable = true; # see note on other shells below
+  };
 
-    home.sessionVariables = {
-      EDITOR = "hx";
-    };
-
-    # Git setup
-    programs.git = {
-        enable = true;
-        userEmail = homeConfig.email;
-        userName = homeConfig.fullName;
-    };
-
-    programs = {
-      direnv = {
-        enable = true;
-        enableZshIntegration = true; # see note on other shells below
-        nix-direnv.enable = true;
+  # Zsh setup
+  programs.zsh = {
+      enable = true;
+      oh-my-zsh = {
+          enable = true;
+          plugins = [ "git" ];
+          theme = "half-life";
       };
-      bash.enable = true; # see note on other shells below
-    };
+      initExtra = ''
+          eval "$(direnv hook zsh)"
 
-    # Zsh setup
-    programs.zsh = {
-        enable = true;
-        oh-my-zsh = {
-            enable = true;
-            plugins = [ "git" ];
-            theme = "half-life";
-        };
-        initExtra = ''
-            eval "$(direnv hook zsh)"
-
-            alias ls="lsd"
-            alias l="lsd --almost-all --long"
-            alias llm="lsd --timesort --long"
-            alias lS="lsd --oneline --classic"
-            alias lt="lsd --tree --depth=2"
-            alias grep="rg"
-         '';
-    };
+          alias ls="lsd"
+          alias l="lsd --almost-all --long"
+          alias llm="lsd --timesort --long"
+          alias lS="lsd --oneline --classic"
+          alias lt="lsd --tree --depth=2"
+          alias grep="rg"
+       '';
   };
+
 }