diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 563bc17..e3b483d 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -19,8 +19,8 @@ # Gaming ../../modules/gaming - # Catppuccin - ../../modules/ricing/catppuccin + # Stylix + ../../modules/ricing/stylix # Home-manager inputs.home-manager.nixosModules.default @@ -95,7 +95,7 @@ }; }; - home-manager.backupFileExtension = "hm-backup"; + home-manager.backupFileExtension = "backup"; environment.sessionVariables = { FLAKE = "/home/shoi/etc/nixos"; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 1d32df7..db38612 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -4,6 +4,7 @@ imports = [ ../../modules/home-manager + ../../modules/home-manager/ricing/stylix ]; home.username = "shoi"; diff --git a/modules/dotfiles/hyprland/hyprland.conf b/modules/dotfiles/hyprland/hyprland.conf index 3989c6a..f84555b 100644 --- a/modules/dotfiles/hyprland/hyprland.conf +++ b/modules/dotfiles/hyprland/hyprland.conf @@ -29,7 +29,7 @@ workspace = name:1, monitor:HDMI-A-2 # Set programs that you use $terminal = kitty -$fileManager = dolphin +$fileManager = nautilus $menu = wofi --show drun $browser = firefox @@ -41,10 +41,9 @@ $browser = firefox # Autostart necessary processes (like notifications daemons, status bars, etc.) # Or execute your favorite apps at launch like this: +exec-once = ferdium exec-once = hyprctl dispatch workspace 1 -exec-once = $browser - - +exec-once = hyprpaper ############################# ### ENVIRONMENT VARIABLES ### @@ -70,8 +69,8 @@ general { border_size = 2 # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) + col.active_border = rgba(d4af8788) + col.inactive_border = rgba(a7a9ac66) # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = false @@ -84,21 +83,21 @@ general { # https://wiki.hyprland.org/Configuring/Variables/#decoration decoration { - rounding = 10 + rounding = 12 # Change transparency of focused and unfocused windows active_opacity = 1.0 - inactive_opacity = 1.0 + inactive_opacity = 0.95 drop_shadow = true shadow_range = 4 shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + col.shadow = rgba(5d5448ee) # https://wiki.hyprland.org/Configuring/Variables/#blur blur { enabled = true - size = 3 + size = 8 passes = 1 vibrancy = 0.1696 @@ -134,8 +133,8 @@ master { # https://wiki.hyprland.org/Configuring/Variables/#misc misc { - force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers - disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( + force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers + disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( } @@ -181,8 +180,8 @@ device { $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Q, exec, $terminal -bind = $mainMod, C, killactive, +bind = $mainMod, T, exec, $terminal +bind = $mainMod, Q, killactive, bind = $mainMod, M, exit, bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating, diff --git a/modules/dotfiles/hyprland/hyprpaper.conf b/modules/dotfiles/hyprland/hyprpaper.conf new file mode 100644 index 0000000..a0b96f2 --- /dev/null +++ b/modules/dotfiles/hyprland/hyprpaper.conf @@ -0,0 +1,2 @@ +preload = /home/shoi/Downloads/sunflower.png +wallpaper = ,/home/shoi/Downloads/sunflower.png \ No newline at end of file diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index fc13e2d..35f6118 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -6,7 +6,6 @@ ./vscode ./terminal ./gnome-extensions - ./ricing/catppuccin ./ricing/hyprland ]; @@ -15,7 +14,6 @@ home.packages = with pkgs; [ # Essentials - firefox ferdium git gh @@ -31,4 +29,6 @@ corefonts noto-fonts ]; + + programs.firefox.enable = true; } \ No newline at end of file diff --git a/modules/home-manager/ricing/hyprland/default.nix b/modules/home-manager/ricing/hyprland/default.nix index 274bb4d..a3ae379 100644 --- a/modules/home-manager/ricing/hyprland/default.nix +++ b/modules/home-manager/ricing/hyprland/default.nix @@ -1,6 +1,10 @@ -{ config, pkgs, ... }: +{ config, ... }: { + imports = [ + ./hyprpaper.nix + ]; + home.file = { ".config/hypr" = { recursive = true; diff --git a/modules/home-manager/ricing/hyprland/hyprpaper.nix b/modules/home-manager/ricing/hyprland/hyprpaper.nix new file mode 100644 index 0000000..5a400bb --- /dev/null +++ b/modules/home-manager/ricing/hyprland/hyprpaper.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + hyprpaper + ]; +} \ No newline at end of file diff --git a/modules/home-manager/ricing/stylix/default.nix b/modules/home-manager/ricing/stylix/default.nix new file mode 100644 index 0000000..26de7ee --- /dev/null +++ b/modules/home-manager/ricing/stylix/default.nix @@ -0,0 +1,20 @@ +{ ... }: + +{ + stylix = { + enable = true; + autoEnable = false; + + image = ../../../wallpapers/maze.png; + + targets = { + firefox.enable = true; + gnome.enable = true; + gtk.enable = true; + hyprland.enable = true; + hyprpaper.enable = true; + kitty.enable = true; + vesktop.enable = true; + }; + }; +} \ No newline at end of file diff --git a/modules/ricing/stylix/default.nix b/modules/ricing/stylix/default.nix index 423d195..8b18283 100644 --- a/modules/ricing/stylix/default.nix +++ b/modules/ricing/stylix/default.nix @@ -10,28 +10,6 @@ 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"; - }; - - sizes = { - applications = 12; - terminal = 15; - desktop = 10; - popups = 10; - }; - }; - stylix.opacity = { applications = 0.9; terminal = 0.9; diff --git a/modules/ricing/stylix/themes/default.nix b/modules/ricing/stylix/themes/default.nix index 5271cdc..41114c2 100644 --- a/modules/ricing/stylix/themes/default.nix +++ b/modules/ricing/stylix/themes/default.nix @@ -2,8 +2,6 @@ { imports = [ - #./dracula.nix - #./ghibli.nix - ./kuromi.nix + ./nostalgia.nix ]; } \ No newline at end of file diff --git a/modules/ricing/stylix/themes/nostalgia.nix b/modules/ricing/stylix/themes/nostalgia.nix new file mode 100644 index 0000000..7acf613 --- /dev/null +++ b/modules/ricing/stylix/themes/nostalgia.nix @@ -0,0 +1,42 @@ +{ pkgs, ... }: + +{ + stylix.enable = true; + stylix.autoEnable = false; + + stylix.base16Scheme = { + base00 = "282828"; + base01 = "3c3836"; + base02 = "504945"; + base03 = "665c54"; + base04 = "bdae93"; + base05 = "d5c4a1"; + base06 = "ebdbb2"; + base07 = "fbf1c7"; + base08 = "fb4934"; + base09 = "fe8019"; + base0A = "fabd2f"; + base0B = "b8bb26"; + base0C = "8ec07c"; + base0D = "d3869b"; + base0E = "d65d0e"; + base0F = "83a598"; + }; + + stylix.image = ../../../wallpapers/maze.png; + + # GRUB + stylix.targets.grub = { + enable = true; + useImage = true; + }; + + # Console + stylix.targets.console.enable = true; + + # GNOME + stylix.targets.gnome.enable = true; + + # GTK + stylix.targets.gtk.enable = true; +} \ No newline at end of file diff --git a/modules/wallpapers/maze.png b/modules/wallpapers/maze.png new file mode 100644 index 0000000..45cf435 Binary files /dev/null and b/modules/wallpapers/maze.png differ