diff --git a/flake.nix b/flake.nix index 4f03f00..9f7510b 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,9 @@ # Home-manager inputs.home-manager.nixosModules.default + # Stylix + inputs.stylix.nixosModules.stylix + #Aagl inputs.aagl.nixosModules.default ]; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 4aa5cd3..5ab297c 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -19,6 +19,9 @@ # Gaming ../../modules/gaming + # Theming + ../../modules/stylix/gruvbox + # Home-manager inputs.home-manager.nixosModules.default ]; @@ -86,7 +89,7 @@ }; }; - home-manager.backupFileExtension = "backup-1"; + home-manager.backupFileExtension = "backup-9"; environment.sessionVariables = { FLAKE = "/home/shoi/etc/nixos"; @@ -98,6 +101,8 @@ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. lm_sensors brightnessctl + python312 + python312Packages.pip ]; programs.light.enable = true; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 7e6eb99..896d565 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -4,6 +4,9 @@ imports = [ ../../modules/home-manager + + # Styling + ../../modules/home-manager/stylix/gruvbox ]; home.username = "shoi"; diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index cec5f3b..0eb53ab 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -5,6 +5,7 @@ ./git ./qt/retro ./shell + ./terminal ]; # Allow Unfree @@ -13,8 +14,6 @@ home.packages = with pkgs; [ # Essentials ferdium - git - gh vscode-fhs # School @@ -22,13 +21,25 @@ onedrive typora logisim - pandoc # Utils corefonts noto-fonts - maim ]; - programs.firefox.enable = true; + programs = { + # Essentials + firefox.enable = true; + git.enable = true; + gh.enable = true; + + # School + pandoc.enable = true; + + # Utils + bat.enable = true; + lazygit.enable = true; + mangohud.enable = true; + zathura.enable = true; + }; } \ No newline at end of file diff --git a/modules/home-manager/qt/retro/default.nix b/modules/home-manager/qt/retro/default.nix index 17bbd6c..c0d0993 100644 --- a/modules/home-manager/qt/retro/default.nix +++ b/modules/home-manager/qt/retro/default.nix @@ -4,6 +4,10 @@ home.packages = with pkgs; [ gruvbox-plus-icons afterglow-cursors-recolored - kde-gruvbox ]; + + programs.rofi = { + enable = true; + theme = "gruvbox-dark"; + }; } \ No newline at end of file diff --git a/modules/home-manager/shell/default.nix b/modules/home-manager/shell/default.nix index 7db5d05..70b38bb 100644 --- a/modules/home-manager/shell/default.nix +++ b/modules/home-manager/shell/default.nix @@ -1,6 +1,10 @@ { pkgs, ... }: { + imports = [ + ./starship + ]; + # Download zsh packages home.packages = with pkgs; [ zsh @@ -25,7 +29,4 @@ }; - - programs.starship.enable = true; - programs.starship.enableZshIntegration = true; } \ No newline at end of file diff --git a/modules/home-manager/shell/starship/default.nix b/modules/home-manager/shell/starship/default.nix new file mode 100644 index 0000000..3369a2f --- /dev/null +++ b/modules/home-manager/shell/starship/default.nix @@ -0,0 +1,8 @@ +{ lib, ... }: + +{ + programs.starship = { + enable = true; + enableZshIntegration = true; + }; +} \ No newline at end of file diff --git a/modules/home-manager/stylix/gruvbox/default.nix b/modules/home-manager/stylix/gruvbox/default.nix new file mode 100644 index 0000000..1d3ac8d --- /dev/null +++ b/modules/home-manager/stylix/gruvbox/default.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }: + +{ + stylix = { + enable = true; + autoEnable = false; + + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; + + cursor = { + package = pkgs.afterglow-cursors-recolored; + name = "Afterglow-Recolored-Gruvbox-White"; + size = 24; + }; + + image = ../../../wallpapers/gruvbox_ghibli-6.png; + + polarity = "dark"; + + targets = { + bat.enable = true; + firefox.enable = true; + lazygit.enable = true; + mangohud.enable = true; + vesktop.enable = true; + wezterm.enable = true; + xresources.enable = true; + zathura.enable = true; + }; + }; +} \ No newline at end of file diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix index 50e4ea4..45b3069 100644 --- a/modules/home-manager/terminal/default.nix +++ b/modules/home-manager/terminal/default.nix @@ -2,6 +2,6 @@ { imports = [ - ./kitty + ./wezterm ]; } \ No newline at end of file diff --git a/modules/home-manager/terminal/kitty/default.nix b/modules/home-manager/terminal/kitty/default.nix deleted file mode 100644 index 6cff9dd..0000000 --- a/modules/home-manager/terminal/kitty/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - programs.kitty = { - enable = true; - shellIntegration.enableZshIntegration = true; - }; -} \ No newline at end of file diff --git a/modules/home-manager/terminal/wezterm/default.nix b/modules/home-manager/terminal/wezterm/default.nix new file mode 100644 index 0000000..9ab4c5d --- /dev/null +++ b/modules/home-manager/terminal/wezterm/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: + +{ + programs.wezterm = { + enable = true; + enableZshIntegration = true; + }; +} \ No newline at end of file diff --git a/modules/stylix/gruvbox/default.nix b/modules/stylix/gruvbox/default.nix new file mode 100644 index 0000000..aab33be --- /dev/null +++ b/modules/stylix/gruvbox/default.nix @@ -0,0 +1,27 @@ +{ pkgs, ... }: + +{ + stylix = { + enable = true; + autoEnable = false; + + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; + + cursor = { + package = pkgs.afterglow-cursors-recolored; + name = "Afterglow-Recolored-Gruvbox-White"; + size = 24; + }; + + image = ../wallpapers/gruvbox_ghibli-6.png; + + polarity = "dark"; + + targets = { + chromium.enable = true; + console.enable = true; + gnome.enable = true; + gtk.enable = true; + }; + }; +} \ No newline at end of file diff --git a/modules/system/default.nix b/modules/system/default.nix index 2e887eb..b9bf367 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -41,13 +41,5 @@ nerdfonts font-awesome ]; - - fontconfig = { - defaultFonts = { - serif = [ "Hack Nerd Font" ]; - sansSerif = [ "DejaVuSansM Nerd Font" ]; - monospace = [ "JetBrainsMono Nerd Font" ]; - }; - }; }; } \ No newline at end of file diff --git a/modules/system/desktop/awesome.nix b/modules/system/desktop/awesome.nix deleted file mode 100644 index 37620a0..0000000 --- a/modules/system/desktop/awesome.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, pkgs, ... }: - -let - awesome = pkgs.awesome.overrideAttrs (oa: { - version = "ad0290bc1aac3ec2391aa14784146a53ebf9d1f0"; - src = pkgs.fetchFromGitHub { - owner = "awesomeWM"; - repo = "awesome"; - rev = "ad0290bc1aac3ec2391aa14784146a53ebf9d1f0"; - hash = "sha256-uaskBbnX8NgxrprI4UbPfb5cRqdRsJZv0YXXshfsxFU="; - }; - - patches = [ ]; - - postPatch = '' - patchShebangs tests/examples/_postprocess.lua - ''; - }); -in { - services.xserver.windowManager.awesome = { - enable = true; - package = awesome.override { - lua = pkgs.luajit; - }; - }; -} \ No newline at end of file diff --git a/modules/system/desktop/default.nix b/modules/system/desktop/default.nix index b307bf6..55019e4 100644 --- a/modules/system/desktop/default.nix +++ b/modules/system/desktop/default.nix @@ -2,8 +2,6 @@ { imports = [ - ./hyprland.nix - ./awesome.nix ./plasma.nix ]; } \ No newline at end of file diff --git a/modules/system/desktop/hyprland.nix b/modules/system/desktop/hyprland.nix deleted file mode 100644 index 6ce1ecd..0000000 --- a/modules/system/desktop/hyprland.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ inputs, pkgs, ... }: - -{ - nix.settings = { - substituters = ["https://hyprland.cachix.org"]; - trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="]; - }; - - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - }; -} \ No newline at end of file diff --git a/modules/wallpapers/Desktop Ghibli Inspired 1.png b/modules/wallpapers/ghibli-1.png similarity index 100% rename from modules/wallpapers/Desktop Ghibli Inspired 1.png rename to modules/wallpapers/ghibli-1.png diff --git a/modules/wallpapers/Desktop Ghibli Inspired 2.png b/modules/wallpapers/ghibli-2.png similarity index 100% rename from modules/wallpapers/Desktop Ghibli Inspired 2.png rename to modules/wallpapers/ghibli-2.png diff --git a/modules/wallpapers/Desktop Ghibli Inspired 6.png b/modules/wallpapers/ghibli-6.png similarity index 100% rename from modules/wallpapers/Desktop Ghibli Inspired 6.png rename to modules/wallpapers/ghibli-6.png diff --git a/modules/wallpapers/gruvbox_ghibli-1.png b/modules/wallpapers/gruvbox_ghibli-1.png new file mode 100644 index 0000000..ee55a96 Binary files /dev/null and b/modules/wallpapers/gruvbox_ghibli-1.png differ diff --git a/modules/wallpapers/gruvbox_ghibli-2.png b/modules/wallpapers/gruvbox_ghibli-2.png new file mode 100644 index 0000000..ccd5e79 Binary files /dev/null and b/modules/wallpapers/gruvbox_ghibli-2.png differ diff --git a/modules/wallpapers/gruvbox_ghibli-3.png b/modules/wallpapers/gruvbox_ghibli-3.png new file mode 100644 index 0000000..e53208f Binary files /dev/null and b/modules/wallpapers/gruvbox_ghibli-3.png differ diff --git a/modules/wallpapers/gruvbox_ghibli-6.png b/modules/wallpapers/gruvbox_ghibli-6.png new file mode 100644 index 0000000..ddf3563 Binary files /dev/null and b/modules/wallpapers/gruvbox_ghibli-6.png differ