diff --git a/hosts/vm-gnome.nix b/hosts/vm-gnome.nix deleted file mode 100644 index 2b54493..0000000 --- a/hosts/vm-gnome.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./vm-base.nix - ../nix-os/desktopManagers/gnome.nix - ../nix-os/displayManagers/gdm.nix - ]; -} diff --git a/hosts/main/cryptocurrency.nix b/nixos/hosts/main/cryptocurrency.nix similarity index 100% rename from hosts/main/cryptocurrency.nix rename to nixos/hosts/main/cryptocurrency.nix diff --git a/hosts/main/default.nix b/nixos/hosts/main/default.nix similarity index 75% rename from hosts/main/default.nix rename to nixos/hosts/main/default.nix index 486c359..c035fd0 100644 --- a/hosts/main/default.nix +++ b/nixos/hosts/main/default.nix @@ -8,22 +8,22 @@ { imports = [ - ../../nix-os/core.nix - ../../nix-os/core-desktop.nix - ../../nix-os/nvidia.nix - ../../nix-os/docker.nix - ../../nix-os/razer.nix - ../../nix-os/desktopManagers/cosmic.nix - ../../nix-os/displayManagers/cosmic-greeter.nix - ../../nix-os/shell.nix - ../../nix-os/virtualization.nix - ../../nix-os/polkit/disable-shutdown.nix - ../../nix-os/locale.nix - ../../nix-os/adb.nix - ../../nix-os/account.nix - ../../nix-os/services/nix-binary-cache.nix - ../../nix-os/udev.nix - ../../nix-os/gnupg.nix + ../../modules/core.nix + ../../modules/core-desktop.nix + ../../modules/nvidia.nix + ../../modules/docker.nix + ../../modules/razer.nix + ../../modules/desktopManagers/cosmic.nix + ../../modules/displayManagers/cosmic-greeter.nix + ../../modules/shell.nix + ../../modules/virtualization.nix + ../../modules/polkit/disable-shutdown.nix + ../../modules/locale.nix + ../../modules/adb.nix + ../../modules/account.nix + ../../modules/services/nix-binary-cache.nix + ../../modules/udev.nix + ../../modules/gnupg.nix "${inputs.nixos-vscode-server}" diff --git a/hosts/main/wireplumber/51-digital-output.conf b/nixos/hosts/main/wireplumber/51-digital-output.conf similarity index 100% rename from hosts/main/wireplumber/51-digital-output.conf rename to nixos/hosts/main/wireplumber/51-digital-output.conf diff --git a/hosts/main/wireplumber/51-hdmi-otuput.conf b/nixos/hosts/main/wireplumber/51-hdmi-otuput.conf similarity index 100% rename from hosts/main/wireplumber/51-hdmi-otuput.conf rename to nixos/hosts/main/wireplumber/51-hdmi-otuput.conf diff --git a/hosts/main/wireplumber/51-razerHeadphones-device.conf b/nixos/hosts/main/wireplumber/51-razerHeadphones-device.conf similarity index 100% rename from hosts/main/wireplumber/51-razerHeadphones-device.conf rename to nixos/hosts/main/wireplumber/51-razerHeadphones-device.conf diff --git a/hosts/main/wireplumber/51-razerHeadphones-input.conf b/nixos/hosts/main/wireplumber/51-razerHeadphones-input.conf similarity index 100% rename from hosts/main/wireplumber/51-razerHeadphones-input.conf rename to nixos/hosts/main/wireplumber/51-razerHeadphones-input.conf diff --git a/hosts/main/wireplumber/51-razerHeadphones-output.conf b/nixos/hosts/main/wireplumber/51-razerHeadphones-output.conf similarity index 100% rename from hosts/main/wireplumber/51-razerHeadphones-output.conf rename to nixos/hosts/main/wireplumber/51-razerHeadphones-output.conf diff --git a/hosts/tablet.nix b/nixos/hosts/tablet.nix similarity index 74% rename from hosts/tablet.nix rename to nixos/hosts/tablet.nix index 12b4780..a2f6de1 100644 --- a/hosts/tablet.nix +++ b/nixos/hosts/tablet.nix @@ -5,18 +5,18 @@ { imports = [ - ../nix-os/core.nix - ../nix-os/core-desktop.nix - ../nix-os/account.nix - ../nix-os/adb.nix - ../nix-os/locale.nix - ../nix-os/shell.nix - ../nix-os/gnupg.nix - ../nix-os/polkit/network.nix + ../modules/core.nix + ../modules/core-desktop.nix + ../modules/account.nix + ../modules/adb.nix + ../modules/locale.nix + ../modules/shell.nix + ../modules/gnupg.nix + ../modules/polkit/network.nix - ../nix-os/desktopManagers/cosmic.nix - ../nix-os/displayManagers/cosmic-greeter.nix - ../nix-os/udev.nix + ../modules/desktopManagers/cosmic.nix + ../modules/displayManagers/cosmic-greeter.nix + ../modules/udev.nix ]; config = { diff --git a/hosts/vm-base.nix b/nixos/hosts/vm-base.nix similarity index 64% rename from hosts/vm-base.nix rename to nixos/hosts/vm-base.nix index 8584fbd..d7bb7c3 100644 --- a/hosts/vm-base.nix +++ b/nixos/hosts/vm-base.nix @@ -3,13 +3,13 @@ { imports = [ "${modulesPath}/virtualisation/qemu-vm.nix" - ../nix-os/account.nix - ../nix-os/core.nix - ../nix-os/core-desktop.nix - ../nix-os/locale.nix - ../nix-os/polkit/disable-shutdown.nix - ../nix-os/shell.nix - ../nix-os/udev.nix + ../modules/account.nix + ../modules/core.nix + ../modules/core-desktop.nix + ../modules/locale.nix + ../modules/polkit/disable-shutdown.nix + ../modules/shell.nix + ../modules/udev.nix ]; config = { diff --git a/hosts/vm-cosmic.nix b/nixos/hosts/vm-cosmic.nix similarity index 79% rename from hosts/vm-cosmic.nix rename to nixos/hosts/vm-cosmic.nix index c842604..dc5e77c 100644 --- a/hosts/vm-cosmic.nix +++ b/nixos/hosts/vm-cosmic.nix @@ -3,8 +3,8 @@ { imports = [ ./vm-base.nix - ../nix-os/desktopManagers/cosmic.nix - ../nix-os/displayManagers/cosmic-greeter.nix + ../modules/desktopManagers/cosmic.nix + ../modules/displayManagers/cosmic-greeter.nix ]; config = { diff --git a/nixos/hosts/vm-gnome.nix b/nixos/hosts/vm-gnome.nix new file mode 100644 index 0000000..ff6a41e --- /dev/null +++ b/nixos/hosts/vm-gnome.nix @@ -0,0 +1,9 @@ +{ lib, ... }: + +{ + imports = [ + ./vm-base.nix + ../modules/desktopManagers/gnome.nix + ../modules/displayManagers/gdm.nix + ]; +} diff --git a/nix-os/account.nix b/nixos/modules/account.nix similarity index 100% rename from nix-os/account.nix rename to nixos/modules/account.nix diff --git a/nix-os/adb.nix b/nixos/modules/adb.nix similarity index 100% rename from nix-os/adb.nix rename to nixos/modules/adb.nix diff --git a/nix-os/core-desktop.nix b/nixos/modules/core-desktop.nix similarity index 100% rename from nix-os/core-desktop.nix rename to nixos/modules/core-desktop.nix diff --git a/nix-os/core.nix b/nixos/modules/core.nix similarity index 95% rename from nix-os/core.nix rename to nixos/modules/core.nix index 8d8c9b3..0fece8a 100644 --- a/nix-os/core.nix +++ b/nixos/modules/core.nix @@ -2,6 +2,7 @@ inputs, lib, pkgs, + self, ... }: @@ -64,7 +65,7 @@ package = pkgs.nix-index.override { nix-index-unwrapped = pkgs.nix-index-unwrapped.overrideAttrs (oldAttrs: { patches = oldAttrs.patches or [] ++ [ - ../pkgs/by-name/ni/nix-index/cnfOutput.patch + ( builtins.path { path = "${self}/pkgs/by-name/ni/nix-index/cnfOutput.patch"; } ) ]; }); diff --git a/nix-os/dconf-common.nix b/nixos/modules/dconf-common.nix similarity index 100% rename from nix-os/dconf-common.nix rename to nixos/modules/dconf-common.nix diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/enable_drag_source diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/favorites diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppList/v1/filter_top_levels diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/military_time diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicAppletTime/v1/show_seconds diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/all diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicBackground/v1/same-on-all diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/autotile_behavior diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/workspaces diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicFiles/v1/desktop diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/anchor_gap diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/autohide diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/border_radius diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/exclusive_zone diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/layer diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_center diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Dock/v1/plugins_wings diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/anchor_gap diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/layer diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_center diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicSettings.Shortcuts/v1/custom diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/active_hint diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/corner_radii diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Dark/v1/gaps diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/active_hint diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/corner_radii diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Light/v1/gaps diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTheme.Mode/v1/is_dark diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_maximize diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize b/nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize similarity index 100% rename from nix-os/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize rename to nixos/modules/desktopManagers/cosmic-config/com.system76.CosmicTk/v1/show_minimize diff --git a/nix-os/desktopManagers/cosmic.nix b/nixos/modules/desktopManagers/cosmic.nix similarity index 91% rename from nix-os/desktopManagers/cosmic.nix rename to nixos/modules/desktopManagers/cosmic.nix index fd12dab..6dd7bbd 100644 --- a/nix-os/desktopManagers/cosmic.nix +++ b/nixos/modules/desktopManagers/cosmic.nix @@ -17,7 +17,7 @@ let ''; outputs = [ "out" "share" ]; - wallpaper = ../../media/wallpaper.png; + wallpaper = builtins.path { path = "${self}/media/wallpaper.png"; }; corner_radii_theme = "2.0"; corner_radii_panel = "2"; }; @@ -26,7 +26,7 @@ in { imports = [ "${inputs.cosmic-modules}/nixos/cosmic/module.nix" - "${self}/nix-os/generic/dconf.nix" + "${self}/nixos/modules/generic/dconf.nix" ]; config = { services.desktopManager.cosmic.enable = true; diff --git a/nix-os/desktopManagers/gnome.nix b/nixos/modules/desktopManagers/gnome.nix similarity index 100% rename from nix-os/desktopManagers/gnome.nix rename to nixos/modules/desktopManagers/gnome.nix diff --git a/nix-os/displayManagers/cosmic-greeter.nix b/nixos/modules/displayManagers/cosmic-greeter.nix similarity index 100% rename from nix-os/displayManagers/cosmic-greeter.nix rename to nixos/modules/displayManagers/cosmic-greeter.nix diff --git a/nix-os/displayManagers/gdm.nix b/nixos/modules/displayManagers/gdm.nix similarity index 100% rename from nix-os/displayManagers/gdm.nix rename to nixos/modules/displayManagers/gdm.nix diff --git a/nix-os/docker.nix b/nixos/modules/docker.nix similarity index 100% rename from nix-os/docker.nix rename to nixos/modules/docker.nix diff --git a/nix-os/generic/dconf.nix b/nixos/modules/generic/dconf.nix similarity index 100% rename from nix-os/generic/dconf.nix rename to nixos/modules/generic/dconf.nix diff --git a/nix-os/generic/mpv.nix b/nixos/modules/generic/mpv.nix similarity index 100% rename from nix-os/generic/mpv.nix rename to nixos/modules/generic/mpv.nix diff --git a/nix-os/gnupg.nix b/nixos/modules/gnupg.nix similarity index 100% rename from nix-os/gnupg.nix rename to nixos/modules/gnupg.nix diff --git a/nix-os/locale.nix b/nixos/modules/locale.nix similarity index 100% rename from nix-os/locale.nix rename to nixos/modules/locale.nix diff --git a/nix-os/module-overrides.nix b/nixos/modules/module-overrides.nix similarity index 100% rename from nix-os/module-overrides.nix rename to nixos/modules/module-overrides.nix diff --git a/nix-os/nix.nix b/nixos/modules/nix.nix similarity index 100% rename from nix-os/nix.nix rename to nixos/modules/nix.nix diff --git a/nix-os/nvidia.nix b/nixos/modules/nvidia.nix similarity index 100% rename from nix-os/nvidia.nix rename to nixos/modules/nvidia.nix diff --git a/nix-os/polkit/disable-shutdown.nix b/nixos/modules/polkit/disable-shutdown.nix similarity index 100% rename from nix-os/polkit/disable-shutdown.nix rename to nixos/modules/polkit/disable-shutdown.nix diff --git a/nix-os/polkit/network.nix b/nixos/modules/polkit/network.nix similarity index 100% rename from nix-os/polkit/network.nix rename to nixos/modules/polkit/network.nix diff --git a/nix-os/razer.nix b/nixos/modules/razer.nix similarity index 100% rename from nix-os/razer.nix rename to nixos/modules/razer.nix diff --git a/nix-os/services/nix-binary-cache.nix b/nixos/modules/services/nix-binary-cache.nix similarity index 100% rename from nix-os/services/nix-binary-cache.nix rename to nixos/modules/services/nix-binary-cache.nix diff --git a/nix-os/shell.nix b/nixos/modules/shell.nix similarity index 100% rename from nix-os/shell.nix rename to nixos/modules/shell.nix diff --git a/nix-os/udev.nix b/nixos/modules/udev.nix similarity index 100% rename from nix-os/udev.nix rename to nixos/modules/udev.nix diff --git a/nix-os/unstable-packages.nix b/nixos/modules/unstable-packages.nix similarity index 100% rename from nix-os/unstable-packages.nix rename to nixos/modules/unstable-packages.nix diff --git a/nix-os/virtualization.nix b/nixos/modules/virtualization.nix similarity index 100% rename from nix-os/virtualization.nix rename to nixos/modules/virtualization.nix diff --git a/nix-os/xdg-default-apps.nix b/nixos/modules/xdg-default-apps.nix similarity index 100% rename from nix-os/xdg-default-apps.nix rename to nixos/modules/xdg-default-apps.nix diff --git a/outputs.nix b/outputs.nix index b95e04b..d5d7bbe 100644 --- a/outputs.nix +++ b/outputs.nix @@ -54,16 +54,17 @@ self = { ]; specialArgs = { inherit self inputs; }; }; + baseHostsDir = ./nixos/hosts; in # mapped attrset of nix file paths to attrSet with initialized NixOS configurations, # whose names are derived from file names - lib.pipe ./hosts [ + lib.pipe baseHostsDir [ builtins.readDir # filter out files that are not .nix files, directories with default.nix or starting with . (dot, hidden files) ( lib.filterAttrs (name: type: ( (type == "regular" && lib.hasSuffix ".nix" name) - || (type == "directory" && builtins.pathExists "${builtins.toString ./.}/hosts/${name}/default.nix") + || (type == "directory" && builtins.pathExists (baseHostsDir + "/${name}/default.nix")) ) && !lib.hasPrefix "." name )) @@ -71,7 +72,7 @@ self = { # remove .nix extension name = if type == "directory" then name else builtins.substring 0 (builtins.stringLength name - 4) name; # initialize NixOS configuration - value = mkNixosSystem ./hosts/${name}; + value = mkNixosSystem (baseHostsDir + "/${name}"); })) builtins.attrValues builtins.listToAttrs diff --git a/update-list.nix b/update-list.nix index ce8c49b..012b930 100644 --- a/update-list.nix +++ b/update-list.nix @@ -30,7 +30,7 @@ in self.lib.concatMapAttrs (name: value: { }; in lib.getAttrFromPath ( [ "config" ] ++ attrpath ) system; in { - "NixOS/nvidia" = mkUpdater ./nix-os/nvidia.nix [ "hardware" "nvidia" "package" ] {}; + "NixOS/nvidia" = mkUpdater ./nixos/modules/nvidia.nix [ "hardware" "nvidia" "package" ] {}; }) # MARK: packages