diff --git a/common.nix b/common.nix index 16018c4..ffe19f6 100644 --- a/common.nix +++ b/common.nix @@ -1,5 +1,7 @@ { config, pkgs, ... }: -{ +let + colors = import ./colors.nix; +in { imports = [ ./vim ./tmux.nix @@ -7,13 +9,18 @@ (import ./termite.nix { config = config; pkgs = pkgs; - colors = import ./colors.nix; + colors = colors; }) ./gpg.nix ./ssh.nix ./git.nix ./gtk.nix ./xdg.nix + (import ./mako.nix { + config = config; + pkgs = pkgs; + colors = colors; + }) ]; systemd.user.services = { diff --git a/mako.nix b/mako.nix new file mode 100644 index 0000000..949fe40 --- /dev/null +++ b/mako.nix @@ -0,0 +1,24 @@ +{ config, pkgs, colors, ...}: +{ + programs.mako = { + enable = true; + anchor = "bottom-right"; + backgroundColor = colors.color8; + borderColor = colors.color0; + defaultTimeout = -1; + font = "Source Code Pro 8"; + format = ''%a %s\n%b''; + height = 100; + #groupBy = "app-name"; + icons = false; + ignoreTimeout = false; + layer = "overlay"; + margin = "0,0,0"; + maxVisible = 200; + padding = "0"; + progressColor = colors.color4; + sort = "+time"; + textColor = colors.foreground; + width = 400; + }; +} diff --git a/metis.nix b/metis.nix index 2993ec7..53f0699 100644 --- a/metis.nix +++ b/metis.nix @@ -26,12 +26,14 @@ in systemd.user.sessionVariables = userEnv; home.packages = with pkgs; [ + libnotify aspellDicts.en aspellDicts.de aspellDicts.en-science aspellDicts.en-computers aspell xorg.xev + evince gnumake graphviz xwayland diff --git a/sway/config b/sway/config index 4ed1f8c..7182496 100644 --- a/sway/config +++ b/sway/config @@ -223,7 +223,7 @@ bar { status_command i3blocks mode dock modifier $mod - position top + position bottom strip_workspace_numbers yes workspace_buttons yes #output LVDS-1 @@ -297,6 +297,7 @@ assign [app_id="jetbrains-studio"] workspace 3 assign [app_id="org.keepassxc.KeePassXC"] workspace 10 exec xset s off +exec mako #exec swayidle -w timeout 300 '$HOME/bin/lock-session' timeout 240 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep '$HOME/bin/lock-session' lock '$HOME/bin/lock-session' #exec redshift #exec keepassxc diff --git a/sway/default.nix b/sway/default.nix index f040da7..6d853e0 100644 --- a/sway/default.nix +++ b/sway/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ...}: +{ config, pkgs, lib, colors, ...}: let unstable = import {}; in { @@ -31,3 +31,4 @@ in { ''; }; } +