updates

Author: esselius

darwin-modules/homebrew-packages/default.nix

@@ -3,13 +3,11 @@
 {
   nix-homebrew = {
     enable = true;
-    user = config.mainUser;
+    user = config.system.primaryUser;
   };
   homebrew.enable = true;
 
   imports = [
     ./common.nix
-    ./home.nix
-    ./work.nix
   ];
 }

darwin-modules/homebrew-packages/home.nix

@@ -1,8 +1,6 @@
-{ lib, config, ... }:
-
 {
   homebrew = {
-    casks = lib.mkIf (config.context == "home") [
+    casks = [
       "plex-media-server"
       "screens-connect"
       "steam"

flake.nix

@@ -74,7 +74,7 @@
   };
 
   outputs =
-    inputs@{ self, flake-parts, ... }:
+    inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         inputs.dev.flakeModule
@@ -109,6 +109,9 @@
               { pkgs, ... }:
               {
                 nix.package = pkgs.nix; # Standalone home-manager requires an explicit nix package
+                nixpkgs.config = {
+                  allowUnfree = true;
+                };
               }
             )
           ];
@@ -164,13 +167,23 @@
                 ./darwin-modules/tiling-wm.nix
                 ./darwin-modules/linux-builder.nix
                 ./darwin-modules/security.nix
-                ./darwin-modules/homebrew-packages/common.nix
+                ./darwin-modules/homebrew-packages
                 ./darwin-modules/user.nix
 
                 ./overlays.nix
 
                 inputs.nix-homebrew.darwinModules.nix-homebrew
               ];
+              rpi = [
+                ./nixos-modules/context.nix
+                ./nixos-modules/nix.nix
+                ./nixos-modules/profiles
+
+                ./overlays.nix
+
+                inputs.raspberry-pi-nix.nixosModules.raspberry-pi
+                inputs.authentik-nix.nixosModules.default
+              ];
             }.${class};
         };
 
@@ -218,7 +231,6 @@
             modules = [
               ./nixos-configurations/adama.nix
               ./nixos-modules/default.nix
-              inputs.raspberry-pi-nix.nixosModules.raspberry-pi
               inputs.agenix.nixosModules.default
               inputs.agenix-rekey.nixosModules.default
               inputs.authentik-nix.nixosModules.default
@@ -253,56 +265,23 @@
                     fsType = "vfat";
                   };
                 };
-
-                pyproject-nix-lib = inputs.pyproject-nix.lib;
               }
-              inputs.home-manager-nixos-24-11.nixosModules.home-manager
-              (
-                { config, ... }:
-                {
-                  home-manager.users.${config.mainUser} = {
-                    imports = [
-                      ./home-configurations/peteresselius.nix
-                      ./home-modules/default.nix
-                      inputs.agenix.homeManagerModules.default
-                      inputs.krewfile.homeModules.krewfile
-                      inputs.nix-index-database.hmModules.nix-index
-                      inputs.nixvim.homeModules.nixvim
-                      {
-                        home.stateVersion = "24.05";
-                      }
-                    ];
-                  };
-                  home-manager.extraSpecialArgs = { inherit inputs; };
-                }
-              )
             ];
             specialArgs = { inherit inputs; };
           };
+
           starbuck = {
             arch = "aarch64";
             class = "rpi";
             deployable = true;
             nixpkgs = inputs.nixpkgs-nixos-24-11;
             modules = [
               ./nixos-configurations/starbuck.nix
-              ./nixos-modules/default.nix
-              inputs.raspberry-pi-nix.nixosModules.raspberry-pi
               inputs.agenix.nixosModules.default
               inputs.agenix-rekey.nixosModules.default
-              inputs.authentik-nix.nixosModules.default
               inputs.microvm.nixosModules.host
 
               {
-                microvm.vms.haos = {
-                  flake = self;
-                  updateFlake = "github:esselius/cfg";
-                };
-              }
-
-              {
-                nixpkgs-path = inputs.nixpkgs-nixos-24-11;
-                nixpkgs-unstable-path = inputs.nixpkgs-unstable;
                 age.rekey = {
                   hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFi1DoYv7wvIkYvTrjUVEqZI00H6d5437IgprVdFMI1+";
                   masterIdentities = [
@@ -329,26 +308,8 @@
                   };
                 };
               }
-              inputs.home-manager-nixos-24-11.nixosModules.home-manager
-              (
-                { config, ... }:
-                {
-                  home-manager.users.${config.mainUser} = {
-                    imports = [
-                      ./home-configurations/peteresselius.nix
-                      ./home-modules/default.nix
-                      inputs.agenix.homeModules.default
-                      inputs.krewfile.homeModules.krewfile
-                      inputs.nix-index-database.homeModules.nix-index
-                      inputs.nixvim.homeModules.nixvim
-                      {
-                        home.stateVersion = "24.05";
-                      }
-                    ];
-                  };
-                }
-              )
             ];
+            specialArgs = { inherit inputs; };
           };
         };
       };

home-modules/neovim.nix

@@ -14,11 +14,14 @@
       shiftwidth = 2;
       undofile = true;
     };
+    nixpkgs.pkgs = pkgs;
 
 
     editorconfig.enable = true;
 
     plugins = {
+      avante.enable = true;
+      copilot-vim.enable = true;
       clangd-extensions.enable = true;
       web-devicons.enable = true;
 

home-modules/nix.nix

@@ -1,6 +1,5 @@
 {
   nix = {
-    # package = pkgs.nixVersions.nix_2_23;
     settings = {
       substituters = [
         "https://cache.nixos.org"

home-modules/profiles/tools/common.nix

@@ -42,5 +42,6 @@
     unzip
     arion
     docker-client
+    nixfmt-rfc-style
   ];
 }

nixos-modules/default.nix

@@ -1,5 +1,3 @@
-{ ... }:
-
 {
   imports = [
     ./context.nix

nixos-modules/nix.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ inputs, ... }:
 
 {
   nix = {
@@ -14,8 +14,8 @@
     };
 
     nixPath = [
-      "nixpkgs=${config.nixpkgs-path}"
-      "nixpkgs-unstable=${config.nixpkgs-unstable-path}"
+      "nixpkgs=${inputs.nixpkgs}"
+      "nixpkgs-unstable=${inputs.nixpkgs-unstable}"
     ];
   };
 }

overlays.nix

@@ -1,10 +1,10 @@
 { inputs
 , pkgs
-, config
 , ...
 }:
 let
   unstable-pkgs = import inputs.nixpkgs-unstable { inherit (pkgs.stdenv) system; };
+  pyproject-nix-lib = inputs.pyproject-nix.lib;
 in
 {
   nixpkgs.overlays = [
@@ -13,9 +13,7 @@ in
         passport-openidconnect = (prev.callPackage ./pkgs/passport-openidconnect { }).package;
       };
       audi_connect_ha = prev.callPackage ./pkgs/audi_connect_ha.nix { };
-      easee_hass = unstable-pkgs.callPackage ./pkgs/easee_hass.nix {
-        inherit (config) pyproject-nix-lib;
-      };
+      easee_hass = unstable-pkgs.callPackage ./pkgs/easee_hass.nix { inherit pyproject-nix-lib; };
 
       darwin = prev.darwin.overrideScope (
         _: _: {

pkgs/pyeasee.nix

@@ -8,4 +8,6 @@ buildPythonPackage rec {
     inherit pname version;
     hash = "sha256-+g3g8yGBVJdABHqt/w7Wq1gh+nqMF3a+2G3MW4yWeGg=";
   };
+
+  format = "setuptools";
 }