From 4146b5aecec156367722a75f1e4dff5bf5f7cbc8 Mon Sep 17 00:00:00 2001 From: foosinn Date: Sun, 13 Feb 2022 00:28:15 +0100 Subject: [PATCH] reice a lot --- dotfiles/sway/config | 8 +++++--- dotfiles/sway/status.toml | 25 +++++++++++++++---------- roles/desktop.nix | 14 +++++++++++--- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dotfiles/sway/config b/dotfiles/sway/config index b14990e..b3bd122 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -7,7 +7,7 @@ set $right l set $term alacritty set $wallpaper /home/stefan/Downloads/bg.jpg set $lock swaylock -t -i $wallpaper --scaling=fill -set $font pango:CaskaydiaCove Nerd Font Mono 10 +set $font CaskaydiaCove Nerd Font 10 set $menucolor --ff=#f8f8f2 --nf=#f8f8f2 --tf=#bd93f9 --hf=#bd93f9 --tb=#282a36 --fb=#282a36 --nb=#282a36 --hb=#282a36 --sb=#282a36 set $menu bemenu-run -H 23 -b -p run $menucolor @@ -116,6 +116,7 @@ mode "resize" { bindsym $mod+r mode "resize" bar { + font $font position bottom colors { background $black @@ -133,8 +134,8 @@ bar { set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'Arc-Dark' - gsettings set $gnome-schema icon-theme 'elementary Xfce' + gsettings set $gnome-schema gtk-theme 'Dracula' + gsettings set $gnome-schema icon-theme 'Dracula' gsettings set $gnome-schema cursor-theme 'Capitaine Cursors - White' } @@ -146,6 +147,7 @@ exec mako --font "$font" \ exec emacs --daemon exec swayidle before-sleep "$lock" exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1 +exec redshift -l 49.8988135:10.9027636 # pastebin exec wl-paste --primary -t text --watch clipman store diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml index 18b43e2..60ef6eb 100644 --- a/dotfiles/sway/status.toml +++ b/dotfiles/sway/status.toml @@ -23,22 +23,25 @@ backlight_full = "" backlight_partial1 = "" backlight_partial2 = "" backlight_partial3 = "" -bat = "" -bat_charging = " " -bat_discharging = "" -bat_empty = "" -bat_full = "" -cogs = "" -disk_space = "" +bat = "" +bat_charging = "" +bat_discharging = "" +bat_empty = "" +bat_quarter = "" +bat_half = "" +bat_three_quarters = "" +bat_full = "" +cogs = "龍" +disk_drive = "" headphones = "  " -memory_mem = "" +memory_mem = "" net_down = "DOWN" net_up = "UP" net_vpn = " " net_wired = "" net_wireless = " " thermometer = "  " -time = "" +time = "" volume_empty = "" volume_full = "" volume_half = "" @@ -64,9 +67,9 @@ command = '''echo " $(cat /sys/class/thermal/thermal_zone0/temp | head -c 2) [[block]] block = "disk_space" path = "/" -alias = " /" info_type = "available" unit = "GB" +format = "{icon} {available}" interval = 20 warning = 20.0 alert = 10.0 @@ -95,6 +98,7 @@ block = "battery" device = "BAT0" interval = 10 format = "{percentage} ({time})" +full_format = "{percentage} ({time}) " icons_format = " {icon} " [[block]] @@ -102,6 +106,7 @@ block = "battery" device = "BAT1" interval = 10 format = "{percentage} ({time})" +full_format = "{percentage} ({time}) " icons_format = " {icon} " [[block]] diff --git a/roles/desktop.nix b/roles/desktop.nix index 3bf6310..d88935e 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -5,6 +5,8 @@ let colors = config.colors; + schema = pkgs.gsettings-desktop-schemas; + datadir = "${schema}/share/gsettings-schemas/${schema.name}"; unstable = import { config.allowUnfree = true; }; in { @@ -17,12 +19,15 @@ in { i3status-rust kanshi mako + redshift-wlr slurp swayidle swaylock - xwayland wf-recorder + xwayland ]; + extraSessionCommands = '' + ''; }; xdg.portal = { @@ -151,7 +156,9 @@ key_bindings: arc-theme capitaine-cursors + dracula-theme elementary-xfce-icon-theme + glib gsettings-desktop-schemas gtk-engine-murrine gtk_engines @@ -195,8 +202,8 @@ key_bindings: text = '' #! ${pkgs.bash}/bin/bash - export GTK_ICON_THEME=Tango - export GTK_THEME=Blackbird + export GTK_ICON_THEME=Dracula + export GTK_THEME=Dracula export _JAVA_AWT_WM_NOREPARENTING=1 export MOZ_ENABLE_WAYLAND=1 export MOZ_USE_XINPUT2=1 @@ -205,6 +212,7 @@ key_bindings: export QT_WAYLAND_FORCE_DPI=96 export SDL_VIDEODRIVER=wayland export XDG_CURRENT_DESKTOP=sway + export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS export XDG_SESSION_TYPE=wayland ${pkgs.dbus}/bin/dbus-run-session ${pkgs.sway}/bin/sway