diff --git a/users/natalie/home.nix b/users/natalie/home.nix index 43f27d39f84f27952928fb959dcb481cb7465c82..9b1db798d56f2814499e41da4ef75bdeb17e74a6 100644 --- a/users/natalie/home.nix +++ b/users/natalie/home.nix @@ -19,6 +19,10 @@ lsd.enable = true; android-sdk.enable = true; # sort-lines:end + ghostty = { + enable = true; + settings.theme = "Catppuccin Mocha"; + }; fish = { shellAliases = diff --git a/users/natalie/home/default.nix b/users/natalie/home/default.nix index 17c17e9dfdb47331f6757fe5fb789e94c25caefa..57100be42fe9fb35a7ff7122423d1724193f0a39 100644 --- a/users/natalie/home/default.nix +++ b/users/natalie/home/default.nix @@ -5,5 +5,7 @@ ./hyprland ./vicinae.nix ./swaync.nix + ./gtk.nix + ./waybar ]; } diff --git a/users/natalie/home/gtk.nix b/users/natalie/home/gtk.nix new file mode 100644 index 0000000000000000000000000000000000000000..c3e1c23823ddce97763585284c0ac22e91d10fb7 --- /dev/null +++ b/users/natalie/home/gtk.nix @@ -0,0 +1,35 @@ +{ pkgs, ... }: +{ + + gtk = { + enable = true; + + font = { + name = "Maple Mono"; + size = 12; + }; + theme = { + name = "Catpuccin gtk"; + package = pkgs.magnetic-catppuccin-gtk.override { + tweaks = [ + "float" + ]; + }; + }; + iconTheme = { + name = "Arashi"; + package = pkgs.arashi; + }; + cursorTheme = { + name = "Bibata-Modern-Ice"; + package = pkgs.bibata-cursors; + size = 24; + }; + }; + + home.pointerCursor = { + name = "Bibata-Modern-Ice"; + package = pkgs.bibata-cursors; + size = 24; + }; +} diff --git a/users/natalie/home/hyprland/exec-once.nix b/users/natalie/home/hyprland/exec-once.nix index 06429381c2b90f9df1d62afd5e0fb348faaeba0a..57bc90b4eb490f4268e857a3fa816b78dc06c6d1 100644 --- a/users/natalie/home/hyprland/exec-once.nix +++ b/users/natalie/home/hyprland/exec-once.nix @@ -19,7 +19,8 @@ "${pkgs.swaynotificationcenter}/bin/swaync &" "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &" "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &" - # "hyprctl setcursor Bibata-Modern-Ice 24 &" + "${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Ice 24 &" + "${pkgs.tmux}/bin/tmux setenv -g HYPRLAND_INSTANCE_SIGNATURE '$HYPRLAND_INSTANCE_SIGNATURE'" # "init-wallpaper &" # # "ghostty --gtk-single-instance=true --quit-after-last-window-closed=false --initial-window=false" diff --git a/users/natalie/home/hyprland/hyprland.nix b/users/natalie/home/hyprland/hyprland.nix index 909b2938dd1939ef6556352e1a6e00ffbca520f3..7ee7df03e53ee41b94ce364a1597f3d240f10e2e 100644 --- a/users/natalie/home/hyprland/hyprland.nix +++ b/users/natalie/home/hyprland/hyprland.nix @@ -14,6 +14,8 @@ wayland direnv playerctl + waybar + networkmanagerapplet ]; systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" diff --git a/users/natalie/home/hyprland/hyprlock.nix b/users/natalie/home/hyprland/hyprlock.nix index 37cfb0022a8d68a49531555466f6c6cfee2a76e0..60f780414f25acb7c0b7b52aaa5e2221bb2a3967 100644 --- a/users/natalie/home/hyprland/hyprlock.nix +++ b/users/natalie/home/hyprland/hyprlock.nix @@ -1,7 +1,7 @@ { ... }: { programs.hyprlock = { - enable = true; + enable = false; settings = { general = { diff --git a/users/natalie/home/hyprland/monitors.nix b/users/natalie/home/hyprland/monitors.nix index ae63a8e983bd40164ca183407a4c596d7c8d94cf..fcb3e3309fdd4a159e7d6e66ba3f60ef8e7f798c 100644 --- a/users/natalie/home/hyprland/monitors.nix +++ b/users/natalie/home/hyprland/monitors.nix @@ -1,14 +1,17 @@ { pkgs, ... }: { wayland.windowManager.hyprland = { - settings.monitor = [ ",preferred,auto,auto" ]; + settings.monitor = [ + "HDMI-A-1, 1980x1080@144, 0x0, auto" + "DP-1,2560x1440@144,auto,auto" + ]; - extraConfig = '' - # hyprlang noerror true - source = ~/.config/hypr/monitors.conf - source = ~/.config/hypr/workspaces.conf - # hyprlang noerror false - ''; + # extraConfig = '' + # # hyprlang noerror true + # source = ~/.config/hypr/monitors.conf + # source = ~/.config/hypr/workspaces.conf + # # hyprlang noerror false + # ''; }; home.packages = with pkgs; [ nwg-displays ]; diff --git a/users/natalie/home/hyprland/settings.nix b/users/natalie/home/hyprland/settings.nix index 522d975c669889907cc601d3fecabed57cabead6..5a14c824e7f5c64c8078dbf4e48cbfb659b3affe 100644 --- a/users/natalie/home/hyprland/settings.nix +++ b/users/natalie/home/hyprland/settings.nix @@ -29,7 +29,7 @@ # https://wiki.hypr.land/Configuring/Dwindle-Layout/ dwindle = { - psuedotile = false; + pseudotile = false; force_split = 2; preserve_split = true; }; @@ -115,6 +115,9 @@ xwayland = { force_zero_scaling = true; }; + debug = { + disable_logs = false; + }; }; } diff --git a/users/natalie/home/waybar/settings.nix b/users/natalie/home/waybar/settings.nix index 373f9a97969e1f0bc46c52fd2c16ee5e72748a42..bf25fe7d81975ee4252e16086e7c5097f8f8e885 100644 --- a/users/natalie/home/waybar/settings.nix +++ b/users/natalie/home/waybar/settings.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: let custom = { font = "Maple Mono"; @@ -38,10 +38,8 @@ in "memory" "pulseaudio" "network" - "battery" "hyprland/language" "custom/notification" - "custom/power-menu" ]; clock = { calendar = {