diff --git a/.config/home-manager/flake.nix b/.config/home-manager/flake.nix index 104e419..77791dd 100644 --- a/.config/home-manager/flake.nix +++ b/.config/home-manager/flake.nix @@ -8,9 +8,14 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { nixpkgs, home-manager, ... }: + outputs = { nixpkgs, home-manager, stylix, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -20,7 +25,10 @@ # Specify your home configuration modules here, for example, # the path to your home.nix. - modules = [ ./home.nix ]; + modules = [ + stylix.homeModules.stylix + ./home.nix + ]; # Optionally use extraSpecialArgs # to pass through arguments to home.nix diff --git a/.config/home-manager/home.nix b/.config/home-manager/home.nix index 39176c8..288e709 100644 --- a/.config/home-manager/home.nix +++ b/.config/home-manager/home.nix @@ -1,9 +1,9 @@ { config, pkgs, ... }: { -# imports = [ -# ./catppuccin.nix -# ]; + imports = [ + ./theme.nix + ]; nixpkgs = { config = { @@ -20,6 +20,19 @@ programs.home-manager.enable = true; + #gtk = { + # enable = true; + #iconTheme = { + # name = "Papirus-Dark"; + # package = pkgs.papirus-icon-theme; + #}; + #}; + + #qt = { + # enable = true; + #}; + + /* gtk = { enable = true; font.name = "TeX Gyre Adventor 10"; @@ -82,4 +95,6 @@ "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css"; "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css"; }; + */ + } diff --git a/.config/home-manager/theme.nix b/.config/home-manager/theme.nix index 8833840..9976b71 100644 --- a/.config/home-manager/theme.nix +++ b/.config/home-manager/theme.nix @@ -1,67 +1,39 @@ { config, pkgs, ... }: { - fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - noto-fonts-emoji - dejavu_fonts - (nerdfonts.override { - fonts = [ - "JetBrainsMono" - "Iosevka" - ]; - }) - ]; stylix = { enable = true; - - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; - - cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 24; - }; + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-moon.yaml"; + polarity = "dark"; fonts = { serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - }; - - monospace = { - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; - name = "JetBrainsMono Nerd Font Mono"; - }; - - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; + package = pkgs.gyre-fonts; + name = "TeX Gyre Adventor 10"; }; sizes = { applications = 10; - terminal = 10; desktop = 10; - popups = 10; }; }; - targets.nixvim.enable = false; - # targets.rofi.enable = false; + cursor.package = pkgs.rose-pine-cursor; + cursor.name = "BreezeX-RosePine-Linux"; + cursor.size = 24; + + icons = { + enable = true; + package = pkgs.papirus-icon-theme; + dark = "Papirus-Dark"; + }; - #FIXME: it doesnt work, it has to do with hyprpaper - # image = ../../assets/Shogoki.png; - - # opacity = { - # desktop = 0.5; - # terminal = 0.9; - # }; + targets.nixos-icons.enable = true; + targets.qt = { + enable = true; + platform = "qtct"; + }; }; } + diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index e5648b9..000c51c 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -23,7 +23,7 @@ autogenerated = 0 # remove this line to remove the warning ################ # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=DP-4,3440x1440@160,auto,auto +monitor=,3440x1440@160,auto,auto monitor=HDMI-A-1, disable #monitor=DP-1,1920x1080@60,auto,auto @@ -58,7 +58,9 @@ exec-once = nix-shell -p appimage-run --run "appimage-run ~/Msty/Msty.AppImage" exec = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" # for GTK4 apps -env = QT_QPA_PLATFORMTHEME,qt6ct # for Qt apps +#env = QT_QPA_PLATFORMTHEME,qt6ct # for Qt apps +env = QT_QPA_PLATFORM,wayland +env = QT_QPA_PLATFORMTHEME,qt5ct windowrule=float,class:^(org.telegram.desktop|telegramdesktop)$,title:^(Media viewer)$ @@ -346,6 +348,10 @@ bindl = , XF86Calculator, exec, gnome-calculator # Hyprlock bind = $mainMod, L, exec, hyprlock +# Screen Magnification +bind = $mainMod, KP_ADD, exec, hyprctl keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor | awk '/^float.*/ {print $2 + 0.5}') +bind = $mainMod, KP_SUBTRACT, exec, hyprctl keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor | awk '/^float.*/ {print $2 - 0.5}') + ############################## ### WINDOWS AND WORKSPACES ### ############################## @@ -377,6 +383,7 @@ windowrule = float, class:^mpv$ windowrule = workspace 1, class:^kitty$ windowrule = workspace 2, class:^floorp$ +windowrule = workspace 2, class:^brave-browser$ windowrule = workspace 3, class:^org.telegram.desktop$ windowrule = workspace 3, class:^discord$ windowrule = workspace 3, class:^Element$ @@ -390,9 +397,12 @@ windowrule = workspace 7, class:^ONLYOFFICE$ windowrule = size 1920 1080, class:^Msty$ windowrule = center, class:^Msty$ windowrule = float, class:^Msty$ + +windowrule = float, class:org.gnome.NautilusPreviewer +windowrule = float, class:zenity #windowrule = move 10 55, Msty #windowrule = pin, Msty windowrule = workspace special:ai, class:^Msty$ + bind = $mainMod, A, togglespecialworkspace, ai - diff --git a/.config/hyprpanel/config.json b/.config/hyprpanel/config.json index 75affc9..944cd84 100644 --- a/.config/hyprpanel/config.json +++ b/.config/hyprpanel/config.json @@ -447,13 +447,13 @@ "bar.workspaces.workspaceIconMap": { "1": "", "2": "", - "3": "", + "3": "", "4": "", "5": "", "6": "", "7": "󰍹", "8": "󰍹", - "9": "󰍹", + "9": "", "10": "" }, "bar.workspaces.icons.available": "",