authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-10-30 14:16:39-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-10-30 14:16:39-07:00
log6045cbf0f62a8a50ec2f16a9668132cb5e85e158
tree8106a9ecafeca84b83dde8840a323f2bca2796f2
parentfbddb0a867385b4cf18724a648a3c2b6f1fa9493
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/home.nix+4
......@@ -19,6 +19,10 @@
1919 lsd.enable = true;
2020 android-sdk.enable = true;
2121 # sort-lines:end
22 ghostty = {
23 enable = true;
24 settings.theme = "Catppuccin Mocha";
25 };
2226
2327 fish = {
2428 shellAliases =
users/natalie/home/default.nix+2
......@@ -5,5 +5,7 @@
55 ./hyprland
66 ./vicinae.nix
77 ./swaync.nix
8 ./gtk.nix
9 ./waybar
810 ];
911}
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 @@
1919 "${pkgs.swaynotificationcenter}/bin/swaync &"
2020 "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &"
2121 "${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'"
2324 # "init-wallpaper &"
2425 #
2526 # "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 @@
1414 wayland
1515 direnv
1616 playerctl
17 waybar
18 networkmanagerapplet
1719 ];
1820 systemd.user.targets.hyprland-session.Unit.Wants = [
1921 "xdg-desktop-autostart.target"
users/natalie/home/hyprland/hyprlock.nix+1-1
......@@ -1,7 +1,7 @@
11{ ... }:
22{
33 programs.hyprlock = {
4 enable = true;
4 enable = false;
55
66 settings = {
77 general = {
users/natalie/home/hyprland/monitors.nix+10-7
......@@ -1,14 +1,17 @@
11{ pkgs, ... }:
22{
33 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 ];
58
6 extraConfig = ''
7 # hyprlang noerror true
8 source = ~/.config/hypr/monitors.conf
9 source = ~/.config/hypr/workspaces.conf
10 # hyprlang noerror false
11 '';
9 # extraConfig = ''
10 # # hyprlang noerror true
11 # source = ~/.config/hypr/monitors.conf
12 # source = ~/.config/hypr/workspaces.conf
13 # # hyprlang noerror false
14 # '';
1215 };
1316
1417 home.packages = with pkgs; [ nwg-displays ];
users/natalie/home/hyprland/settings.nix+4-1
......@@ -29,7 +29,7 @@
2929
3030 # https://wiki.hypr.land/Configuring/Dwindle-Layout/
3131 dwindle = {
32 psuedotile = false;
32 pseudotile = false;
3333 force_split = 2;
3434 preserve_split = true;
3535 };
......@@ -115,6 +115,9 @@
115115 xwayland = {
116116 force_zero_scaling = true;
117117 };
118 debug = {
119 disable_logs = false;
120 };
118121 };
119122
120123}
users/natalie/home/waybar/settings.nix+1-3
......@@ -1,4 +1,4 @@
1{ ... }:
1{ pkgs, ... }:
22let
33 custom = {
44 font = "Maple Mono";
......@@ -38,10 +38,8 @@ in
3838 "memory"
3939 "pulseaudio"
4040 "network"
41 "battery"
4241 "hyprland/language"
4342 "custom/notification"
44 "custom/power-menu"
4543 ];
4644 clock = {
4745 calendar = {