From f48152ff7a52140bc6c63fc6a6067bad844ddbd1 Mon Sep 17 00:00:00 2001 From: smayzy Date: Tue, 29 Jul 2025 17:28:29 +0200 Subject: [PATCH] clean --- modules/home-manager/default.nix | 4 +-- modules/home-manager/terminal/default.nix | 2 +- modules/nix/base-cli/default.nix | 2 +- modules/nix/cad/default.nix | 2 +- modules/nix/comm/default.nix | 2 +- modules/nix/default.nix | 32 +++++++++++------------ modules/nix/games/default.nix | 2 +- modules/nix/groups/default.nix | 2 +- modules/nix/hardware/default.nix | 2 +- modules/nix/office/default.nix | 8 +++--- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 8978264..43bcb09 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1,8 +1,8 @@ { ... }: { imports = [ - ./wm/hyprland.nix - ./terminal ./lf + ./terminal + ./wm/hyprland.nix ]; } diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix index a425efd..cfce850 100644 --- a/modules/home-manager/terminal/default.nix +++ b/modules/home-manager/terminal/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./kitty.nix ./alacritty.nix + ./kitty.nix ]; } diff --git a/modules/nix/base-cli/default.nix b/modules/nix/base-cli/default.nix index 5c58291..7cb4ad2 100644 --- a/modules/nix/base-cli/default.nix +++ b/modules/nix/base-cli/default.nix @@ -1,9 +1,9 @@ { ... }: { imports = [ + ./fzf.nix ./nh.nix ./nvf.nix - ./fzf.nix ./pkgs.nix ]; } diff --git a/modules/nix/cad/default.nix b/modules/nix/cad/default.nix index 57ffb57..573514f 100644 --- a/modules/nix/cad/default.nix +++ b/modules/nix/cad/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./fritzing.nix ./freecad.nix + ./fritzing.nix ]; } diff --git a/modules/nix/comm/default.nix b/modules/nix/comm/default.nix index b86db09..b4d6905 100644 --- a/modules/nix/comm/default.nix +++ b/modules/nix/comm/default.nix @@ -2,7 +2,7 @@ { imports = [ ./element.nix - ./webcord.nix ./thunderbird.nix + ./webcord.nix ]; } diff --git a/modules/nix/default.nix b/modules/nix/default.nix index cdac769..b1429fa 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -3,25 +3,25 @@ imports = [ ./audio ./base-cli - ./hardware - ./virt - ./games ./browser - ./shell - ./rice - ./groups - ./wm - ./de - ./office - ./comm - ./displaymanager - ./vpn - ./utilities - ./flatpak - ./ide - ./ebook ./cad + ./comm + ./de + ./displaymanager + ./ebook + ./flatpak + ./games + ./groups + ./hardware + ./ide + ./office + ./rice + ./shell ./terminal + ./utilities + ./virt + ./vpn + ./wm ]; # Timzone and locales (same for all machines so I put it here) diff --git a/modules/nix/games/default.nix b/modules/nix/games/default.nix index 90ca668..c93f174 100644 --- a/modules/nix/games/default.nix +++ b/modules/nix/games/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./steam.nix ./prism.nix + ./steam.nix ]; } diff --git a/modules/nix/groups/default.nix b/modules/nix/groups/default.nix index e3e786d..d9ff4c4 100644 --- a/modules/nix/groups/default.nix +++ b/modules/nix/groups/default.nix @@ -1,8 +1,8 @@ { ... }: { imports = [ + ./base.nix ./desktop.nix ./laptop.nix - ./base.nix ]; } diff --git a/modules/nix/hardware/default.nix b/modules/nix/hardware/default.nix index 0f13c7c..f3592b3 100644 --- a/modules/nix/hardware/default.nix +++ b/modules/nix/hardware/default.nix @@ -1,8 +1,8 @@ { ... }: { imports = [ - ./nvidia.nix ./grub.nix + ./nvidia.nix ./power.nix ]; } diff --git a/modules/nix/office/default.nix b/modules/nix/office/default.nix index 3f6629c..5f9d243 100644 --- a/modules/nix/office/default.nix +++ b/modules/nix/office/default.nix @@ -1,12 +1,12 @@ { ... }: { imports = [ - ./office.nix - ./obsidian.nix - ./kdenlive.nix + ./aegisub.nix ./blender.nix ./inkscape.nix + ./kdenlive.nix ./komikku.nix - ./aegisub.nix + ./obsidian.nix + ./office.nix ]; }