diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index 46e87c4..a484d16 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -230,6 +230,7 @@ return { ft = 'oil', opts = { symbol_position = 'signcolumn', + can_use_signcolumn = function() return 'yes' end, show_file_highlights = false, show_directory_highlights = false, symbols = { diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix index 32f5ea3..d0fdb6e 100644 --- a/hosts/xps15/configuration.nix +++ b/hosts/xps15/configuration.nix @@ -8,7 +8,7 @@ let tuigreet = lib.getExe pkgs.tuigreet; loginShell = pkgs.writeShellScript "login-shell" '' - exec $(getent passwd $(id -un) | cut -d: -f7) -l + exec $(getent passwd $(id -un) | cut -d: -f7) -lc 'exec start-hyprland' ''; in { @@ -98,11 +98,6 @@ in export INPUTRC="$HOME/.config/nix/config/bash/inputrc" export THEME="midnight" ''; - # loginShellInit = '' - # if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then - # exec start-hyprland - # fi - # ''; interactiveShellInit = '' [ -f "$HOME/.config/nix/config/bash/bashrc" ] && . "$HOME/.config/nix/config/bash/bashrc" '';