Improve colors
This commit is contained in:
Malte Brandy
parent
9ec9447a71
commit
aea1281d9f
|
|
@ -1,5 +1,7 @@
|
||||||
{ pkgs, lib, config, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
let inherit (import ../../pkgs) desktop-pkgs;
|
let
|
||||||
|
inherit (import ../../pkgs) desktop-pkgs;
|
||||||
|
inherit (import ../../lib) colors;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./sway.nix
|
./sway.nix
|
||||||
|
|
@ -23,26 +25,7 @@ in {
|
||||||
"config"
|
"config"
|
||||||
];
|
];
|
||||||
terminal = "${desktop-pkgs.terminal}/bin/terminal";
|
terminal = "${desktop-pkgs.terminal}/bin/terminal";
|
||||||
colors = {
|
colors = colors;
|
||||||
"foreground" = "#dddbff";
|
|
||||||
"background" = "#000000";
|
|
||||||
"black" = "#000000";
|
|
||||||
"brightBlack" = "#55508f";
|
|
||||||
"red" = "#e34b4f";
|
|
||||||
"brightRed" = "#e34b4f";
|
|
||||||
"green" = "#67b779";
|
|
||||||
"brightGreen" = "#45b75e";
|
|
||||||
"yellow" = "#ff9c00";
|
|
||||||
"brightYellow" = "#ff9c00";
|
|
||||||
"blue" = "#5c67ff";
|
|
||||||
"brightBlue" = "#5c67ff";
|
|
||||||
"magenta" = "#cb85ff";
|
|
||||||
"brightMagenta" = "#cb85ff";
|
|
||||||
"cyan" = "#17d0f4";
|
|
||||||
"brightCyan" = "#17d0f4";
|
|
||||||
"white" = "#dddbff";
|
|
||||||
"brightWhite" = "#ffffff";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
home = { packages = builtins.attrValues desktop-pkgs; };
|
home = { packages = builtins.attrValues desktop-pkgs; };
|
||||||
programs.browserpass.enable = true;
|
programs.browserpass.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
set $mod Mod4
|
set $mod Mod4
|
||||||
set $term ate
|
|
||||||
set $lock swaylock -e -F -l -s fill -f -i ~/volatile/wallpaper.jpg
|
set $lock swaylock -e -F -l -s fill -f -i ~/volatile/wallpaper.jpg
|
||||||
|
|
||||||
exec systemctl --user set-environment SWAYSOCK="$SWAYSOCK"
|
exec systemctl --user set-environment SWAYSOCK="$SWAYSOCK"
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ in {
|
||||||
"prior" = "focus parent";
|
"prior" = "focus parent";
|
||||||
"next" = "focus child";
|
"next" = "focus child";
|
||||||
"shift+q" =
|
"shift+q" =
|
||||||
"exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
|
"exec ${pkgs.sway}/bin/swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'";
|
||||||
"Return" = "exec ${terminal}";
|
"Return" = "exec ${terminal}";
|
||||||
"q" = "kill";
|
"q" = "kill";
|
||||||
"space" = "exec hotkeys";
|
"space" = "exec hotkeys";
|
||||||
|
|
@ -119,6 +119,7 @@ in {
|
||||||
font monospace 9.5
|
font monospace 9.5
|
||||||
height 17
|
height 17
|
||||||
strip_workspace_numbers yes
|
strip_workspace_numbers yes
|
||||||
|
position top
|
||||||
|
|
||||||
mode hide
|
mode hide
|
||||||
|
|
||||||
|
|
@ -158,6 +159,7 @@ in {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exec ${pkgs.mako}/bin/mako --background-color ${colors.background}cc --text-color ${colors.foreground} --border-size 0
|
||||||
exec ${my-pkgs.my-ssh-add}/bin/my-ssh-add
|
exec ${my-pkgs.my-ssh-add}/bin/my-ssh-add
|
||||||
exec xrdb -load ${builtins.toFile "Xresources" "Xft.dpi: 96"}
|
exec xrdb -load ${builtins.toFile "Xresources" "Xft.dpi: 96"}
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,8 @@ in {
|
||||||
value = mkService name account;
|
value = mkService name account;
|
||||||
};
|
};
|
||||||
hasImapHost = name: account: account.imap != null;
|
hasImapHost = name: account: account.imap != null;
|
||||||
in mapAttrs' mkServiceWithName
|
in mapAttrs' mkServiceWithName
|
||||||
(filterAttrs hasImapHost config.accounts.email.accounts);
|
(filterAttrs hasImapHost config.accounts.email.accounts);
|
||||||
|
|
||||||
programs.msmtp.enable = true;
|
programs.msmtp.enable = true;
|
||||||
programs.mbsync.enable = true;
|
programs.mbsync.enable = true;
|
||||||
|
|
@ -107,77 +107,78 @@ in {
|
||||||
video/*; ${pkgs.xdg_utils}/bin/xdg-open %s > /dev/null
|
video/*; ${pkgs.xdg_utils}/bin/xdg-open %s > /dev/null
|
||||||
audio/*; ${pkgs.xdg_utils}/bin/xdg-open %s > /dev/null
|
audio/*; ${pkgs.xdg_utils}/bin/xdg-open %s > /dev/null
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
".neomuttrc".text = ''
|
".neomuttrc".text = ''
|
||||||
alternative_order text/plain text/html
|
alternative_order text/plain text/html
|
||||||
auto_view text/*
|
auto_view text/*
|
||||||
auto_view message/*
|
auto_view message/*
|
||||||
unset wait_key
|
unset wait_key
|
||||||
|
color normal default default
|
||||||
|
|
||||||
set query_format="%4c %t %-70.70a %-70.70n %?e?(%e)?"
|
set query_format="%4c %t %-70.70a %-70.70n %?e?(%e)?"
|
||||||
set query_command = "${pkgs.notmuch}/bin/notmuch address --output=recipients --deduplicate=address '%s' | grep -i '%s'"
|
set query_command = "${pkgs.notmuch}/bin/notmuch address --output=recipients --deduplicate=address '%s' | grep -i '%s'"
|
||||||
bind editor <Tab> complete-query
|
bind editor <Tab> complete-query
|
||||||
bind editor ^T complete
|
bind editor ^T complete
|
||||||
|
|
||||||
set crypt_use_gpgme = yes
|
set crypt_use_gpgme = yes
|
||||||
set pgp_use_gpg_agent = yes
|
set pgp_use_gpg_agent = yes
|
||||||
set pgp_auto_decode = yes
|
set pgp_auto_decode = yes
|
||||||
set pgp_autosign = yes
|
set pgp_autosign = yes
|
||||||
set pgp_replysign = yes
|
set pgp_replysign = yes
|
||||||
set pgp_replyencrypt = yes
|
set pgp_replyencrypt = yes
|
||||||
set crypt_replysignencrypted = yes
|
set crypt_replysignencrypted = yes
|
||||||
set crypt_verify_sig = yes
|
set crypt_verify_sig = yes
|
||||||
set pgp_sign_as="${me.gpg}"
|
set pgp_sign_as="${me.gpg}"
|
||||||
set pgp_use_gpg_agent = yes
|
set pgp_use_gpg_agent = yes
|
||||||
set pgp_default_key="${me.gpg}"
|
set pgp_default_key="${me.gpg}"
|
||||||
set timeout = 5
|
set timeout = 5
|
||||||
|
|
||||||
|
|
||||||
alternates ${mutt_alternates}
|
alternates ${mutt_alternates}
|
||||||
set folder="${maildir}"
|
set folder="${maildir}"
|
||||||
mailboxes `find ${maildir} -type d -name Inbox -printf '"%h" '` `find ${maildir} -type d -name cur -printf '"%h" '`
|
mailboxes `find ${maildir} -type d -name Inbox -printf '"%h" '` `find ${maildir} -type d -name cur -printf '"%h" '`
|
||||||
set sendmail="${pkgs.msmtp}/bin/msmtp --read-envelope-from"
|
set sendmail="${pkgs.msmtp}/bin/msmtp --read-envelope-from"
|
||||||
set sort=threads
|
set sort=threads
|
||||||
set sort_aux=date-sent
|
set sort_aux=date-sent
|
||||||
set realname="${me.name}"
|
set realname="${me.name}"
|
||||||
set from=fill-later
|
set from=fill-later
|
||||||
set use_from=yes
|
set use_from=yes
|
||||||
set fast_reply=yes
|
set fast_reply=yes
|
||||||
set mailcap_path=${mailcap};
|
set mailcap_path=${mailcap};
|
||||||
set include=yes
|
set include=yes
|
||||||
set edit_headers=yes
|
set edit_headers=yes
|
||||||
set mbox_type=Maildir
|
set mbox_type=Maildir
|
||||||
set spoolfile="${maildir}/hera/Inbox"
|
set spoolfile="${maildir}/hera/Inbox"
|
||||||
set record="${maildir}/hera/Archiv/unsortiert"
|
set record="${maildir}/hera/Archiv/unsortiert"
|
||||||
set postponed="${maildir}/hera/Drafts"
|
set postponed="${maildir}/hera/Drafts"
|
||||||
set mail_check_stats=yes
|
set mail_check_stats=yes
|
||||||
bind index / vfolder-from-query
|
bind index / vfolder-from-query
|
||||||
set header_cache = "~/.cache/neomutt"
|
set header_cache = "~/.cache/neomutt"
|
||||||
set date_format="!%y-%m-%d %H:%M"
|
set date_format="!%y-%m-%d %H:%M"
|
||||||
set mime_forward=yes
|
set mime_forward=yes
|
||||||
set mime_forward_rest=yes
|
set mime_forward_rest=yes
|
||||||
|
|
||||||
macro index <F5> "!systemctl --user start mbsync > /dev/null<enter>"
|
macro index <F5> "!systemctl --user start mbsync > /dev/null<enter>"
|
||||||
|
|
||||||
source "${hide-sidebar}"
|
source "${hide-sidebar}"
|
||||||
macro index <right> "<enter-command>source ${hide-sidebar}<enter>"
|
macro index <right> "<enter-command>source ${hide-sidebar}<enter>"
|
||||||
macro index <left> "<enter-command>source ${show-sidebar}<enter>"
|
macro index <left> "<enter-command>source ${show-sidebar}<enter>"
|
||||||
set sidebar_folder_indent=yes
|
set sidebar_folder_indent=yes
|
||||||
set sidebar_short_path=yes
|
set sidebar_short_path=yes
|
||||||
set sidebar_width=40
|
set sidebar_width=40
|
||||||
set sidebar_sort_method="alpha"
|
set sidebar_sort_method="alpha"
|
||||||
set sidebar_indent_string=" "
|
set sidebar_indent_string=" "
|
||||||
color sidebar_indicator black white
|
color sidebar_indicator black white
|
||||||
color sidebar_highlight white blue
|
color sidebar_highlight white blue
|
||||||
set sidebar_format = "%B%* %?N?%N/?%S"
|
set sidebar_format = "%B%* %?N?%N/?%S"
|
||||||
|
|
||||||
alias f__0 ${me.name} <${me.mail}>
|
alias f__0 ${me.name} <${me.mail}>
|
||||||
${builtins.concatStringsSep "\n"
|
${builtins.concatStringsSep "\n"
|
||||||
(lib.imap1 (n: x: "alias f__${toString n} ${me.name} <${x}>")
|
(lib.imap1 (n: x: "alias f__${toString n} ${me.name} <${x}>")
|
||||||
me.alternates)}
|
me.alternates)}
|
||||||
send2-hook '~f fill-later' "push <edit-from><kill-line>f__<complete><search>${me.mail}<enter>"
|
send2-hook '~f fill-later' "push <edit-from><kill-line>f__<complete><search>${me.mail}<enter>"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
rec {
|
rec {
|
||||||
colors = {
|
colors = {
|
||||||
"foreground" = "#dddbff";
|
"foreground" = "#dddbff";
|
||||||
"background" = "#000000";
|
"background" = "#000018";
|
||||||
"black" = "#000000";
|
"black" = "#000000";
|
||||||
"brightBlack" = "#55508f";
|
"brightBlack" = "#55508f";
|
||||||
"red" = "#e34b4f";
|
"red" = "#e34b4f";
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,17 @@
|
||||||
n:
|
n:
|
||||||
n.override (let
|
n.override (let
|
||||||
pkgs = import <nixpkgs> { };
|
pkgs = import <nixpkgs> { };
|
||||||
tabnine = (import ../../lib).sources.tabnine-vim;
|
inherit (import ../../lib) sources colors;
|
||||||
|
tabnine = sources.tabnine-vim;
|
||||||
in {
|
in {
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
withPython3 = true;
|
withPython3 = true;
|
||||||
configure = {
|
configure = {
|
||||||
customRC = ''
|
customRC = ''
|
||||||
set rtp+=${tabnine}
|
set rtp+=${tabnine}
|
||||||
${builtins.readFile ./vimrc}'';
|
${builtins.readFile ./vimrc}
|
||||||
|
hi Normal ctermbg=NONE
|
||||||
|
'';
|
||||||
packages.myVimPackage = {
|
packages.myVimPackage = {
|
||||||
start = builtins.attrValues {
|
start = builtins.attrValues {
|
||||||
inherit (pkgs.vimPlugins)
|
inherit (pkgs.vimPlugins)
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,6 @@ let g:autoformat_autoindent = 0
|
||||||
let g:autoformat_retab = 0
|
let g:autoformat_retab = 0
|
||||||
|
|
||||||
colorscheme PaperColor
|
colorscheme PaperColor
|
||||||
hi Normal ctermbg=black
|
|
||||||
|
|
||||||
" if hidden is not set, TextEdit might fail.
|
" if hidden is not set, TextEdit might fail.
|
||||||
set hidden
|
set hidden
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue