diff --git a/flake.nix b/flake.nix index 63d5964..7538eb8 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ specialArgs = {inherit user host;}; modules = [ ./hosts/${host}/system-imports.nix + ./global/system-imports.nix jovian.nixosModules.jovian home-manager.nixosModules.home-manager { @@ -33,7 +34,10 @@ home-manager.useUserPackages = true; home-manager.backupFileExtension = "backup"; home-manager.extraSpecialArgs = {inherit pkgs;}; - home-manager.users.${user}.imports = [./hosts/${host}/user-imports.nix]; + home-manager.users.${user}.imports = [ + ./hosts/${host}/user-imports.nix + ./global/user-imports.nix + ]; home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager]; } ]; diff --git a/global/system-imports.nix b/global/system-imports.nix new file mode 100644 index 0000000..27bfa91 --- /dev/null +++ b/global/system-imports.nix @@ -0,0 +1,16 @@ +{ ... }: +{ + imports = + [ + # Packages + ./system-packages/sys.pkg-dev.nix + # Settings + ./system-settings/sys.set-boot.nix + ./system-settings/sys.set-dev.nix + ./system-settings/sys.set-locale.nix + ./system-settings/sys.set-networking.nix + ./system-settings/sys.set-system.nix + ./system-settings/sys.set-updates.nix + ./system-settings/sys.set-users.nix + ]; +} diff --git a/global/system-packages/sys.pkg-dev.nix b/global/system-packages/sys.pkg-dev.nix new file mode 100644 index 0000000..db04665 --- /dev/null +++ b/global/system-packages/sys.pkg-dev.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + programs.zsh.enable = true; + + environment.systemPackages = + (with pkgs; [ + git + ]); +} diff --git a/global/system-settings/sys.set-boot.nix b/global/system-settings/sys.set-boot.nix new file mode 100644 index 0000000..6613bca --- /dev/null +++ b/global/system-settings/sys.set-boot.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + boot.initrd.verbose = false; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; +} diff --git a/hosts/computer-mo/system-settings/sys.set-dev.nix b/global/system-settings/sys.set-dev.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-dev.nix rename to global/system-settings/sys.set-dev.nix diff --git a/hosts/computer-mo/system-settings/sys.set-locale.nix b/global/system-settings/sys.set-locale.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-locale.nix rename to global/system-settings/sys.set-locale.nix diff --git a/hosts/computer-mo/system-settings/sys.set-networking.nix b/global/system-settings/sys.set-networking.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-networking.nix rename to global/system-settings/sys.set-networking.nix diff --git a/hosts/computer-mo/system-settings/sys.set-system.nix b/global/system-settings/sys.set-system.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-system.nix rename to global/system-settings/sys.set-system.nix diff --git a/hosts/computer-mo/system-settings/sys.set-updates.nix b/global/system-settings/sys.set-updates.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-updates.nix rename to global/system-settings/sys.set-updates.nix diff --git a/hosts/computer-mo/system-settings/sys.set-users.nix b/global/system-settings/sys.set-users.nix similarity index 100% rename from hosts/computer-mo/system-settings/sys.set-users.nix rename to global/system-settings/sys.set-users.nix diff --git a/global/user-imports.nix b/global/user-imports.nix new file mode 100644 index 0000000..03b7a08 --- /dev/null +++ b/global/user-imports.nix @@ -0,0 +1,11 @@ +{ ... }: + +{ + imports = [ + # Home-Manager Packages + ./user-packages/usr.pkg-dev.nix + # Home-Manager Settings + ./user-settings/usr.set-dev.nix + ./user-settings/usr.set-system.nix + ]; +} diff --git a/global/user-packages/usr.pkg-dev.nix b/global/user-packages/usr.pkg-dev.nix new file mode 100644 index 0000000..b4cf876 --- /dev/null +++ b/global/user-packages/usr.pkg-dev.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + programs.git = { + enable = true; + }; +} diff --git a/hosts/computer-mo/user-settings/usr.set-dev.nix b/global/user-settings/usr.set-dev.nix similarity index 100% rename from hosts/computer-mo/user-settings/usr.set-dev.nix rename to global/user-settings/usr.set-dev.nix diff --git a/hosts/computer-mo/user-settings/usr.set-system.nix b/global/user-settings/usr.set-system.nix similarity index 100% rename from hosts/computer-mo/user-settings/usr.set-system.nix rename to global/user-settings/usr.set-system.nix diff --git a/hosts/computer-mo/system-imports.nix b/hosts/computer-mo/system-imports.nix index 4feb818..5b86536 100644 --- a/hosts/computer-mo/system-imports.nix +++ b/hosts/computer-mo/system-imports.nix @@ -17,15 +17,9 @@ ./system-settings/sys.set-boot.nix ./system-settings/sys.set-controller.nix ./system-settings/sys.set-desktop.nix - ./system-settings/sys.set-dev.nix ./system-settings/sys.set-filesystems.nix ./system-settings/sys.set-hardware.nix - ./system-settings/sys.set-locale.nix - ./system-settings/sys.set-networking.nix ./system-settings/sys.set-steam.nix - ./system-settings/sys.set-system.nix ./system-settings/sys.set-systemd.nix - ./system-settings/sys.set-updates.nix - ./system-settings/sys.set-users.nix ]; } diff --git a/hosts/computer-mo/system-packages/sys.pkg-dev.nix b/hosts/computer-mo/system-packages/sys.pkg-dev.nix index 1cae7c5..0ccd73a 100644 --- a/hosts/computer-mo/system-packages/sys.pkg-dev.nix +++ b/hosts/computer-mo/system-packages/sys.pkg-dev.nix @@ -1,11 +1,8 @@ { pkgs, ... }: { - programs.zsh.enable = true; - environment.systemPackages = (with pkgs; [ kdePackages.kate - git nil yaml-language-server ]); diff --git a/hosts/computer-mo/system-settings/sys.set-boot.nix b/hosts/computer-mo/system-settings/sys.set-boot.nix index cb8fbc6..ccb99ca 100644 --- a/hosts/computer-mo/system-settings/sys.set-boot.nix +++ b/hosts/computer-mo/system-settings/sys.set-boot.nix @@ -2,11 +2,8 @@ { boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.initrd.verbose = false; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; boot.plymouth.enable = true; boot.plymouth.theme = "bgrt"; boot.consoleLogLevel = 0; diff --git a/hosts/computer-mo/user-imports.nix b/hosts/computer-mo/user-imports.nix index 8579a10..f973bc9 100644 --- a/hosts/computer-mo/user-imports.nix +++ b/hosts/computer-mo/user-imports.nix @@ -6,10 +6,8 @@ ./user-packages/usr.pkg-dev.nix ./user-packages/usr.pkg-desktop.nix # Home-Manager Settings - ./user-settings/usr.set-dotfiles.nix ./user-settings/usr.set-customization.nix - ./user-settings/usr.set-dev.nix ./user-settings/usr.set-desktop.nix - ./user-settings/usr.set-system.nix + ./user-settings/usr.set-dotfiles.nix ]; }