From 6e14acf607362c8975a9705754722daf250ab6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Wed, 9 Jan 2019 00:28:02 +0100 Subject: [PATCH] Changed terminal to kitty and split up even more shit --- config/{ => xsession}/dunstrc.nix | 0 config/xsession/terminal.nix | 53 +++++++++++++++ config/{ => xsession}/xsession.nix | 11 +++- config/{ => xsession}/zsh/ntfy.yml | 0 .../powerlevel9k/.github/ISSUE_TEMPLATE.md | 0 .../.github/PULL_REQUEST_TEMPLATE.md | 0 .../oh-my-zsh-custom/powerlevel9k/.gitignore | 0 .../oh-my-zsh-custom/powerlevel9k/.gitmodules | 0 .../oh-my-zsh-custom/powerlevel9k/.travis.yml | 0 .../powerlevel9k/CHANGELOG.md | 0 .../powerlevel9k/CODE_OF_CONDUCT.md | 0 .../zsh/oh-my-zsh-custom/powerlevel9k/LICENSE | 0 .../oh-my-zsh-custom/powerlevel9k/README.md | 0 .../oh-my-zsh-custom/powerlevel9k/TESTS.md | 0 .../powerlevel9k/debug/font-issues.zsh | 0 .../powerlevel9k/debug/iterm.zsh | 0 .../powerlevel9k/docker/antibody/Dockerfile | 0 .../powerlevel9k/docker/antibody/install.zsh | 0 .../powerlevel9k/docker/antibody/zshrc | 0 .../powerlevel9k/docker/antigen/Dockerfile | 0 .../powerlevel9k/docker/antigen/install.zsh | 0 .../powerlevel9k/docker/antigen/zshrc | 0 .../docker/base-4.3.11/Dockerfile | 0 .../powerlevel9k/docker/base-5.0.3/Dockerfile | 0 .../powerlevel9k/docker/base-5.1.1/Dockerfile | 0 .../powerlevel9k/docker/base-5.2/Dockerfile | 0 .../powerlevel9k/docker/base-5.3.1/Dockerfile | 0 .../powerlevel9k/docker/base-5.4.2/Dockerfile | 0 .../powerlevel9k/docker/base-5.5.1/Dockerfile | 0 .../powerlevel9k/docker/dotfile/Dockerfile | 0 .../powerlevel9k/docker/dotfile/zshrc | 0 .../powerlevel9k/docker/fred-sudoers | 0 .../powerlevel9k/docker/omz/Dockerfile | 0 .../powerlevel9k/docker/omz/install.zsh | 0 .../powerlevel9k/docker/omz/zshrc | 0 .../powerlevel9k/docker/prezto/Dockerfile | 0 .../powerlevel9k/docker/prezto/install.zsh | 0 .../powerlevel9k/docker/zgen/Dockerfile | 0 .../powerlevel9k/docker/zgen/install.zsh | 0 .../powerlevel9k/docker/zgen/zshrc | 0 .../powerlevel9k/docker/zim/Dockerfile | 0 .../powerlevel9k/docker/zim/install.zsh | 0 .../powerlevel9k/docker/zplug/Dockerfile | 0 .../powerlevel9k/docker/zplug/install.zsh | 0 .../powerlevel9k/docker/zplug/zshrc | 0 .../powerlevel9k/docker/zplugin/Dockerfile | 0 .../powerlevel9k/docker/zplugin/install.zsh | 0 .../powerlevel9k/docker/zplugin/zshrc.plugins | 0 .../powerlevel9k/docker/zpm/Dockerfile | 0 .../powerlevel9k/docker/zpm/install.zsh | 0 .../powerlevel9k/docker/zpm/zshrc | 0 .../powerlevel9k/docker/zshing/Dockerfile | 0 .../powerlevel9k/docker/zshing/install.zsh | 0 .../powerlevel9k/docker/zulu/Dockerfile | 0 .../powerlevel9k/docker/zulu/install.zsh | 0 .../powerlevel9k/functions/colors.zsh | 0 .../powerlevel9k/functions/icons.zsh | 0 .../powerlevel9k/functions/utilities.zsh | 0 .../powerlevel9k/functions/vcs.zsh | 0 .../powerlevel9k/powerlevel9k.zsh-theme | 0 .../powerlevel9k/prompt_powerlevel9k_setup | 0 .../powerlevel9k/test-bsd-vm/Vagrantfile | 0 .../test-bsd-vm/bootstrap-zero.sh | 0 .../powerlevel9k/test-bsd-vm/bootstrap.sh | 0 .../powerlevel9k/test-in-docker | 0 .../powerlevel9k/test-vm-providers/plain.sh | 0 .../test-vm-providers/setup-environment.sh | 0 .../powerlevel9k/test-vm/README.md | 0 .../powerlevel9k/test-vm/Vagrantfile | 0 .../powerlevel9k/test-vm/antigen.sh | 0 .../powerlevel9k/test-vm/bootstrap.sh | 0 .../powerlevel9k/test-vm/omz.sh | 0 .../powerlevel9k/test-vm/prezto.sh | 0 .../test/core/color_overriding.spec | 0 .../test/core/joining_segments.spec | 0 .../powerlevel9k/test/core/prompt.spec | 0 .../test/core/visual_identifier.spec | 0 .../powerlevel9k/test/functions/colors.spec | 0 .../powerlevel9k/test/functions/icons.spec | 0 .../test/functions/utilities.spec | 0 .../powerlevel9k/test/powerlevel9k.spec | 0 .../powerlevel9k/test/segments/anaconda.spec | 0 .../test/segments/aws_eb_env.spec | 0 .../test/segments/background_jobs.spec | 0 .../powerlevel9k/test/segments/battery.spec | 0 .../test/segments/command_execution_time.spec | 0 .../powerlevel9k/test/segments/context.spec | 0 .../powerlevel9k/test/segments/custom.spec | 0 .../test/segments/detect_virt.spec | 0 .../powerlevel9k/test/segments/dir.spec | 0 .../test/segments/disk_usage.spec | 0 .../test/segments/go_version.spec | 0 .../powerlevel9k/test/segments/ip.spec | 0 .../test/segments/kubecontext.spec | 0 .../test/segments/laravel_version.spec | 0 .../powerlevel9k/test/segments/load.spec | 0 .../test/segments/node_version.spec | 0 .../powerlevel9k/test/segments/nodeenv.spec | 0 .../powerlevel9k/test/segments/nvm.spec | 0 .../test/segments/php_version.spec | 0 .../powerlevel9k/test/segments/public_ip.spec | 0 .../powerlevel9k/test/segments/ram.spec | 0 .../test/segments/rust_version.spec | 0 .../powerlevel9k/test/segments/ssh.spec | 0 .../powerlevel9k/test/segments/status.spec | 0 .../powerlevel9k/test/segments/swap.spec | 0 .../test/segments/swift_version.spec | 0 .../test/segments/symfony_version.spec | 0 .../powerlevel9k/test/segments/todo.spec | 0 .../powerlevel9k/test/segments/vcs-git.spec | 0 .../powerlevel9k/test/segments/vcs-hg.spec | 0 .../powerlevel9k/test/segments/vi_mode.spec | 0 .../powerlevel9k/test/suite.spec | 0 config/xsession/zsh/zsh.nix | 64 +++++++++++++++++++ config/zsh/zsh.nix | 60 ----------------- home.nix | 43 +------------ 116 files changed, 128 insertions(+), 103 deletions(-) rename config/{ => xsession}/dunstrc.nix (100%) create mode 100644 config/xsession/terminal.nix rename config/{ => xsession}/xsession.nix (88%) rename config/{ => xsession}/zsh/ntfy.yml (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/.github/ISSUE_TEMPLATE.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/.github/PULL_REQUEST_TEMPLATE.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/.gitignore (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/.gitmodules (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/.travis.yml (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/CHANGELOG.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/CODE_OF_CONDUCT.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/LICENSE (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/README.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/TESTS.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/debug/font-issues.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/debug/iterm.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-4.3.11/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.0.3/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.1.1/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.2/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.3.1/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.4.2/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.5.1/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/fred-sudoers (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/zshrc.plugins (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/zshrc (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/Dockerfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/install.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/functions/colors.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/functions/icons.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/functions/utilities.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/functions/vcs.zsh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/powerlevel9k.zsh-theme (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/prompt_powerlevel9k_setup (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/Vagrantfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap-zero.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-in-docker (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/plain.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/setup-environment.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/README.md (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/Vagrantfile (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/antigen.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/bootstrap.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/omz.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/prezto.sh (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/core/color_overriding.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/core/joining_segments.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/core/prompt.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/core/visual_identifier.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/colors.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/icons.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/utilities.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/powerlevel9k.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/anaconda.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/aws_eb_env.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/background_jobs.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/battery.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/command_execution_time.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/context.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/custom.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/detect_virt.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/dir.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/disk_usage.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/go_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ip.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/kubecontext.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/laravel_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/load.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/node_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nodeenv.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nvm.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/php_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/public_ip.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ram.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/rust_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ssh.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/status.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swap.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swift_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/symfony_version.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/todo.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-git.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-hg.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vi_mode.spec (100%) rename config/{ => xsession}/zsh/oh-my-zsh-custom/powerlevel9k/test/suite.spec (100%) create mode 100644 config/xsession/zsh/zsh.nix delete mode 100644 config/zsh/zsh.nix diff --git a/config/dunstrc.nix b/config/xsession/dunstrc.nix similarity index 100% rename from config/dunstrc.nix rename to config/xsession/dunstrc.nix diff --git a/config/xsession/terminal.nix b/config/xsession/terminal.nix new file mode 100644 index 0000000..4174554 --- /dev/null +++ b/config/xsession/terminal.nix @@ -0,0 +1,53 @@ +{ pkgs, config, lib, ...}: +{ + + imports = [ ./zsh/zsh.nix ]; + +# programs.urxvt = { +# enable = true; +# fonts = [ "xft:DejaVu Sans Mono Nerd Font:size=12" ]; +# scroll.bar.enable = false; +# shading = 20; +# extraConfig = { +# "foreground" = "#cccccc"; +# "tintColor" = "white"; +# "depth" = 32; +# "background" = "rgba:0000/0000/0200/c800"; +# "color0" = "#000000"; +# "color1" = "#9e1828"; +# "color2" = "#aece92"; +# "color3" = "#968a38"; +# "color4" = "#414171"; +# "color5" = "#963c59"; +# "color6" = "#418179"; +# "color7" = "#bebebe"; +# "color8" = "#666666"; +# "color9" = "#cf6171"; +# "color10" = "#c5f779"; +# "color11" = "#fff796"; +# "color12" = "#4186be"; +# "color13" = "#cf9ebe"; +# "color14" = "#71bebe"; +# "color15" = "#ffffff"; +# "buffered" = "false"; +# }; +# }; + + + home.file.kitty = { + target = ".config/kitty/kitty.conf"; + text = '' +font_family monospace +font_size 12.0 +background_opacity 0.7 +map ctrl+shift+question change_font_size all +2.0 + ''; + }; + + + home.packages = [ + pkgs.gnome3.gnome-terminal + pkgs.kitty + ]; + +} diff --git a/config/xsession.nix b/config/xsession/xsession.nix similarity index 88% rename from config/xsession.nix rename to config/xsession/xsession.nix index 8ad09c5..aad5bcf 100644 --- a/config/xsession.nix +++ b/config/xsession/xsession.nix @@ -1,5 +1,8 @@ {pkgs, config, lib, ...}: { + + imports = [ ./dunstrc.nix ./terminal.nix ]; + home.keyboard = { layout = "no-latin1"; }; @@ -36,8 +39,8 @@ "${modifier}+b" = "exec firefox"; "${modifier}+t" = "exec gedit"; - "${modifier}+Return" = lib.mkForce "exec i3-sensible-terminal"; - "${modifier}+Shift+Return" = "exec i3-sensible-terminal -e ssh daniel@adam"; + "${modifier}+Return" = lib.mkForce "exec kitty"; + "${modifier}+Shift+Return" = "exec kitty -e ssh daniel@adam"; }; }; }; @@ -49,10 +52,14 @@ }; home.packages = [ + pkgs.xorg.xbacklight + pkgs.dunst pkgs.libnotify pkgs.dmenu + + pkgs.scrot ]; } diff --git a/config/zsh/ntfy.yml b/config/xsession/zsh/ntfy.yml similarity index 100% rename from config/zsh/ntfy.yml rename to config/xsession/zsh/ntfy.yml diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/.github/ISSUE_TEMPLATE.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.github/ISSUE_TEMPLATE.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/.github/ISSUE_TEMPLATE.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.github/ISSUE_TEMPLATE.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/.github/PULL_REQUEST_TEMPLATE.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/.github/PULL_REQUEST_TEMPLATE.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.github/PULL_REQUEST_TEMPLATE.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/.gitignore b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.gitignore similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/.gitignore rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.gitignore diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/.gitmodules b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.gitmodules similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/.gitmodules rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.gitmodules diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/.travis.yml b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.travis.yml similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/.travis.yml rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/.travis.yml diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/CHANGELOG.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/CHANGELOG.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/CHANGELOG.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/CHANGELOG.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/CODE_OF_CONDUCT.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/CODE_OF_CONDUCT.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/CODE_OF_CONDUCT.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/CODE_OF_CONDUCT.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/LICENSE b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/LICENSE similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/LICENSE rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/LICENSE diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/README.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/README.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/README.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/README.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/TESTS.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/TESTS.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/TESTS.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/TESTS.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/debug/font-issues.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/debug/font-issues.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/debug/font-issues.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/debug/font-issues.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/debug/iterm.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/debug/iterm.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/debug/iterm.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/debug/iterm.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antibody/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/antigen/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-4.3.11/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-4.3.11/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-4.3.11/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-4.3.11/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.0.3/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.0.3/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.0.3/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.0.3/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.1.1/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.1.1/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.1.1/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.1.1/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.2/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.2/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.2/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.2/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.3.1/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.3.1/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.3.1/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.3.1/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.4.2/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.4.2/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.4.2/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.4.2/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.5.1/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.5.1/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.5.1/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/base-5.5.1/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/dotfile/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/fred-sudoers b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/fred-sudoers similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/fred-sudoers rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/fred-sudoers diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/omz/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/prezto/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zgen/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zim/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplug/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/zshrc.plugins b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/zshrc.plugins similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/zshrc.plugins rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zplugin/zshrc.plugins diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/zshrc b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/zshrc similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/zshrc rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zpm/zshrc diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zshing/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/Dockerfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/Dockerfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/Dockerfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/Dockerfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/install.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/install.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/install.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/docker/zulu/install.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/functions/colors.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/colors.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/functions/colors.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/colors.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/functions/icons.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/icons.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/functions/icons.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/icons.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/functions/utilities.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/utilities.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/functions/utilities.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/utilities.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/functions/vcs.zsh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/vcs.zsh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/functions/vcs.zsh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/functions/vcs.zsh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/powerlevel9k.zsh-theme b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/powerlevel9k.zsh-theme similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/powerlevel9k.zsh-theme rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/powerlevel9k.zsh-theme diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/prompt_powerlevel9k_setup b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/prompt_powerlevel9k_setup similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/prompt_powerlevel9k_setup rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/prompt_powerlevel9k_setup diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/Vagrantfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/Vagrantfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/Vagrantfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/Vagrantfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap-zero.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap-zero.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap-zero.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap-zero.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-bsd-vm/bootstrap.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-in-docker b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-in-docker similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-in-docker rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-in-docker diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/plain.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/plain.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/plain.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/plain.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/setup-environment.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/setup-environment.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/setup-environment.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm-providers/setup-environment.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/README.md b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/README.md similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/README.md rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/README.md diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/Vagrantfile b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/Vagrantfile similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/Vagrantfile rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/Vagrantfile diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/antigen.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/antigen.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/antigen.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/antigen.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/bootstrap.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/bootstrap.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/bootstrap.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/bootstrap.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/omz.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/omz.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/omz.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/omz.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/prezto.sh b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/prezto.sh similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/prezto.sh rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test-vm/prezto.sh diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/color_overriding.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/color_overriding.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/color_overriding.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/color_overriding.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/joining_segments.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/joining_segments.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/joining_segments.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/joining_segments.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/prompt.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/prompt.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/prompt.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/prompt.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/visual_identifier.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/visual_identifier.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/core/visual_identifier.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/core/visual_identifier.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/colors.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/colors.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/colors.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/colors.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/icons.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/icons.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/icons.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/icons.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/utilities.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/utilities.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/utilities.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/functions/utilities.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/powerlevel9k.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/powerlevel9k.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/powerlevel9k.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/powerlevel9k.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/anaconda.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/anaconda.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/anaconda.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/anaconda.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/aws_eb_env.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/aws_eb_env.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/aws_eb_env.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/aws_eb_env.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/background_jobs.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/background_jobs.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/background_jobs.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/background_jobs.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/battery.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/battery.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/battery.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/battery.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/command_execution_time.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/command_execution_time.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/command_execution_time.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/command_execution_time.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/context.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/context.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/context.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/context.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/custom.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/custom.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/custom.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/custom.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/detect_virt.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/detect_virt.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/detect_virt.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/detect_virt.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/dir.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/dir.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/dir.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/dir.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/disk_usage.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/disk_usage.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/disk_usage.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/disk_usage.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/go_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/go_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/go_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/go_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ip.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ip.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ip.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ip.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/kubecontext.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/kubecontext.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/kubecontext.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/kubecontext.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/laravel_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/laravel_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/laravel_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/laravel_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/load.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/load.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/load.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/load.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/node_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/node_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/node_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/node_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nodeenv.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nodeenv.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nodeenv.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nodeenv.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nvm.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nvm.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nvm.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/nvm.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/php_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/php_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/php_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/php_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/public_ip.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/public_ip.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/public_ip.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/public_ip.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ram.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ram.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ram.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ram.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/rust_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/rust_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/rust_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/rust_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ssh.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ssh.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ssh.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/ssh.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/status.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/status.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/status.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/status.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swap.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swap.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swap.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swap.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swift_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swift_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swift_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/swift_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/symfony_version.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/symfony_version.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/symfony_version.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/symfony_version.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/todo.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/todo.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/todo.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/todo.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-git.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-git.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-git.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-git.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-hg.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-hg.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-hg.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vcs-hg.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vi_mode.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vi_mode.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vi_mode.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/segments/vi_mode.spec diff --git a/config/zsh/oh-my-zsh-custom/powerlevel9k/test/suite.spec b/config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/suite.spec similarity index 100% rename from config/zsh/oh-my-zsh-custom/powerlevel9k/test/suite.spec rename to config/xsession/zsh/oh-my-zsh-custom/powerlevel9k/test/suite.spec diff --git a/config/xsession/zsh/zsh.nix b/config/xsession/zsh/zsh.nix new file mode 100644 index 0000000..8f672f3 --- /dev/null +++ b/config/xsession/zsh/zsh.nix @@ -0,0 +1,64 @@ +{pkgs, config, lib, ...}: +{ + programs.zsh = { + enable = true; + dotDir = ".config/zsh"; + enableAutosuggestions = true; + enableCompletion = true; + history = { + expireDuplicatesFirst = true; + ignoreDups = true; + }; + oh-my-zsh = { + enable = true; + custom = "\$HOME/.config/nixpkgs/nix-dotfiles/config/xsession/zsh/oh-my-zsh-custom"; + plugins = [ + "git" + "sudo" + ]; + theme = "powerlevel9k/powerlevel9k"; + }; + initExtra = '' +POWERLEVEL9K_MODE='nerdfont-complete' + +POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon context dir newline vcs) +POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status time) + +POWERLEVEL9K_OS_ICON_BACKGROUND="white" +POWERLEVEL9K_OS_ICON_FOREGROUND="blue" + +POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND="green" +POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND="white" +POWERLEVEL9K_CONTEXT_SUDO_BACKGROUND="red" +POWERLEVEL9K_CONTEXT_SUDO_FOREGROUND="white" + +POWERLEVEL9K_DIR_HOME_FOREGROUND="white" +POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND="white" +POWERLEVEL9K_DIR_DEFAULT_FOREGROUND="white" +POWERLEVEL9K_SHORTEN_DIR_LENGTH=2 +POWERLEVEL9K_SHORTEN_DELIMITER=".." + +POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="↱" +POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="↳ " + + +eval "$(ntfy shell-integration)" +AUTO_NTFY_DONE_IGNORE="vim nano screen tmux man mpv" + ''; + }; + + home.file.ntfy = { + source = ./ntfy.yml; + target = ".config/ntfy/ntfy.yml"; + }; + + programs.direnv = { + enable = true; + }; + + home.packages = [ + pkgs.nerdfonts + pkgs.ntfy + ]; + +} diff --git a/config/zsh/zsh.nix b/config/zsh/zsh.nix deleted file mode 100644 index 6af6310..0000000 --- a/config/zsh/zsh.nix +++ /dev/null @@ -1,60 +0,0 @@ -{pkgs, config, lib, ...}: -{ - programs.zsh = { - enable = true; - dotDir = ".config/zsh"; - enableAutosuggestions = true; - enableCompletion = true; - history = { - expireDuplicatesFirst = true; - ignoreDups = true; - }; - oh-my-zsh = { - enable = true; - custom = "\$HOME/.config/nixpkgs/nix-dotfiles/config/zsh/oh-my-zsh-custom"; - plugins = [ - "git" - "sudo" - ]; - theme = "powerlevel9k/powerlevel9k"; - }; - initExtra = '' - POWERLEVEL9K_MODE='nerdfont-complete' - - POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(os_icon context dir newline vcs) - POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status time) - - POWERLEVEL9K_OS_ICON_BACKGROUND="white" - POWERLEVEL9K_OS_ICON_FOREGROUND="blue" - - POWERLEVEL9K_CONTEXT_DEFAULT_BACKGROUND="green" - POWERLEVEL9K_CONTEXT_DEFAULT_FOREGROUND="white" - POWERLEVEL9K_CONTEXT_SUDO_BACKGROUND="red" - POWERLEVEL9K_CONTEXT_SUDO_FOREGROUND="white" - - POWERLEVEL9K_DIR_HOME_FOREGROUND="white" - POWERLEVEL9K_DIR_HOME_SUBFOLDER_FOREGROUND="white" - POWERLEVEL9K_DIR_DEFAULT_FOREGROUND="white" - POWERLEVEL9K_SHORTEN_DIR_LENGTH=2 - POWERLEVEL9K_SHORTEN_DELIMITER=".." - - POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX="↱" - POWERLEVEL9K_MULTILINE_LAST_PROMPT_PREFIX="↳ " - - - eval "$(ntfy shell-integration)" - AUTO_NTFY_DONE_IGNORE="vim nano screen tmux man" - ''; - }; - - home.file.ntfy = { - source = ./ntfy.yml; - target = ".config/ntfy/ntfy.yml"; - }; - - home.packages = [ - pkgs.nerdfonts - pkgs.ntfy - ]; - -} diff --git a/home.nix b/home.nix index 5e4093c..b9d4088 100644 --- a/home.nix +++ b/home.nix @@ -7,44 +7,11 @@ # target = ".config/nixpkgs/overlays"; #}; - imports = [ ./config/xsession.nix ./config/zsh/zsh.nix ./config/dunstrc.nix ]; - - programs.urxvt = { - enable = true; - fonts = [ "xft:DejaVu Sans Mono Nerd Font:size=12" ]; - scroll.bar.enable = false; - shading = 20; - extraConfig = { - "foreground" = "#cccccc"; - "tintColor" = "white"; - "depth" = 32; - "background" = "rgba:0000/0000/0200/c800"; -# "color0" = "#000000"; -# "color1" = "#9e1828"; -# "color2" = "#aece92"; -# "color3" = "#968a38"; -# "color4" = "#414171"; -# "color5" = "#963c59"; -# "color6" = "#418179"; -# "color7" = "#bebebe"; -# "color8" = "#666666"; -# "color9" = "#cf6171"; -# "color10" = "#c5f779"; -# "color11" = "#fff796"; -# "color12" = "#4186be"; -# "color13" = "#cf9ebe"; -# "color14" = "#71bebe"; -# "color15" = "#ffffff"; -# "buffered" = "false"; - }; - }; - - programs.direnv = { - enable = true; - }; + imports = [ ./config/xsession/xsession.nix ]; home.packages = [ pkgs.gnome3.gnome-terminal + pkgs.kitty pkgs.pavucontrol @@ -52,10 +19,6 @@ pkgs.virtmanager pkgs.dejavu_fonts - - - pkgs.scrot - pkgs.xorg.xbacklight pkgs.steam pkgs.dolphinEmuMaster @@ -107,8 +70,6 @@ userName = "Daniel Løvbrøtte Olsen"; }; -# programs.htop = { - services.kdeconnect = { enable = true;