diff --git a/home-manager/style/colors.nix b/home-manager/common/colors.nix similarity index 100% rename from home-manager/style/colors.nix rename to home-manager/common/colors.nix diff --git a/home-manager/guiapps/foot.nix b/home-manager/guiapps/foot.nix index 3de379c..b5aa2a4 100644 --- a/home-manager/guiapps/foot.nix +++ b/home-manager/guiapps/foot.nix @@ -14,7 +14,7 @@ style = "beam"; }; colors = let - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; in { alpha = "0.65"; background = "${colors.dark}"; diff --git a/home-manager/style/gtk.nix b/home-manager/guiapps/gtk.nix similarity index 100% rename from home-manager/style/gtk.nix rename to home-manager/guiapps/gtk.nix diff --git a/home-manager/guiapps/librewolf.nix b/home-manager/guiapps/librewolf.nix index b96fa8f..3ae36e8 100644 --- a/home-manager/guiapps/librewolf.nix +++ b/home-manager/guiapps/librewolf.nix @@ -1,6 +1,6 @@ {pkgs, config, ...}: let # Import variables - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; fonts = import ../common/fonts.nix; # FireFox colors diff --git a/home-manager/guiapps/rofi.nix b/home-manager/guiapps/rofi.nix index fd0f60e..edd927c 100644 --- a/home-manager/guiapps/rofi.nix +++ b/home-manager/guiapps/rofi.nix @@ -10,7 +10,7 @@ theme = let inherit (config.lib.formats.rasi) mkLiteral; border = import ../common/border.nix; - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; in { "*" = { lightbg = mkLiteral "#EEE8D5"; diff --git a/home-manager/jimbo_desktop.nix b/home-manager/jimbo_desktop.nix index efad4f3..62d1b55 100644 --- a/home-manager/jimbo_desktop.nix +++ b/home-manager/jimbo_desktop.nix @@ -8,6 +8,7 @@ # GUI Apps ./misc/guifiles.nix ./sway/sway.nix + ./guiapps/gtk.nix ./guiapps/foot.nix ./guiapps/librewolf.nix ./guiapps/mangohud.nix @@ -31,10 +32,6 @@ ./misc/school.nix ./misc/variables.nix - # Theming - ./style/gtk.nix - ./style/qt.nix - # Services ./services/gnome-keyring.nix ./services/mako.nix diff --git a/home-manager/services/mako.nix b/home-manager/services/mako.nix index c27324b..1bc1cff 100644 --- a/home-manager/services/mako.nix +++ b/home-manager/services/mako.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { # Notification daemon services.mako = let - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; border = import ../common/border.nix; displays = import ../common/displays.nix; fonts = import ../common/fonts.nix; diff --git a/home-manager/style/qt.nix b/home-manager/style/qt.nix deleted file mode 100644 index 266b07d..0000000 --- a/home-manager/style/qt.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - qt = { - enable = true; - style = { - name = "gtk2"; - }; - platformTheme.name = "gtk2"; - }; -} diff --git a/home-manager/sway/hotkeys.nix b/home-manager/sway/hotkeys.nix index f6dd96d..4d05ccd 100644 --- a/home-manager/sway/hotkeys.nix +++ b/home-manager/sway/hotkeys.nix @@ -2,7 +2,7 @@ wayland.windowManager.sway = { config = let border = import ../common/border.nix; - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; displays = import ../common/displays.nix; nixcfg = import ../common/nixcfg.nix; ws = import ./workspaces.nix; diff --git a/home-manager/sway/swaylock.nix b/home-manager/sway/swaylock.nix index 4cf2bf3..c1cf348 100644 --- a/home-manager/sway/swaylock.nix +++ b/home-manager/sway/swaylock.nix @@ -1,6 +1,6 @@ {config, pkgs, ...}: let swayLock = let - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; fonts = import ../common/fonts.nix; in pkgs.writeScriptBin "swaylock" '' # Set the lock script diff --git a/home-manager/sway/swayshot.nix b/home-manager/sway/swayshot.nix index c292a42..1e6c777 100644 --- a/home-manager/sway/swayshot.nix +++ b/home-manager/sway/swayshot.nix @@ -3,7 +3,7 @@ # Use grim and slurp to take screenshots in multiple ways swayShot = let border = import ../common/border.nix; - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; in pkgs.writeScriptBin "swayshot" '' # Swappy handle_swappy() { diff --git a/home-manager/sway/theme.nix b/home-manager/sway/theme.nix index 3f4bbee..dacbab7 100644 --- a/home-manager/sway/theme.nix +++ b/home-manager/sway/theme.nix @@ -6,7 +6,7 @@ wrapperFeatures.gtk = true; checkConfig = false; config = let - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; fonts = import ../common/fonts.nix; in { # Theming settings diff --git a/home-manager/sway/waybar.nix b/home-manager/sway/waybar.nix index e60f4c4..a48775c 100644 --- a/home-manager/sway/waybar.nix +++ b/home-manager/sway/waybar.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { programs.waybar = let - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; displays = import ../common/displays.nix; fonts = import ../common/fonts.nix; diff --git a/home-manager/tuiapps/neovim.nix b/home-manager/tuiapps/neovim.nix index ac6797a..3d74027 100644 --- a/home-manager/tuiapps/neovim.nix +++ b/home-manager/tuiapps/neovim.nix @@ -30,7 +30,7 @@ ]; extraConfig = let # Import colors - colors = import ../style/colors.nix; + colors = import ../common/colors.nix; in '' lua <