Compare commits
No commits in common. "beca99a134560b92be78788087f48978d2a44b5a" and "c51aeacd035dd55cffe8313fb1650abbdbf24d1c" have entirely different histories.
beca99a134
...
c51aeacd03
|
@ -10,9 +10,16 @@
|
||||||
when: root_access
|
when: root_access
|
||||||
- role: dotfiles
|
- role: dotfiles
|
||||||
tags: dotfiles
|
tags: dotfiles
|
||||||
|
- role: mnussbaum.base16-builder-ansible # Required for desktop_environment
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
- desktop_environment
|
||||||
- role: termux
|
- role: termux
|
||||||
tags: termux
|
tags: termux
|
||||||
when: termux
|
when: termux
|
||||||
|
- role: desktop_environment
|
||||||
|
tags: desktop_environment
|
||||||
|
when: display_server
|
||||||
- role: extensions
|
- role: extensions
|
||||||
tags: extensions
|
tags: extensions
|
||||||
# TODO Dependencies
|
# TODO Dependencies
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
base16_scheme: solarized-dark
|
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
- name: I3-reload
|
||||||
|
ansible.builtin.command: i3-msg reload
|
||||||
|
listen: i3-reload
|
||||||
|
- name: Shell-reload
|
||||||
|
ansible.builtin.command: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApply"
|
||||||
|
listen: shell-reload
|
||||||
|
- name: Fzf-reload
|
||||||
|
ansible.builtin.shell: source {{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf
|
||||||
|
listen: fzf-reload
|
148
config/automatrop/roles/desktop_environment/tasks/main.yml
Normal file
148
config/automatrop/roles/desktop_environment/tasks/main.yml
Normal file
|
@ -0,0 +1,148 @@
|
||||||
|
---
|
||||||
|
- name: Ensure directories for desktop applications are present
|
||||||
|
ansible.builtin.file:
|
||||||
|
state: directory
|
||||||
|
path: "{{ ansible_user_dir }}/{{ item }}"
|
||||||
|
mode: u=rwx,g=rx,o=rx
|
||||||
|
with_items:
|
||||||
|
- .config/Xresources
|
||||||
|
- .config/rofi
|
||||||
|
- .local/bin
|
||||||
|
- .local/share/fonts
|
||||||
|
- .config/qutebrowser
|
||||||
|
- .config/tridactyl/themes
|
||||||
|
|
||||||
|
# Download fonts
|
||||||
|
- name: Download Nerd fonts
|
||||||
|
ansible.builtin.get_url:
|
||||||
|
url: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/704336735f576781b2a57b12a0c723e3316cbdec/patched-fonts/DejaVuSansMono/{{ item.folder }}/complete/{{
|
||||||
|
item.filename | urlencode }}
|
||||||
|
dest: "{{ ansible_user_dir }}/.local/share/fonts/{{ item.filename }}"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
loop:
|
||||||
|
- filename: DejaVu Sans Mono Bold Nerd Font Complete Mono.ttf
|
||||||
|
folder: Bold
|
||||||
|
- filename: DejaVu Sans Mono Bold Oblique Nerd Font Complete Mono.ttf
|
||||||
|
folder: Bold-Italic
|
||||||
|
- filename: DejaVu Sans Mono Nerd Font Complete Mono.ttf
|
||||||
|
folder: Regular
|
||||||
|
- filename: DejaVu Sans Mono Oblique Nerd Font Complete Mono.ttf
|
||||||
|
folder: Italic
|
||||||
|
|
||||||
|
- name: Download icon fonts
|
||||||
|
ansible.builtin.get_url:
|
||||||
|
url: https://raw.githubusercontent.com/FortAwesome/Font-Awesome/a8386aae19e200ddb0f6845b5feeee5eb7013687/fonts/fontawesome-webfont.ttf
|
||||||
|
dest: "{{ ansible_user_dir }}/.local/share/fonts/fontawesome-webfont.ttf"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
# TODO Either replace with ForkAwesome or Nerd Fonts
|
||||||
|
|
||||||
|
- name: Install python dependencies for lemonbar
|
||||||
|
ansible.builtin.pip:
|
||||||
|
requirements: "{{ ansible_user_dir }}/.dotfiles/config/lemonbar/requirements.txt"
|
||||||
|
extra_args: --break-system-packages # It's fine, it's local anyways
|
||||||
|
|
||||||
|
# Build a single color scheme and template and assign it to a variable
|
||||||
|
- base16_builder:
|
||||||
|
scheme: "{{ base16_scheme }}"
|
||||||
|
template: # This requires https://github.com/mnussbaum/base16-builder-ansible/pull/6
|
||||||
|
- i3
|
||||||
|
- xresources
|
||||||
|
- rofi
|
||||||
|
- alacritty
|
||||||
|
- shell
|
||||||
|
- fzf
|
||||||
|
- vim
|
||||||
|
- qutebrowser
|
||||||
|
- tridactyl
|
||||||
|
- dunst
|
||||||
|
register: base16_schemes
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
- i3
|
||||||
|
|
||||||
|
- name: Download base16 theme for Tridactyl
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['tridactyl']['base16-' + base16_scheme + '.config.py'] }}"
|
||||||
|
# url: "https://raw.githubusercontent.com/bezmi/base16-tridactyl/master/base16-{{ base16_scheme }}.css"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/tridactyl/themes/theme.css"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
when: false # Not currently used
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
|
||||||
|
- name: Configure i3
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: "{{ ansible_env.HOME }}/.config/i3/config.j2"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/i3/config"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
notify:
|
||||||
|
- i3-reload
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
- i3
|
||||||
|
when: display_server == 'x11'
|
||||||
|
|
||||||
|
- name: Set base16 theme for rofi
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['rofi']['themes']['base16-' + base16_scheme + '.' + item] }}"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/rofi/theme.{{ item }}"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
loop:
|
||||||
|
- config
|
||||||
|
- rasi
|
||||||
|
|
||||||
|
- name: Configure Dunst
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: "{{ ansible_env.HOME }}/.config/dunst/dunstrc.j2"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/dunst/dunstrc"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
when: display_server == 'x11'
|
||||||
|
|
||||||
|
- name: Download base16 theme for fzf
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['fzf']['bash']['base16-' + base16_scheme + '.config'] }}"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
notify:
|
||||||
|
- fzf-reload
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
|
||||||
|
- name: Download base16 theme for shell
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['shell']['script']['base16-' + base16_scheme + '.sh'] }}"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApply"
|
||||||
|
mode: u=rwx,g=rx,o=rx
|
||||||
|
notify:
|
||||||
|
- shell-reload
|
||||||
|
when: false # Not currently used
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
|
||||||
|
- name: Set used base16 theme for vim
|
||||||
|
ansible.builtin.copy:
|
||||||
|
path: "{{ ansible_env.HOME }}/.config/vim/colorscheme.vim"
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
content: colorscheme base16-{{ base16_scheme }}
|
||||||
|
when: false # Not currently used
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
|
||||||
|
- name: Enable user services
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
name: "{{ item }}"
|
||||||
|
state: started
|
||||||
|
enabled: true
|
||||||
|
scope: user
|
||||||
|
loop:
|
||||||
|
- pulseaudio
|
||||||
|
- mpd
|
||||||
|
when: has_systemd
|
||||||
|
|
||||||
|
# TODO bar (might change bar in the future, so...)
|
||||||
|
# TODO highlight (there IS a template but the colors look different from vim and mostly the same from when there's no config)
|
||||||
|
# TODO https://github.com/makuto/auto-base16-theme ? :P
|
|
@ -13,7 +13,15 @@
|
||||||
path: "{{ ansible_user_dir }}/.hushlogin"
|
path: "{{ ansible_user_dir }}/.hushlogin"
|
||||||
mode: u=rw,g=r,o=r
|
mode: u=rw,g=r,o=r
|
||||||
|
|
||||||
# https://github.com/kdrag0n/base16-termux/blob/master/templates/default.mustache
|
# Build a single color scheme and template and assign it to a variable
|
||||||
|
- base16_builder:
|
||||||
|
scheme: "{{ base16_scheme }}"
|
||||||
|
template: # This requires https://github.com/mnussbaum/base16-builder-ansible/pull/6
|
||||||
|
- termux
|
||||||
|
register: base16_schemes
|
||||||
|
tags:
|
||||||
|
- color
|
||||||
|
|
||||||
- name: Download base16 theme for Termux
|
- name: Download base16 theme for Termux
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['termux']['colors']['base16-' + base16_scheme + '.properties'] }}"
|
content: "{{ base16_schemes['schemes'][base16_scheme]['termux']['colors']['base16-' + base16_scheme + '.properties'] }}"
|
||||||
|
|
2
config/dunst/.gitignore
vendored
Normal file
2
config/dunst/.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
dunstrc
|
||||||
|
theme
|
65
config/dunst/dunstrc.j2
Normal file
65
config/dunst/dunstrc.j2
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
[global]
|
||||||
|
alignment = left
|
||||||
|
always_run_script = true
|
||||||
|
browser = /usr/bin/qutebrowser
|
||||||
|
class = Dunst
|
||||||
|
dmenu = /usr/bin/dmenu -p dunst:
|
||||||
|
ellipsize = middle
|
||||||
|
follow = none
|
||||||
|
font = DejaVu Sans 10
|
||||||
|
force_xinerama = false
|
||||||
|
format = "<b>%s %p</b>\n%b"
|
||||||
|
frame_color = "#A6E22E"
|
||||||
|
frame_width = 3
|
||||||
|
geometry = "500x5-30+20"
|
||||||
|
hide_duplicate_count = false
|
||||||
|
history_length = 20
|
||||||
|
horizontal_padding = 8
|
||||||
|
icon_path = /usr/share/icons/gnome/256x256/actions/:/usr/share/icons/gnome/256x256/status/:/usr/share/icons/gnome/256x256/devices/
|
||||||
|
icon_position = left
|
||||||
|
idle_threshold = 120
|
||||||
|
ignore_newline = no
|
||||||
|
indicate_hidden = yes
|
||||||
|
line_height = 0
|
||||||
|
markup = full
|
||||||
|
max_icon_size = 48
|
||||||
|
monitor = 0
|
||||||
|
notification_height = 0
|
||||||
|
padding = 8
|
||||||
|
separator_color = frame
|
||||||
|
separator_height = 2
|
||||||
|
show_age_threshold = 60
|
||||||
|
show_indicators = yes
|
||||||
|
shrink = no
|
||||||
|
sort = yes
|
||||||
|
stack_duplicates = true
|
||||||
|
startup_notification = false
|
||||||
|
sticky_history = yes
|
||||||
|
title = Dunst
|
||||||
|
transparency = 0
|
||||||
|
verbosity = mesg
|
||||||
|
word_wrap = yes
|
||||||
|
[experimental]
|
||||||
|
per_monitor_dpi = false
|
||||||
|
[shortcuts]
|
||||||
|
close_all = ctrl+mod4+n
|
||||||
|
close = mod4+n
|
||||||
|
context = mod1+mod4+n
|
||||||
|
history = shift+mod4+n
|
||||||
|
[urgency_low]
|
||||||
|
background = "#272822"
|
||||||
|
foreground = "#F8F8F2"
|
||||||
|
frame_color = "#A6E22E"
|
||||||
|
timeout = 10
|
||||||
|
[urgency_normal]
|
||||||
|
background = "#272822"
|
||||||
|
foreground = "#F8F8F2"
|
||||||
|
frame_color = "#F4BF75"
|
||||||
|
timeout = 10
|
||||||
|
[urgency_critical]
|
||||||
|
background = "#272822"
|
||||||
|
foreground = "#F8F8F2"
|
||||||
|
frame_color = "#F92672"
|
||||||
|
timeout = 0
|
||||||
|
{{ base16_schemes['schemes'][base16_scheme]['dunst']['themes']['base16-' + base16_scheme + '.dunstrc'] }}
|
||||||
|
# TODO Not used. Not sure how it's supposed to be used :D
|
2
config/i3/.gitignore
vendored
Normal file
2
config/i3/.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
config
|
||||||
|
theme
|
|
@ -1,3 +1,5 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
BATT="/sys/class/power_supply/BAT0"
|
BATT="/sys/class/power_supply/BAT0"
|
||||||
LOW=10
|
LOW=10
|
||||||
CRIT=3
|
CRIT=3
|
||||||
|
@ -23,10 +25,10 @@ function computeState() {
|
||||||
|
|
||||||
if [ "$acpiStatus" == "Discharging" ]
|
if [ "$acpiStatus" == "Discharging" ]
|
||||||
then
|
then
|
||||||
if [ "$acpiCapacity" -le $CRIT ]
|
if [ $acpiCapacity -le $CRIT ]
|
||||||
then
|
then
|
||||||
setState "CRIT" -u critical -i battery-caution "Battery level is critical" "$acpiCapacity %"
|
setState "CRIT" -u critical -i battery-caution "Battery level is critical" "$acpiCapacity %"
|
||||||
elif [ "$acpiCapacity" -le $LOW ]
|
elif [ $acpiCapacity -le $LOW ]
|
||||||
then
|
then
|
||||||
setState "LOW" -u critical -i battery-low "Battery level is low" "$acpiCapacity %"
|
setState "LOW" -u critical -i battery-low "Battery level is low" "$acpiCapacity %"
|
||||||
else
|
else
|
107
config/i3/config.j2
Normal file
107
config/i3/config.j2
Normal file
|
@ -0,0 +1,107 @@
|
||||||
|
# vi:syntax=conf
|
||||||
|
# i3 config file (v4)
|
||||||
|
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
|
||||||
|
|
||||||
|
# Set mod key (Mod1=<Alt>, Mod4=<Super>)
|
||||||
|
set $mod Mod4
|
||||||
|
|
||||||
|
# set default desktop layout (default is tiling)
|
||||||
|
# workspace_layout tabbed <stacking|tabbed>
|
||||||
|
|
||||||
|
# Configure border style <normal|1pixel|pixel xx|none|pixel>
|
||||||
|
new_window pixel 2
|
||||||
|
new_float normal
|
||||||
|
|
||||||
|
# Hide borders
|
||||||
|
hide_edge_borders both
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
mouse_warping output
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Workspace names
|
||||||
|
set $WS1 1
|
||||||
|
set $WS2 2
|
||||||
|
set $WS3 3
|
||||||
|
set $WS4 4
|
||||||
|
set $WS5 5
|
||||||
|
set $WS6 6
|
||||||
|
set $WS7 7
|
||||||
|
set $WS8 8
|
||||||
|
set $WS9 9
|
||||||
|
set $WS10 10
|
||||||
|
|
||||||
|
# Workspace output
|
||||||
|
{% set screens = x11_screens | default(['DEFAULT']) %}
|
||||||
|
{% for i in range(1, 11) %}
|
||||||
|
workspace "$WS{{ i }}" output {{ screens[(i - 1) % (screens | length)] }}
|
||||||
|
{% endfor %}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Default layout = tabs, since I mostly exclusively use them
|
||||||
|
workspace_layout tabbed
|
||||||
|
|
||||||
|
# Open specific applications in floating mode
|
||||||
|
for_window [title="pacmixer"] floating enable border pixel 2
|
||||||
|
for_window [class="Firefox"] layout tabbed # Doesn't seem to work anymore
|
||||||
|
for_window [class="qutebrowser"] layout tabbed
|
||||||
|
|
||||||
|
for_window [window_role="pop-up"] floating enable
|
||||||
|
for_window [window_role="task_dialog"] floating enable
|
||||||
|
for_window [ title="^pdfpc.*" window_role="presenter" ] move to output left, fullscreen
|
||||||
|
for_window [ title="^pdfpc.*" window_role="presentation" ] move to output right, fullscreen
|
||||||
|
|
||||||
|
# switch to workspace with urgent window automatically
|
||||||
|
for_window [urgent=latest] focus
|
||||||
|
|
||||||
|
# Set shut down, restart and locking features
|
||||||
|
set $locker $HOME/.config/i3/lock
|
||||||
|
|
||||||
|
# Screen temperature ("redness") setting
|
||||||
|
"$mod+y" = "mode "$mode_temp"";
|
||||||
|
set $mode_temp Temperature [R] Red [D] Dust storm [C] Campfire [O] Normal [A] All nighter [B] Blue
|
||||||
|
mode "$mode_temp" {
|
||||||
|
"r" = "exec sct 1000";
|
||||||
|
"d" = "exec sct 2000";
|
||||||
|
"c" = "exec sct 4500";
|
||||||
|
"o" = "exec sct";
|
||||||
|
"a" = "exec sct 8000";
|
||||||
|
"b" = "exec sct 10000";
|
||||||
|
|
||||||
|
# back to normal: Enter or Escape
|
||||||
|
"Return" = "mode "default"";
|
||||||
|
"Escape" = "mode "default"";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Inactivity settings
|
||||||
|
exec --no-startup-id xautolock -time 10 -locker 'xset dpms force standby' -killtime 1 -killer '$locker'
|
||||||
|
"$mod+F1" = "exec --no-startup-id sh -c "sleep .25 && xset dpms force off"";
|
||||||
|
"$mod+F4" = "exec --no-startup-id xautolock -disable";
|
||||||
|
"$mod+F5" = "exec --no-startup-id xautolock -enable";
|
||||||
|
|
||||||
|
|
||||||
|
# Autostart applications
|
||||||
|
#exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # Password remembering
|
||||||
|
#exec --no-startup-id gnome-keyring-daemon # Password remembering
|
||||||
|
# exec --no-startup-id urxvtd -q -f # urxvt daemon
|
||||||
|
{% if auto_numlock %}
|
||||||
|
exec --no-startup-id numlockx on # Activate Num lock
|
||||||
|
{% endif %}
|
||||||
|
exec --no-startup-id unclutter -root # Hide mouse cursor after some time
|
||||||
|
#exec --no-startup-id dunst # Notifications (handled by systemd)
|
||||||
|
exec --no-startup-id keynav # Keyboard cursor controller
|
||||||
|
#exec --no-startup-id mpd # Music Player Daemon (handled by systemd)
|
||||||
|
exec --no-startup-id autorandr --change --force # Screen configuration and everything that depends on it
|
||||||
|
{% if has_battery %}
|
||||||
|
exec --no-startup-id ~/.config/i3/batteryNotify -d # Battery state notification
|
||||||
|
{% endif %}
|
||||||
|
|
|
@ -54,7 +54,7 @@ class Bar:
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Constants
|
# Constants
|
||||||
FONTS = ["DejaVuSansMono Nerd Font Mono"]
|
FONTS = ["DejaVuSansMono Nerd Font Mono", "Font Awesome"]
|
||||||
FONTSIZE = 10
|
FONTSIZE = 10
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
|
@ -1,31 +1,15 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
{
|
{
|
||||||
|
home.stateVersion = "23.05";
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
bash.enable = true; # Just in case the default shell is not ZSH, so we still have the variables
|
|
||||||
zsh = {
|
zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAutosuggestions = true;
|
enableAutosuggestions = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
enableSyntaxHighlighting = true;
|
enableSyntaxHighlighting = true;
|
||||||
# syntaxHighlighting.enable = true; # 23.11 syntax
|
# syntaxHighlighting.enable = true; # 23.11 syntax
|
||||||
historySubstringSearch.enable = true;
|
|
||||||
initExtra = builtins.readFile ./zshrc.sh;
|
|
||||||
defaultKeymap = "viins";
|
|
||||||
};
|
|
||||||
powerline-go = {
|
|
||||||
enable = true;
|
|
||||||
modules = [ "user" "host" "venv" "cwd" "perms" "git" ];
|
|
||||||
modulesRight = [ "jobs" "exit" "duration" "load" ];
|
|
||||||
settings = {
|
|
||||||
colorize-hostname = true;
|
|
||||||
max-width = 25;
|
|
||||||
cwd-max-dir-size = 10;
|
|
||||||
duration = "$( test -n \"$__TIMER\" && echo $(( $EPOCHREALTIME - $\{__TIMER:-EPOCHREALTIME})) || echo 0 )";
|
|
||||||
# UPST Implement this properly in home-manager
|
|
||||||
};
|
|
||||||
extraUpdatePS1 = ''unset __TIMER'';
|
|
||||||
};
|
};
|
||||||
# neovim = {
|
# neovim = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
|
@ -66,20 +50,9 @@
|
||||||
trust = "ultimate";
|
trust = "ultimate";
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
fzf.enable = true;
|
|
||||||
# TODO highlight or bat
|
|
||||||
nix-index = {
|
|
||||||
enable = true;
|
|
||||||
enableZshIntegration = true;
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
home = {
|
home.packages = with pkgs; [
|
||||||
stateVersion = "23.05";
|
|
||||||
language = {
|
|
||||||
base = "en_US.UTF-8";
|
|
||||||
time = "en_DK.UTF-8";
|
|
||||||
};
|
|
||||||
packages = with pkgs; [
|
|
||||||
# dotfiles dependencies
|
# dotfiles dependencies
|
||||||
coreutils
|
coreutils
|
||||||
bash
|
bash
|
||||||
|
@ -157,5 +130,4 @@
|
||||||
syncthing
|
syncthing
|
||||||
|
|
||||||
];
|
];
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
{
|
{
|
||||||
xsession = {
|
xsession.windowManager.i3 = {
|
||||||
enable = true;
|
|
||||||
windowManager = {
|
|
||||||
i3 = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
config =
|
config =
|
||||||
let
|
let
|
||||||
|
@ -12,7 +9,7 @@
|
||||||
lockColors = { a = "#82a401"; b = "#466c01"; d = "#648901"; }; # Old
|
lockColors = { a = "#82a401"; b = "#466c01"; d = "#648901"; }; # Old
|
||||||
lockSvg = pkgs.writeText "lock.svg" "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\" height=\"50\" width=\"50\"><path fill=\"${lockColors.a}\" d=\"M0 50h50V0H0z\"/><path d=\"M0 0l50 50H25L0 25zm50 0v25L25 0z\" fill=\"${lockColors.d}\"/></svg>";
|
lockSvg = pkgs.writeText "lock.svg" "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\" height=\"50\" width=\"50\"><path fill=\"${lockColors.a}\" d=\"M0 50h50V0H0z\"/><path d=\"M0 0l50 50H25L0 25zm50 0v25L25 0z\" fill=\"${lockColors.d}\"/></svg>";
|
||||||
lockPng = pkgs.runCommand "lock.png" { } "${pkgs.imagemagick}/bin/convert ${lockSvg} $out";
|
lockPng = pkgs.runCommand "lock.png" { } "${pkgs.imagemagick}/bin/convert ${lockSvg} $out";
|
||||||
locker = pkgs.writeShellScript "i3-locker"
|
locker = "exec ${ pkgs.writeShellScript "i3-locker"
|
||||||
''
|
''
|
||||||
# Remove SSH and GPG keys from keystores
|
# Remove SSH and GPG keys from keystores
|
||||||
${pkgs.openssh}/bin/ssh-add -D
|
${pkgs.openssh}/bin/ssh-add -D
|
||||||
|
@ -29,14 +26,15 @@
|
||||||
pattern=${lockPng}
|
pattern=${lockPng}
|
||||||
fi
|
fi
|
||||||
revert() {
|
revert() {
|
||||||
${pkgs.xorg.xset}/bin/xset dpms 0 0 0
|
${pkgs.xorg.xset} dpms 0 0 0
|
||||||
}
|
}
|
||||||
trap revert SIGHUP SIGINT SIGTERM
|
trap revert SIGHUP SIGINT SIGTERM
|
||||||
${pkgs.xorg.xset}/bin/xset dpms 5 5 5
|
${pkgs.xorg.xset} dpms 5 5 5
|
||||||
${pkgs.i3lock}/bin/i3lock --nofork --color ${builtins.substring 1 6 lockColors.d} --image=$pattern --tiling --ignore-empty-password
|
${pkgs.i3lock}/bin/i3lock --nofork --color ${builtins.substring 1 6 lockColors.d} --image=$pattern --tiling --ignore-empty-password
|
||||||
revert
|
revert
|
||||||
fi
|
fi
|
||||||
'';
|
''
|
||||||
|
}";
|
||||||
focus = "exec ${ pkgs.writeShellScript "i3-focus-window"
|
focus = "exec ${ pkgs.writeShellScript "i3-focus-window"
|
||||||
''
|
''
|
||||||
WINDOW=`${pkgs.xdotool}/bin/xdotool getwindowfocus`
|
WINDOW=`${pkgs.xdotool}/bin/xdotool getwindowfocus`
|
||||||
|
@ -51,10 +49,8 @@
|
||||||
mode_pres_main = "Presentation (main display)";
|
mode_pres_main = "Presentation (main display)";
|
||||||
mode_pres_sec = "Presentation (secondary display)";
|
mode_pres_sec = "Presentation (secondary display)";
|
||||||
mode_screen = "Screen setup [A] Auto [L] Load [S] Save [R] Remove [D] Default";
|
mode_screen = "Screen setup [A] Auto [L] Load [S] Save [R] Remove [D] Default";
|
||||||
mode_temp = "Temperature [R] Red [D] Dust storm [C] Campfire [O] Normal [A] All nighter [B] Blue";
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
modifier = "Mod1"; # FIXME Mod1 for VM, Mod4 for not VM
|
|
||||||
terminal = "alacritty";
|
terminal = "alacritty";
|
||||||
# bars = []; # FIXME lemonbar
|
# bars = []; # FIXME lemonbar
|
||||||
colors = let ignore = "#ff00ff"; in
|
colors = let ignore = "#ff00ff"; in
|
||||||
|
@ -80,7 +76,7 @@
|
||||||
# Compatibility layer for people coming from other backgrounds
|
# Compatibility layer for people coming from other backgrounds
|
||||||
# "Mod1+Tab" = "${rofi} -modi window -show window"; # FIXME When no longer using a VM
|
# "Mod1+Tab" = "${rofi} -modi window -show window"; # FIXME When no longer using a VM
|
||||||
"Mod1+F2" = "${rofi} -modi drun -show drun";
|
"Mod1+F2" = "${rofi} -modi drun -show drun";
|
||||||
# "Mod1+F4" = "kill"; # FIXME When no longer using a VM
|
"Mod1+F4" = "kill";
|
||||||
# kill focused window
|
# kill focused window
|
||||||
"${mod}+z" = "kill";
|
"${mod}+z" = "kill";
|
||||||
button2 = "kill";
|
button2 = "kill";
|
||||||
|
@ -166,7 +162,6 @@
|
||||||
"${mod}+8" = "workspace 8; ${focus}";
|
"${mod}+8" = "workspace 8; ${focus}";
|
||||||
"${mod}+9" = "workspace 9; ${focus}";
|
"${mod}+9" = "workspace 9; ${focus}";
|
||||||
"${mod}+0" = "workspace 10; ${focus}";
|
"${mod}+0" = "workspace 10; ${focus}";
|
||||||
# TODO Prevent repetitions, see workspace assignation for example
|
|
||||||
#navigate workspaces next / previous
|
#navigate workspaces next / previous
|
||||||
"${mod}+Ctrl+h" = "workspace prev_on_output; ${focus}";
|
"${mod}+Ctrl+h" = "workspace prev_on_output; ${focus}";
|
||||||
"${mod}+Ctrl+l" = "workspace next_on_output; ${focus}";
|
"${mod}+Ctrl+l" = "workspace next_on_output; ${focus}";
|
||||||
|
@ -208,17 +203,11 @@
|
||||||
"${mod}+Shift+c" = "reload";
|
"${mod}+Shift+c" = "reload";
|
||||||
"${mod}+Shift+r" = "restart";
|
"${mod}+Shift+r" = "restart";
|
||||||
"${mod}+Shift+e" = "exit";
|
"${mod}+Shift+e" = "exit";
|
||||||
# Screen off commands
|
|
||||||
"${mod}+F1" = "exec --no-startup-id ${pkgs.bash}/bin/sh -c \"${pkgs.coreutils}/bin/sleep .25 && ${pkgs.xorg.xset}/bin/xset dpms force off\"";
|
|
||||||
# TODO --release?
|
|
||||||
"${mod}+F4" = "exec --no-startup-id ${pkgs.xautolock}/bin/xautolock -disable";
|
|
||||||
"${mod}+F5" = "exec --no-startup-id ${pkgs.xautolock}/bin/xautolock -enable";
|
|
||||||
# Modes
|
# Modes
|
||||||
"${mod}+Escape" = "mode ${mode_system}";
|
"${mod}+Escape" = "mode ${mode_system}";
|
||||||
"${mod}+r" = "mode ${mode_resize}";
|
"${mod}+r" = "mode ${mode_resize}";
|
||||||
"${mod}+Shift+p" = "mode ${mode_pres_main}";
|
"${mod}+Shift+p" = "mode ${mode_pres_main}";
|
||||||
"${mod}+t" = "mode ${mode_screen}";
|
"${mod}+t" = "mode ${mode_screen}";
|
||||||
"${mod}+y" = "mode ${mode_temp}";
|
|
||||||
};
|
};
|
||||||
modes = let return_bindings = {
|
modes = let return_bindings = {
|
||||||
"Return" = "mode default";
|
"Return" = "mode default";
|
||||||
|
@ -226,10 +215,10 @@
|
||||||
}; in
|
}; in
|
||||||
{
|
{
|
||||||
"${mode_system}" = {
|
"${mode_system}" = {
|
||||||
"l" = "exec --no-startup-id exec ${locker}, mode default";
|
"l" = "exec --no-startup-id ${locker}, mode default";
|
||||||
"e" = "exit, mode default";
|
"e" = "exit, mode default";
|
||||||
"s" = "exec --no-startup-id exec ${locker} & ${pkgs.systemd}/bin/systemctl suspend, mode default";
|
"s" = "exec --no-startup-id ${locker} & ${pkgs.systemd}/bin/systemctl suspend, mode default";
|
||||||
"h" = "exec --no-startup-id exec ${locker} & ${pkgs.systemd}/bin/systemctl hibernate, mode default";
|
"h" = "exec --no-startup-id ${locker} & ${pkgs.systemd}/bin/systemctl hibernate, mode default";
|
||||||
"r" = "exec --no-startup-id ${pkgs.systemd}/bin/systemctl reboot, mode default";
|
"r" = "exec --no-startup-id ${pkgs.systemd}/bin/systemctl reboot, mode default";
|
||||||
"p" = "exec --no-startup-id ${pkgs.systemd}/bin/systemctl poweroff -i, mode default";
|
"p" = "exec --no-startup-id ${pkgs.systemd}/bin/systemctl poweroff -i, mode default";
|
||||||
} // return_bindings;
|
} // return_bindings;
|
||||||
|
@ -268,64 +257,9 @@
|
||||||
"r" = "exec ${autorandrmenu {title="Remove profile"; option="--remove";}}, mode default";
|
"r" = "exec ${autorandrmenu {title="Remove profile"; option="--remove";}}, mode default";
|
||||||
"d" = "exec ${autorandrmenu {title="Default profile"; option="--default"; builtin = true;}}, mode default";
|
"d" = "exec ${autorandrmenu {title="Default profile"; option="--default"; builtin = true;}}, mode default";
|
||||||
} // return_bindings;
|
} // return_bindings;
|
||||||
"${mode_temp}" = {
|
|
||||||
"r" = "exec ${pkgs.sct}/bin/sct 1000";
|
|
||||||
"d" = "exec ${pkgs.sct}/bin/sct 2000";
|
|
||||||
"c" = "exec ${pkgs.sct}/bin/sct 4500";
|
|
||||||
"o" = "exec ${pkgs.sct}/bin/sct";
|
|
||||||
"a" = "exec ${pkgs.sct}/bin/sct 8000";
|
|
||||||
"b" = "exec ${pkgs.sct}/bin/sct 10000";
|
|
||||||
} // return_bindings;
|
|
||||||
};
|
|
||||||
window = {
|
|
||||||
hideEdgeBorders = "both";
|
|
||||||
titlebar = false; # So that single-container screens are basically almost fullscreen
|
|
||||||
commands = [
|
|
||||||
# Open specific applications in floating mode
|
|
||||||
{ criteria = { class = "Firefox"; }; command = "layout tabbed"; } # Doesn't seem to work anymore
|
|
||||||
{ criteria = { class = "qutebrowser"; }; command = "layout tabbed"; }
|
|
||||||
{ criteria = { title = "^pdfpc.*"; window_role = "presenter"; }; command = "move to output left, fullscreen"; }
|
|
||||||
{ criteria = { title = "^pdfpc.*"; window_role = "presentation"; }; command = "move to output right, fullscreen"; }
|
|
||||||
# switch to workspace with urgent window automatically
|
|
||||||
{ criteria = { urgent = "latest"; }; command = "focus"; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
floating = {
|
|
||||||
criteria = [
|
|
||||||
{ title = "pacmixer"; }
|
|
||||||
{ window_role = "pop-up"; }
|
|
||||||
{ window_role = "task_dialog"; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
startup = [
|
|
||||||
# Lock screen after 10 minutes
|
|
||||||
{ notification = false; command = "${pkgs.xautolock}/bin/xautolock -time 10 -locker '${pkgs.xorg.xset}/bin/xset dpms force standby' -killtime 1 -killer ${locker}"; }
|
|
||||||
{
|
|
||||||
notification = false;
|
|
||||||
command = "${pkgs.writeShellApplication {
|
|
||||||
name = "batteryNotify";
|
|
||||||
runtimeInputs = with pkgs; [coreutils libnotify];
|
|
||||||
text = builtins.readFile ./batteryNotify.sh;
|
|
||||||
# TODO Use batsignal instead?
|
|
||||||
# TODO Only on computers with battery
|
|
||||||
}}/bin/batteryNotify";
|
|
||||||
}
|
|
||||||
# TODO There's a services.screen-locker.xautolock but not sure it can match the above command
|
|
||||||
];
|
|
||||||
workspaceLayout = "tabbed";
|
|
||||||
focus.mouseWarping = true; # i3 only supports warping to workspace, hence ${focus}
|
|
||||||
workspaceOutputAssign =
|
|
||||||
let
|
|
||||||
x11_screens = [ "HDMI-1-0" "eDP1" ]; # FIXME Per computer thing
|
|
||||||
workspaces = map (i: { name = toString i; key = toString (lib.mod i 10); }) (lib.lists.range 1 10);
|
|
||||||
forEachWorkspace = f: map (w: f { w = w; workspace = ((builtins.elemAt workspaces w)); }) (lib.lists.range 0 ((builtins.length workspaces) - 1));
|
|
||||||
in
|
|
||||||
forEachWorkspace ({ w, workspace }: { output = builtins.elemAt x11_screens (lib.mod w (builtins.length x11_screens)); workspace = workspace.name; });
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
numlock.enable = true; # FIXME Only on computers with a separate one
|
|
||||||
};
|
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
# Browser
|
# Browser
|
||||||
|
@ -379,88 +313,14 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
pass.enable = true;
|
pass.enable = true;
|
||||||
};
|
};
|
||||||
autorandr.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg = {
|
home.packages = with pkgs; [
|
||||||
mimeApps = {
|
|
||||||
enable = true;
|
|
||||||
associations.added = {
|
|
||||||
"text/html" = "org.qutebrowser.qutebrowser.desktop";
|
|
||||||
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
|
|
||||||
"x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
|
|
||||||
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
|
|
||||||
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
userDirs.enable = true; # TODO Which ones do we want?
|
|
||||||
};
|
|
||||||
services = {
|
|
||||||
unclutter.enable = true;
|
|
||||||
dunst =
|
|
||||||
{
|
|
||||||
enable = true;
|
|
||||||
settings =
|
|
||||||
# TODO Change dmenu for rofi, so we can use context
|
|
||||||
with config.lib.stylix.colors.withHashtag; {
|
|
||||||
global = {
|
|
||||||
separator_color = lib.mkForce base05;
|
|
||||||
idle_threshold = 120;
|
|
||||||
markup = "full";
|
|
||||||
max_icon_size = 48;
|
|
||||||
# TODO Those shortcuts don't seem to work, maybe try:
|
|
||||||
# > define shortcuts inside your window manager and bind them to dunstctl(1) commands
|
|
||||||
close_all = "ctrl+mod4+n";
|
|
||||||
close = "mod4+n";
|
|
||||||
context = "mod1+mod4+n";
|
|
||||||
history = "shift+mod4+n";
|
|
||||||
};
|
|
||||||
|
|
||||||
urgency_low = {
|
|
||||||
background = lib.mkForce base01;
|
|
||||||
foreground = lib.mkForce base03;
|
|
||||||
frame_color = lib.mkForce base05;
|
|
||||||
};
|
|
||||||
urgency_normal = {
|
|
||||||
background = lib.mkForce base02;
|
|
||||||
foreground = lib.mkForce base05;
|
|
||||||
frame_color = lib.mkForce base05;
|
|
||||||
};
|
|
||||||
urgency_critical = {
|
|
||||||
background = lib.mkForce base08;
|
|
||||||
foreground = lib.mkForce base06;
|
|
||||||
frame_color = lib.mkForce base05;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
mpd.enable = true;
|
|
||||||
autorandr.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home = {
|
|
||||||
file =
|
|
||||||
let
|
|
||||||
nixgl = import
|
|
||||||
(builtins.fetchGit {
|
|
||||||
url = "https://github.com/nix-community/nixGL";
|
|
||||||
rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5";
|
|
||||||
})
|
|
||||||
{ };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
".xinitrc" = {
|
|
||||||
# TODO Configurable
|
|
||||||
source = pkgs.writeShellScript "xinitrc" ''
|
|
||||||
${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path}
|
|
||||||
${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ${config.xsession.windowManager.command}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
packages = with pkgs; [
|
|
||||||
# remote
|
# remote
|
||||||
tigervnc
|
tigervnc
|
||||||
|
|
||||||
# music
|
# music
|
||||||
|
mpd
|
||||||
mpc-cli
|
mpc-cli
|
||||||
ashuffle
|
ashuffle
|
||||||
vimpc
|
vimpc
|
||||||
|
@ -491,13 +351,17 @@
|
||||||
yubikey-touch-detector
|
yubikey-touch-detector
|
||||||
|
|
||||||
# x11-exclusive
|
# x11-exclusive
|
||||||
|
dunst
|
||||||
numlockx
|
numlockx
|
||||||
# TODO urxvt-resize-font-git
|
# TODO urxvt-resize-font-git
|
||||||
simplescreenrecorder
|
simplescreenrecorder
|
||||||
trayer
|
trayer
|
||||||
|
unclutter
|
||||||
|
xautolock
|
||||||
xclip
|
xclip
|
||||||
lemonbar-xft
|
lemonbar-xft
|
||||||
keynav
|
keynav
|
||||||
|
sct
|
||||||
xorg.xinit
|
xorg.xinit
|
||||||
xorg.xbacklight
|
xorg.xbacklight
|
||||||
|
|
||||||
|
@ -506,6 +370,5 @@
|
||||||
pass
|
pass
|
||||||
thunderbird
|
thunderbird
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,8 +27,5 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
# Fix https://nix-community.github.io/home-manager/index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal_or_literal_dconf_service_literal
|
# Fix https://nix-community.github.io/home-manager/index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal_or_literal_dconf_service_literal
|
||||||
# home.packages = [ pkgs.dconf ];
|
home.packages = [ pkgs.dconf ];
|
||||||
dconf.enable = false; # Otherwise standalone home-manager complains it can't find /etc/dbus-1/session.conf on Arch.
|
|
||||||
# Symlinking it to /usr/share/dbus-1/session.conf goes further but not much.
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
# powerline-go duration support
|
|
||||||
zmodload zsh/datetime
|
|
||||||
function preexec() {
|
|
||||||
__TIMER=$EPOCHREALTIME
|
|
||||||
}
|
|
||||||
|
|
||||||
# Cursor based on mode
|
|
||||||
if [ $TERM = "linux" ]; then
|
|
||||||
_LINE_CURSOR="\e[?0c"
|
|
||||||
_BLOCK_CURSOR="\e[?8c"
|
|
||||||
else
|
|
||||||
_LINE_CURSOR="\e[6 q"
|
|
||||||
_BLOCK_CURSOR="\e[2 q"
|
|
||||||
fi
|
|
||||||
function zle-keymap-select zle-line-init
|
|
||||||
{
|
|
||||||
case $KEYMAP in
|
|
||||||
vicmd) print -n -- "$_BLOCK_CURSOR";;
|
|
||||||
viins|main) print -n -- "$_LINE_CURSOR";;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
function zle-line-finish
|
|
||||||
{
|
|
||||||
print -n -- "$_BLOCK_CURSOR"
|
|
||||||
}
|
|
||||||
zle -N zle-line-init
|
|
||||||
zle -N zle-line-finish
|
|
||||||
zle -N zle-keymap-select
|
|
||||||
|
|
||||||
# Also return to normal mode from jk shortcut
|
|
||||||
bindkey 'jk' vi-cmd-mode
|
|
||||||
|
|
||||||
# Edit command line
|
|
||||||
autoload edit-command-line
|
|
||||||
zle -N edit-command-line
|
|
||||||
bindkey -M vicmd v edit-command-line
|
|
||||||
|
|
||||||
# Additional history-substring-search bindings for vi cmd mode
|
|
||||||
# TODO Doesn't work, as home-manager loads history-substring at the very end of the file
|
|
||||||
# bindkey -M vicmd 'k' history-substring-search-up
|
|
||||||
# bindkey -M vicmd 'j' history-substring-search-down
|
|
||||||
|
|
|
@ -51,8 +51,9 @@ padding-right = 2
|
||||||
module-margin-left = 1
|
module-margin-left = 1
|
||||||
module-margin-right = 1
|
module-margin-right = 1
|
||||||
|
|
||||||
font-0 = "DejaVu Sans:size=10;0"
|
font-0 = "Font Awesome:size=10;0"
|
||||||
font-1 = "DejaVuSansMono Nerd Font Mono:pixelsize=10;0"
|
font-1 = "DejaVu Sans:size=10;0"
|
||||||
|
font-2 = "DejaVuSansMono Nerd Font Mono:pixelsize=10;0"
|
||||||
|
|
||||||
modules-left = i3
|
modules-left = i3
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ alias dmesg='dmesg --ctime'
|
||||||
alias wget='wget --hsts-file $HOME/.cache/wget-hsts'
|
alias wget='wget --hsts-file $HOME/.cache/wget-hsts'
|
||||||
|
|
||||||
# [ -f ~/.local/bin/colorSchemeApplyFzf ] && . ~/.local/bin/colorSchemeApplyFzf # Only applies RGB colors...
|
# [ -f ~/.local/bin/colorSchemeApplyFzf ] && . ~/.local/bin/colorSchemeApplyFzf # Only applies RGB colors...
|
||||||
|
POWERLINE_GO_DEFAULT_OPTS=(-colorize-hostname -max-width 25 -cwd-max-dir-size 10 -modules 'user,host,venv,cwd,perms,git' -modules-right 'jobs,exit,duration,load') # For reading by shell profiles
|
||||||
FZF_DEFAULT_OPTS="--height 40% --layout=default"
|
FZF_DEFAULT_OPTS="--height 40% --layout=default"
|
||||||
FZF_CTRL_T_OPTS="--preview '[[ -d {} ]] && ls -l --color=always {} || [[ \$(file --mime {}) =~ binary ]] && file --brief {} || (highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -500'"
|
FZF_CTRL_T_OPTS="--preview '[[ -d {} ]] && ls -l --color=always {} || [[ \$(file --mime {}) =~ binary ]] && file --brief {} || (highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -500'"
|
||||||
FZF_COMPLETION_OPTS="${FZF_CTRL_T_OPTS}"
|
FZF_COMPLETION_OPTS="${FZF_CTRL_T_OPTS}"
|
||||||
|
|
|
@ -5,7 +5,134 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
# TODO Learn `setopt extendedglob`
|
# TODO Learn `setopt extendedglob`
|
||||||
|
# TODO Add asdf (oh-my-zsh plugin is air, git clone is the way (aur package outdated))
|
||||||
|
|
||||||
|
# Approximate RGB colors by terminal colors
|
||||||
|
[[ "$COLORTERM" == (24bit|truecolor) || "${terminfo[colors]}" -eq '16777216' ]] || zmodload zsh/nearcolor
|
||||||
|
|
||||||
|
# Plugins
|
||||||
|
ADOTDIR=~/.cache/antigen
|
||||||
|
mkdir -p $ADOTDIR
|
||||||
|
typeset -a ANTIGEN_CHECK_FILES=(~/.config/shell/zshrc)
|
||||||
|
|
||||||
|
if [ -f /usr/share/zsh/share/antigen.zsh ]
|
||||||
|
then
|
||||||
|
source /usr/share/zsh/share/antigen.zsh
|
||||||
|
else
|
||||||
|
[ -f ~/.local/share/zsh/antigen.zsh ] || (mkdir -p ~/.local/share/zsh/ && curl -L git.io/antigen > ~/.local/share/zsh/antigen.zsh)
|
||||||
|
# TODO If the downloaded file is wrong then we're doomed
|
||||||
|
source ~/.local/share/zsh/antigen.zsh
|
||||||
|
fi
|
||||||
|
|
||||||
|
# This is better to have them installed as system since we can use them as root
|
||||||
|
# pacman -S zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting zsh-completions --needed
|
||||||
|
function plugin() {
|
||||||
|
if [ -d "/usr/share/licenses/$2" ]
|
||||||
|
then
|
||||||
|
trysource "/usr/share/zsh/plugins/$2/$2.zsh"
|
||||||
|
# It's ok if it fails
|
||||||
|
else
|
||||||
|
antigen bundle "$1/$2"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
plugin zsh-users zsh-completions
|
||||||
|
plugin zsh-users zsh-syntax-highlighting
|
||||||
|
plugin zsh-users zsh-autosuggestions
|
||||||
|
plugin zsh-users zsh-history-substring-search
|
||||||
|
antigen apply
|
||||||
|
|
||||||
|
# Prompt customization
|
||||||
|
zmodload zsh/datetime
|
||||||
|
|
||||||
|
function preexec() {
|
||||||
|
__TIMER=$EPOCHREALTIME
|
||||||
|
}
|
||||||
|
|
||||||
|
if command -v powerline-go > /dev/null
|
||||||
|
then
|
||||||
|
function powerline_precmd() {
|
||||||
|
local __ERRCODE=$?
|
||||||
|
local __DURATION=0
|
||||||
|
|
||||||
|
if [ -n $__TIMER ]; then
|
||||||
|
local __ERT=$EPOCHREALTIME
|
||||||
|
__DURATION="$(($__ERT - ${__TIMER:-__ERT}))"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -en "\033]0; ${USER}@${HOST} $PWD\007"
|
||||||
|
# echo -en "… $\r"
|
||||||
|
eval "$(powerline-go -shell zsh -eval -duration $__DURATION -error $__ERRCODE "${POWERLINE_GO_DEFAULT_OPTS[@]}")"
|
||||||
|
unset __TIMER
|
||||||
|
}
|
||||||
|
|
||||||
|
function install_powerline_precmd() {
|
||||||
|
for s in "${precmd_functions[@]}"; do
|
||||||
|
if [ "$s" = "powerline_precmd" ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
precmd_functions+=(powerline_precmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
install_powerline_precmd
|
||||||
|
else
|
||||||
|
export PS1="\[\e]2;\u@\H \w\a\]\[\e[0;37m\][\[\e[0;${col}m\]\u\[\e[0;37m\]@\[\e[0;34m\]\h \[\e[0;36m\]\W\[\e[0;37m\]]\$\[\e[0m\] "
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Cursor based on mode
|
||||||
|
if [ $TERM = "linux" ]; then
|
||||||
|
_LINE_CURSOR="\e[?0c"
|
||||||
|
_BLOCK_CURSOR="\e[?8c"
|
||||||
|
else
|
||||||
|
_LINE_CURSOR="\e[6 q"
|
||||||
|
_BLOCK_CURSOR="\e[2 q"
|
||||||
|
fi
|
||||||
|
function zle-keymap-select zle-line-init
|
||||||
|
{
|
||||||
|
case $KEYMAP in
|
||||||
|
vicmd) print -n -- "$_BLOCK_CURSOR";;
|
||||||
|
viins|main) print -n -- "$_LINE_CURSOR";;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# zle reset-prompt
|
||||||
|
# zle -R
|
||||||
|
}
|
||||||
|
|
||||||
|
function zle-line-finish
|
||||||
|
{
|
||||||
|
print -n -- "$_BLOCK_CURSOR"
|
||||||
|
}
|
||||||
|
|
||||||
|
zle -N zle-line-init
|
||||||
|
zle -N zle-line-finish
|
||||||
|
zle -N zle-keymap-select
|
||||||
|
|
||||||
|
# Should I really put a comment to explain what this does?
|
||||||
|
bindkey 'jk' vi-cmd-mode
|
||||||
|
|
||||||
|
# Edit command line
|
||||||
|
autoload edit-command-line
|
||||||
|
zle -N edit-command-line
|
||||||
|
bindkey -M vicmd v edit-command-line
|
||||||
|
|
||||||
|
# History search
|
||||||
|
# bind UP and DOWN arrow keys
|
||||||
|
zmodload zsh/terminfo
|
||||||
|
bindkey "$terminfo[kcuu1]" history-substring-search-up
|
||||||
|
bindkey "$terminfo[kcud1]" history-substring-search-down
|
||||||
|
|
||||||
|
# bind UP and DOWN arrow keys (compatibility fallback
|
||||||
|
# for Ubuntu 12.04, Fedora 21, and MacOSX 10.9 users)
|
||||||
|
bindkey '^[[A' history-substring-search-up
|
||||||
|
bindkey '^[[B' history-substring-search-down
|
||||||
|
|
||||||
|
# bind P and N for EMACS mode
|
||||||
|
bindkey -M emacs '^P' history-substring-search-up
|
||||||
|
bindkey -M emacs '^N' history-substring-search-down
|
||||||
|
|
||||||
|
# bind k and j for VI mode
|
||||||
|
bindkey -M vicmd 'k' history-substring-search-up
|
||||||
|
bindkey -M vicmd 'j' history-substring-search-down
|
||||||
|
|
||||||
# Autocompletion
|
# Autocompletion
|
||||||
autoload -Uz promptinit
|
autoload -Uz promptinit
|
||||||
|
|
Loading…
Reference in a new issue