Compare commits

..

2 commits

3 changed files with 22 additions and 30 deletions

View file

@ -1,10 +1,10 @@
{ pkgs, inputs, ... }: {
{ pkgs, ... }: {
config.modules = {
application = {
gnupg.enable = true;
gnupg.enable = false;
zathura.enable = true;
foot.enable = true;
imv.enable = true;
foot.enable = false;
imv.enable = false;
};
audio = {
cmus.enable = true;
@ -12,11 +12,7 @@
cli = {
direnv.enable = true;
ghq.enable = true;
git = {
enable = true;
userEmail = inputs.nix-private.git.personal.userEmail;
signingKey = inputs.nix-private.git.personal.signingKey;
};
git.enable = true;
neovim.enable = true;
starship.enable = true;
tmux.enable = true;
@ -33,9 +29,8 @@
web.webcord.enable = false;
gaming.lutris.enable = false;
desktop.sway = {
enable = true;
enable = false;
kanshi = false;
swaylock.useNullPackage = true;
wallpapers.lockscreen = "${./files/lockscreen.png}";
wallpapers.desktop = "${./files/background.png} fill #000000";
waybar = {
@ -44,7 +39,7 @@
enable = false;
};
cpuThermal = {
thermalZone = 2;
thermalZone = "2";
# hwmonPathAbs = "";
# inputFilename = "";
};

View file

@ -1,24 +1,21 @@
_:
{
wayland.windowManager.sway.config.output = {
"eDP-1" = {
scale = "1.4";
};
"HDMI-A-1" = {
disable = "";
};
};
wayland.windowManager.sway.config.input = {
"4617:27904:MNT_Research_MNT_Reform_Keyboard_2.0_US/LT" = {
xkb_layout = "us";
xkb_variant = "altgr-intl";
};
};
programs.zsh.loginExtra = ''
#notmutch
export NOTMUCH_CONFIG="$HOME/.config/notmuch/config"
# export PATH=~/.local/bin:$PATH
export PATH=~/.local/bin:$PATH
# export XDG_DATA_HOME=$HOME/.local/share
unset DEBUGINFOD_URLS
if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
export QT_QPA_PLATFORM="wayland-egl"
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export MOZ_ENABLE_WAYLAND=1
export QT_QPA_PLATFORMTHEME=qt5ct
export NO_AT_BRIDGE=1
export XDG_SESSION_TYPE=wayland
export XDG_CURRENT_DESKTOP=sway
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
exec ~/.local/bin/sway.sh
fi
'';
}

View file

@ -162,7 +162,7 @@ tmux_vsplit() {
tmux_hsplit() {
local size="${1:-20}"
debug "execute hsplit with size '${size}'"
tmux split-window -t "${SESSION_NAME}" -c "$CURRENT_PATH" -h -p "$size"
tmux split-window "${SESSION_NAME}" -c "$CURRENT_PATH" -h -p "$size"
}
tmux_neww() {