From b2e45bf27fcc99ae4bb6716e778fd02702db2f1e Mon Sep 17 00:00:00 2001
From: Steven Carpenter <specCon18@gmail.com>
Date: Tue, 14 Feb 2023 00:45:36 -0500
Subject: [PATCH] working on tagss development env, devenv and added README

---
 .hm-modules/home-manager.nix                  | 22 +++-----
 .hm-modules/users/speccon18.nix               | 50 +++++++++++++++++++
 .../desktop/applications/speccon18.nix        | 13 -----
 .modules/features/development/devenv.nix      |  4 ++
 .modules/users/speccon18.nix                  |  6 +--
 README.md                                     |  4 ++
 flake.nix                                     |  2 +-
 hosts/creatorforge.nix                        |  1 +
 8 files changed, 69 insertions(+), 33 deletions(-)
 create mode 100644 .hm-modules/users/speccon18.nix
 delete mode 100644 .modules/features/desktop/applications/speccon18.nix
 create mode 100644 .modules/features/development/devenv.nix
 create mode 100644 README.md

diff --git a/.hm-modules/home-manager.nix b/.hm-modules/home-manager.nix
index 310bc0c..01e905f 100644
--- a/.hm-modules/home-manager.nix
+++ b/.hm-modules/home-manager.nix
@@ -1,20 +1,10 @@
 { config, pkgs, lib, ... }:
 {
+  imports = [
+    ./users/speccon18.nix
+  ];
+  programs.home-manager.enable = true;
+
 # https://github.com/arouzing/nix/blob/main/hm/sky/home.nix
-  home = {
-    username = "speccon18";
-    homeDirectory = "/home/speccon18";
-    stateVersion = "22.11";
-  };
-  direnv = {
-    enableZshIntegration = true;
-    enable = true;
-  };
-  starship = {
-    enable = true;
-    enableZshIntegration = true;
-  };
-  zsh = {
-    enable = true;
-  };
+
 }
\ No newline at end of file
diff --git a/.hm-modules/users/speccon18.nix b/.hm-modules/users/speccon18.nix
new file mode 100644
index 0000000..53d0112
--- /dev/null
+++ b/.hm-modules/users/speccon18.nix
@@ -0,0 +1,50 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home-manager.users.speccon18 = {
+    home.packages = [
+      firefox
+      vscodium-fhs
+      alacritty
+      starship
+      diff-so-fancy
+    ];
+  };
+  programs = {
+    home = {
+      username = "speccon18";
+      homeDirectory = "/home/speccon18";
+      stateVersion = "22.11";
+    };
+    direnv = {
+      enableZshIntegration = true;
+      enable = true;
+    };
+    starship = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+    zsh = {
+      enable = lib.mkDefault true;
+      dotDir = ".config/zsh";
+      history = {
+        path = "$ZDOTDIR/.zsh_history";
+        save = 10000000;
+      };
+    };
+    git = {
+      enable = true;
+      userName = "specCon18";
+      userEmail = "specCon18@gmail.com";
+    #  signing = {
+    #    key = "71F252936D785219";
+    #    signByDefault = true;
+    #  };
+      diff-so-fancy = {
+        enable = true;
+        changeHunkIndicators = true;
+      };
+      lfs.enable = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/.modules/features/desktop/applications/speccon18.nix b/.modules/features/desktop/applications/speccon18.nix
deleted file mode 100644
index 4b71266..0000000
--- a/.modules/features/desktop/applications/speccon18.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    tailscale
-    firefox
-    vscodium-fhs
-    alacritty
-    starship
-  ];
-  programs = {
-    zsh.enable = lib.mkDefault true;
-  };
-}
\ No newline at end of file
diff --git a/.modules/features/development/devenv.nix b/.modules/features/development/devenv.nix
new file mode 100644
index 0000000..25ac50e
--- /dev/null
+++ b/.modules/features/development/devenv.nix
@@ -0,0 +1,4 @@
+{ config, pkgs, lib, ... }:
+{
+  
+}
\ No newline at end of file
diff --git a/.modules/users/speccon18.nix b/.modules/users/speccon18.nix
index fad4d60..b5466d9 100644
--- a/.modules/users/speccon18.nix
+++ b/.modules/users/speccon18.nix
@@ -1,12 +1,12 @@
 { config, pkgs, lib, ... }:
 {
-    users.users.speccon18 = {
+  users.users.speccon18 = {
     shell = pkgs.zsh;
     isNormalUser = true;
     initialHashedPassword = "$6$pJB0TDUj8IS8hQNJ$GfENlHg89lsUjRiSaePWJeqX1pevTTZOuEw5KgcVEpyPw9lyiAifz5ZiuOQnYxUAMhAiCmF/pCjaWSy6m5sWM/";
     openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdigmndcdQD/864P059K2hZOXyEkbGvMkH0/b2QavkD speccon18@creatorforge"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPc1AQ6hcjdSZZuhS5SISwtulFoTLpC5f5JoMFQkZ5l2 specCon18@DESKTOP-Q1I2PAE"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdigmndcdQD/864P059K2hZOXyEkbGvMkH0/b2QavkD speccon18@creatorforge"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPc1AQ6hcjdSZZuhS5SISwtulFoTLpC5f5JoMFQkZ5l2 specCon18@DESKTOP-Q1I2PAE"
     ];
     description = "admin";
     extraGroups = [ "wheel" "docker" ];
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4811a92
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+# NixOS Config
+My personal NixOS Configuration Repository
+
+[![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org)
diff --git a/flake.nix b/flake.nix
index 8495fe1..a9d78b1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
     };
-    outputs = { self, home-manager, nixos-generators, nixpkgs, ... }@inputs:
+    outputs = { self, home-manager, nixos-generators, flake-utils, nixpkgs, ... }@inputs:
     {
         proxmox = nixos-generators.nixosGenerate {
             system = "x86_64-linux";
diff --git a/hosts/creatorforge.nix b/hosts/creatorforge.nix
index bef18c8..23f33a0 100644
--- a/hosts/creatorforge.nix
+++ b/hosts/creatorforge.nix
@@ -37,6 +37,7 @@
     zsh
     vim
     micro
+    tailscale
     direnv
     uutils-coreutils
   ];