martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🚚 [shared] Added shared config that shared desktop config inherits from

Browse Source
This commit is contained in:
Martin Berg Alstad
2025-05-20 21:52:00 +02:00
parent adb02fbcc2
commit 9a8cc63674
92 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/desktop/default.nix
View File

@ -6,7 +6,7 @@
{
imports = [
(lib.custom.relativeToRoot "shared/modules")
(lib.custom.relativeToDesktop "modules")
./bluetooth.nix
./hardware-configuration.nix
];

2
hosts/desktop/home-manager/default.nix
View File

@ -5,7 +5,7 @@
{
imports = [
(lib.custom.relativeToRoot "shared/home-manager")
(lib.custom.relativeToDesktop "home-manager")
./hyprpaper.nix
./settings.nix
];

8
hosts/pi4/default.nix
View File

@ -7,10 +7,10 @@
{
imports = with lib.custom; [
(relativeToRoot "shared/modules/nix-helper.nix")
(relativeToRoot "shared/modules/nixos.nix")
(relativeToRoot "shared/modules/shell.nix")
(relativeToRoot "shared/modules/security/sops.nix")
(relativeToRoot "shared/desktop/modules/nix-helper.nix")
(relativeToRoot "shared/desktop/modules/nixos.nix")
(relativeToRoot "shared/desktop/modules/shell.nix")
(relativeToRoot "shared/desktop/modules/security/sops.nix")
./boot.nix
./development.nix
./hardware.nix

16
hosts/pi4/home-manager/default.nix
View File

@ -9,14 +9,14 @@
{
imports = [
inputs.catppuccin.homeModules.catppuccin
(lib.custom.relativeToRoot "shared/home-manager/development/git.nix")
(lib.custom.relativeToRoot "shared/home-manager/development/helix.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/btop.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/eza.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/fastfetch.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/fish.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/zoxide.nix")
(lib.custom.relativeToRoot "shared/home-manager/gpg.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/development/git.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/development/helix.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/btop.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/eza.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fastfetch.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fish.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/zoxide.nix")
(lib.custom.relativeToRoot "shared/desktop/home-manager/gpg.nix")
];
home.stateVersion = systemConfig.version;

2
hosts/thinkpad/default.nix
View File

@ -6,7 +6,7 @@
{
imports = [
(lib.custom.relativeToRoot "shared/modules")
(lib.custom.relativeToDesktop "modules")
./battery.nix
./bluetooth.nix
./hardware-configuration.nix

2
hosts/thinkpad/home-manager/default.nix
View File

@ -5,7 +5,7 @@
{
imports = [
(lib.custom.relativeToRoot "shared/home-manager")
(lib.custom.relativeToDesktop "home-manager")
./hyprland
./zen
];