Merge branch 'main' into feature/neovim-improvements
This commit is contained in:
commit
01fc42e15f
|
@ -12,8 +12,7 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
|
||||||
home.packages = [
|
home.packages = [
|
||||||
#mySignalDesktop
|
ps-signal-desktop
|
||||||
signal-desktop
|
|
||||||
tdesktop
|
tdesktop
|
||||||
element-desktop
|
element-desktop
|
||||||
irssi
|
irssi
|
||||||
|
|
|
@ -22,7 +22,6 @@ in
|
||||||
[ "$(tty)" = "/dev/tty1" ] && exec sway
|
[ "$(tty)" = "/dev/tty1" ] && exec sway
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
nano = "nvim";
|
nano = "nvim";
|
||||||
vi = "nvim";
|
vi = "nvim";
|
||||||
|
@ -84,6 +83,10 @@ in
|
||||||
stty -ixon
|
stty -ixon
|
||||||
stty erase '^?'
|
stty erase '^?'
|
||||||
|
|
||||||
|
precmd () {
|
||||||
|
echo -e "\e]2;$(pwd)\e\\"
|
||||||
|
}
|
||||||
|
|
||||||
# If a command is not found, show me where it is
|
# If a command is not found, show me where it is
|
||||||
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
|
||||||
''
|
''
|
||||||
|
|
|
@ -195,7 +195,16 @@
|
||||||
typeset -g POWERLEVEL9K_DIR_{HOME,HOME_SUBFOLDER}_BACKGROUND=1
|
typeset -g POWERLEVEL9K_DIR_{HOME,HOME_SUBFOLDER}_BACKGROUND=1
|
||||||
typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_BACKGROUND=1
|
typeset -g POWERLEVEL9K_DIR_NOT_WRITABLE_BACKGROUND=1
|
||||||
|
|
||||||
typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true
|
# If directory is too long, shorten some of its segments to the shortest possible unique
|
||||||
|
# prefix. The shortened directory can be tab-completed to the original.
|
||||||
|
typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique
|
||||||
|
# Color of the shortened directory segments.
|
||||||
|
typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=0
|
||||||
|
# Color of the anchor directory segments. Anchor segments are never shortened. The first
|
||||||
|
# segment is always an anchor.
|
||||||
|
typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=0
|
||||||
|
# Display anchor directory segments in bold.
|
||||||
|
typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=false
|
||||||
# Don't shorten directories that contain any of these files. They are anchors.
|
# Don't shorten directories that contain any of these files. They are anchors.
|
||||||
local anchor_files=(
|
local anchor_files=(
|
||||||
.bzr
|
.bzr
|
||||||
|
@ -228,13 +237,13 @@
|
||||||
# contains a marker (.git) and other directories don't.
|
# contains a marker (.git) and other directories don't.
|
||||||
typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false
|
typeset -g POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER=false
|
||||||
# Don't shorten this many last directory segments. They are anchors.
|
# Don't shorten this many last directory segments. They are anchors.
|
||||||
typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=100
|
typeset -g POWERLEVEL9K_SHORTEN_DIR_LENGTH=1
|
||||||
# Shorten directory if it's longer than this even if there is space for it. The value can
|
# Shorten directory if it's longer than this even if there is space for it. The value can
|
||||||
# be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty,
|
# be either absolute (e.g., '80') or a percentage of terminal width (e.g, '50%'). If empty,
|
||||||
# directory will be shortened only when prompt doesn't fit or when other parameters demand it
|
# directory will be shortened only when prompt doesn't fit or when other parameters demand it
|
||||||
# (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below).
|
# (see POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS and POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS_PCT below).
|
||||||
# If set to `0`, directory will always be shortened to its minimum length.
|
# If set to `0`, directory will always be shortened to its minimum length.
|
||||||
typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=
|
typeset -g POWERLEVEL9K_DIR_MAX_LENGTH=80
|
||||||
# When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this
|
# When `dir` segment is on the last prompt line, try to shorten it enough to leave at least this
|
||||||
# many columns for typing commands.
|
# many columns for typing commands.
|
||||||
typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40
|
typeset -g POWERLEVEL9K_DIR_MIN_COMMAND_COLUMNS=40
|
||||||
|
|
|
@ -14,6 +14,7 @@ in
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"amd_iommu=on"
|
"amd_iommu=on"
|
||||||
|
"intel_iommu=on"
|
||||||
"iommu=pt"
|
"iommu=pt"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,7 @@ with final; {
|
||||||
toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
|
toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
|
||||||
uhk-agent = import ./uhk-agent.nix final;
|
uhk-agent = import ./uhk-agent.nix final;
|
||||||
wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
|
wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
|
||||||
|
|
||||||
|
# ps-fixes
|
||||||
|
ps-signal-desktop = writeShellScriptBin "signal-desktop" (import ./ps-signal-desktop.nix final);
|
||||||
}
|
}
|
||||||
|
|
3
pkgs/ps-signal-desktop.nix
Normal file
3
pkgs/ps-signal-desktop.nix
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
self: with self; ''
|
||||||
|
exec ${signal-desktop}/bin/signal-desktop --disable-gpu -- "$@"
|
||||||
|
''
|
Loading…
Reference in a new issue