diff --git a/home-manager/default.nix b/home-manager/default.nix index 0413ae9..a183cbc 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -90,7 +90,7 @@ in fzf ncmpcpp acpi - joplin-desktop # gui + unstable.joplin-desktop unstable.prusa-slicer htop diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix index 6995b3f..d1c722a 100644 --- a/home-manager/modules/sway.nix +++ b/home-manager/modules/sway.nix @@ -5,11 +5,9 @@ in { wayland.windowManager.sway = { enable = true; - package = pkgs.swayfx; wrapperFeatures.gtk = true; # Sway can't find wallpaper.jpg and failes to build - # swayfx also has some problems: # https://discourse.nixos.org/t/sway-fails-with-cannot-create-gles2-renderer-after-update/45703/2 checkConfig = false; @@ -42,12 +40,12 @@ in } // lib.optionalAttrs (nixosConfig.networking.hostName == "smithers") { "eDP-1" = { mode = "2256x1504"; - scale = "1.3"; + scale = "1.2"; position = "0,0"; }; }; - gaps = { inner = 10; }; + gaps = { inner = 5; }; window.border = 2; window.hideEdgeBorders = "smart"; workspaceAutoBackAndForth = true; @@ -98,8 +96,8 @@ in { command = ''${pkgs.swayidle}/bin/swayidle -w \ timeout 600 "${lockCmd}" \ - timeout 900 "${pkgs.swayfx}/bin/swaymsg output * dpms off" \ - resume "${pkgs.swayfx}/bin/swaymsg output * dpms on" \ + timeout 900 "${pkgs.sway}/bin/swaymsg output * dpms off" \ + resume "${pkgs.sway}/bin/swaymsg output * dpms on" \ before-sleep "${lockCmd}"''; } ]; @@ -191,13 +189,6 @@ in }; }; - extraConfig = '' - blur enable - blur_radius 10 - - default_dim_inactive 0.2 - corner_radius 15 - ''; }; } diff --git a/home-manager/modules/waybar.css b/home-manager/modules/waybar.css index a153050..149790c 100644 --- a/home-manager/modules/waybar.css +++ b/home-manager/modules/waybar.css @@ -66,6 +66,7 @@ } .modules-center { padding: 3px; + padding-right: 10px; background-color: @dark; margin: 0 0 5px 0; border-radius: 10px; @@ -87,6 +88,7 @@ #pulseaudio, #temperature, #tray, +#idle_inhibitor, #disk { background: transparent; color: @light;