nix-less hm config ready

flake.nix

@@ -56,14 +56,6 @@
         ];
       };
     };
-
+    homeConfigurations = import ./src/system/machines/nix-less;
-    homeConfigurations = {
-      ${config.user.name} = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        modules = [
-          ./src/system/machines/nix-less
-        ];
-      };
-    };
   };
 }

src/system/machines/nix-less/default.nix

@@ -1,8 +1,9 @@
-{ ... }:
+{ config, pkgs, home-manager, ... }:
 
 {
-  imports = [
+  imports = [ ../../../user ];
-    ../../../user/configs
+  "${config.user.name}" = home-manager.lib.homeManagerConfiguration {
-    ./system.nix
+    inherit pkgs;
-  ];
+    modules = [ ./home.nix ];
+  };
 }

src/system/machines/nix-less/home.nix

@@ -1,37 +1,56 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 
 {
-  home-manager.useGlobalPkgs = true;
+  imports = [ ../../../user ];
-  home-manager.useUserPackages = true;
-  home-manager.users.${config.user.name} = {
-    imports = [
-      ../../../user
-    ];
 
-    programs.home-manager.enable = true;
+  home = {
-    programs.bash.shellAliases = {
+    stateVersion = "23.11";
-      nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows";
+    username = "${config.user.name}";
+    homeDirectory = "/home/${config.user.name}";
+
+    file.".config/home-manager" = {
+      source = ../../../../../nixos;
+      recursive = true;
     };
+  };
 
-    home.stateVersion = "23.11";
+  programs.home-manager.enable = true;
+  programs.bash.shellAliases = {
+    nixup = "home-manager switch";
+  };
 
-    home.username = "${config.user.name}";
+  nix = {
-    home.homeDirectory = "/home/${config.user.name}";
+    package = pkgs.nixFlakes;
+    extraOptions = "experimental-features = nix-command flakes";
+    settings = {
+      auto-optimise-store = true;
+      trusted-users = [ "${config.user.name}" ];
+    };
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 30d";
+    };
+  };
+  modules = {
+    user = {
+      bash.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      security.enable = false;
+      gui = {
+        alacritty.enable = true;
+        browsers.enable = true;
+        neovim.enable = true;
 
-    modules = {
+
-      user = {
+      };
-        bash.enable = true;
+      utils = {
-        git.enable = true;
+        enable = true;
-        gpg.enable = true;
+        dev.enable = true;
-        gui.enable = false;
+        email.enable = true;
-        security.enable = true;
+        irc.enable = true;
-        utils = {
+        vim.enable = true;
-          enable = true;
-          dev.enable = true;
-          email.enable = true;
-          irc.enable = true;
-          vim.enable = true;
-        };
       };
     };
   };

src/system/machines/nix-less/system.nix

@@ -1,84 +0,0 @@
-{ pkgs, lib, config, ... }:
-
-{ system.stateVersion = "23.11";
-
-# Users
-  users.users = {
-    ${config.user.name} = {
-      isNormalUser = true;
-      extraGroups = config.user.groups;
-      openssh.authorizedKeys.keys = config.user.sshKeys;
-    };
-  };
-  boot.isContainer = true;
-
-# Nix
-  nix = {
-    channel.enable = false;
-    package = pkgs.nixFlakes;
-    extraOptions = "experimental-features = nix-command flakes";
-    settings = {
-      auto-optimise-store = true;
-      trusted-users = [ "${config.user.name}" ];
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 30d";
-    };
-  };
-
-# Sudo Options
-  security.sudo = {
-    wheelNeedsPassword = false;
-    execWheelOnly = true;
-  };
-
-# System Services
-  services = {
-    cron = {
-      enable = true;
-      systemCronJobs = [];
-    };
-  };
-
-# Locale
-  time = {
-    timeZone = "America/New_York";
-  };
-
-  services.timesyncd = {
-    enable = true;
-    servers = [
-      "0.pool.ntp.org"
-      "1.pool.ntp.org"
-      "2.pool.ntp.org"
-      "3.pool.ntp.org"
-    ];
-  };
-
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true;
-  };
-
-# Networking
-  networking = {
-    useDHCP = lib.mkDefault true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [ 22 80 443 ];
-    };
-  };
-
-  services.openssh = {
-    enable = true;
-    startWhenNeeded = true;
-    settings = {
-      X11Forwarding = false;
-      PasswordAuthentication = false;
-    };
-  };
-}

src/system/machines/nix-less/wsl.nix

@@ -1,21 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  imports = [
-    ../../../user
-  ];
-
-  wsl = {
-    enable = true;
-    defaultUser = pkgs.lib.mkDefault "${config.user.name}";
-    nativeSystemd = true;
-
-    wslConf = {
-      boot.command = "cd";
-      network = {
-        hostname = "plato";
-        generateHosts = true;
-      };
-    };
-  };
-}

src/user/modules/bash/config/bashrc.nix

@@ -54,8 +54,6 @@ function penpot() {
   esac
 }
 
-source ~/Documents/projects/ldv/ldv.sh
-
 set -o vi
 
 bind 'set completion-ignore-case on'

src/user/modules/bash/config/prompt.nix

@@ -9,7 +9,7 @@ check_ssh() {
 add_icon() {
   local icon=$1
   if [[ ! $venv_icons =~ $icon ]]; then
-    venv_icons+="$icon"
+    venv_icons+="$icon "
   fi
 }
 

src/user/modules/gui/modules/browsers/default.nix

@@ -11,6 +11,7 @@ in
 
     home.packages = with pkgs; [
      tor-browser
+     brave
     ];
   };
 }

src/user/modules/utils/modules/dev/default.nix

@@ -10,11 +10,6 @@ in
     home.packages = with pkgs; [
       nix-init
       nix-prefetch-git
-
-      glibc
-      gcc
-
-      docker
     ];
   };
 }

src/user/modules/utils/modules/vim/config/vimrc

@@ -13,7 +13,7 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
   \| endif
 
 call plug#begin('~/.vim/plugged')
-  Plug 'joshdick/onedark.vim'
+  Plug 'petobens/colorish'
   Plug 'tpope/vim-surround'
   Plug 'jiangmiao/auto-pairs'
   Plug 'junegunn/fzf', { 'do': { -> fzf#install()  }  }
@@ -26,7 +26,8 @@ call plug#begin('~/.vim/plugged')
 call plug#end()
 
 let mapleader = "\<Space>"
-colorscheme onedark
+set background=dark
+colorscheme onedarkish
 
 highlight CursorLine ctermbg=NONE guibg=NONE
 highlight CursorLineNr ctermfg=magenta guifg=magenta

src/user/modules/utils/modules/vim/default.nix

@@ -7,6 +7,10 @@ let
 in
 { options.modules.user.utils.vim = { enable = mkEnableOption "user.utils.vim"; };
   config = mkIf cfg.enable {
+    programs.bash.shellAliases = {
+      vi = "${pkgs.vim}/bin/vim";
+    };
+
     home = {
       packages = with pkgs; [
         vim
@@ -16,8 +20,5 @@ in
         recursive = true;
       };
     };
-    programs.bash.shellAliases = {
-      vi = "${pkgs.vim}/bin/vim";
-    };
   };
 }