From fb8431da2df279c0badc1a23469f07b6363f9d54 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Tue, 10 Sep 2024 10:37:32 -0700 Subject: [PATCH] Flatten home modules --- home/home-default.nix | 10 +++++----- home/home-nix-book.nix | 2 +- home/home-z790prors.nix | 2 +- home/modules/{applications => }/emacs/default.nix | 0 .../modules/{applications => }/emacs/doom/config.el | 0 home/modules/{applications => }/emacs/doom/init.el | 0 .../{applications => }/emacs/doom/packages.el | 0 .../{window_managers => }/hyprland/default.nix | 0 .../{window_managers => }/hyprland/hyprpaper.nix | 0 .../{window_managers => }/hyprland/nix-book.nix | 0 .../{window_managers => }/hyprland/wallpaper.jpg | Bin .../{window_managers => }/hyprland/z790prors.nix | 0 home/modules/{window_managers => }/i3/default.nix | 0 home/modules/{games => }/lutris/default.nix | 0 .../nextcloud-talk-desktop/package.nix | 0 home/modules/{window_managers => }/sway/default.nix | 0 16 files changed, 7 insertions(+), 7 deletions(-) rename home/modules/{applications => }/emacs/default.nix (100%) rename home/modules/{applications => }/emacs/doom/config.el (100%) rename home/modules/{applications => }/emacs/doom/init.el (100%) rename home/modules/{applications => }/emacs/doom/packages.el (100%) rename home/modules/{window_managers => }/hyprland/default.nix (100%) rename home/modules/{window_managers => }/hyprland/hyprpaper.nix (100%) rename home/modules/{window_managers => }/hyprland/nix-book.nix (100%) rename home/modules/{window_managers => }/hyprland/wallpaper.jpg (100%) rename home/modules/{window_managers => }/hyprland/z790prors.nix (100%) rename home/modules/{window_managers => }/i3/default.nix (100%) rename home/modules/{games => }/lutris/default.nix (100%) rename home/modules/{applications => }/nextcloud-talk-desktop/package.nix (100%) rename home/modules/{window_managers => }/sway/default.nix (100%) diff --git a/home/home-default.nix b/home/home-default.nix index fa6fd65..e0cf0c7 100644 --- a/home/home-default.nix +++ b/home/home-default.nix @@ -1,7 +1,7 @@ { pkgs, ... }: let - nextcloudTalkDesktop = pkgs.callPackage ./modules/applications/nextcloud-talk-desktop/package.nix {}; + nextcloudTalkDesktop = pkgs.callPackage ./modules/nextcloud-talk-desktop/package.nix {}; in { # Home Manager needs a bit of information about you and the paths it should @@ -106,10 +106,10 @@ in nixpkgs.config.allowUnfree = true; imports = [ - ./modules/applications/emacs - ./modules/games/lutris - ./modules/window_managers/i3 - ./modules/window_managers/sway + ./modules/emacs + ./modules/lutris + ./modules/i3 + ./modules/sway ]; programs.bash.enable = true; diff --git a/home/home-nix-book.nix b/home/home-nix-book.nix index 1026ef3..315c253 100644 --- a/home/home-nix-book.nix +++ b/home/home-nix-book.nix @@ -3,6 +3,6 @@ { imports = [ ./home-default.nix - ./modules/window_managers/hyprland/nix-book.nix + ./modules/hyprland/nix-book.nix ]; } diff --git a/home/home-z790prors.nix b/home/home-z790prors.nix index 0081782..a08e843 100644 --- a/home/home-z790prors.nix +++ b/home/home-z790prors.nix @@ -3,6 +3,6 @@ { imports = [ ./home-default.nix - ./modules/window_managers/hyprland/z790prors.nix + ./modules/hyprland/z790prors.nix ]; } diff --git a/home/modules/applications/emacs/default.nix b/home/modules/emacs/default.nix similarity index 100% rename from home/modules/applications/emacs/default.nix rename to home/modules/emacs/default.nix diff --git a/home/modules/applications/emacs/doom/config.el b/home/modules/emacs/doom/config.el similarity index 100% rename from home/modules/applications/emacs/doom/config.el rename to home/modules/emacs/doom/config.el diff --git a/home/modules/applications/emacs/doom/init.el b/home/modules/emacs/doom/init.el similarity index 100% rename from home/modules/applications/emacs/doom/init.el rename to home/modules/emacs/doom/init.el diff --git a/home/modules/applications/emacs/doom/packages.el b/home/modules/emacs/doom/packages.el similarity index 100% rename from home/modules/applications/emacs/doom/packages.el rename to home/modules/emacs/doom/packages.el diff --git a/home/modules/window_managers/hyprland/default.nix b/home/modules/hyprland/default.nix similarity index 100% rename from home/modules/window_managers/hyprland/default.nix rename to home/modules/hyprland/default.nix diff --git a/home/modules/window_managers/hyprland/hyprpaper.nix b/home/modules/hyprland/hyprpaper.nix similarity index 100% rename from home/modules/window_managers/hyprland/hyprpaper.nix rename to home/modules/hyprland/hyprpaper.nix diff --git a/home/modules/window_managers/hyprland/nix-book.nix b/home/modules/hyprland/nix-book.nix similarity index 100% rename from home/modules/window_managers/hyprland/nix-book.nix rename to home/modules/hyprland/nix-book.nix diff --git a/home/modules/window_managers/hyprland/wallpaper.jpg b/home/modules/hyprland/wallpaper.jpg similarity index 100% rename from home/modules/window_managers/hyprland/wallpaper.jpg rename to home/modules/hyprland/wallpaper.jpg diff --git a/home/modules/window_managers/hyprland/z790prors.nix b/home/modules/hyprland/z790prors.nix similarity index 100% rename from home/modules/window_managers/hyprland/z790prors.nix rename to home/modules/hyprland/z790prors.nix diff --git a/home/modules/window_managers/i3/default.nix b/home/modules/i3/default.nix similarity index 100% rename from home/modules/window_managers/i3/default.nix rename to home/modules/i3/default.nix diff --git a/home/modules/games/lutris/default.nix b/home/modules/lutris/default.nix similarity index 100% rename from home/modules/games/lutris/default.nix rename to home/modules/lutris/default.nix diff --git a/home/modules/applications/nextcloud-talk-desktop/package.nix b/home/modules/nextcloud-talk-desktop/package.nix similarity index 100% rename from home/modules/applications/nextcloud-talk-desktop/package.nix rename to home/modules/nextcloud-talk-desktop/package.nix diff --git a/home/modules/window_managers/sway/default.nix b/home/modules/sway/default.nix similarity index 100% rename from home/modules/window_managers/sway/default.nix rename to home/modules/sway/default.nix