| author |  Natalie Marks <nmarks413@gmail.com> 2025-10-30 14:16:39-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-10-30 14:16:39-07:00 |
| log | 6045cbf0f62a8a50ec2f16a9668132cb5e85e158 |
| tree | 8106a9ecafeca84b83dde8840a323f2bca2796f2 |
| parent | fbddb0a867385b4cf18724a648a3c2b6f1fa9493 |
| signature | Commit is signed but in an unrecognized format. |
fix (natalie): forgot to include waybar directory, and various other hyprland bug fixes
9 files changed, 61 insertions(+), 13 deletions(-)
users
natalie
users/natalie/home.nix+4
| ... | @@ -19,6 +19,10 @@ | ... | @@ -19,6 +19,10 @@ |
| 19 | lsd.enable = true; | 19 | lsd.enable = true; |
| 20 | android-sdk.enable = true; | 20 | android-sdk.enable = true; |
| 21 | # sort-lines:end | 21 | # sort-lines:end |
| 22 | ghostty = { | ||
| 23 | enable = true; | ||
| 24 | settings.theme = "Catppuccin Mocha"; | ||
| 25 | }; | ||
| 22 | 26 | ||
| 23 | fish = { | 27 | fish = { |
| 24 | shellAliases = | 28 | shellAliases = |
users/natalie/home/default.nix+2
| ... | @@ -5,5 +5,7 @@ | ... | @@ -5,5 +5,7 @@ |
| 5 | ./hyprland | 5 | ./hyprland |
| 6 | ./vicinae.nix | 6 | ./vicinae.nix |
| 7 | ./swaync.nix | 7 | ./swaync.nix |
| 8 | ./gtk.nix | ||
| 9 | ./waybar | ||
| 8 | ]; | 10 | ]; |
| 9 | } | 11 | } |
users/natalie/home/gtk.nix created+35
| ... | @@ -0,0 +1,35 @@ | ||
| 1 | { pkgs, ... }: | ||
| 2 | { | ||
| 3 | |||
| 4 | gtk = { | ||
| 5 | enable = true; | ||
| 6 | |||
| 7 | font = { | ||
| 8 | name = "Maple Mono"; | ||
| 9 | size = 12; | ||
| 10 | }; | ||
| 11 | theme = { | ||
| 12 | name = "Catpuccin gtk"; | ||
| 13 | package = pkgs.magnetic-catppuccin-gtk.override { | ||
| 14 | tweaks = [ | ||
| 15 | "float" | ||
| 16 | ]; | ||
| 17 | }; | ||
| 18 | }; | ||
| 19 | iconTheme = { | ||
| 20 | name = "Arashi"; | ||
| 21 | package = pkgs.arashi; | ||
| 22 | }; | ||
| 23 | cursorTheme = { | ||
| 24 | name = "Bibata-Modern-Ice"; | ||
| 25 | package = pkgs.bibata-cursors; | ||
| 26 | size = 24; | ||
| 27 | }; | ||
| 28 | }; | ||
| 29 | |||
| 30 | home.pointerCursor = { | ||
| 31 | name = "Bibata-Modern-Ice"; | ||
| 32 | package = pkgs.bibata-cursors; | ||
| 33 | size = 24; | ||
| 34 | }; | ||
| 35 | } | ||
users/natalie/home/hyprland/exec-once.nix+2-1
| ... | @@ -19,7 +19,8 @@ | ... | @@ -19,7 +19,8 @@ |
| 19 | "${pkgs.swaynotificationcenter}/bin/swaync &" | 19 | "${pkgs.swaynotificationcenter}/bin/swaync &" |
| 20 | "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &" | 20 | "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &" |
| 21 | "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &" | 21 | "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &" |
| 22 | # "hyprctl setcursor Bibata-Modern-Ice 24 &" | 22 | "${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Ice 24 &" |
| 23 | "${pkgs.tmux}/bin/tmux setenv -g HYPRLAND_INSTANCE_SIGNATURE '$HYPRLAND_INSTANCE_SIGNATURE'" | ||
| 23 | # "init-wallpaper &" | 24 | # "init-wallpaper &" |
| 24 | # | 25 | # |
| 25 | # "ghostty --gtk-single-instance=true --quit-after-last-window-closed=false --initial-window=false" | 26 | # "ghostty --gtk-single-instance=true --quit-after-last-window-closed=false --initial-window=false" |
users/natalie/home/hyprland/hyprland.nix+2
| ... | @@ -14,6 +14,8 @@ | ... | @@ -14,6 +14,8 @@ |
| 14 | wayland | 14 | wayland |
| 15 | direnv | 15 | direnv |
| 16 | playerctl | 16 | playerctl |
| 17 | waybar | ||
| 18 | networkmanagerapplet | ||
| 17 | ]; | 19 | ]; |
| 18 | systemd.user.targets.hyprland-session.Unit.Wants = [ | 20 | systemd.user.targets.hyprland-session.Unit.Wants = [ |
| 19 | "xdg-desktop-autostart.target" | 21 | "xdg-desktop-autostart.target" |
users/natalie/home/hyprland/hyprlock.nix+1-1
| ... | @@ -1,7 +1,7 @@ | ... | @@ -1,7 +1,7 @@ |
| 1 | { ... }: | 1 | { ... }: |
| 2 | { | 2 | { |
| 3 | programs.hyprlock = { | 3 | programs.hyprlock = { |
| 4 | enable = true; | 4 | enable = false; |
| 5 | 5 | ||
| 6 | settings = { | 6 | settings = { |
| 7 | general = { | 7 | general = { |
users/natalie/home/hyprland/monitors.nix+10-7
| ... | @@ -1,14 +1,17 @@ | ... | @@ -1,14 +1,17 @@ |
| 1 | { pkgs, ... }: | 1 | { pkgs, ... }: |
| 2 | { | 2 | { |
| 3 | wayland.windowManager.hyprland = { | 3 | wayland.windowManager.hyprland = { |
| 4 | settings.monitor = [ ",preferred,auto,auto" ]; | 4 | settings.monitor = [ |
| 5 | "HDMI-A-1, 1980x1080@144, 0x0, auto" | ||
| 6 | "DP-1,2560x1440@144,auto,auto" | ||
| 7 | ]; | ||
| 5 | 8 | ||
| 6 | extraConfig = '' | 9 | # extraConfig = '' |
| 7 | # hyprlang noerror true | 10 | # # hyprlang noerror true |
| 8 | source = ~/.config/hypr/monitors.conf | 11 | # source = ~/.config/hypr/monitors.conf |
| 9 | source = ~/.config/hypr/workspaces.conf | 12 | # source = ~/.config/hypr/workspaces.conf |
| 10 | # hyprlang noerror false | 13 | # # hyprlang noerror false |
| 11 | ''; | 14 | # ''; |
| 12 | }; | 15 | }; |
| 13 | 16 | ||
| 14 | home.packages = with pkgs; [ nwg-displays ]; | 17 | home.packages = with pkgs; [ nwg-displays ]; |
users/natalie/home/hyprland/settings.nix+4-1
| ... | @@ -29,7 +29,7 @@ | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | ||
| 30 | # https://wiki.hypr.land/Configuring/Dwindle-Layout/ | 30 | # https://wiki.hypr.land/Configuring/Dwindle-Layout/ |
| 31 | dwindle = { | 31 | dwindle = { |
| 32 | psuedotile = false; | 32 | pseudotile = false; |
| 33 | force_split = 2; | 33 | force_split = 2; |
| 34 | preserve_split = true; | 34 | preserve_split = true; |
| 35 | }; | 35 | }; |
| ... | @@ -115,6 +115,9 @@ | ... | @@ -115,6 +115,9 @@ |
| 115 | xwayland = { | 115 | xwayland = { |
| 116 | force_zero_scaling = true; | 116 | force_zero_scaling = true; |
| 117 | }; | 117 | }; |
| 118 | debug = { | ||
| 119 | disable_logs = false; | ||
| 120 | }; | ||
| 118 | }; | 121 | }; |
| 119 | 122 | ||
| 120 | } | 123 | } |
users/natalie/home/waybar/settings.nix+1-3
| ... | @@ -1,4 +1,4 @@ | ... | @@ -1,4 +1,4 @@ |
| 1 | { ... }: | 1 | { pkgs, ... }: |
| 2 | let | 2 | let |
| 3 | custom = { | 3 | custom = { |
| 4 | font = "Maple Mono"; | 4 | font = "Maple Mono"; |
| ... | @@ -38,10 +38,8 @@ in | ... | @@ -38,10 +38,8 @@ in |
| 38 | "memory" | 38 | "memory" |
| 39 | "pulseaudio" | 39 | "pulseaudio" |
| 40 | "network" | 40 | "network" |
| 41 | "battery" | ||
| 42 | "hyprland/language" | 41 | "hyprland/language" |
| 43 | "custom/notification" | 42 | "custom/notification" |
| 44 | "custom/power-menu" | ||
| 45 | ]; | 43 | ]; |
| 46 | clock = { | 44 | clock = { |
| 47 | calendar = { | 45 | calendar = { |