README.md

@@ -22,18 +22,12 @@ Then use [stow](https://www.gnu.org/software/stow/) to create symlinks for each
 
 **i.e.** `$ stow -S vim`
 
-------------
+### Anything nix related
-
+I use [nix: home-manager](https://github.com/nix-community/home-manager). I suggest you do too. `stow` is fine until it isn't. 
-## Darwin Configuration (nix-darwin + home-manager)
-I use [nix-darwin](https://github.com/LnL7/nix-darwin) and [home-manager](https://github.com/nix-community/home-manager). I suggest you do too. `stow` is fine until it isn't. 
 
 If you want to try out my nix config, then you can do this:
 ```sh
-darwin-rebuild switch --flake ~/.dotfiles/nix-darwin#exa
+home-manager switch --flake .#elal
-```
-or 
-```sh
-darwin-rebuild switch --flake github:almqv/dotfiles/nix-darwin#exa
 ```
 
 Be sure that your hostname is `exa` and your username is `elal`.

nix-darwin/configuration.nix

@@ -1,42 +0,0 @@
-{ pkgs, ... }: 
-
-{
-  # List packages installed in system profile. To search by name, run:
-  # $ nix-env -qaP | grep wget
-  environment.systemPackages = with pkgs; [ 
-    git
-  ];
-
-  # Necessary for using flakes on this system.
-  nix.settings.experimental-features = "nix-command flakes";
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-
-  # Enable zsh 
-  programs.zsh.enable = true;
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 6;
-
-  # Fix dumb MacOS features that no one asked for
-  system.defaults.NSGlobalDomain = {
-    ApplePressAndHoldEnabled = false;
-  };
-
-  # Allow unfree (and optionally broken) packages
-  nixpkgs.config = {
-    allowUnfree = true;
-    # If needed, you can also allow broken packages:
-    # allowBroken = true;
-  };
-
-  # The platform the configuration will be used on.
-  nixpkgs.hostPlatform = "aarch64-darwin";
-
-  users.users.elal = {
-    name = "elal";
-    home = "/Users/elal";
-  };
-}

nix-darwin/flake.lock

@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738743987,
-        "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -27,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738878603,
+        "lastModified": 1732420764,
-        "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
+        "narHash": "sha256-u6JOOVlnGe8fMekW0BgaHuuZwbJp4ixQaMA5BEvRoDA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
+        "rev": "67cd4814a247fd0fe97171acb90659f7e304bcb8",
         "type": "github"
       },
       "original": {
@@ -42,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738824222,
+        "lastModified": 1732014248,
-        "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=",
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
         "type": "github"
       },
       "original": {
@@ -58,7 +38,6 @@
     },
     "root": {
       "inputs": {
-        "darwin": "darwin",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }

nix-darwin/flake.nix

@@ -1,31 +1,23 @@
 {
-  description = "Epsilons Darwin configuration";
+  description = "Home Manager configuration";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    darwin.url = "github:lnl7/nix-darwin";
+    home-manager = {
-    darwin.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
-    home-manager.url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, darwin, ... }: {
+  outputs = { nixpkgs, home-manager, ... }:
-    darwinConfigurations = {
+    let
-      exa = darwin.lib.darwinSystem {
+      system = "aarch64-darwin";
-        system = "aarch64-darwin";
+      pkgs = nixpkgs.legacyPackages.${system};
-        modules = [
+    in {
-          ./configuration.nix
+      homeConfigurations.elal = home-manager.lib.homeManagerConfiguration {
-          home-manager.darwinModules.home-manager
+        inherit pkgs;
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.elal = import ./home.nix;
 
-            # Optionally, use home-manager.extraSpecialArgs to pass
+        modules = [ ./home.nix ];
-            # arguments to home.nix
-          }
-        ];
       };
     };
-  };
 }

nix-darwin/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
 {
   # Home Manager needs a bit of information about you and the paths it should
@@ -15,6 +15,28 @@
   # release notes.
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
+  nixpkgs = {
+    # You can add overlays here
+    overlays = [
+      # If you want to use overlays exported from other flakes:
+      # neovim-nightly-overlay.overlays.default
+
+      # Or define it inline, for example:
+      # (final: prev: {
+      #   hi = final.hello.overrideAttrs (oldAttrs: {
+      #     patches = [ ./change-hello-to-hi.patch ];
+      #   });
+      # })
+    ];
+    # Configure your nixpkgs instance
+    config = {
+      # Disable if you don't want unfree packages
+      allowUnfree = true;
+      # Workaround for https://github.com/nix-community/home-manager/issues/2942
+      allowUnfreePredicate = _: true;
+    };
+  };
+
   imports = [
     # Modules
     ./modules/skhd.nix
@@ -165,17 +187,6 @@
     LIBTORCH = "${pkgs.libtorch-bin}/lib";
   };
 
-  # Link apps to ~/Applications/Nix
-  home.activation = {
-    linkApps = lib.hm.dag.entryAfter [ "checkLinkTargets" ] ''
-      mkdir -p ~/Applications/Nix
-      for app in ~/.nix-profile/Applications/*.app; do
-        ln -sf "$app" ~/Applications/Nix/
-      done
-    '';
-  };
-
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 

nvchad/.config/nvim/lua/chadrc.lua

@@ -37,8 +37,8 @@ end
 
 M = {
   base46 = {
-    theme = "doomchad",
+    theme = "ayu_dark",
-    theme_toggle = { "doomchad", "everforest_light" },
+    theme_toggle = { "ayu_dark", "ayu_light" },
   },
   ui = {
     hl_override = highlights.override,