From 064ec2956540996be27eb738190203dc8b7bf4ec Mon Sep 17 00:00:00 2001 From: CherryKitten Date: Sun, 5 May 2024 10:27:01 +0200 Subject: [PATCH] Reorganize sway, replace waybar with default swaybar --- profiles/desktop/default.nix | 13 ++-- .../desktop/{sway.nix => sway/default.nix} | 56 +++++++++++++-- profiles/desktop/{ => sway}/mako.nix | 0 profiles/desktop/{ => sway}/wofi.nix | 0 profiles/desktop/waybar-config.json | 69 ------------------- profiles/desktop/waybar-style.css | 60 ---------------- profiles/desktop/waybar.nix | 12 ---- 7 files changed, 59 insertions(+), 151 deletions(-) rename profiles/desktop/{sway.nix => sway/default.nix} (81%) rename profiles/desktop/{ => sway}/mako.nix (100%) rename profiles/desktop/{ => sway}/wofi.nix (100%) delete mode 100644 profiles/desktop/waybar-config.json delete mode 100644 profiles/desktop/waybar-style.css delete mode 100644 profiles/desktop/waybar.nix diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix index 591abda..d6f3b12 100644 --- a/profiles/desktop/default.nix +++ b/profiles/desktop/default.nix @@ -1,16 +1,14 @@ { pkgs, ... }: { imports = [ - ./sway.nix - ./mako.nix - ./wofi.nix - ./waybar.nix + ./sway ./foot.nix ./firefox.nix ]; users.users.sammy.packages = with pkgs; [ telegram-desktop + mpv ]; services.logind.lidSwitch = "suspend-then-hibernate"; @@ -19,7 +17,12 @@ services.xserver = { enable = true; - displayManager.sddm.enable = true; + displayManager.sddm = { + enable = true; + wayland.enable = true; + autoNumlock = true; + }; + libinput.enable = true; xkb.layout = "de"; diff --git a/profiles/desktop/sway.nix b/profiles/desktop/sway/default.nix similarity index 81% rename from profiles/desktop/sway.nix rename to profiles/desktop/sway/default.nix index 9bb091f..6a61820 100644 --- a/profiles/desktop/sway.nix +++ b/profiles/desktop/sway/default.nix @@ -1,4 +1,10 @@ { config, pkgs, ... }: { + + imports = [ + ./mako.nix + ./wofi.nix + ]; + hardware.opengl.enable = true; programs.sway.enable = true; @@ -28,9 +34,7 @@ services.swayidle = let lockCommand = "${pkgs.writeShellScript "swaylock-command" '' - ${pkgs.grim}/bin/grim -t png -l 1 /tmp/lock-screenshot.png - ${pkgs.imagemagick}/bin/magick /tmp/lock-screenshot.png -blur 80x40 /tmp/lock-screenshot.png - ${pkgs.swaylock}/bin/swaylock -i /tmp/lock-screenshot.png + ${pkgs.swaylock}/bin/swaylock ''}"; in { @@ -60,8 +64,6 @@ terminal = "foot"; menu = "wofi --show drun"; - bars = [ ]; - window = { border = 0; hideEdgeBorders = "both"; @@ -82,6 +84,50 @@ }; }; + bars = [{ + mode = "dock"; + hiddenState = "hide"; + position = "bottom"; + workspaceButtons = true; + workspaceNumbers = true; + statusCommand = "${pkgs.i3status}/bin/i3status"; + fonts = { + names = [ "JetBrains Mono" ]; + size = 10.0; + }; + trayOutput = "primary"; + colors = { + background = "#000000"; + statusline = "#ffffff"; + separator = "#666666"; + focusedWorkspace = { + border = "#4c7899"; + background = "#285577"; + text = "#ffffff"; + }; + activeWorkspace = { + border = "#333333"; + background = "#5f676a"; + text = "#ffffff"; + }; + inactiveWorkspace = { + border = "#333333"; + background = "#222222"; + text = "#888888"; + }; + urgentWorkspace = { + border = "#2f343a"; + background = "#900000"; + text = "#ffffff"; + }; + bindingMode = { + border = "#2f343a"; + background = "#900000"; + text = "#ffffff"; + }; + }; + }]; + keybindings = { "${modifier}+Return" = "exec ${cfg.config.terminal}"; diff --git a/profiles/desktop/mako.nix b/profiles/desktop/sway/mako.nix similarity index 100% rename from profiles/desktop/mako.nix rename to profiles/desktop/sway/mako.nix diff --git a/profiles/desktop/wofi.nix b/profiles/desktop/sway/wofi.nix similarity index 100% rename from profiles/desktop/wofi.nix rename to profiles/desktop/sway/wofi.nix diff --git a/profiles/desktop/waybar-config.json b/profiles/desktop/waybar-config.json deleted file mode 100644 index 30973f5..0000000 --- a/profiles/desktop/waybar-config.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "layer": "top", - "position": "bottom", - "modules-left": [ - "sway/workspaces", - "sway/mode", - "tray" - ], - "modules-right": [ - "network", - "pulseaudio", - "temperature", - "cpu", - "memory", - "battery", - "clock" - ], - "cpu": { - "format": " {usage}%" - }, - "memory": { - "format": " {percentage}%", - "states": { - "warning": 15, - "critical": 75 - } - }, - "battery": { - "format": "{icon} {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "" - ], - "states": { - "critical": 10, - "warning": 25 - } - }, - "pulseaudio": { - "format": "{icon} {volume}%", - "format-icons": [ - "", - "" - ], - "format-muted": " muted" - }, - "clock": { - "format": "{:%a %Y-%m-%d %H:%M:%S%z}", - "interval": 1 - }, - "network": { - "format-wifi": " {essid} ({signalStrength}%)", - "format-ethernet": " connected", - "format-disconnected": "no network", - //An empty format will hide the module. - "tooltip-format": "IPv4: {ipaddr}/{cidr}\nFrequency: {frequency}MHz\nStrength:{signaldBm}dBm", - "max-length": 50, - "interval": 5 - }, - "temperature": { - "critical-threshold": 70, - "format": " {temperatureC}°C", - "interval": 1, - "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input" - } -} diff --git a/profiles/desktop/waybar-style.css b/profiles/desktop/waybar-style.css deleted file mode 100644 index 76ece20..0000000 --- a/profiles/desktop/waybar-style.css +++ /dev/null @@ -1,60 +0,0 @@ -* { - border: none; - border-radius: 0; - font-family: "JetBrains Mono", sans-serif; - font-size: 8pt; -} - -window { - background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0.4)); - color: #fff; -} -#workspaces { - padding-right: 15px; -} - -#workspaces button { - transition: none; - padding: 0 5px; - background: rgba(255, 255, 255, .2); - color: #fff; -} - -#workspaces button.icon label { - font-size: 10px; -} - -#workspaces button.focused { - color: #333; - background: #fff; -} - -/* :sparkles: maybe needs to be changed to button, when waybar breaks */ -window>*>*>*>label { - margin: 0 7px; - padding: 5px; - background-color: rgba(255, 255, 255, .2); - color: #fff; -} - -#tray { - margin-left: 10px; -} - -#pulseaudio.muted { - color: #ffbb00 -} -#network.disconnected, -#battery:not(.charging).warning, -#temperature.critical { - background: #ffbb00; - color: black; -} -#battery:not(.charging).critical { - background: #c50014; - color: white; -} - -#battery.charging { - background: #2a7230; -} diff --git a/profiles/desktop/waybar.nix b/profiles/desktop/waybar.nix deleted file mode 100644 index a78cfb6..0000000 --- a/profiles/desktop/waybar.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: { - users.users.sammy.packages = with pkgs; [ waybar ]; - home-manager.users.sammy = { - xdg.configFile."waybar/config".source = ./waybar-config.json; - xdg.configFile."waybar/style.css".source = ./waybar-style.css; - wayland.windowManager.sway.config.startup = [{ - command = "${pkgs.waybar}/bin/waybar"; - always = true; - }]; - }; -} -