From 46682b9b42e59b0e5b1553a063453ad4d9f922b0 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Sun, 28 Jan 2024 10:07:49 -0500 Subject: [PATCH] Modularized GUI for potentially new environments in the future --- homeConfig/modules/bash/config/alias.nix | 2 - homeConfig/modules/gui/default.nix | 35 +---------- .../gui/desktopEnvironments/default.nix | 5 ++ .../modules/alacritty/config/alacritty.nix | 0 .../modules/alacritty/default.nix | 6 +- .../modules/browsers/default.nix | 0 .../modules/corn/default.nix | 0 .../modules/default.nix | 2 - .../modules/fun/default.nix | 0 .../modules/guiUtils/default.nix | 2 + .../modules/neovim/config/lazyvim/init.lua | 0 .../config/lazyvim/lua/config/autocmds.lua | 0 .../config/lazyvim/lua/config/keymaps.lua | 0 .../neovim/config/lazyvim/lua/config/lazy.lua | 0 .../config/lazyvim/lua/config/options.lua | 0 .../config/lazyvim/lua/plugins/core.lua | 0 .../modules/neovim/config/servers.nix | 0 .../modules/neovim/default.nix | 0 .../sway}/config/rofi.nix | 0 .../sway}/config/shellHook.nix | 0 .../sway}/config/sway.nix | 0 .../gui/desktopEnvironments/sway/default.nix | 61 +++++++++++++++++++ .../modules/utils/modules/irc/default.nix | 3 + 23 files changed, 77 insertions(+), 39 deletions(-) create mode 100644 homeConfig/modules/gui/desktopEnvironments/default.nix rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/alacritty/config/alacritty.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/alacritty/default.nix (85%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/browsers/default.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/corn/default.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/default.nix (98%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/fun/default.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/guiUtils/default.nix (95%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/lazyvim/init.lua (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/lazyvim/lua/config/autocmds.lua (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/lazyvim/lua/config/keymaps.lua (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/lazyvim/lua/config/lazy.lua (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/lazyvim/lua/config/options.lua (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/lazyvim/lua/plugins/core.lua (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/config/servers.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments}/modules/neovim/default.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments/sway}/config/rofi.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments/sway}/config/shellHook.nix (100%) rename homeConfig/modules/gui/{ => desktopEnvironments/sway}/config/sway.nix (100%) create mode 100644 homeConfig/modules/gui/desktopEnvironments/sway/default.nix diff --git a/homeConfig/modules/bash/config/alias.nix b/homeConfig/modules/bash/config/alias.nix index 2991411..1b750ba 100644 --- a/homeConfig/modules/bash/config/alias.nix +++ b/homeConfig/modules/bash/config/alias.nix @@ -1,5 +1,3 @@ { nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop"; - chat = "weechat"; - open = "xdg-open"; } diff --git a/homeConfig/modules/gui/default.nix b/homeConfig/modules/gui/default.nix index 6b10dc9..9df24d5 100644 --- a/homeConfig/modules/gui/default.nix +++ b/homeConfig/modules/gui/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ lib, config, ... }: with lib; let @@ -6,39 +6,10 @@ let in { options.modules.gui = { enable = mkEnableOption "gui"; }; - imports = [ ./modules ]; + imports = [ ./desktopEnvironments ]; config = mkIf cfg.enable { - wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; }; - programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; }; - programs.bash.profileExtra = import ./config/shellHook.nix; - modules = { - alacritty.enable = true; - browsers.enable = true; - corn.enable = true; - fun.enable = true; - guiUtils.enable = true; - neovim.enable = true; + sway.enable = true; }; - - gtk = { - enable = true; - theme.package = pkgs.juno-theme; - theme.name = "Juno-ocean"; - iconTheme.package = pkgs.qogir-icon-theme; - iconTheme.name = "Qogir"; - }; - - qt = { - enable = true; - style.package = pkgs.juno-theme; - platformTheme = "gtk"; - }; - - programs = { - imv.enable = true; - }; - - fonts.fontconfig.enable = true; }; } diff --git a/homeConfig/modules/gui/desktopEnvironments/default.nix b/homeConfig/modules/gui/desktopEnvironments/default.nix new file mode 100644 index 0000000..bd5d292 --- /dev/null +++ b/homeConfig/modules/gui/desktopEnvironments/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./sway + ]; +} diff --git a/homeConfig/modules/gui/modules/alacritty/config/alacritty.nix b/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix similarity index 100% rename from homeConfig/modules/gui/modules/alacritty/config/alacritty.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix diff --git a/homeConfig/modules/gui/modules/alacritty/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix similarity index 85% rename from homeConfig/modules/gui/modules/alacritty/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix index 4e8d097..6f6e61a 100644 --- a/homeConfig/modules/gui/modules/alacritty/default.nix +++ b/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix @@ -14,9 +14,9 @@ in home.packages = with pkgs; [ terminus-nerdfont - monocraft - ranger - highlight + noto-fonts + noto-fonts-cjk + noto-fonts-emoji ]; }; } diff --git a/homeConfig/modules/gui/modules/browsers/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/browsers/default.nix similarity index 100% rename from homeConfig/modules/gui/modules/browsers/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/browsers/default.nix diff --git a/homeConfig/modules/gui/modules/corn/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/corn/default.nix similarity index 100% rename from homeConfig/modules/gui/modules/corn/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/corn/default.nix diff --git a/homeConfig/modules/gui/modules/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/default.nix similarity index 98% rename from homeConfig/modules/gui/modules/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/default.nix index f8b5f77..7472415 100644 --- a/homeConfig/modules/gui/modules/default.nix +++ b/homeConfig/modules/gui/desktopEnvironments/modules/default.nix @@ -2,10 +2,8 @@ imports = [ ./alacritty ./browsers - ./corn ./fun - ./guiUtils ./neovim ]; diff --git a/homeConfig/modules/gui/modules/fun/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/fun/default.nix similarity index 100% rename from homeConfig/modules/gui/modules/fun/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/fun/default.nix diff --git a/homeConfig/modules/gui/modules/guiUtils/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/guiUtils/default.nix similarity index 95% rename from homeConfig/modules/gui/modules/guiUtils/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/guiUtils/default.nix index 37cad30..602b947 100644 --- a/homeConfig/modules/gui/modules/guiUtils/default.nix +++ b/homeConfig/modules/gui/desktopEnvironments/modules/guiUtils/default.nix @@ -10,7 +10,9 @@ in programs.btop.enable = true; home.packages = with pkgs; [ gimp + okular pdftk + teams-for-linux zoom-us exercism diff --git a/homeConfig/modules/gui/modules/neovim/config/lazyvim/init.lua b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/lazyvim/init.lua rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua diff --git a/homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua diff --git a/homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua diff --git a/homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua diff --git a/homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua diff --git a/homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua diff --git a/homeConfig/modules/gui/modules/neovim/config/servers.nix b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix similarity index 100% rename from homeConfig/modules/gui/modules/neovim/config/servers.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix diff --git a/homeConfig/modules/gui/modules/neovim/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/neovim/default.nix similarity index 100% rename from homeConfig/modules/gui/modules/neovim/default.nix rename to homeConfig/modules/gui/desktopEnvironments/modules/neovim/default.nix diff --git a/homeConfig/modules/gui/config/rofi.nix b/homeConfig/modules/gui/desktopEnvironments/sway/config/rofi.nix similarity index 100% rename from homeConfig/modules/gui/config/rofi.nix rename to homeConfig/modules/gui/desktopEnvironments/sway/config/rofi.nix diff --git a/homeConfig/modules/gui/config/shellHook.nix b/homeConfig/modules/gui/desktopEnvironments/sway/config/shellHook.nix similarity index 100% rename from homeConfig/modules/gui/config/shellHook.nix rename to homeConfig/modules/gui/desktopEnvironments/sway/config/shellHook.nix diff --git a/homeConfig/modules/gui/config/sway.nix b/homeConfig/modules/gui/desktopEnvironments/sway/config/sway.nix similarity index 100% rename from homeConfig/modules/gui/config/sway.nix rename to homeConfig/modules/gui/desktopEnvironments/sway/config/sway.nix diff --git a/homeConfig/modules/gui/desktopEnvironments/sway/default.nix b/homeConfig/modules/gui/desktopEnvironments/sway/default.nix new file mode 100644 index 0000000..7ea3589 --- /dev/null +++ b/homeConfig/modules/gui/desktopEnvironments/sway/default.nix @@ -0,0 +1,61 @@ +{ pkgs, lib, config, ... }: + +with lib; +let + cfg = config.modules.sway; + +in +{ options.modules.sway = { enable = mkEnableOption "sway"; }; + imports = [ ../modules ]; + config = mkIf cfg.enable { + wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; }; + programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; }; + + programs.bash = { + profileExtra = import ./config/shellHook.nix; + shellAliases = { + open = "xdg-open"; + }; + }; + + gtk = { + enable = true; + theme.package = pkgs.juno-theme; + theme.name = "Juno-ocean"; + iconTheme.package = pkgs.qogir-icon-theme; + iconTheme.name = "Qogir"; + }; + + qt = { + enable = true; + style.package = pkgs.juno-theme; + platformTheme = "gtk"; + }; + + programs = { + imv.enable = true; + }; + + home.packages = with pkgs; [ + xdg-utils + grim + slurp + wl-clipboard + autotiling + + ranger + highlight + ]; + + fonts.fontconfig.enable = true; + + modules = { + alacritty.enable = true; + browsers.enable = true; + corn.enable = true; + fun.enable = true; + guiUtils.enable = true; + neovim.enable = true; + }; + }; +} diff --git a/homeConfig/modules/utils/modules/irc/default.nix b/homeConfig/modules/utils/modules/irc/default.nix index 46e0529..17fa07f 100644 --- a/homeConfig/modules/utils/modules/irc/default.nix +++ b/homeConfig/modules/utils/modules/irc/default.nix @@ -10,5 +10,8 @@ in home.packages = with pkgs; [ weechat ]; + programs.bash.shellAliases = { + chat = "weechat"; + }; }; }