Browse Source

some changes

main
Evelyn Alicke 2 years ago
parent
commit
b88da7757e
  1. 94
      kitty/kitty.conf
  2. 4
      mako/config
  3. 14
      tmux/tmux.conf
  4. 126
      waybar/config
  5. 272
      waybar/style.css
  6. 277
      wayfire.ini

94
kitty/kitty.conf

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
#: individual font faces and even specify special fonts for particular
#: characters.
font_family Victor Mono
font_family atkinson hyperlegible
bold_font auto
italic_font auto
bold_italic_font auto
@ -61,7 +61,7 @@ disable_ligatures never @@ -61,7 +61,7 @@ disable_ligatures never
#: map alt+1 disable_ligatures_in active always
#: map alt+2 disable_ligatures_in all never
#: map alt+3 disable_ligatures_in tab cursor
map alt+3 disable_ligatures_in tab cursor
box_drawing_scale 0.001, 1, 1.5, 2
@ -333,7 +333,7 @@ draw_minimal_borders yes @@ -333,7 +333,7 @@ draw_minimal_borders yes
#: that setting a non-zero window margin overrides this and causes all
#: borders to be drawn.
window_margin_width 10.0
window_margin_width 0.0
#: The window margin (in pts) (blank area outside the border)
@ -451,10 +451,10 @@ tab_title_template {title} @@ -451,10 +451,10 @@ tab_title_template {title}
#: goto_tab N.
active_tab_foreground #000
active_tab_background #eee
active_tab_background #b9d
active_tab_font_style bold-italic
inactive_tab_foreground #444
inactive_tab_background #999
inactive_tab_foreground #aaa
inactive_tab_background #111
inactive_tab_font_style normal
#: Tab bar colors and styles
@ -464,11 +464,10 @@ inactive_tab_font_style normal @@ -464,11 +464,10 @@ inactive_tab_font_style normal
#: Color scheme {{{
foreground #ffffff
background #000000
#: The foreground and background colors
background_opacity 0.80
background_opacity 0.60
#: The opacity of the background. A number between 0 and 1, where 1 is
#: opaque and 0 is fully transparent. This will only work if
@ -497,69 +496,34 @@ dim_opacity 0.75 @@ -497,69 +496,34 @@ dim_opacity 0.75
#: How much to dim text that has the DIM/FAINT attribute set. One
#: means no dimming and zero means fully dimmed (i.e. invisible).
selection_foreground #000000
#: The foreground for text selected with the mouse. A value of none
#: means to leave the color unchanged.
selection_background #fffacd
#: The background for text selected with the mouse.
color0 #0a4c62
color1 #99246e
color2 #5cb1b3
color3 #eab9a8
color4 #90a5bd
color5 #9d54a7
color6 #7e83cc
color7 #f0e8d6
#color8 #201637
#color9 #c87272
#color10 #0a6c7e
#color11 #7a3188
#color12 #39173d
#color13 #bc94b7
#color14 #5e6071
#color15 #0a6c7e
#selection_foreground #1c0c28
cursor #ffffff
foreground #ffffff
#selection_background #babab9
#underline_color #59175a
#url_color #59175a
#: The 16 terminal colors. There are 8 basic colors, each color has a
#: dull and bright version. You can also set the remaining colors from
#: the 256 color table as color16 to color255.
color0 #111111
color8 #767676
#: black
color1 #ff6666
color9 #f2201f
#: red
color2 #66ff66
color10 #23fd00
#: green
color3 #ffff66
color11 #fffd00
#: yellow
color4 #6666ff
color12 #1a8fff
#: blue
color5 #ff66ff
color13 #fd28ff
#: magenta
color6 #66ffff
color14 #14ffff
#: cyan
color7 #ffffff
color15 #ffffff
#: white
#define oxide_00_black #212121
#define oxide_01_red #e57373
#define oxide_02_green #a6bc69
#define oxide_03_yellow #fac863
#define oxide_04_blue #6699cc
#define oxide_05_magenta #c594c5
#define oxide_06_cyan #5fb3b3
#define oxide_07_white #c0c5ce
#define oxide_08_bright_black #5c5c5c
#define oxide_15_bright_white #f3f4f5
#: }}}

4
mako/config

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
font=Victor Mono 9
font=atkinson hyperlegible 10
text-color=#ffffffff
background-color=#000000cd
background-color=#00000088
width=300
border-size=2
border-radius=10

14
tmux/tmux.conf

@ -19,17 +19,21 @@ set -g @mode_indicator_empty_mode_style 'bg=cyan,fg=black' @@ -19,17 +19,21 @@ set -g @mode_indicator_empty_mode_style 'bg=cyan,fg=black'
set -g @suspend_key 'F12'
set -g @suspend_suspended_options " \
status-style::bg=black\\,fg=brightblack bold dim, \
status-style::bg=#101010\\,fg=#303030 bold dim, \
window-status-current-style:gw:bg=brightblack\\,fg=black, \
window-status-last-style:gw:fg=brightblack, \
window-status-style:gw:bg=brightblack\\,fg=white, \
@mode_indicator_custom_prompt:: SUSPENDED , \
window-status-last-style:gw:fg=#ff0000, \
window-status-style:gw:bg=#101010\\,fg=white, \
pane-active-style:gw:fg=#ff0000, \
@mode_indicator_custom_prompt:: SUS , \
@mode_indicator_custom_mode_style::bg=brightred\\,fg=white, \
"
set -g status-right '%Y-%m-%d %H:%M #{tmux_mode_indicator}'
set -g pane-border-style fg='#666666'
set -g pane-active-border-style fg='#442244'
set -g status-style bg='#503070'
set -g status-style 'bg=#010101,fg=#ffffff'
# set -g window-status-last-style
# set -g mouse on
run '~/.config/tmux/plugins/tpm/tpm'

126
waybar/config

@ -1,123 +1,33 @@ @@ -1,123 +1,33 @@
// add to git
{
// "layer": "top", // Waybar at top layer
// "position": "bottom", // Waybar position (top|bottom|left|right)
"height": 20, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
"modules-center": ["sway/window"],
"modules-right": ["idle_inhibitor", "network", "bluetooth", "battery", "battery#bat2", "clock", "tray"],
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
"sway/window": {
"max-length": 50
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"position": "bottom",
"modules-left": ["wlr/workspaces"],
"modules-center": ["network"],
"modules-right": ["battery", "clock"],
"height": "20",
"clock": {
// "timezone": "Europe/Berlin",
"format": "{:%Y-%m-%d %H:%M}",
"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-charging": "{capacity}% ",
"format-plugged": "{capacity}% ",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format": "🡳{capacity}% at {power}W",
"format-charging": "🡱{capacity}%",
"format-plugged": "{capacity}%",
"format-critical": "!{capacity}% at {power}W",
"format-icons": ["", "", "", "", ""]
},
"battery#bat2": {
"bat": "BAT2"
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
"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": ["", "", ""]
"format":"",
"format-linked": "link on {ifname}",
"format-disconnected": "no network connected",
},
"on-click": "pavucontrol"
},
"bluetooth": {
"format": "{icon}",
"format-alt": "bluetooth: {status}",
"on-click": "blueman-manager",
"format-icons": {
"enabled": "",
"disabled": ""
},
"tooltip-format": "{}"
"wlr/workspaces": {
"format": "{name}"
},
"custom/state": {
"exec": "/usr/bin/waybar-custom-state",
}
}

272
waybar/style.css

@ -1,274 +1,48 @@ @@ -1,274 +1,48 @@
* {
border: none;
border-radius: 0;
/* `otf-font-awesome` is required to be installed for icons */
font-family: Victor Mono Medium ,Roboto, Helvetica, Arial, sans-serif;
font-size: 12px;
min-height: 0;
font-family: atkinson hyperlegible;
font-size: 14px;
}
window#waybar {
background-color: rgba(0,0,0, 0.8);
color: transparent;
transition-property: all;
transition-duration: 200ms;
transition-timing-function: ease-in-out;
background: black;
}
window#waybar.hidden {
background-color: yellow;
}
window#waybar.empty {
background-color: transparent;
}
window#waybar.solo {
background-color: rgba(0,0,0,0.8);
}
window#waybar.termite {
background-color: #3F3F3F;
}
window#waybar.chromium {
background-color: #000000;
border: none;
}
#workspaces button {
padding: 0 5px;
background-color: transparent;
min-width: 10px;
color: white;
/* Use box-shadow instead of border so the text isn't offset */
transition-property: box-shadow, color;
transition-duration: 200ms;
transition-timing-function: ease-in-out;
}
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
#workspaces button:hover {
background: rgba(0, 0, 0, 0.2);
color: rgba(100,50,255,1);
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
/* box-shadow: inset 0 -3px #ffffff; */
}
#workspaces button.focused {
background: rgba(0, 0, 0, 0.5);
color: #ff00aa;
border-bottom-right-radius: 5px;
border-bottom-left-radius: 5px;
}
#workspaces button.urgent {
background-color: #eb4d4b;
}
#mode {
background-color: #64727D;
}
#clock{
}
#battery,
#cpu,
#memory,
#disk,
#temperature,
#backlight,
#network,
#pulseaudio,
#custom-media,
#tray,
#mode,
#idle_inhibitor{
padding: 0 10px;
margin: 0 4px;
color: #222;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
}
#mpd {
padding: 0 10px;
margin: 0 4px;
color: #ffffff;
opacity: 0.2;
}
#window {
transition-property: color;
transition-duration: 1s;
}
#workspaces {
margin: 0 1px;
background: black;
}
/* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces {
margin-left: 0;
}
/* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces {
margin-right: 0;
}
#clock {
background-color: rgba(20,20,20,0.6);
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
widget > * {
margin: 0px;
padding: 0px 10px 0px 10px;
transition: none;
min-height:10px;
background: transparent;
color: white;
padding: 0 10px;
margin: 0 4px;
}
#battery {
background-color: rgba(20,20,20,0.6);
color: #fff;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
transition-property: background-color;
transition-duration: 500ms;
}
#battery.charging, #battery.plugged {
color: #ffffff;
background-color: #689948;
}
@keyframes blink {
to {
background-color: #ffffff;
color: #000000;
}
}
#battery.critical:not(.charging) {
background-color: #e54c4c;
color: #ffffff;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
label:focus {
background-color: #000000;
}
#cpu {
background-color: #2ecc71;
color: #000000;
color: #91ffc1;
transition: color 0.2s ease;
}
#memory {
background-color: #9b59b6;
#battery.warning {
color: #ffc144;
}
#disk {
background-color: #964B00;
}
#backlight {
background-color: #90b1b1;
#battery.critical {
color: #ff4444;
}
#network {
background-color: rgba(10, 120, 120, 0.6);
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
transition-property: background-color;
transition-duration: 500ms;
color: white;
}
#network.disconnected {
background-color: rgba(120, 10, 10, 0.6);
}
#bluetooth {
background-color: rgba(170, 110, 180, 0.6);
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
transition-property: background-color;
transition-duration: 500ms;
padding: 0 10px;
margin: 0 4px;
color: white;
}
#pulseaudio {
background-color: #f1c40f;
color: #000000;
}
#pulseaudio.muted {
background-color: #90b1b1;
color: #2a5c45;
}
#custom-media {
background-color: #66cc99;
color: #2a5c45;
min-width: 100px;
}
#custom-media.custom-spotify {
background-color: #66cc99;
}
#custom-media.custom-vlc {
background-color: #ffa000;
}
#temperature {
background-color: #f0932b;
}
#temperature.critical {
background-color: #eb4d4b;
}
#tray {
background-color: rgba(20,20,20,0.6);
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
}
#idle_inhibitor {
background-color: rgba(20,20,20, 0.6);
color: rgba(200,200,200, 0.6);
}
#idle_inhibitor.activated {
background-color: #ecf0f1;
color: #2d3436;
}
#mpd {
background-color: #66cc99;
color: #2a5c45;
}
#mpd.disconnected {
background-color: #f53c3c;
color: #91ffc1;
transition: color 0.2s ease;
}
#mpd.stopped {
background-color: #90b1b1;
}
#mpd.paused {
background-color: #51a37a;
#network.linked{
color: #ffc144;
}
#language {
background: #00b093;
color: #740864;
padding: 0 5px;
margin: 0 5px;
min-width: 16px;
#network.disconnected{
color: #ff4444;
}

277
wayfire.ini

@ -0,0 +1,277 @@ @@ -0,0 +1,277 @@
# Input configuration ──────────────────────────────────────────────────────────
[input]
xkb_layout = de
xkb_variant = us
#mouse_accel_profile = flat
# I like to use this with my external mouse but I have not configured it
# Core options ─────────────────────────────────────────────────────────────────
[core]
plugins = \
alpha \
animate \
autostart \
command \
fast-switcher \
grid \
idle \
invert \
move \
oswitch \
place \
resize \
switcher \
vswitch \
window-rules \
wm-actions \
wrot \
zoom \
expo \
follow-focus \
blur \
scale
background_color = 0 0 0 1
# Close focused window.
close_top_view = <super> <shift> KEY_Q | <alt> KEY_F4
# Workspaces arranged into a grid: 3 × 3.
vwidth = 5
vheight = 5
# Prefer client-side decoration or server-side decoration
preferred_decoration_mode = server
[place]
mode = cascade
# Mouse bindings ───────────────────────────────────────────────────────────────
# Drag windows by holding down Super and left mouse button.
[move]
activate = <super> BTN_LEFT
# Resize them with right mouse button + Super.
[resize]
activate = <super> BTN_RIGHT
# Zoom in the desktop by scrolling + Super.
[zoom]
modifier = <super>
# Change opacity by scrolling with Super + Alt.
[alpha]
modifier = <super> <alt>
# Rotate windows with the mouse.
[wrot]
activate = <super> <ctrl> BTN_RIGHT
# Startup commands ─────────────────────────────────────────────────────────────
[autostart]
#background = feh Downloads/milad-fakurian-seA-FPPXL-M-unsplash.jpg
automatic_output_configuration = kanshi
notification_daemon = mako
information_bar = waybar
#gamma = gammastep -l 7:51 -t 6500:3000 -b 1:0.8
idle = swayidle before-sleep export LAST_BRIGHTNESS=$(light -G) && light -S 1 && swaylock -i Downloads/lock.png -u && light -S $LAST_BRIGHTNESS
#idle = swayidle before-sleep swaylock --color 000000
portal = /usr/libexec/xdg-desktop-portal
element_dekstop = element-desktop
firefox_main = firefox
[window-rules]
rule_element_desktop_0 = on created if app_id is "element-desktop" then assign_workspace 2 5
rule_element_desktop_1 = on created if app_id is "element-desktop" then maximise
# Applications ─────────────────────────────────────────────────────────────────
[command]
binding_terminal = <super> KEY_ENTER
command_terminal = kitty
binding_super_terminal = <super> <shift> KEY_ENTER
command_super_terminal = kitty mosh root@map-services.in-nue.evl.li
binding_qalculate = <super> KEY_Q
command_qalculate = qalculate-gtk
binding_launcher = <super> KEY_D
command_launcher = bemenu-run --fn "atkinson hyperlegible[15]" -b -ip ">" -W 0.8
binding_lock = <super> KEY_L
# command_lock = swaylock --color 000000
command_lock = export LAST_BRIGHTNESS=$(light -G) && light -S 1 && swaylock -i Downloads/lock.png -u && light -S $LAST_BRIGHTNESS
binding_suspend = <super> <shift> KEY_S
# command_suspend = swaylock --color 000000 & systemctl suspend
command_suspend = export LAST_BRIGHTNESS=$(light -G) && light -S 1 && swaylock -i Downloads/lock.png -u & systemctl suspend & light -S 100
binding_hibrenate = <super> <shift> <alt> KEY_S
command_hibrenate = systemctl hibrenate
# Logout
# https://github.com/ArtsyMacaw/wlogout
binding_logout = <super> KEY_ESC
command_logout = wlogout
# Screenshots
# https://wayland.emersion.fr/grim/
# https://wayland.emersion.fr/slurp/
binding_screenshot = <super> KEY_P
command_screenshot = grimshot copy area
binding_screenshot2 = <print>
command_screenshot2 = grimshot copy area
binding_screenshot_interactive = <shift> KEY_PRINT
command_screenshot_interactive = slurp | grim -g - $(date '+%F_%T').webp
# Volume controls
repeatable_binding_volume_up = KEY_VOLUMEUP
command_volume_up = pactl set-sink-volume @DEFAULT_SINK@ +5%
repeatable_binding_volume_down = KEY_VOLUMEDOWN
command_volume_down = pactl set-sink-volume @DEFAULT_SINK@ -5%
binding_mute = KEY_MUTE
command_mute = pactl set-sink-mute @DEFAULT_SINK@ toggle
# Screen brightness
# https://haikarainen.github.io/light/
repeatable_binding_light_up = KEY_BRIGHTNESSUP
command_light_up = light -A 5
repeatable_binding_light_down = KEY_BRIGHTNESSDOWN
command_light_down = light -U 5
# Windows ──────────────────────────────────────────────────────────────────────
# Actions related to window management functionalities.
#
# Example configuration:
#
[wm-actions]
#toggle_fullscreen = <super> KEY_F
toggle_always_on_top = <super> KEY_X
# toggle_sticky = <super> <shift> KEY_X
# Position the windows in certain regions of the output.
[grid]
#
# ⇱ ↑ ⇲ │ 7 8 9
# ← f → │ 4 5 6
# ⇱ ↓ ⇲ d │ 1 2 3 0
# ‾ ‾
slot_bl = <super> KEY_KP1
slot_b = <super> KEY_KP2
slot_br = <super> KEY_KP3
slot_l = <super> KEY_LEFT | <super> KEY_KP4
slot_c = <super> KEY_UP | <super> KEY_KP5
slot_r = <super> KEY_RIGHT | <super> KEY_KP6
slot_tl = <super> KEY_KP7
slot_t = <super> KEY_KP8
slot_tr = <super> KEY_KP9
# Restore default.
restore = <super> KEY_DOWN | <super> KEY_KP0
# Change active window with an animation.
[switcher]
next_view = <alt> KEY_TAB
prev_view = <alt> <shift> KEY_TAB
# Simple active window switcher.
[fast-switcher]
activate = <alt> KEY_ESC
# Workspaces ───────────────────────────────────────────────────────────────────
# Switch to workspace.
[vswitch]
binding_left = <ctrl> <super> KEY_LEFT
binding_down = <ctrl> <super> KEY_DOWN
binding_up = <ctrl> <super> KEY_UP
binding_right = <ctrl> <super> KEY_RIGHT
# Move the focused window with the same key-bindings, but add Shift.
with_win_left = <ctrl> <super> <shift> KEY_LEFT
with_win_down = <ctrl> <super> <shift> KEY_DOWN
with_win_up = <ctrl> <super> <shift> KEY_UP
with_win_right = <ctrl> <super> <shift> KEY_RIGHT
# i3-like bindings
binding_1 = <super> KEY_1
binding_2 = <super> KEY_2
binding_3 = <super> KEY_3
binding_4 = <super> KEY_4
binding_5 = <super> KEY_5
binding_6 = <super> KEY_6
binding_7 = <super> KEY_7
binding_8 = <super> KEY_8
binding_9 = <super> KEY_9
binding_10 = <super> KEY_0
send_win_1 = <super> <shift> KEY_1
send_win_2 = <super> <shift> KEY_2
send_win_3 = <super> <shift> KEY_3
send_win_4 = <super> <shift> KEY_4
send_win_5 = <super> <shift> KEY_5
send_win_6 = <super> <shift> KEY_6
send_win_7 = <super> <shift> KEY_7
send_win_8 = <super> <shift> KEY_8
send_win_9 = <super> <shift> KEY_9
send_win_10 = <super> <shift> KEY_0
duration = 0
# Outputs ──────────────────────────────────────────────────────────────────────
# Invert the colors of the whole output.
[invert]
toggle = <super> KEY_I
# Rules ────────────────────────────────────────────────────────────────────────
# Example configuration:
#
# [window-rules]
# maximize_alacritty = on created if app_id is "Alacritty" then maximize
#
# You can get the properties of your applications with the following command:
# $ WAYLAND_DEBUG=1 alacritty 2>&1 | kak
#
# See Window rules for a complete reference.
# https://github.com/WayfireWM/wayfire/wiki/Configuration#window-rules
[animate]
close_animation = fade
open_animation = fade
duration = 100
fire_particles = 32
fire_particle_size = 16
[wobbly]
friction = 5
spring_k = 100
grid_resolution = 7
[follow-focus]
raise_on_top = false
[expo]
toggle = <super> KEY_MINUS
background = 0.4 0.4 0.5 1
offset = 5
[autostart]
0_0 = systemctl --user import-environment
xdg = sleep 1 && (XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=sway /usr/lib/xdg-desktop-portal --replace & /usr/lib/xdg-desktop-portal-wlr)
[scale]
toggle = <super> KEY_A
duration = 200
[blur]
method=box
box_degrade=1
Loading…
Cancel
Save