This commit is contained in:
dusk 2020-11-24 23:04:53 +03:00
parent 258e31048d
commit 28d1d1540b
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 11 additions and 4 deletions

View File

@ -149,6 +149,7 @@ in {
environment = { environment = {
systemPackages = [ btrfsDiff ]; systemPackages = [ btrfsDiff ];
pathsToLink = [ "/share/zsh" ];
persistence."/persist" = { persistence."/persist" = {
directories = [ "/etc/nixos" ]; directories = [ "/etc/nixos" ];
files = [ "/etc/machine-id" ]; files = [ "/etc/machine-id" ];

View File

@ -192,7 +192,7 @@ in {
inherit font; inherit font;
}; };
sway = { sway = {
enable = false; enable = true;
extraSessionCommands = '' extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages # needs qt5.qtwayland in systemPackages
@ -261,7 +261,7 @@ in {
}; };
output = { output = {
"*" = { "*" = {
bg = config.home.homeDirectory + "wallpaper.png" + " fill"; bg = config.home.homeDirectory + "/wallpaper.png" + " fill";
}; };
}; };
}; };
@ -387,7 +387,7 @@ in {
# xdg compliant # xdg compliant
dotDir = ".config/zsh"; dotDir = ".config/zsh";
history.path = ".local/share/zsh/history"; history.path = ".local/share/zsh/history";
loginExtra = '' envExtra = ''
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages # needs qt5.qtwayland in systemPackages
export QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM=wayland
@ -395,11 +395,17 @@ in {
# Fix for some Java AWT applications (e.g. Android Studio), # Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly: # use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
'';
loginExtra = ''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
exec ${pkgBin "hikari"} exec ${pkgBin "hikari"}
fi fi
''; '';
initExtra = ''
bindkey "$terminfo[kRIT5]" forward-word
bindkey "$terminfo[kLFT5]" backward-word
zstyle ':completion:*' menu select
'';
shellAliases = nixosConfig.environment.shellAliases // { shellAliases = nixosConfig.environment.shellAliases // {
rember = '' rember = ''
${pkgs.kakoune-unwrapped}/bin/kak -e "try %(gtd-jump-today)" "${config.home.homeDirectory}/rember/stuff$(date '+_%m_%Y').gtd" ${pkgs.kakoune-unwrapped}/bin/kak -e "try %(gtd-jump-today)" "${config.home.homeDirectory}/rember/stuff$(date '+_%m_%Y').gtd"