From b0098b81120dbba5d48f0c64d3ac924a1c51a4e7 Mon Sep 17 00:00:00 2001 From: Isshi0417 Date: Thu, 11 Jul 2024 14:03:15 +0900 Subject: [PATCH] Improve modularity --- flake.nix | 2 +- hosts/default/configuration.nix | 15 ++--- hosts/default/home.nix | 6 +- .../{nixos/gnome.nix => gnome/default.nix} | 0 modules/home-manager/catppuccin-mocha.nix | 51 --------------- modules/home-manager/default.nix | 10 +++ .../home-manager/{git.nix => git/default.nix} | 0 .../ricing/catppuccin/default.nix | 59 ++++++++++++++++++ .../shell/{zsh.nix => default.nix} | 4 -- modules/home-manager/shell/themes/dracula.nix | 24 ------- modules/home-manager/themes/basic-gtk.nix | 11 ---- .../{vscode.nix => vscode/default.nix} | 0 modules/nixos/alienware/alienware.nix | 25 -------- modules/nixos/alienware/nh.nix | 9 --- modules/nixos/stylix/dracula.nix | 40 ------------ modules/nixos/stylix/ghibli.nix | 26 -------- modules/ricing/catppuccin/default.nix | 10 +++ .../kuromi.nix => ricing/stylix/default.nix} | 8 +-- modules/ricing/stylix/themes/default.nix | 9 +++ modules/ricing/stylix/themes/dracula.nix | 5 ++ modules/ricing/stylix/themes/ghibli.nix | 5 ++ modules/ricing/stylix/themes/kuromi.nix | 14 +++++ .../wallpapers/Desktop Ghibli Inspired 1.png | Bin .../wallpapers/Desktop Ghibli Inspired 10.png | Bin .../wallpapers/Desktop Ghibli Inspired 2.png | Bin .../wallpapers/Desktop Ghibli Inspired 4.png | Bin .../wallpapers/Desktop Ghibli Inspired 5.png | Bin .../wallpapers/Desktop Ghibli Inspired 6.png | Bin .../wallpapers/Desktop Ghibli Inspired 8.png | Bin .../wallpapers/Desktop Ghibli Inspired 9.png | Bin .../stylix => }/wallpapers/dracula-pro.png | Bin .../stylix => }/wallpapers/ghibli-3.png | Bin .../stylix => }/wallpapers/ghibli-7.png | Bin .../{nixos/stylix => }/wallpapers/kuromi.jpg | Bin 34 files changed, 122 insertions(+), 211 deletions(-) rename modules/{nixos/gnome.nix => gnome/default.nix} (100%) delete mode 100644 modules/home-manager/catppuccin-mocha.nix create mode 100644 modules/home-manager/default.nix rename modules/home-manager/{git.nix => git/default.nix} (100%) create mode 100644 modules/home-manager/ricing/catppuccin/default.nix rename modules/home-manager/shell/{zsh.nix => default.nix} (91%) delete mode 100644 modules/home-manager/shell/themes/dracula.nix delete mode 100644 modules/home-manager/themes/basic-gtk.nix rename modules/home-manager/{vscode.nix => vscode/default.nix} (100%) delete mode 100644 modules/nixos/alienware/alienware.nix delete mode 100644 modules/nixos/alienware/nh.nix delete mode 100644 modules/nixos/stylix/dracula.nix delete mode 100644 modules/nixos/stylix/ghibli.nix create mode 100644 modules/ricing/catppuccin/default.nix rename modules/{nixos/stylix/kuromi.nix => ricing/stylix/default.nix} (89%) create mode 100644 modules/ricing/stylix/themes/default.nix create mode 100644 modules/ricing/stylix/themes/dracula.nix create mode 100644 modules/ricing/stylix/themes/ghibli.nix create mode 100644 modules/ricing/stylix/themes/kuromi.nix rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 1.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 10.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 2.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 4.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 5.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 6.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 8.png (100%) rename modules/{nixos/stylix => }/wallpapers/Desktop Ghibli Inspired 9.png (100%) rename modules/{nixos/stylix => }/wallpapers/dracula-pro.png (100%) rename modules/{nixos/stylix => }/wallpapers/ghibli-3.png (100%) rename modules/{nixos/stylix => }/wallpapers/ghibli-7.png (100%) rename modules/{nixos/stylix => }/wallpapers/kuromi.jpg (100%) diff --git a/flake.nix b/flake.nix index f38c20b..63ff921 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ inputs.catppuccin.nixosModules.catppuccin # Stylix - # inputs.stylix.nixosModules.stylix + inputs.stylix.nixosModules.stylix #Aagl inputs.aagl.nixosModules.default diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 29bbe44..e4cf42b 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -17,15 +17,13 @@ ../../modules/gaming # Gnome customization - ../../modules/nixos/gnome.nix + ../../modules/gnome + + # Catppuccin + ../../modules/ricing/catppuccin # Home-manager inputs.home-manager.nixosModules.default - - # Stylix colors - #../../modules/nixos/stylix/ghibli.nix - #../../modules/nixos/stylix/kuromi.nix - #../../modules/nixos/stylix/dracula.nix ]; # Bootloader. @@ -174,11 +172,6 @@ lm_sensors ]; - catppuccin = { - enable = true; - flavor = "mocha"; - }; - fonts = { enableDefaultPackages = true; packages = with pkgs; [ diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 66dea1e..5d541ef 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -3,11 +3,7 @@ { imports = [ - ../../modules/home-manager/git.nix - ../../modules/home-manager/shell/zsh.nix - ../../modules/home-manager/vscode.nix - #../../modules/home-manager/themes/basic-gtk.nix - ../../modules/home-manager/catppuccin-mocha.nix + ../../modules/home-manager ]; # Allow Unfree diff --git a/modules/nixos/gnome.nix b/modules/gnome/default.nix similarity index 100% rename from modules/nixos/gnome.nix rename to modules/gnome/default.nix diff --git a/modules/home-manager/catppuccin-mocha.nix b/modules/home-manager/catppuccin-mocha.nix deleted file mode 100644 index 90fe816..0000000 --- a/modules/home-manager/catppuccin-mocha.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ inputs, ... }: - -{ - imports = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - - catppuccin = { - enable = true; - flavor = "mocha"; - - pointerCursor.enable = true; - }; - - gtk = { - enable = true; - - catppuccin = { - enable = true; - flavor = "mocha"; - gnomeShellTheme = true; - - icon = { - enable = true; - flavor = "mocha"; - }; - }; - }; - - programs.kitty.catppuccin.enable = true; - programs.kitty.catppuccin.flavor = "mocha"; - - programs.neovim.catppuccin.enable = true; - programs.neovim.catppuccin.flavor = "mocha"; - - programs.rofi.catppuccin.enable = true; - programs.rofi.catppuccin.flavor = "mocha"; - - programs.starship.catppuccin.enable = true; - programs.starship.catppuccin.flavor = "mocha"; - - programs.waybar.catppuccin.enable = true; - programs.waybar.catppuccin.flavor = "mocha"; - - programs.zsh.syntaxHighlighting.catppuccin.enable = true; - programs.zsh.syntaxHighlighting.catppuccin.flavor = "mocha"; - - qt.style.catppuccin.enable = true; - qt.style.catppuccin.accent = "mocha"; - qt.style.catppuccin.apply = true; -} \ No newline at end of file diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix new file mode 100644 index 0000000..d907ce4 --- /dev/null +++ b/modules/home-manager/default.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = [ + ./git + ./ricing/catppuccin + ./shell + ./vscode + ]; +} \ No newline at end of file diff --git a/modules/home-manager/git.nix b/modules/home-manager/git/default.nix similarity index 100% rename from modules/home-manager/git.nix rename to modules/home-manager/git/default.nix diff --git a/modules/home-manager/ricing/catppuccin/default.nix b/modules/home-manager/ricing/catppuccin/default.nix new file mode 100644 index 0000000..2be6036 --- /dev/null +++ b/modules/home-manager/ricing/catppuccin/default.nix @@ -0,0 +1,59 @@ +{ inputs, ... }: + +{ + imports = [ + inputs.catppuccin.homeManagerModules.catppuccin + ]; + + catppuccin = { + enable = true; + accent = "rosewater"; + flavor = "latte"; + + pointerCursor.enable = true; + }; + + gtk = { + enable = true; + + catppuccin = { + enable = true; + accent = "rosewater"; + flavor = "latte"; + gnomeShellTheme = true; + + icon = { + enable = true; + accent = "rosewater"; + flavor = "latte"; + }; + }; + }; + + programs.kitty.catppuccin = { + enable = true; + flavor = "latte"; + }; + + programs.neovim.catppuccin = { + enable = true; + flavor = "latte"; + }; + + programs.starship.catppuccin = { + enable = true; + flavor = "latte"; + }; + + programs.zsh.syntaxHighlighting.catppuccin = { + enable = true; + flavor = "latte"; + }; + + qt.style.catppuccin = { + enable = true; + accent = "rosewater"; + apply = true; + flavor = "latte"; + }; +} \ No newline at end of file diff --git a/modules/home-manager/shell/zsh.nix b/modules/home-manager/shell/default.nix similarity index 91% rename from modules/home-manager/shell/zsh.nix rename to modules/home-manager/shell/default.nix index 0fae00b..8d3c748 100644 --- a/modules/home-manager/shell/zsh.nix +++ b/modules/home-manager/shell/default.nix @@ -1,10 +1,6 @@ { pkgs, ... }: { - imports = [ - #./themes/dracula.nix - ]; - # Download zsh packages home.packages = with pkgs; [ zsh diff --git a/modules/home-manager/shell/themes/dracula.nix b/modules/home-manager/shell/themes/dracula.nix deleted file mode 100644 index e9b8e4f..0000000 --- a/modules/home-manager/shell/themes/dracula.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: - -{ - programs.starship = { - enable = true; - enableZshIntegration = true; - settings = { - aws.style = "bold #FF9580"; - cmd_duration.style = "bold #FFFF80"; - directory.style = "bold #FFCA80"; - hostname.style = "bold #9580FF"; - git_branch.style = "bold #80FFEA"; - git_status.style = "bold #FF80BF"; - username = { - format = "[$user]($style) on "; - style_user = "bold #8AFF80"; - }; - character = { - success_symbol = "[λ](bold #F8F8F2)"; - error_symbol = "[λ](bold #FF9580)"; - }; - }; - }; -} \ No newline at end of file diff --git a/modules/home-manager/themes/basic-gtk.nix b/modules/home-manager/themes/basic-gtk.nix deleted file mode 100644 index 6d6bc88..0000000 --- a/modules/home-manager/themes/basic-gtk.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, lib, ... }: - -{ - gtk.enable = true; - - gtk.theme.package = lib.mkDefault pkgs.adw-gtk3; - gtk.theme.name = lib.mkDefault "adw-gtk3-dark"; - - gtk.iconTheme.package = pkgs.tela-circle-icon-theme; - gtk.iconTheme.name = "Tela-circle-dark"; -} \ No newline at end of file diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode/default.nix similarity index 100% rename from modules/home-manager/vscode.nix rename to modules/home-manager/vscode/default.nix diff --git a/modules/nixos/alienware/alienware.nix b/modules/nixos/alienware/alienware.nix deleted file mode 100644 index 82f339f..0000000 --- a/modules/nixos/alienware/alienware.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ./nh.nix - ]; - - swapDevices = [{ - device = "/var/lib/swapfile"; - size = 20*1024; - }]; - - hardware = { - enableRedistributableFirmware = lib.mkDefault true; - }; - - services = { - fwupd = { - enable = lib.mkDefault true; - }; - thermald = { - enable = lib.mkDefault true; - }; - }; -} \ No newline at end of file diff --git a/modules/nixos/alienware/nh.nix b/modules/nixos/alienware/nh.nix deleted file mode 100644 index e202470..0000000 --- a/modules/nixos/alienware/nh.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, pkgs, ... }: - -{ - programs.nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; - }; -} \ No newline at end of file diff --git a/modules/nixos/stylix/dracula.nix b/modules/nixos/stylix/dracula.nix deleted file mode 100644 index aef5ad3..0000000 --- a/modules/nixos/stylix/dracula.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, ... }: - -{ - stylix.enable = true; - stylix.image = ./wallpapers/dracula-pro.png; - - stylix.cursor.package = pkgs.bibata-cursors; - stylix.cursor.name = "Bibata-Modern-Ice"; - - stylix.fonts = { - monospace = { - package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; }; - name = "JetBrainsMono Nerd Font"; - }; - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - serif = { - package = pkgs.dejavu_fonts; - name = "Dejavu Serif"; - }; - }; - - stylix.fonts.sizes = { - applications = 12; - terminal = 15; - desktop = 10; - popups = 10; - }; - - stylix.opacity = { - applications = 1.0; - terminal = 1.0; - desktop = 1.0; - popups = 1.0; - }; - - stylix.polarity = "dark"; -} \ No newline at end of file diff --git a/modules/nixos/stylix/ghibli.nix b/modules/nixos/stylix/ghibli.nix deleted file mode 100644 index f5ad92c..0000000 --- a/modules/nixos/stylix/ghibli.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, ... }: - -{ - stylix.enable = true; - stylix.image = ./wallpapers/ghibli-3.png; - - stylix.cursor.package = pkgs.bibata-cursors; - stylix.cursor.name = "Bibata-Modern-Ice"; - - stylix.fonts = { - monospace = { - package = pkgs.nerdfonts.override { fonts = ["JetBrainsMono"]; }; - name = "JetBrainsMono Nerd Font"; - }; - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - serif = { - package = pkgs.dejavu_fonts; - name = "Dejavu Serif"; - }; - }; - - stylix.polarity = "dark"; -} \ No newline at end of file diff --git a/modules/ricing/catppuccin/default.nix b/modules/ricing/catppuccin/default.nix new file mode 100644 index 0000000..b215a25 --- /dev/null +++ b/modules/ricing/catppuccin/default.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + # global + catppuccin = { + enable = true; + accent = "rosewater"; + flavor = "latte"; + }; +} \ No newline at end of file diff --git a/modules/nixos/stylix/kuromi.nix b/modules/ricing/stylix/default.nix similarity index 89% rename from modules/nixos/stylix/kuromi.nix rename to modules/ricing/stylix/default.nix index a433ed7..423d195 100644 --- a/modules/nixos/stylix/kuromi.nix +++ b/modules/ricing/stylix/default.nix @@ -1,11 +1,11 @@ { pkgs, ... }: { - stylix.homeManagerIntegration.followSystem = true; + imports = [ + ./themes + ]; - stylix.enable = true; - stylix.autoEnable = true; - stylix.image = ./wallpapers/kuromi.jpg; + stylix.homeManagerIntegration.followSystem = true; stylix.cursor.package = pkgs.bibata-cursors; stylix.cursor.name = "Bibata-Modern-Ice"; diff --git a/modules/ricing/stylix/themes/default.nix b/modules/ricing/stylix/themes/default.nix new file mode 100644 index 0000000..5271cdc --- /dev/null +++ b/modules/ricing/stylix/themes/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + imports = [ + #./dracula.nix + #./ghibli.nix + ./kuromi.nix + ]; +} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/dracula.nix b/modules/ricing/stylix/themes/dracula.nix new file mode 100644 index 0000000..e38f1d3 --- /dev/null +++ b/modules/ricing/stylix/themes/dracula.nix @@ -0,0 +1,5 @@ +{ lib, pkgs, ... }: + +{ + stylix.image = ./wallpapers/dracula-pro.png; +} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/ghibli.nix b/modules/ricing/stylix/themes/ghibli.nix new file mode 100644 index 0000000..b9fc05b --- /dev/null +++ b/modules/ricing/stylix/themes/ghibli.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: + +{ + stylix.image = ./wallpapers/ghibli-3.png; +} \ No newline at end of file diff --git a/modules/ricing/stylix/themes/kuromi.nix b/modules/ricing/stylix/themes/kuromi.nix new file mode 100644 index 0000000..e9e91cd --- /dev/null +++ b/modules/ricing/stylix/themes/kuromi.nix @@ -0,0 +1,14 @@ +{ lib, config, ... }: + +let + cfg = config.kuromi; +in { + options = { + kuromi.enable = lib.mkEnableOption "Enable Module"; + }; + + config = lib.mkIf cfg.enable { + stylix.enable = true; + stylix.image = ../../wallpapers/kuromi.jpg; + }; +} \ No newline at end of file diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 1.png b/modules/wallpapers/Desktop Ghibli Inspired 1.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 1.png rename to modules/wallpapers/Desktop Ghibli Inspired 1.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 10.png b/modules/wallpapers/Desktop Ghibli Inspired 10.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 10.png rename to modules/wallpapers/Desktop Ghibli Inspired 10.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 2.png b/modules/wallpapers/Desktop Ghibli Inspired 2.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 2.png rename to modules/wallpapers/Desktop Ghibli Inspired 2.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 4.png b/modules/wallpapers/Desktop Ghibli Inspired 4.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 4.png rename to modules/wallpapers/Desktop Ghibli Inspired 4.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 5.png b/modules/wallpapers/Desktop Ghibli Inspired 5.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 5.png rename to modules/wallpapers/Desktop Ghibli Inspired 5.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 6.png b/modules/wallpapers/Desktop Ghibli Inspired 6.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 6.png rename to modules/wallpapers/Desktop Ghibli Inspired 6.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 8.png b/modules/wallpapers/Desktop Ghibli Inspired 8.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 8.png rename to modules/wallpapers/Desktop Ghibli Inspired 8.png diff --git a/modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 9.png b/modules/wallpapers/Desktop Ghibli Inspired 9.png similarity index 100% rename from modules/nixos/stylix/wallpapers/Desktop Ghibli Inspired 9.png rename to modules/wallpapers/Desktop Ghibli Inspired 9.png diff --git a/modules/nixos/stylix/wallpapers/dracula-pro.png b/modules/wallpapers/dracula-pro.png similarity index 100% rename from modules/nixos/stylix/wallpapers/dracula-pro.png rename to modules/wallpapers/dracula-pro.png diff --git a/modules/nixos/stylix/wallpapers/ghibli-3.png b/modules/wallpapers/ghibli-3.png similarity index 100% rename from modules/nixos/stylix/wallpapers/ghibli-3.png rename to modules/wallpapers/ghibli-3.png diff --git a/modules/nixos/stylix/wallpapers/ghibli-7.png b/modules/wallpapers/ghibli-7.png similarity index 100% rename from modules/nixos/stylix/wallpapers/ghibli-7.png rename to modules/wallpapers/ghibli-7.png diff --git a/modules/nixos/stylix/wallpapers/kuromi.jpg b/modules/wallpapers/kuromi.jpg similarity index 100% rename from modules/nixos/stylix/wallpapers/kuromi.jpg rename to modules/wallpapers/kuromi.jpg