From 80808acdd86ef37fbdce3aa9baff7f80608f220a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Fri, 6 Jun 2025 15:27:16 +0200
Subject: [PATCH] refactor(home): adjust nixpkgs config
---
home/base.nix | 5 +++++
home/felschr-server.nix | 1 +
home/felschr-work.nix | 1 +
home/felschr.nix | 1 +
home/flake-module.nix | 16 ++++++----------
home/{modules => }/nixpkgs.nix | 0
6 files changed, 14 insertions(+), 10 deletions(-)
create mode 100644 home/base.nix
rename home/{modules => }/nixpkgs.nix (100%)
diff --git a/home/base.nix b/home/base.nix
new file mode 100644
index 0000000..3a1b576
--- /dev/null
+++ b/home/base.nix
@@ -0,0 +1,5 @@
+_:
+
+{
+ imports = [ ./nixpkgs.nix ];
+}
diff --git a/home/felschr-server.nix b/home/felschr-server.nix
index 82c0de5..71414f5 100644
--- a/home/felschr-server.nix
+++ b/home/felschr-server.nix
@@ -7,6 +7,7 @@
{
imports = [
+ ./base.nix
./shell
./editors/lsp.nix
./editors/helix
diff --git a/home/felschr-work.nix b/home/felschr-work.nix
index 73e4003..ce4cb8f 100644
--- a/home/felschr-work.nix
+++ b/home/felschr-work.nix
@@ -3,6 +3,7 @@
with pkgs;
{
imports = [
+ ./base.nix
./shell
./tailscale.nix
./editors
diff --git a/home/felschr.nix b/home/felschr.nix
index b0e32b0..95c4076 100644
--- a/home/felschr.nix
+++ b/home/felschr.nix
@@ -2,6 +2,7 @@
{
imports = [
+ ./base.nix
./shell
./tailscale.nix
./editors
diff --git a/home/flake-module.nix b/home/flake-module.nix
index f6b54ac..caee67c 100644
--- a/home/flake-module.nix
+++ b/home/flake-module.nix
@@ -16,15 +16,12 @@ let
pkgs = self.pkgsFor system;
extraSpecialArgs = { inherit inputs; };
- modules =
- (with self.homeModules; [ nixpkgs ])
- ++ [
- {
- home.username = user;
- home.homeDirectory = "/home/${user}";
- }
- ]
- ++ modules;
+ modules = [
+ {
+ home.username = user;
+ home.homeDirectory = "/home/${user}";
+ }
+ ] ++ modules;
};
in
{
@@ -32,7 +29,6 @@ in
flake = {
homeModules = {
- nixpkgs = import ./modules/nixpkgs.nix;
git = import ./modules/git.nix;
firefox = import ./modules/firefox/firefox.nix;
tor-browser = import ./modules/firefox/tor-browser.nix;
diff --git a/home/modules/nixpkgs.nix b/home/nixpkgs.nix
similarity index 100%
rename from home/modules/nixpkgs.nix
rename to home/nixpkgs.nix