diff --git a/hosts/default.nix b/hosts/default.nix index b2082a1..14d8ee6 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -7,6 +7,7 @@ in { system = "x86_64-linux"; specialArgs = { inherit lib inputs self; }; modules = [ + inputs.stylix.nixosModules.stylix ./vali/mars ../modules inputs.home-manager.nixosModules.home-manager diff --git a/hosts/vali/mars/2024-04-21-14-50.png b/hosts/vali/mars/2024-04-21-14-50.png new file mode 100644 index 0000000..3c19b41 Binary files /dev/null and b/hosts/vali/mars/2024-04-21-14-50.png differ diff --git a/hosts/vali/mars/configuration.nix b/hosts/vali/mars/configuration.nix index a68e2a7..5a8205b 100644 --- a/hosts/vali/mars/configuration.nix +++ b/hosts/vali/mars/configuration.nix @@ -24,11 +24,62 @@ keep-derivations = true ''; }; + /* + stylix = { + image = ./2024-04-21-14-50.png; + polarity = "dark"; + autoEnable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml"; + opacity = { + applications = 0.9; + popups = 0.9; + desktop = 0.9; + }; + targets = { + fish.enable = true; + grub.enable = true; + gtk.enable = true; + nixos-icons.enable = true; + plymouth.enable = true; + #emacs.enable = true; + firefox.enable = true; + kitty.enable = true; + lazygit.enable = true; + rofi.enable = true; + tmux.enable = true; + vim.enable = true; + zathura.enable = true; + }; + fonts = { + sizes = { + terminal = 14; + }; + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + monospace = { + package = (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}); + name = "JetBrainsMono"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + }; + }; + */ security.sudo.package = pkgs.sudo.override { withInsults = true; }; security.polkit.enable = true; programs.kdeconnect.enable = true; programs.dconf.enable = true; + services.picom.enable = true; modules = { other = { system = { @@ -48,22 +99,24 @@ mpv.enable = true; kitty.enable = true; awesome.enable = true; + hyprland.enable = true; newsboat.enable = true; emacs.enable = true; fish.enable = true; + stylix.enable = true; }; services = { pipewire.enable = true; }; themes = { cursor = { - enable = true; + enable = false; package = pkgs.bibata-cursors; name = "Bibata-Modern-Classic"; size = 24; }; gtk = { - enable = true; + enable = false; package = pkgs.materia-theme; name = "Materia-dark"; # iconTheme = { @@ -72,7 +125,7 @@ # }; }; qt = { - enable = true; + enable = false; package = pkgs.kde-gruvbox; name = "Gruvbox-Dark"; }; diff --git a/hosts/vali/mars/default.nix b/hosts/vali/mars/default.nix index acd94e4..37c4e38 100644 --- a/hosts/vali/mars/default.nix +++ b/hosts/vali/mars/default.nix @@ -5,6 +5,7 @@ _: { ./hardware-configuration.nix ./profile.nix ./awesome/awesome.nix + ./hyprland/hyprland.nix ]; } diff --git a/hosts/vali/mars/hyprland/default.nix b/hosts/vali/mars/hyprland/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/vali/mars/hyprland/hyprland.nix b/hosts/vali/mars/hyprland/hyprland.nix new file mode 100644 index 0000000..08551be --- /dev/null +++ b/hosts/vali/mars/hyprland/hyprland.nix @@ -0,0 +1,32 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + username = config.modules.other.system.username; + cfg = config.modules.programs.hyprland; +in { + options.modules.programs.hyprland.enable = mkEnableOption "hyprland"; + config = mkIf cfg.enable { + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; + environment.sessionVariables = { + WLR_NO_HARDWARE_CURSORS = "1"; + NIXOS_OZONE_WL = "1"; + }; + hardware = { + opengl.enable = true; + nvidia.modesetting.enable = true; + }; + environment.systemPackages = with pkgs; [ + (waybar.overrideAttrs (oldAttrs: { + mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; + })) + dunst + libnotify + hyprpaper + ]; + }; +} + diff --git a/modules/gui/default.nix b/modules/gui/default.nix index a66e86a..ca4f998 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -6,6 +6,7 @@ _: { ./mpv.nix ./qt.nix ./zathura.nix + ./stylix.nix ./rofi.nix ./kitty.nix ./vivado.nix diff --git a/modules/gui/emacs.nix b/modules/gui/emacs.nix index 27a74fc..48dd8ca 100644 --- a/modules/gui/emacs.nix +++ b/modules/gui/emacs.nix @@ -17,6 +17,7 @@ in { ''; extraPackages = epkgs: [ epkgs.evil + epkgs.gruvbox-theme ]; }; diff --git a/modules/gui/kitty.nix b/modules/gui/kitty.nix index b665bc9..98183e3 100644 --- a/modules/gui/kitty.nix +++ b/modules/gui/kitty.nix @@ -10,13 +10,13 @@ in { programs.kitty = { enable = true; settings = { - font_size = "13.0"; + # font_size = "13.0"; mouse_hide_wait = -1; url_style = "curly"; open_url_with = "default"; - background_opacity = "0.9"; + #background_opacity = "0.9"; confirm_os_window_close = "0"; - font_family = "JetBrainsMono Nerd Font"; + #font_family = "JetBrainsMono Nerd Font"; cursor_text_color = "background"; diff --git a/modules/gui/stylix.nix b/modules/gui/stylix.nix index 07dad6b..8f512fd 100644 --- a/modules/gui/stylix.nix +++ b/modules/gui/stylix.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.modules.programs.stylix; username = config.modules.other.system.username; @@ -7,20 +7,58 @@ in { config = mkIf cfg.enable { home-manager.users.${username} = { - programs.btop = { - enable = true; - settings = { - theme_background = false; - vim_keys = true; - update_ms = 1000; - cpu_single_graph = true; - clock_format = "%X"; - use_fstab = true; - io_mode = true; - net_sync = true; - net_iface = "enp4s0"; - log_level = "WARNING"; + stylix = { + autoEnable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml"; + polarity = "dark"; + targets = { + btop.enable = true; + fish.enable = true; + emacs.enable = true; + firefox.enable = true; + kitty.enable = true; + lazygit.enable = true; + rofi.enable = true; + tmux.enable = true; + vim.enable = true; + zathura.enable = true; + gtk.enable = true; + }; + opacity = { + applications = 0.9; + popups = 0.9; + desktop = 0.9; + }; + + fonts = { + sizes = { + terminal = 14; + popups = 14; + + }; + sansSerif = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + }; + monospace = { + package = (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}); + name = "JetBrainsMono"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + + }; + }; + stylix = { + image = ../../hosts/vali/mars/2024-04-21-14-50.png; + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; }; }; };