Refactor flake.nix and home.nix: modernize homeManagerModules output and comment out secrets import

This commit is contained in:
2026-06-23 16:37:01 +02:00
parent c91bb0df4b
commit 0205b8fe89
5 changed files with 21 additions and 25 deletions
+1 -7
View File
@@ -82,14 +82,8 @@
# Formatter output # Formatter output
formatter.${system} = pkgs.alejandra; formatter.${system} = pkgs.alejandra;
# Explicit homeManagerModules output (needed for home-manager packages)
# Define homeManagerModules output for home-manager integration
homeManagerModules = {
default = import ./home/programs/group/flake.nix args;
};
# Update to modern syntax (no defaultApp) # Update to modern syntax (no defaultApp)
nixosConfigurations = { nixosConfigurations = {
thinkpad = import ./hosts/laptop/flake.nix args; thinkpad = import ./hosts/laptop/flake.nix args;
home-pc = import ./hosts/home-pc/flake.nix args; home-pc = import ./hosts/home-pc/flake.nix args;
+4 -2
View File
@@ -19,7 +19,8 @@
in { in {
packages.${system}.nvim = nvimConfig.neovim; packages.${system}.nvim = nvimConfig.neovim;
apps.${system}.nvim = { apps.${system} = {
nvim = {
type = "app"; type = "app";
program = "${nvimConfig.neovim}/bin/nvim"; program = "${nvimConfig.neovim}/bin/nvim";
meta = { meta = {
@@ -28,7 +29,7 @@ in {
license = "Apache-2.0"; license = "Apache-2.0";
}; };
}; };
defaultApp.${system} = { default = {
type = "app"; type = "app";
program = "${nvimConfig.neovim}/bin/nvim"; program = "${nvimConfig.neovim}/bin/nvim";
meta = { meta = {
@@ -37,6 +38,7 @@ in {
license = "Apache-2.0"; license = "Apache-2.0";
}; };
}; };
};
homeManagerModules.nvim = { homeManagerModules.nvim = {
imports = [ imports = [
+1 -1
View File
@@ -28,7 +28,7 @@
../../home/system/udiskie ../../home/system/udiskie
./variables.nix # Mostly user-specific configuration ./variables.nix # Mostly user-specific configuration
./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets #./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
]; ];
home = { home = {
+1 -1
View File
@@ -30,7 +30,7 @@
../../home/system/udiskie ../../home/system/udiskie
./variables.nix # Mostly user-specific configuration ./variables.nix # Mostly user-specific configuration
./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets #./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
]; ];
home = { home = {
+1 -1
View File
@@ -28,7 +28,7 @@
../../home/system/udiskie ../../home/system/udiskie
./variables.nix # Mostly user-specific configuration ./variables.nix # Mostly user-specific configuration
./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets #./secrets # CHANGEME: You should probably remove this line, this is where I store my secrets
]; ];
home = { home = {