From 7755141752d94c910c6b4d0a61aaf5bf895cd114 Mon Sep 17 00:00:00 2001 From: ooks-io Date: Mon, 10 Jun 2024 13:25:14 +1200 Subject: [PATCH] refactor(home:options): move modules/options -> ../options --- home/default.nix | 1 + home/modules/default.nix | 1 - .../options/appearance/cursor.nix | 0 .../options/appearance/fonts.nix | 0 home/{modules => }/options/appearance/gtk.nix | 0 home/{modules => }/options/appearance/qt.nix | 0 .../options/appearance/theme.nix | 0 .../options/appearance/wallpaper.nix | 0 home/{modules => }/options/console/editor.nix | 0 .../options/console/multiplexer.nix | 0 home/{modules => }/options/console/shell.nix | 0 home/{modules => }/options/console/tools.nix | 0 home/{modules => }/options/desktop/binds.nix | 0 .../{modules => }/options/desktop/browser.nix | 0 .../options/desktop/communication.nix | 0 .../options/desktop/creative.nix | 0 home/{modules => }/options/desktop/gaming.nix | 0 home/{modules => }/options/desktop/media.nix | 0 .../options/desktop/productivity.nix | 0 .../options/desktop/security.nix | 0 .../options/desktop/terminal.nix | 0 home/{modules => }/options/desktop/tools.nix | 0 .../{modules => }/options/desktop/wayland.nix | 0 .../options/profiles/console.nix | 0 .../options/profiles/desktop.nix | 0 home/profiles/hyprland.nix | 69 ------------------- 26 files changed, 1 insertion(+), 70 deletions(-) rename home/{modules => }/options/appearance/cursor.nix (100%) rename home/{modules => }/options/appearance/fonts.nix (100%) rename home/{modules => }/options/appearance/gtk.nix (100%) rename home/{modules => }/options/appearance/qt.nix (100%) rename home/{modules => }/options/appearance/theme.nix (100%) rename home/{modules => }/options/appearance/wallpaper.nix (100%) rename home/{modules => }/options/console/editor.nix (100%) rename home/{modules => }/options/console/multiplexer.nix (100%) rename home/{modules => }/options/console/shell.nix (100%) rename home/{modules => }/options/console/tools.nix (100%) rename home/{modules => }/options/desktop/binds.nix (100%) rename home/{modules => }/options/desktop/browser.nix (100%) rename home/{modules => }/options/desktop/communication.nix (100%) rename home/{modules => }/options/desktop/creative.nix (100%) rename home/{modules => }/options/desktop/gaming.nix (100%) rename home/{modules => }/options/desktop/media.nix (100%) rename home/{modules => }/options/desktop/productivity.nix (100%) rename home/{modules => }/options/desktop/security.nix (100%) rename home/{modules => }/options/desktop/terminal.nix (100%) rename home/{modules => }/options/desktop/tools.nix (100%) rename home/{modules => }/options/desktop/wayland.nix (100%) rename home/{modules => }/options/profiles/console.nix (100%) rename home/{modules => }/options/profiles/desktop.nix (100%) delete mode 100644 home/profiles/hyprland.nix diff --git a/home/default.nix b/home/default.nix index 848ce17..a143f26 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,5 +3,6 @@ ./modules ./profiles ./roles + ./options ]; } diff --git a/home/modules/default.nix b/home/modules/default.nix index 5df7837..d761722 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -4,6 +4,5 @@ ./desktop # gui modules ./console # cli modules ./appearance # modules for configuring themes ie: fonts, wallpapers, color-schemes, etc... - ./options # all module options live here ]; } diff --git a/home/modules/options/appearance/cursor.nix b/home/options/appearance/cursor.nix similarity index 100% rename from home/modules/options/appearance/cursor.nix rename to home/options/appearance/cursor.nix diff --git a/home/modules/options/appearance/fonts.nix b/home/options/appearance/fonts.nix similarity index 100% rename from home/modules/options/appearance/fonts.nix rename to home/options/appearance/fonts.nix diff --git a/home/modules/options/appearance/gtk.nix b/home/options/appearance/gtk.nix similarity index 100% rename from home/modules/options/appearance/gtk.nix rename to home/options/appearance/gtk.nix diff --git a/home/modules/options/appearance/qt.nix b/home/options/appearance/qt.nix similarity index 100% rename from home/modules/options/appearance/qt.nix rename to home/options/appearance/qt.nix diff --git a/home/modules/options/appearance/theme.nix b/home/options/appearance/theme.nix similarity index 100% rename from home/modules/options/appearance/theme.nix rename to home/options/appearance/theme.nix diff --git a/home/modules/options/appearance/wallpaper.nix b/home/options/appearance/wallpaper.nix similarity index 100% rename from home/modules/options/appearance/wallpaper.nix rename to home/options/appearance/wallpaper.nix diff --git a/home/modules/options/console/editor.nix b/home/options/console/editor.nix similarity index 100% rename from home/modules/options/console/editor.nix rename to home/options/console/editor.nix diff --git a/home/modules/options/console/multiplexer.nix b/home/options/console/multiplexer.nix similarity index 100% rename from home/modules/options/console/multiplexer.nix rename to home/options/console/multiplexer.nix diff --git a/home/modules/options/console/shell.nix b/home/options/console/shell.nix similarity index 100% rename from home/modules/options/console/shell.nix rename to home/options/console/shell.nix diff --git a/home/modules/options/console/tools.nix b/home/options/console/tools.nix similarity index 100% rename from home/modules/options/console/tools.nix rename to home/options/console/tools.nix diff --git a/home/modules/options/desktop/binds.nix b/home/options/desktop/binds.nix similarity index 100% rename from home/modules/options/desktop/binds.nix rename to home/options/desktop/binds.nix diff --git a/home/modules/options/desktop/browser.nix b/home/options/desktop/browser.nix similarity index 100% rename from home/modules/options/desktop/browser.nix rename to home/options/desktop/browser.nix diff --git a/home/modules/options/desktop/communication.nix b/home/options/desktop/communication.nix similarity index 100% rename from home/modules/options/desktop/communication.nix rename to home/options/desktop/communication.nix diff --git a/home/modules/options/desktop/creative.nix b/home/options/desktop/creative.nix similarity index 100% rename from home/modules/options/desktop/creative.nix rename to home/options/desktop/creative.nix diff --git a/home/modules/options/desktop/gaming.nix b/home/options/desktop/gaming.nix similarity index 100% rename from home/modules/options/desktop/gaming.nix rename to home/options/desktop/gaming.nix diff --git a/home/modules/options/desktop/media.nix b/home/options/desktop/media.nix similarity index 100% rename from home/modules/options/desktop/media.nix rename to home/options/desktop/media.nix diff --git a/home/modules/options/desktop/productivity.nix b/home/options/desktop/productivity.nix similarity index 100% rename from home/modules/options/desktop/productivity.nix rename to home/options/desktop/productivity.nix diff --git a/home/modules/options/desktop/security.nix b/home/options/desktop/security.nix similarity index 100% rename from home/modules/options/desktop/security.nix rename to home/options/desktop/security.nix diff --git a/home/modules/options/desktop/terminal.nix b/home/options/desktop/terminal.nix similarity index 100% rename from home/modules/options/desktop/terminal.nix rename to home/options/desktop/terminal.nix diff --git a/home/modules/options/desktop/tools.nix b/home/options/desktop/tools.nix similarity index 100% rename from home/modules/options/desktop/tools.nix rename to home/options/desktop/tools.nix diff --git a/home/modules/options/desktop/wayland.nix b/home/options/desktop/wayland.nix similarity index 100% rename from home/modules/options/desktop/wayland.nix rename to home/options/desktop/wayland.nix diff --git a/home/modules/options/profiles/console.nix b/home/options/profiles/console.nix similarity index 100% rename from home/modules/options/profiles/console.nix rename to home/options/profiles/console.nix diff --git a/home/modules/options/profiles/desktop.nix b/home/options/profiles/desktop.nix similarity index 100% rename from home/modules/options/profiles/desktop.nix rename to home/options/profiles/desktop.nix diff --git a/home/profiles/hyprland.nix b/home/profiles/hyprland.nix deleted file mode 100644 index a86cfbd..0000000 --- a/home/profiles/hyprland.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.profiles.hyprland; -in -{ - - imports = [ - ../../modules - ]; - - config = lib.mkIf cfg.enable { - homeModules.desktop = { - - wayland = { - enable = true; - windowManager.hyprland = { - enable = true; - extras = { - hyprcapture.enable = true; - hyprshade.enable = true; - }; - }; - lockscreen.hyprlock.enable = true; - notification.mako.enable = true; - bar.waybar.enable = true; - launcher.rofi.enable = true; - utility = { - tools.enable = true; - gammastep.enable = true; - }; - }; - - security.polkit = "pantheon"; - - communication = { - discord.enable = true; - }; - - creative = { - audio = { - audacity.enable = true; - }; - }; - - browser.firefox= { - enable = true; - default = true; - }; - - terminal = { - foot = { - enable = true; - default = true; - }; - }; - - media = { - music.tui.enable = true; - music.easyeffects.enable = true; - image.imv.enable = true; - video = { - mpv.enable = true; - youtube.enable = true; - jellyfin.enable = true; - }; - }; - }; - }; -}