tux/tnvim
1
0
Fork 0
mirror of https://github.com/tuxdotrs/tnvim.git synced 2025-07-06 21:36:34 +05:30
Code Issues Packages Projects Releases Wiki Activity

move common imports

Browse Source
This commit is contained in:
0xTux
2024-08-08 13:12:28 +05:30
parent 69486b7df4
commit fd92021844
10 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -45,7 +45,6 @@
canopus = nixpkgs.lib.nixosSystem { canopus = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;}; specialArgs = {inherit inputs outputs username;};
modules = [ modules = [
./modules/nixos
./hosts/canopus ./hosts/canopus
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -55,7 +54,6 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;}; home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ imports = [
./modules/home-manager
./hosts/canopus/home.nix ./hosts/canopus/home.nix
]; ];
}; };
@ -66,7 +64,6 @@
controller = nixpkgs.lib.nixosSystem { controller = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;}; specialArgs = {inherit inputs outputs username;};
modules = [ modules = [
./modules/nixos
./hosts/controller ./hosts/controller
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -76,7 +73,7 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;}; home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ imports = [
./modules/home-manager ./hosts/controller/home.nix
]; ];
}; };
} }
@ -86,7 +83,6 @@
wsl = nixpkgs.lib.nixosSystem { wsl = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;}; specialArgs = {inherit inputs outputs username;};
modules = [ modules = [
./modules/nixos
./hosts/wsl ./hosts/wsl
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -96,7 +92,7 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;}; home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ imports = [
./modules/home-manager ./hosts/wsl/home.nix
]; ];
}; };
} }
@ -106,7 +102,6 @@
isoImage = nixpkgs.lib.nixosSystem { isoImage = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;}; specialArgs = {inherit inputs outputs username;};
modules = [ modules = [
./modules/nixos
./hosts/isoImage ./hosts/isoImage
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -116,7 +111,7 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;}; home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ imports = [
./modules/home-manager ./hosts/isoImage/home.nix
]; ];
}; };
} }

2
hosts/canopus/default.nix
View File

@ -6,7 +6,7 @@
imports = [ imports = [
inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503 inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/nixos/default.nix ../common
../../modules/nixos/desktop ../../modules/nixos/desktop
../../modules/nixos/desktop/awesome ../../modules/nixos/desktop/awesome
../../modules/nixos/desktop/hyprland ../../modules/nixos/desktop/hyprland

1
hosts/canopus/home.nix
View File

@ -1,5 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [ imports = [
../common/home.nix
../../modules/home-manager/awesome ../../modules/home-manager/awesome
../../modules/home-manager/hyprland ../../modules/home-manager/hyprland
../../modules/home-manager/waybar ../../modules/home-manager/waybar

0
modules/nixos/default.nix → hosts/common/default.nix
View File

12
modules/home-manager/default.nix → hosts/common/home.nix Executable file → Normal file
View File

@ -4,12 +4,12 @@
... ...
}: { }: {
imports = [ imports = [
./shell ../../modules/home-manager/shell
./git ../../modules/home-manager/git
./starship ../../modules/home-manager/starship
./nvim ../../modules/home-manager/nvim
./tmux ../../modules/home-manager/tmux
./helix ../../modules/home-manager/helix
]; ];
nixpkgs = { nixpkgs = {

2
hosts/controller/default.nix
View File

@ -8,7 +8,7 @@
imports = [ imports = [
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/nixos/default.nix ../common
../../modules/nixos/headscale.nix ../../modules/nixos/headscale.nix
../../modules/nixos/vaultwarden.nix ../../modules/nixos/vaultwarden.nix
../../modules/nixos/uptime-kuma.nix ../../modules/nixos/uptime-kuma.nix

5
hosts/controller/home.nix
View File

@ -0,0 +1,5 @@
{...}: {
imports = [
../common/home.nix
];
}

5
hosts/isoImage/home.nix Normal file
View File

@ -0,0 +1,5 @@
{...}: {
imports = [
../common/home.nix
];
}

2
hosts/wsl/default.nix
View File

@ -7,7 +7,7 @@
}: { }: {
imports = [ imports = [
inputs.nixos-wsl.nixosModules.wsl inputs.nixos-wsl.nixosModules.wsl
../../modules/nixos/default.nix ../common
../../modules/nixos/virtualisation/docker.nix ../../modules/nixos/virtualisation/docker.nix
]; ];

5
hosts/wsl/home.nix Normal file
View File

@ -0,0 +1,5 @@
{...}: {
imports = [
../common/home.nix
];
}