From 02cc09d144b4ea54a0df925d975face14283ac84 Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Sat, 20 Jan 2024 12:53:14 -0600 Subject: [PATCH] Change default.nix to system.nix as it is the system config --- flake.nix | 2 +- home.nix | 27 ++++++++++++++------------- default.nix => system.nix | 6 +----- 3 files changed, 16 insertions(+), 19 deletions(-) rename default.nix => system.nix (94%) diff --git a/flake.nix b/flake.nix index 3f11288..0911a95 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,7 @@ inherit wallpaperDir; inherit wallpaperGit; inherit deviceProfile; }; - modules = [ ./default.nix + modules = [ ./system.nix home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit username; inherit gitUsername; inherit gitEmail; diff --git a/home.nix b/home.nix index 96016ad..819e1d5 100644 --- a/home.nix +++ b/home.nix @@ -18,23 +18,24 @@ inputs.hyprland.homeManagerModules.default # Enable &/ Configure Programs - ./config/home/waybar.nix - ./config/home/swaync.nix - ./config/home/swaylock.nix - ./config/home/starship.nix - ./config/home/neofetch.nix - ./config/home/hyprland.nix - ./config/home/kitty.nix - ./config/home/rofi.nix - ./config/home/vim.nix - ./config/home/bash.nix - ./config/home/gtk-qt.nix + # ./config/home/waybar.nix + # ./config/home/swaync.nix + # ./config/home/swaylock.nix + # ./config/home/starship.nix + # ./config/home/neofetch.nix + # ./config/home/hyprland.nix + # ./config/home/kitty.nix + # ./config/home/rofi.nix + # ./config/home/vim.nix + # ./config/home/bash.nix + # ./config/home/gtk-qt.nix + ./config/home/ # Install Programs & Scripts For User - ./config/home/packages.nix + # ./config/home/packages.nix # Place Home Files Like Pictures - ./config/home/files.nix + # ./config/home/files.nix ]; # Define Settings For Xresources diff --git a/default.nix b/system.nix similarity index 94% rename from default.nix rename to system.nix index 38929b0..93c4a2e 100644 --- a/default.nix +++ b/system.nix @@ -6,11 +6,7 @@ imports = [ ./hardware.nix - ./config/system/boot.nix - ./config/system/polkit.nix - ./config/system/intel-opengl.nix - ./config/system/amd-opengl.nix - ./config/system/autorun.nix + ./config/system ]; # Enable networking