Sway : Use names for colors.

This commit is contained in:
Dmitry Voronin 2024-04-02 06:01:10 +03:00
parent 435a6ec9e0
commit cee243f86f
7 changed files with 25 additions and 231 deletions

View file

@ -7,7 +7,6 @@
./desktop/Portal.nix
./desktop/Realtime.nix
./desktop/Sound.nix
./desktop/Waybar.nix
];
@ -34,9 +33,9 @@
environment = {
variables = {
FOOT_CONFIG = ./foot/Foot.ini;
SWAY_CONFIG = ./sway/module;
SWAY_SCRIPT_IWT = "${pkgs.sway-contrib.inactive-windows-transparency}/bin/inactive-windows-transparency.py";
FOOT_CONFIG = ./foot/Foot.ini;
SWAY_CONFIG = ./sway/module;
SWAY_IWT_PATH = "${pkgs.sway-contrib.inactive-windows-transparency}/bin/inactive-windows-transparency.py";
# PATH = [ "/etc/swaybin" ]; # NOTE: Kept as an example on PATH modification.
};
};

View file

@ -1,3 +0,0 @@
{ ... }: {
programs.waybar.enable = true;
}

View file

@ -1,21 +1,22 @@
set $bg #282828
set $bg_2 #504945
set $fg #000000
set $fg_1 #fbf1c7
set $fg_2 #d5c4a1
set $red #cc241d
set $green #98971a
set $yellow #b8bb26
set $blue #458588
set $blue_faded #076678
set $purple #b16286
set $aqua #689d68
set $gray #a89984
set $darkgray #1d2021
set $aqua 689d68
set $bg 1d2021
set $bg_1 504945
set $blue 458588
set $blue_faded 076678
set $darkgray 282828
set $fg ebdbb2
set $fg_1 fbf1c7
set $fg_2 d5c4a1
set $gray a89984
set $green 98971a
set $purple b16286
set $red cc241d
set $transparent ffffff00
set $yellow b8bb26
# Class Border Bground Text Indicator ChildBorder
client.focused $yellow $yellow $fg $yellow $yellow
client.focused_inactive $bg_2 #5f676a $fg #484e50 #5f676a
client.unfocused $bg_2 #282828 #888888 #292d2e #222222
client.urgent #2f343a #cc241d $fg_1 #cc241d #cc241d
client.placeholder #1d2021 #0c0c0c $fg #000000 #0c0c0c
client.focused #$yellow #$yellow #$fg #$yellow #$yellow
client.focused_inactive #$bg_1 #5f676a #$fg #484e50 #5f676a
client.unfocused #$bg_1 #282828 #888888 #292d2e #222222
client.urgent #2f343a #cc241d #$fg_1 #cc241d #cc241d
client.placeholder #1d2021 #0c0c0c #$fg #000000 #0c0c0c

View file

@ -1,6 +1,6 @@
# Application launcher.
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
set $menu _dmenu_path_wrapped | wmenu -b -p 'Run:' -i -f "SF Pro Display Medium 14" -M 1d2021 -S 1d2021 -N 1d2021 -m b8bb26 -s b8bb26 -n ebdbb2 | xargs swaymsg exec --
set $menu _dmenu_path_wrapped | wmenu -b -p 'Run:' -i -f "SF Pro Display Medium 14" -M $bg -S $bg -N $bg -m $yellow -s $yellow -n $fg | xargs swaymsg exec --
bindsym $mod+space exec $menu

View file

@ -18,7 +18,7 @@ bindsym $mod+Tab layout toggle split tabbed
bindsym $mod+f fullscreen
# Dim inactive windows.
exec $SWAY_SCRIPT_IWT --opacity 0.85
exec $SWAY_IWT_PATH --opacity 0.85
# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.

View file

@ -14,7 +14,6 @@
".config/gtk-4.0".source = ./module/gtk/4;
".config/htop".source = ./module/top/htop;
".config/mako".source = ./module/mako;
".config/waybar".source = ./module/waybar;
".editorconfig".source = ./module/Editorconfig;
".parallel/will-cite".text = "";
"media/template".source = ./module/template;

View file

@ -1,202 +0,0 @@
// -*- mode: jsonc -*-
{
"layer": "top",
"position": "top",
// "height": 30,
// "width": 1280, // Waybar width
"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": [
"sway/workspaces",
"sway/mode",
"sway/scratchpad",
"custom/media"
],
"modules-center": [
"sway/window"
],
"modules-right": [
"mpd",
"idle_inhibitor",
"pulseaudio",
"network",
"power-profiles-daemon",
"cpu",
"memory",
"temperature",
"backlight",
"keyboard-state",
"sway/language",
"battery",
"battery#bat2",
"clock",
"tray"
],
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "warp-on-scroll": false,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"keyboard-state": {
"numlock": true,
"capslock": true,
"format": "{name} {icon}",
"format-icons": {
"locked": "",
"unlocked": ""
}
},
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
"sway/scratchpad": {
"format": "{icon} {count}",
"show-empty": false,
"format-icons": ["", ""],
"tooltip": true,
"tooltip-format": "{app}: {title}"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 5,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
},
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"clock": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% ",
"tooltip": false
},
"memory": {
"format": "{}% "
},
"temperature": {
// "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": ["", "", ""]
},
"backlight": {
// "device": "acpi_video1",
"format": "{percent}% {icon}",
"format-icons": ["", "", "", "", "", "", "", "", ""]
},
"battery": {
"states": {
// "good": 95,
"warning": 30,
"critical": 15
},
"format": "{capacity}% {icon}",
"format-full": "{capacity}% {icon}",
"format-charging": "{capacity}% ",
"format-plugged": "{capacity}% ",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": ["", "", "", "", ""]
},
"battery#bat2": {
"bat": "BAT2"
},
"power-profiles-daemon": {
"format": "{icon}",
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
"tooltip": true,
"format-icons": {
"default": "",
"performance": "",
"balanced": "",
"power-saver": ""
}
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ipaddr}/{cidr} ",
"tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
"format": "{volume}% {icon} {format_source}",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
"format-source": "{volume}% ",
"format-source-muted": "",
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["", "", ""]
},
"on-click": "pavucontrol"
},
"custom/media": {
"format": "{icon} {}",
"return-type": "json",
"max-length": 40,
"format-icons": {
"spotify": "",
"default": "🎜"
},
"escape": true,
"exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
// "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
}
}