diff --git a/configuration.nix b/configuration.nix index ca4a3ca..e2e0a3a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,11 +6,13 @@ { imports = [ + # custom modules ./modules/colors.nix # Include the results of the hardware scan. ./hardware-configuration.nix + # roles ./roles/admin.nix ./roles/base.nix ./roles/desktop.nix diff --git a/dotfiles/alacritty.yml b/dotfiles/alacritty.yml index eac8077..4d524b9 100644 --- a/dotfiles/alacritty.yml +++ b/dotfiles/alacritty.yml @@ -3,7 +3,6 @@ font: family: CaskaydiaCove Nerd Font size: 12 -background_opacity: 0.9 draw_bold_text_with_bright_colors: true colors: @@ -23,6 +22,7 @@ colors: window: dynamic_title: true + opacity: 0.9 env: TERM: xterm-256color diff --git a/dotfiles/sway/config b/dotfiles/sway/config index b3bd122..4fdd32b 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -115,6 +115,19 @@ mode "resize" { } bindsym $mod+r mode "resize" +mode "umlaut" { + bindsym s exec wtype ß + bindsym a exec wtype ä + bindsym o exec wtype ö + bindsym u exec wtype ü + bindsym Shift+a exec wtype Ä + bindsym Shift+o exec wtype Ö + bindsym Shift+u exec wtype Ü + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym $mod+u mode "umlaut" + bar { font $font position bottom @@ -148,6 +161,7 @@ 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 +exec systemctl --user import-environment DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR # pastebin exec wl-paste --primary -t text --watch clipman store diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml index 60ef6eb..90c512f 100644 --- a/dotfiles/sway/status.toml +++ b/dotfiles/sway/status.toml @@ -23,7 +23,7 @@ backlight_full = "" backlight_partial1 = "" backlight_partial2 = "" backlight_partial3 = "" -bat = "" +bat = "" bat_charging = "" bat_discharging = "" bat_empty = "" diff --git a/packages/cloudstation.nix b/packages/cloudstation.nix index 3196d59..745c4e4 100644 --- a/packages/cloudstation.nix +++ b/packages/cloudstation.nix @@ -57,6 +57,7 @@ in buildFHSUserEnv { runScript = writeScript "cloudstation" '' #!/usr/bin/env bash export QT_PLUGIN_PATH="${pkgs.qt5.qtbase.bin}/${pkgs.qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM=xcb ${cloudstation}/bin/launcher export LD_LIBRARY_PATH="/home/stefan/.CloudStation/CloudStation.app/lib:$LD_LIBRARY_PATH" diff --git a/roles/desktop.nix b/roles/desktop.nix index c4a159e..36313d3 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -186,7 +186,7 @@ in xdg_utils xfce.thunar xfce.thunar-volman - ydotool + wtype (pkgs.writeTextFile { name = "startsway"; destination = "/bin/startsway";