feat: update config a bit

Author: rhodee

README.md

@@ -1,6 +1,6 @@
 # Install Development Environment
 
-- [ ] Already installed? See [Rebuild Existing System](#rebuild-system)
+- [ ] Already have `nix` installed and need to refresh? See [Troubleshooting Guide](https://github.com/DeterminateSystems/nix-installer?tab=readme-ov-file#troubleshooting)
 
 ## Install Nix
 
@@ -11,39 +11,35 @@ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix
 
 ## Build Machine
 
-It is probably best to run this command:
-
 ```sh
 nix --accept-flake-config run github:juspay/omnix -- init github:juspay/nixos-unified-template -o $HOME/.config/nixconfig
 ```
 
-Answer the prompts and then you will have a working config. To make it more useful (to myself) copy the `modules`
-directory and wire it up in each configuration.
+Follow prompts then a working config is generated at `$HOME/.config/nixconfig`.
 
-If you are just moving configs between machines follow the steps below:
+If you cloned this repo you can run `nix run` on macOS or `nix run . <your user>` on a non nixOS (YMMV).
 
-```sh
-cp nix.conf $HOME/nix/nix.conf
-cp nixconfig $HOME/.config/nixconfig
-cd $HOME/.config/nixconfig
+Before you do that...Make sure to have the configs like this:
 
-# One-time activation
-nix --extra-experimental-features "nix-command flakes" run
+```sh
+cp nix.conf $XDG_CONFIG_HOME/nix/nix.conf
+cp nixconfig $XDG_CONFIG_HOME/nixconfig
+cd $XDG_CONFIG_HOME/nixconfig
 ```
 
-To update:
+To update nix -> <https://github.com/DeterminateSystems/nix-installer?tab=readme-ov-file#upgrading-nix>
+
+To update your flakes:
 
 ```sh
 nix flake update && nix run [. $USER@ ] # add the ' .$USER@' on non-NixOS Linux
 ```
 
-To update nix:
+## Troubleshooting
 
-```sh
-nix upgrade-nix --nix-store-paths-url https://install.determinate.systems/nix-upgrade/stable/universal
-```
+### Rebuild System
 
-## Rebuild System
+On a really, really bad system failure I ran these commands to get it working again.
 
 ```sh
 nix --extra-experimental-features "nix-command flakes" run nix-darwin#darwin-uninstaller
@@ -56,7 +52,3 @@ sudo mv /etc/zshrc /etc/zshrc.before-nix-darwin
 rm $HOME/.local/state/nix/profiles/home-manager*
 rm $HOME/.local/state/home-manager/gcroots/current-home
 ```
-
-```sh
-deno jupyter --install
-```

nixconfig/configurations/home/rhodee.nix

@@ -10,7 +10,7 @@ in
 
   home.username = "rhodee";
   home.homeDirectory = lib.mkDefault "/${if pkgs.stdenv.isDarwin then "Users" else "home"}/rhodee";
-  home.stateVersion = "22.11";
+  home.stateVersion = "24.11";
   nixpkgs.config.allowUnfree = true;
 
   home.sessionVariables = {

nixconfig/configurations/home/rhodeewins.nix

@@ -14,7 +14,7 @@ in
 
   home.username = "rhodee";
   home.homeDirectory = lib.mkDefault "/home/rhodee";
-  home.stateVersion = "22.11";
+  home.stateVersion = "24.11";
 
   nixpkgs.hostPlatform = "x86_64-linux";
   networking.hostName = "rhodeewins";

nixconfig/flake.nix

@@ -2,10 +2,11 @@
   description = "Home manager configs";
   inputs = {
     nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz";
-    catppuccin = {
-      url = "github:catppuccin/nix";
-    };
+
+    catppuccin.url = "github:catppuccin/nix";
+
     home-manager = {
+      # url = "github:nix-community/home-manager/release-24.11";
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -20,20 +21,22 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    ghostty = {
-      url = "github:ghostty-org/ghostty";
-    };
-
+    ghostty.url = "github:ghostty-org/ghostty";
     flake-parts.url = "github:hercules-ci/flake-parts";
-    nixos-unified.url = "github:srid/nixos-unified";
     systems.url = "github:nix-systems/default";
+    nixos-unified.url = "github:srid/nixos-unified";
+
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+    };
 
     # Software inputs
-    nix-index-database.url = "github:nix-community/nix-index-database";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-    nixvim.url = "github:nix-community/nixvim";
-    nixvim.inputs.nixpkgs.follows = "nixpkgs";
-    nixvim.inputs.flake-parts.follows = "flake-parts";
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs:

nixconfig/modules/darwin/default.nix

@@ -1,45 +1,26 @@
 # This is your nix-darwin configuration.
 # For home configuration, see /modules/home/*
-{ flake, pkgs, lib, ... }:
-
-let
+{
+  flake,
+  pkgs,
+  lib,
+  ...
+}: let
   inherit (flake) inputs;
   inherit (inputs) self;
-in
-{
+in {
+  imports = [
+    # Services
+
+    # System
+    ./system.nix
+  ];
+
+  services.nix-daemon.enable = true;
 
   # Use TouchID for `sudo` authentication
   security.pam.enableSudoTouchIdAuth = true;
 
   # These users can add Nix caches.
   nix.settings.trusted-users = [ "root" "rhodee" ];
-
-  # Configure macOS system
-  # More rhodeeBooks => https://github.com/ryan4yin/nix-darwin-kickstarter/blob/main/rich-demo/modules/system.nix
-  system = {
-    defaults = {
-      dock = {
-        # autohide = true;
-        # customize Hot Corners
-        wvous-tl-corner = 2; # top-left - Mission Control
-        # wvous-tr-corner = 13; # top-right - Lock Screen
-        wvous-bl-corner = 3; # bottom-left - Application Windows
-        wvous-br-corner = 4; # bottom-right - Desktop
-      };
-
-      finder = {
-        _FXShowPosixPathInTitle = true; # show full path in finder title
-        AppleShowAllExtensions = true; # show all file extensions
-        FXEnableExtensionChangeWarning = false; # disable warning when changing file extension
-        QuitMenuItem = true; # enable quit menu item
-        ShowPathbar = true; # show path bar
-        ShowStatusBar = true; # show status bar
-      };
-    };
-
-    keyboard = {
-      # enableKeyMapping = true;
-      # remapCapsLockToControl = true;
-    };
-  };
 }

nixconfig/modules/darwin/system.nix

@@ -0,0 +1,38 @@
+# This is your nix-darwin configuration.
+# For home configuration, see /modules/home/*
+{ flake, pkgs, lib, ... }:
+
+let
+  inherit (flake) inputs;
+  inherit (inputs) self;
+in
+{
+  # Configure macOS system
+  # More rhodeeBooks => https://github.com/ryan4yin/nix-darwin-kickstarter/blob/main/rich-demo/modules/system.nix
+  system = {
+    defaults = {
+      dock = {
+        # autohide = true;
+        # customize Hot Corners
+        wvous-tl-corner = 2; # top-left - Mission Control
+        # wvous-tr-corner = 13; # top-right - Lock Screen
+        wvous-bl-corner = 3; # bottom-left - Application Windows
+        wvous-br-corner = 4; # bottom-right - Desktop
+      };
+
+      finder = {
+        _FXShowPosixPathInTitle = true; # show full path in finder title
+        AppleShowAllExtensions = true; # show all file extensions
+        FXEnableExtensionChangeWarning = false; # disable warning when changing file extension
+        QuitMenuItem = true; # enable quit menu item
+        ShowPathbar = true; # show path bar
+        ShowStatusBar = true; # show status bar
+      };
+    };
+
+    keyboard = {
+      # enableKeyMapping = true;
+      # remapCapsLockToControl = true;
+    };
+  };
+}

nixconfig/modules/home/default.nix

@@ -1,5 +1,5 @@
 {
-  home.stateVersion = "22.11";
+  home.stateVersion = "24.11";
   imports = [
     ./gc.nix
     ./catppuccin.nix

nixconfig/modules/home/macos.nix

@@ -1,6 +1,6 @@
 { inputs, ... }:
 {
-  home.stateVersion = "22.11";
+  home.stateVersion = "24.11";
   imports = [
     ./all/zsh.nix
     ./all/iterm