From 1fd92fcaf3aadea1e9509f859340f57100218c41 Mon Sep 17 00:00:00 2001
From: "Simen A. W. Olsen" <cobraz@Simens-MacBook-Pro-4.local>
Date: Sat, 21 Mar 2026 13:49:10 +0100
Subject: refactor: consolidate dotfiles into declarative Nix modules

- Remove nvim git submodule, use flake input instead
- Inline all shell configurations into Nix modules
- Remove legacy bootstrap.sh and macos/macos script
- Add NixOS system configuration support
- Update documentation with platform-specific setup
- Add claude-code to macOS Homebrew
- Remove stow-based dotfile management approach
---
 flake.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 015881f..b117a71 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,11 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    config-nvim = {
+      url = "github:simenandre/config.nvim";
+      flake = false;
+    };
   };
 
   outputs =
@@ -21,7 +26,16 @@
       nixpkgs,
       nix-darwin,
       home-manager,
+      config-nvim,
     }:
+    let
+      homeModules = [
+        ./modules/home
+        {
+          home.file.".config/nvim".source = config-nvim;
+        }
+      ];
+    in
     {
       darwinConfigurations."default" = nix-darwin.lib.darwinSystem {
         system = "aarch64-darwin";
@@ -31,7 +45,7 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.simenandre = import ./modules/home;
+            home-manager.users.simenandre = { imports = homeModules; };
           }
         ];
       };
@@ -44,19 +58,19 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.simenandre = import ./modules/home;
+            home-manager.users.simenandre = { imports = homeModules; };
           }
         ];
       };
 
       homeConfigurations."simenandre" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."x86_64-linux";
-        modules = [ ./modules/home ];
+        modules = homeModules;
       };
 
       homeConfigurations."simenandre@aarch64-linux" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages."aarch64-linux";
-        modules = [ ./modules/home ];
+        modules = homeModules;
       };
     };
 }
-- 
cgit v1.2.3