diff --git a/home/default.nix b/home/default.nix index dd3b881b..cb8c8f57 100644 --- a/home/default.nix +++ b/home/default.nix @@ -220,7 +220,7 @@ } rsync-local-config () { HOST=$1 - for TARGET in emacs doom starship.toml; do + for TARGET in starship.toml; do SOURCE="${config.xdg.configHome}/$TARGET" if [[ -e ${config.xdg.configHome}/$TARGET ]]; then [[ -d $SOURCE ]] && SOURCE="$SOURCE/" diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index 2994fb86..b3950da1 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -181,24 +181,30 @@ in '' windowrule = center,(davmail-imap-ImapConnection) windowrule = float,(wlogout) windowrule = center,(wlogout) + windowrule = size 100% 100%,(wlogout) windowrule = nofullscreenrequest,(wlogout) windowrule = nomaximizerequest,(wlogout) - windowrule = size 75% 75%,(wlogout) + windowrule = noborder,(wlogout) + windowrule = noanim,(wlogout) windowrule = pin,(wlogout) - windowrule = dimaround,(wlogout) windowrule = stayfocused,(wlogout) + windowrule = keepaspectratio,(wlogout) windowrule = pin,(Rofi) windowrule = dimaround,(Rofi) windowrule = stayfocused,(Rofi) windowrule = nofullscreenrequest,(firefox) windowrule = nomaximizerequest,(firefox) windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) + windowrulev2 = float,title:^(Extension.*)$,class:(firefox) windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) - windowrulev2 = workspace special silent, title:^(Firefox — Sharing Indicator)$ - windowrulev2 = workspace special silent, title:^(.*is sharing (your screen|a window)\.)$ + windowrulev2 = pin,title:^(Extension.*)$,class:(firefox) + windowrulev2 = center,title:(File|Picture-in-Picture),class:(firefox) + windowrulev2 = center,title:^(Extension.*)$,class:(firefox) + windowrulev2 = workspace special silent, title:^(Firefox — Sharing Indicator)$,class:(firefox) + windowrulev2 = workspace special silent, title:^(.*is sharing (your screen|a window)\.)$,class:(firefox) windowrulev2 = float,title:(Open),class:(soffice) - windowrulev2 = float,class:(steam),title:(Friends List) - windowrulev2 = float,class:(steam),title:(Steam Settings) + windowrulev2 = float,title:(Friends List),class:(steam) + windowrulev2 = float,title:(Steam Settings),class:(steam) # Workspace definitions # 1: [t]erminal diff --git a/home/hyprland/wlogout/default.nix b/home/hyprland/wlogout/default.nix index dd602eb8..673294a9 100644 --- a/home/hyprland/wlogout/default.nix +++ b/home/hyprland/wlogout/default.nix @@ -23,52 +23,53 @@ keybind = "l"; } ]; - style = let - shutdownIcon = ./icons/shutdown.png; - rebootIcon = ./icons/reboot.png; - logoutIcon = ./icons/logout.png; - in '' - * { - font-family: "Fira Sans"; - } + style = with config.lib.stylix.colors.withHashtag; + let + font-family = config.stylix.fonts.sansSerif.name; + shutdownIcon = ./icons/shutdown.png; + rebootIcon = ./icons/reboot.png; + logoutIcon = ./icons/logout.png; + in '' + * { font-family: "${font-family}"; } - window { - background: transparent; - } + window { + border: none; + background: transparent; + } - button { - background-repeat: no-repeat; - background-position: center; - background-size: 25%; - border: none; - background-color: rgba(36, 39, 58, .5); - box-shadow: none; - margin: 5px; - font-size: 20px; - color: #6e738d; - } + button { + border: ${base0D}; + background-color: alpha(${base00}, 0.8); + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + box-shadow: none; + margin: 5px; + font-size: 20px; + color: ${base05}; + } - button:hover { - background-color: rgba(183, 189, 248, .05); - color: #cad3f5; - } + button:hover { + background-color: ${base01}; + color: ${base05}; + } - button:focus { - background-color: rgba(202, 211, 245, .1); - color: #cad3f5; - } + button:focus { + background-color: ${base03}; + color: ${base05}; + } - #shutdown { - background-image: url("${shutdownIcon}"); - } + #shutdown { + background-image: url("${shutdownIcon}"); + } - #reboot { - background-image: url("${rebootIcon}"); - } + #reboot { + background-image: url("${rebootIcon}"); + } - #logout { - background-image: url("${logoutIcon}"); - } - ''; + #logout { + background-image: url("${logoutIcon}"); + } + ''; }; } diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix index 3fc58b64..309c8adf 100644 --- a/hosts/Ronin/home.nix +++ b/hosts/Ronin/home.nix @@ -23,7 +23,7 @@ disable_splash_rendering = true } - monitor=eDP-1,preferred,0x190,1.5 - monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,1280x190,1 + monitor=eDP-1,preferred,0x480,1.5 + monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,1280x0,1 ''; }