Compare commits
No commits in common. "main" and "dev-ssh" have entirely different histories.
@ -1,4 +1,3 @@
|
|||||||
[general]
|
|
||||||
live_config_reload = true
|
live_config_reload = true
|
||||||
|
|
||||||
[bell]
|
[bell]
|
||||||
@ -47,7 +46,7 @@ style = "Block"
|
|||||||
unfocused_hollow = true
|
unfocused_hollow = true
|
||||||
|
|
||||||
[font]
|
[font]
|
||||||
size = 11.0
|
size = 10.0
|
||||||
|
|
||||||
[font.glyph_offset]
|
[font.glyph_offset]
|
||||||
x = 0
|
x = 0
|
||||||
|
|||||||
@ -1,16 +1,8 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# Extract parent window uuid
|
# Extract parent window uuid
|
||||||
|
|
||||||
# On hyprland
|
|
||||||
hyprctl monitors > /dev/null 2>&1
|
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
WM_NAME=$(hyprctl activewindow | grep title | cut -d ':' -f 2 | tr -d ' ')
|
|
||||||
else
|
|
||||||
WINDOW_ID=$(xdotool getactivewindow)
|
WINDOW_ID=$(xdotool getactivewindow)
|
||||||
WM_NAME=$(xprop -id $WINDOW_ID WM_NAME | cut -d '"' -f 2)
|
WM_NAME=$(xprop -id $WINDOW_ID WM_NAME | cut -d '"' -f 2)
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate new uuid for new terminal
|
# Generate new uuid for new terminal
|
||||||
uuid=$(uuidgen)
|
uuid=$(uuidgen)
|
||||||
|
|||||||
36
bin/update
36
bin/update
@ -244,31 +244,21 @@ update-rust() {
|
|||||||
echo -e "\033[32;1m=== Updating rust ===\033[0m"
|
echo -e "\033[32;1m=== Updating rust ===\033[0m"
|
||||||
rustup update
|
rustup update
|
||||||
|
|
||||||
|
cargo install-update --help > /dev/null 2>&1
|
||||||
|
|
||||||
|
# Program to update cargo programs is not installed
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
|
||||||
|
echo -e "\033[33;1m=== To allow updating rust packages, run \`cargo install cargo-update\`===\033[0m"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If the user has no root, and if he doesn't have openssl, we won't install cargo update.
|
||||||
|
# Before running cargo update, we check again that it is installed.
|
||||||
|
cargo install-update --help > /dev/null 2>&1
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo -e "\033[32;1m=== Updating rust packages ===\033[0m"
|
echo -e "\033[32;1m=== Updating rust packages ===\033[0m"
|
||||||
|
cargo install-update -ag
|
||||||
IFS=$'\n'
|
|
||||||
for line in $(cargo install --list); do
|
|
||||||
if [[ $line == " "* ]] || [[ $line == "\t"* ]]; then
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ $line == *"("* ]]; then
|
|
||||||
crate=$(echo $line | cut -d ' ' -f 1)
|
|
||||||
full_repo=$(echo $line | cut -d '(' -f 2 | cut -d ')' -f 1)
|
|
||||||
repo=$(echo $full_repo | cut -d '#' -f 1)
|
|
||||||
current_commit=$(echo $full_repo | cut -d '#' -f 2)
|
|
||||||
latest_commit=$(git ls-remote $repo | head -n 1 | cut -d $'\t' -f 1)
|
|
||||||
|
|
||||||
if [[ $latest_commit == ${current_commit}* ]]; then
|
|
||||||
echo -e " \x1b[32;1mIgnored\x1b[0m package \`$crate\` is already installed"
|
|
||||||
else
|
|
||||||
cargo install --git $repo
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
cargo install $(echo $line | cut -d ' ' -f 1)
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local seconds=$((`date +%s` - $start))
|
local seconds=$((`date +%s` - $start))
|
||||||
|
|||||||
3
hypr/.gitignore
vendored
3
hypr/.gitignore
vendored
@ -1,3 +0,0 @@
|
|||||||
.stat.txt
|
|
||||||
monitors.conf
|
|
||||||
exec-once.conf
|
|
||||||
@ -1,335 +0,0 @@
|
|||||||
# This is an example Hyprland config file.
|
|
||||||
# Refer to the wiki for more information.
|
|
||||||
# https://wiki.hyprland.org/Configuring/
|
|
||||||
|
|
||||||
# Please note not all available settings / options are set here.
|
|
||||||
# For a full list, see the wiki
|
|
||||||
|
|
||||||
# You can split this configuration into multiple files
|
|
||||||
# Create your files separately and then link them to this file like this:
|
|
||||||
# source = ~/.config/hypr/myColors.conf
|
|
||||||
|
|
||||||
|
|
||||||
################
|
|
||||||
### MONITORS ###
|
|
||||||
################
|
|
||||||
|
|
||||||
source = ~/.config/dotfiles/hypr/monitors.conf
|
|
||||||
|
|
||||||
|
|
||||||
###################
|
|
||||||
### MY PROGRAMS ###
|
|
||||||
###################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/
|
|
||||||
|
|
||||||
# Set programs that you use
|
|
||||||
$terminal = new-terminal
|
|
||||||
$fileManager = dolphin
|
|
||||||
$menu = rofi -show drun -theme ~/.config/rofi/theme.rasi
|
|
||||||
$hyprscript = ~/.config/dotfiles/hypr/hyprscript
|
|
||||||
$social = firefox "http://jdb.localhost/todo.html" "https://web.telegram.org" "https://web.whatsapp.com/" "https://discord.com/app" "https://nuage.polymny.studio/index.php/apps/calendar/"
|
|
||||||
|
|
||||||
|
|
||||||
#################
|
|
||||||
### AUTOSTART ###
|
|
||||||
#################
|
|
||||||
|
|
||||||
# Autostart necessary processes (like notifications daemons, status bars, etc.)
|
|
||||||
# Or execute your favorite apps at launch like this:
|
|
||||||
|
|
||||||
exec-once = $hyprscript stat
|
|
||||||
exec-once = hyprpaper
|
|
||||||
exec-once = nm-applet
|
|
||||||
exec-once = flameshot
|
|
||||||
exec-once = blueberry-tray
|
|
||||||
exec-once = nextcloud --background
|
|
||||||
exec-once = [workspace special:a_social silent] $social
|
|
||||||
exec-once = [workspace special:b_mail silent] thunderbird
|
|
||||||
exec-once = [workspace special:c_terminal silent] alacritty
|
|
||||||
|
|
||||||
source = ~/.config/dotfiles/hypr/exec-once.conf
|
|
||||||
|
|
||||||
#############################
|
|
||||||
### ENVIRONMENT VARIABLES ###
|
|
||||||
#############################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Environment-variables/
|
|
||||||
|
|
||||||
env = XCURSOR_SIZE,18
|
|
||||||
env = HYPRCURSOR_SIZE,18
|
|
||||||
|
|
||||||
|
|
||||||
#####################
|
|
||||||
### LOOK AND FEEL ###
|
|
||||||
#####################
|
|
||||||
|
|
||||||
# Refer to https://wiki.hyprland.org/Configuring/Variables/
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#general
|
|
||||||
general {
|
|
||||||
gaps_in = 0
|
|
||||||
gaps_out = 0
|
|
||||||
|
|
||||||
border_size = 1
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
|
|
||||||
col.active_border = rgba(ffffffaa)
|
|
||||||
col.inactive_border = rgba(ffffff22)
|
|
||||||
|
|
||||||
# Set to true enable resizing windows by clicking and dragging on borders and gaps
|
|
||||||
resize_on_border = false
|
|
||||||
|
|
||||||
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
|
|
||||||
allow_tearing = false
|
|
||||||
|
|
||||||
layout = dwindle
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#decoration
|
|
||||||
decoration {
|
|
||||||
rounding = 0
|
|
||||||
rounding_power = 2
|
|
||||||
|
|
||||||
# Change transparency of focused and unfocused windows
|
|
||||||
active_opacity = 1.0
|
|
||||||
inactive_opacity = 1.0
|
|
||||||
|
|
||||||
shadow {
|
|
||||||
enabled = false
|
|
||||||
range = 4
|
|
||||||
render_power = 3
|
|
||||||
color = rgba(1a1a1aee)
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#blur
|
|
||||||
blur {
|
|
||||||
enabled = true
|
|
||||||
size = 3
|
|
||||||
passes = 1
|
|
||||||
|
|
||||||
vibrancy = 0.1696
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#animations
|
|
||||||
animations {
|
|
||||||
enabled = yes, please :)
|
|
||||||
|
|
||||||
# Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
|
|
||||||
|
|
||||||
bezier = easeOutQuint,0.23,1,0.32,1
|
|
||||||
bezier = easeInOutCubic,0.65,0.05,0.36,1
|
|
||||||
bezier = linear,0,0,1,1
|
|
||||||
bezier = almostLinear,0.5,0.5,0.75,1.0
|
|
||||||
bezier = quick,0.15,0,0.1,1
|
|
||||||
|
|
||||||
animation = global, 1, 10, default
|
|
||||||
animation = border, 1, 5.39, easeOutQuint
|
|
||||||
animation = windows, 1, 4.79, easeOutQuint
|
|
||||||
animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
|
|
||||||
animation = windowsOut, 1, 1.49, linear, popin 87%
|
|
||||||
animation = fadeIn, 1, 1.73, almostLinear
|
|
||||||
animation = fadeOut, 1, 1.46, almostLinear
|
|
||||||
animation = fade, 1, 3.03, quick
|
|
||||||
animation = layers, 1, 3.81, easeOutQuint
|
|
||||||
animation = layersIn, 1, 4, easeOutQuint, fade
|
|
||||||
animation = layersOut, 1, 1.5, linear, fade
|
|
||||||
animation = fadeLayersIn, 1, 1.79, almostLinear
|
|
||||||
animation = fadeLayersOut, 1, 1.39, almostLinear
|
|
||||||
animation = workspaces, 1, 1.94, almostLinear, fade
|
|
||||||
animation = workspacesIn, 1, 1.21, almostLinear, fade
|
|
||||||
animation = workspacesOut, 1, 1.94, almostLinear, fade
|
|
||||||
}
|
|
||||||
|
|
||||||
# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
|
|
||||||
# "Smart gaps" / "No gaps when only"
|
|
||||||
# uncomment all if you wish to use that.
|
|
||||||
# workspace = w[tv1], gapsout:0, gapsin:0
|
|
||||||
# workspace = f[1], gapsout:0, gapsin:0
|
|
||||||
# windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
|
|
||||||
# windowrule = rounding 0, floating:0, onworkspace:w[tv1]
|
|
||||||
# windowrule = bordersize 0, floating:0, onworkspace:f[1]
|
|
||||||
# windowrule = rounding 0, floating:0, onworkspace:f[1]
|
|
||||||
|
|
||||||
# Borders only on alacritty
|
|
||||||
windowrule = noborder, class:negative:Alacritty
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
|
|
||||||
dwindle {
|
|
||||||
pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
|
|
||||||
preserve_split = true # You probably want this
|
|
||||||
force_split = 2 # split to the right / bottom
|
|
||||||
}
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
|
|
||||||
master {
|
|
||||||
new_status = master
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#misc
|
|
||||||
misc {
|
|
||||||
force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
|
|
||||||
disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
|
|
||||||
focus_on_activate = true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#############
|
|
||||||
### INPUT ###
|
|
||||||
#############
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#input
|
|
||||||
input {
|
|
||||||
kb_layout = fr
|
|
||||||
kb_variant =
|
|
||||||
kb_model =
|
|
||||||
kb_options =
|
|
||||||
kb_rules =
|
|
||||||
|
|
||||||
follow_mouse = 1
|
|
||||||
|
|
||||||
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
|
|
||||||
numlock_by_default = true
|
|
||||||
|
|
||||||
touchpad {
|
|
||||||
natural_scroll = false
|
|
||||||
tap-to-click = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#gestures
|
|
||||||
gestures {
|
|
||||||
workspace_swipe = false
|
|
||||||
}
|
|
||||||
|
|
||||||
# Example per-device config
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
|
|
||||||
device {
|
|
||||||
name = epic-mouse-v1
|
|
||||||
sensitivity = -0.5
|
|
||||||
}
|
|
||||||
|
|
||||||
#################
|
|
||||||
### ECOSYSTEM ###
|
|
||||||
#################
|
|
||||||
ecosystem {
|
|
||||||
no_update_news = true
|
|
||||||
no_donation_nag = true
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
###################
|
|
||||||
### KEYBINDINGS ###
|
|
||||||
###################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/
|
|
||||||
$mainMod = SUPER # Sets "Windows" key as main modifier
|
|
||||||
|
|
||||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
|
||||||
bind = $mainMod, return, exec, $terminal
|
|
||||||
bind = $mainMod, A, exec, firefox
|
|
||||||
bind = $mainMod SHIFT, A, exec, firefox -private-window
|
|
||||||
bind = $mainMod SHIFT, C, killactive,
|
|
||||||
bind = $mainMod, V, togglefloating,
|
|
||||||
bind = $mainMod, R, exec, $menu
|
|
||||||
bind = $mainMod, J, exec, $hyprscript focusnextmonitor
|
|
||||||
|
|
||||||
bind = $mainMod, O, exec, $hyprscript movewindow
|
|
||||||
bind = $mainMod, Tab, cyclenext
|
|
||||||
|
|
||||||
bind = $mainMod CTRL, R, exec, $hyprscript reload
|
|
||||||
bind = $mainMod SHIFT, Q, exec, hyprctl dispatch exit
|
|
||||||
|
|
||||||
bind = $mainMod, Z, exec, $social
|
|
||||||
bind = $mainMod, E, exec, firefox "ext+container:name=Yuzzit&url=https://yip.atlassian.net/wiki/spaces/Y/overview" "ext+container:name=Yuzzit&url=https://yip.atlassian.net/" "ext+container:name=Yuzzit&url=https://app.slack.com/client/T03UFFGJK/D07KS0S1LDT" "ext+container:name=Yuzzit&url=https://app.gather.town/app/bZRkf3gh7MIximOa/ytopenspace"
|
|
||||||
|
|
||||||
bind = $mainMod, C, exec, alacritty -e numbat
|
|
||||||
bind = $mainMod, P, exec, pavucontrol
|
|
||||||
bind = $mainMod, B, exec, blueberry
|
|
||||||
|
|
||||||
bind = $mainMod SHIFT, M, exec, sleep 0.5s && wtype "thomas@forgione.fr"
|
|
||||||
bind = $mainMod SHIFT, code:48, exec, sleep 0.5s && wtype "thomas@polymny.studio"
|
|
||||||
|
|
||||||
# Move focus with mainMod + arrow keys
|
|
||||||
# bind = $mainMod, left, movefocus, l
|
|
||||||
# bind = $mainMod, right, movefocus, r
|
|
||||||
# bind = $mainMod, up, movefocus, u
|
|
||||||
# bind = $mainMod, down, movefocus, d
|
|
||||||
|
|
||||||
bind = $mainMod, left, exec, $hyprscript workspace previous
|
|
||||||
bind = $mainMod, right, exec, $hyprscript workspace next
|
|
||||||
|
|
||||||
# Switch workspaces with mainMod + [0-9]
|
|
||||||
bind = $mainMod, code:10, exec, $hyprscript workspace 1
|
|
||||||
bind = $mainMod, code:11, exec, $hyprscript workspace 2
|
|
||||||
bind = $mainMod, code:12, exec, $hyprscript workspace 3
|
|
||||||
bind = $mainMod, code:13, exec, $hyprscript workspace 4
|
|
||||||
bind = $mainMod, code:14, exec, $hyprscript workspace 5
|
|
||||||
bind = $mainMod, code:15, exec, $hyprscript workspace 6
|
|
||||||
bind = $mainMod, code:16, exec, $hyprscript workspace 7
|
|
||||||
bind = $mainMod, code:17, exec, $hyprscript workspace 8
|
|
||||||
bind = $mainMod, code:18, exec, $hyprscript workspace 9
|
|
||||||
bind = $mainMod, code:19, exec, $hyprscript workspace 10
|
|
||||||
|
|
||||||
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
|
||||||
bind = $mainMod SHIFT, code:10, exec, $hyprscript movetoworkspace 1
|
|
||||||
bind = $mainMod SHIFT, code:11, exec, $hyprscript movetoworkspace 2
|
|
||||||
bind = $mainMod SHIFT, code:12, exec, $hyprscript movetoworkspace 3
|
|
||||||
bind = $mainMod SHIFT, code:13, exec, $hyprscript movetoworkspace 4
|
|
||||||
bind = $mainMod SHIFT, code:14, exec, $hyprscript movetoworkspace 5
|
|
||||||
bind = $mainMod SHIFT, code:15, exec, $hyprscript movetoworkspace 6
|
|
||||||
bind = $mainMod SHIFT, code:16, exec, $hyprscript movetoworkspace 7
|
|
||||||
bind = $mainMod SHIFT, code:17, exec, $hyprscript movetoworkspace 8
|
|
||||||
bind = $mainMod SHIFT, code:18, exec, $hyprscript movetoworkspace 9
|
|
||||||
bind = $mainMod SHIFT, code:19, exec, $hyprscript movetoworkspace 10
|
|
||||||
|
|
||||||
# Screenshot
|
|
||||||
bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy
|
|
||||||
|
|
||||||
# Example special workspace (scratchpad)
|
|
||||||
bind = $mainMod, Q, togglespecialworkspace, a_social
|
|
||||||
bind = $mainMod, S, togglespecialworkspace, b_mail
|
|
||||||
bind = $mainMod, D, togglespecialworkspace, c_terminal
|
|
||||||
|
|
||||||
# Scroll through existing workspaces with mainMod + scroll
|
|
||||||
bind = $mainMod, mouse_down, workspace, e+1
|
|
||||||
bind = $mainMod, mouse_up, workspace, e-1
|
|
||||||
|
|
||||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
|
||||||
bindm = $mainMod, mouse:272, movewindow
|
|
||||||
bindm = $mainMod, mouse:273, resizewindow
|
|
||||||
|
|
||||||
# Laptop multimedia keys for volume and LCD brightness
|
|
||||||
bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
|
|
||||||
bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
|
|
||||||
bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
|
|
||||||
bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
|
|
||||||
bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 2%+
|
|
||||||
bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 2%-
|
|
||||||
|
|
||||||
# Requires playerctl
|
|
||||||
bindl = , XF86AudioNext, exec, playerctl next
|
|
||||||
bindl = , XF86AudioPause, exec, playerctl play-pause
|
|
||||||
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
|
||||||
bindl = , XF86AudioPrev, exec, playerctl previous
|
|
||||||
|
|
||||||
##############################
|
|
||||||
### WINDOWS AND WORKSPACES ###
|
|
||||||
##############################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
|
|
||||||
|
|
||||||
# Example windowrule
|
|
||||||
# windowrule = float,class:^(kitty)$,title:^(kitty)$
|
|
||||||
|
|
||||||
# Ignore maximize requests from apps. You'll probably like this.
|
|
||||||
windowrule = suppressevent maximize, class:.*
|
|
||||||
|
|
||||||
# Fix some dragging issues with XWayland
|
|
||||||
windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
|
||||||
|
|
||||||
# Nvidia config
|
|
||||||
env = LIBVA_DRIVER_NAME,nvidia
|
|
||||||
env = __GLX_VENDOR_LIBRARY_NAME,nvidia
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
preload = /home/thomas/.config/awesome/Wallpapers/cobra-kai-1.png
|
|
||||||
wallpaper = , /home/thomas/.config/awesome/Wallpapers/cobra-kai-1.png
|
|
||||||
286
hypr/hyprscript
286
hypr/hyprscript
@ -1,286 +0,0 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import os.path
|
|
||||||
import subprocess
|
|
||||||
import sys
|
|
||||||
import typing
|
|
||||||
|
|
||||||
os.chdir(os.path.expanduser('~/.config/dotfiles/hypr'))
|
|
||||||
bars = "_▂▃▄▅▆▇█"
|
|
||||||
batteries = ""
|
|
||||||
batteries_charging = ""
|
|
||||||
|
|
||||||
|
|
||||||
class Monitor:
|
|
||||||
"""
|
|
||||||
A monitor on which many workspaces can appear.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, id: int, name: str, special_workspace: typing.Optional['Workspace']):
|
|
||||||
"""
|
|
||||||
Constructs a monitor from its id and its name.
|
|
||||||
"""
|
|
||||||
self.id = id
|
|
||||||
self.name = name
|
|
||||||
self.special_workspace = special_workspace
|
|
||||||
|
|
||||||
def __eq__(self, other):
|
|
||||||
"""
|
|
||||||
Returns true if the monitors are the same.
|
|
||||||
"""
|
|
||||||
self.id == other.id
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def active(monitors: list['Monitor']) -> 'Monitor':
|
|
||||||
"""
|
|
||||||
Returns the active monitor.
|
|
||||||
"""
|
|
||||||
proc = subprocess.run(['hyprctl', 'activeworkspace', '-j'], capture_output=True)
|
|
||||||
result = json.loads(proc.stdout)
|
|
||||||
return next((monitor for monitor in monitors if monitor.id == result['monitorID']))
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def all() -> list['Monitor']:
|
|
||||||
"""
|
|
||||||
Returns the list of available monitors.
|
|
||||||
"""
|
|
||||||
monitors: list['Monitor'] = []
|
|
||||||
|
|
||||||
proc = subprocess.run(['hyprctl', 'monitors', '-j'], capture_output=True)
|
|
||||||
result = json.loads(proc.stdout)
|
|
||||||
|
|
||||||
for mon in result:
|
|
||||||
if mon['specialWorkspace']['id'] == 0:
|
|
||||||
monitors.append(Monitor(mon['id'], mon['name'], None))
|
|
||||||
else:
|
|
||||||
special_workspace = Workspace(mon['specialWorkspace']['id'], mon['specialWorkspace']['name'])
|
|
||||||
monitors.append(Monitor(mon['id'], mon['name'], special_workspace))
|
|
||||||
|
|
||||||
return monitors
|
|
||||||
|
|
||||||
def previous(self, monitors: list['Monitor'], move: bool = False):
|
|
||||||
"""
|
|
||||||
Moves the focus to the previous monitor.
|
|
||||||
|
|
||||||
Params:
|
|
||||||
move: whether you want to move the active window to the new monitor.
|
|
||||||
"""
|
|
||||||
mon = monitors[(monitors.index(self) - 1) % len(monitors)]
|
|
||||||
|
|
||||||
if move:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'movewindow', 'mon:' + str(mon.id)])
|
|
||||||
else:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'focusmonitor', str(mon.id)])
|
|
||||||
|
|
||||||
def next(self, monitors: list['Monitor'], move: bool = False):
|
|
||||||
"""
|
|
||||||
Moves the focus to the next monitor.
|
|
||||||
|
|
||||||
Params:
|
|
||||||
move: whether you want to move the active window to the new monitor.
|
|
||||||
"""
|
|
||||||
mon = monitors[(monitors.index(self) + 1) % len(monitors)]
|
|
||||||
|
|
||||||
if move:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'movewindow', 'mon:' + str(mon.name)])
|
|
||||||
else:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'focusmonitor', str(mon.name)])
|
|
||||||
|
|
||||||
|
|
||||||
class Workspace:
|
|
||||||
"""
|
|
||||||
A workspace bound to a monitor.
|
|
||||||
|
|
||||||
Workspaces with id from 10 * n + k belongs to the same monitor for k in [1, 10].
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, id: int, name: str):
|
|
||||||
"""
|
|
||||||
Constructs a workspace from its id and its name.
|
|
||||||
"""
|
|
||||||
self.id = id
|
|
||||||
self.name = name
|
|
||||||
|
|
||||||
def is_special(self) -> bool:
|
|
||||||
"""
|
|
||||||
Returns true if the workspace is a magic workspace.
|
|
||||||
"""
|
|
||||||
return self.id < 0
|
|
||||||
|
|
||||||
def special_name(self) -> typing.Optional[str]:
|
|
||||||
"""
|
|
||||||
Returns the part after the : if the workspace is special, none otherwise.
|
|
||||||
"""
|
|
||||||
if self.is_special():
|
|
||||||
return ':'.join(self.name.split(':')[1:])
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def active() -> 'Workspace':
|
|
||||||
"""
|
|
||||||
Returns the active workspace.
|
|
||||||
"""
|
|
||||||
proc = subprocess.run(['hyprctl', 'activeworkspace', '-j'], capture_output=True)
|
|
||||||
result = json.loads(proc.stdout)
|
|
||||||
return Workspace(result['id'], result['name'])
|
|
||||||
|
|
||||||
def nth(self, n: int, monitor: Monitor, move: bool = False):
|
|
||||||
"""
|
|
||||||
Goes to the nth workspace on the same monitor as the current workspace.
|
|
||||||
|
|
||||||
Params:
|
|
||||||
n: workspace to go to, between 1 and 10.
|
|
||||||
monitor: active monitor.
|
|
||||||
move: whether you want to move the active window to the new workspace.
|
|
||||||
"""
|
|
||||||
new_id = (self.id - 1) // 10 * 10 + n
|
|
||||||
|
|
||||||
current = monitor.special_workspace
|
|
||||||
if current is not None:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'togglespecialworkspace', current.special_name()])
|
|
||||||
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
|
|
||||||
|
|
||||||
def previous(self, monitor: Monitor, move: bool = False):
|
|
||||||
"""
|
|
||||||
Goes to the previous workspace on the same monitor, or the last if we're on the first.
|
|
||||||
|
|
||||||
Params:
|
|
||||||
monitor: active monitor.
|
|
||||||
move: whether you want to move the active window to the new workspace.
|
|
||||||
"""
|
|
||||||
new_id = self.id - 1
|
|
||||||
|
|
||||||
if new_id % 10 == 0:
|
|
||||||
new_id += 10
|
|
||||||
|
|
||||||
current = monitor.special_workspace
|
|
||||||
if current is not None:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'togglespecialworkspace', current.special_name()])
|
|
||||||
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
|
|
||||||
|
|
||||||
def next(self, monitor: Monitor, move: bool = False):
|
|
||||||
"""
|
|
||||||
Goes to the next workspace on the same monitor, or the first if we're on the last.
|
|
||||||
|
|
||||||
Params:
|
|
||||||
monitor: active monitor.
|
|
||||||
move: whether you want to move the active window to the new workspace.
|
|
||||||
"""
|
|
||||||
new_id = self.id + 1
|
|
||||||
|
|
||||||
if new_id % 10 == 1:
|
|
||||||
new_id -= 10
|
|
||||||
|
|
||||||
current = monitor.special_workspace
|
|
||||||
if current is not None:
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'togglespecialworkspace', current.special_name()])
|
|
||||||
|
|
||||||
subprocess.run(['hyprctl', 'dispatch', 'movetoworkspace' if move else 'workspace', str(new_id)])
|
|
||||||
|
|
||||||
|
|
||||||
def to_bar(x):
|
|
||||||
return bars[round((len(bars) - 1) * x / 100)]
|
|
||||||
|
|
||||||
|
|
||||||
def monitor_stats():
|
|
||||||
"""
|
|
||||||
Monitors CPU and MEM usage and prints info in file.
|
|
||||||
"""
|
|
||||||
|
|
||||||
try:
|
|
||||||
import psutil
|
|
||||||
except ModuleNotFoundError:
|
|
||||||
print('Stats requires psutil (run `pip install psutil`)', file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
cpu_values = [0] * 10
|
|
||||||
mem_values = [0] * 10
|
|
||||||
|
|
||||||
while True:
|
|
||||||
cpu_percent = psutil.cpu_percent(interval=2)
|
|
||||||
mem_percent = psutil.virtual_memory().percent
|
|
||||||
battery = psutil.sensors_battery()
|
|
||||||
|
|
||||||
for i in range(len(cpu_values) - 1):
|
|
||||||
cpu_values[i] = cpu_values[i+1]
|
|
||||||
mem_values[i] = mem_values[i+1]
|
|
||||||
|
|
||||||
cpu_values[-1] = cpu_percent
|
|
||||||
mem_values[-1] = mem_percent
|
|
||||||
|
|
||||||
if battery is None:
|
|
||||||
battery_json = '{"text": "", "class": "hidden"}'
|
|
||||||
else:
|
|
||||||
battery_index = round(battery.percent / 10)
|
|
||||||
battery_icon = batteries_charging[battery_index] if battery.power_plugged else batteries[battery_index]
|
|
||||||
|
|
||||||
if battery.power_plugged:
|
|
||||||
battery_class = 'charging'
|
|
||||||
elif battery.percent < 30.0:
|
|
||||||
battery_class = 'low'
|
|
||||||
elif battery.percent < 15.0:
|
|
||||||
battery_class = 'critical'
|
|
||||||
else:
|
|
||||||
battery_class = None
|
|
||||||
|
|
||||||
battery_json = f', "class": "{battery_class}"' if battery_class else ''
|
|
||||||
battery_json = '{"text": "' + battery_icon + ' ' + "% 4.0f" % battery.percent + '%"' + battery_json + '}'
|
|
||||||
|
|
||||||
with open('.stat.txt', 'w') as f:
|
|
||||||
f.write(
|
|
||||||
' ' + ''.join([to_bar(x) for x in cpu_values]) + ' ' + "% 5.1f" % cpu_percent + '%\n' +
|
|
||||||
' ' + ''.join([to_bar(x) for x in mem_values]) + ' ' + "% 5.1f" % mem_percent + '%\n' +
|
|
||||||
battery_json
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
if len(sys.argv) < 2:
|
|
||||||
return
|
|
||||||
|
|
||||||
if sys.argv[1] == 'workspace' or sys.argv[1] == 'movetoworkspace':
|
|
||||||
monitors = Monitor.all()
|
|
||||||
monitor = Monitor.active(monitors)
|
|
||||||
|
|
||||||
workspace = Workspace.active()
|
|
||||||
move = sys.argv[1] == 'movetoworkspace'
|
|
||||||
|
|
||||||
if sys.argv[2] == 'next':
|
|
||||||
workspace.next(monitor, move)
|
|
||||||
|
|
||||||
elif sys.argv[2] == 'previous':
|
|
||||||
workspace.previous(monitor, move)
|
|
||||||
|
|
||||||
else:
|
|
||||||
new_workspace = int(sys.argv[2])
|
|
||||||
workspace.nth(new_workspace, monitor, move)
|
|
||||||
|
|
||||||
elif sys.argv[1] in ['movewindow', 'focusnextmonitor', 'focuspreviousmonitor']:
|
|
||||||
monitors = Monitor.all()
|
|
||||||
monitor = Monitor.active(monitors)
|
|
||||||
|
|
||||||
if sys.argv[1] == 'movewindow':
|
|
||||||
monitor.next(monitors, True)
|
|
||||||
elif sys.argv[1] == 'focusnextmonitor':
|
|
||||||
monitor.next(monitors)
|
|
||||||
elif sys.argv[1] == 'focuspreviousmonitor':
|
|
||||||
monitor.previous(monitors)
|
|
||||||
|
|
||||||
elif sys.argv[1] == 'reload':
|
|
||||||
subprocess.run(['systemctl', 'restart', 'waybar', '--user'])
|
|
||||||
|
|
||||||
elif sys.argv[1] == 'stat':
|
|
||||||
monitor_stats()
|
|
||||||
|
|
||||||
else:
|
|
||||||
print(f'Command not found: {sys.argv[1]}', file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
$mainMonitorName = eDP-1
|
|
||||||
$mainMonitorResolution = 1920x1080@59.99900
|
|
||||||
$mainMonitorPosition = 0x0
|
|
||||||
$mainMonitorScale = 1
|
|
||||||
|
|
||||||
workspace = 11, monitor:$mainMonitorName, default:true
|
|
||||||
workspace = 12, monitor:$mainMonitorName
|
|
||||||
workspace = 13, monitor:$mainMonitorName
|
|
||||||
workspace = 14, monitor:$mainMonitorName
|
|
||||||
workspace = 15, monitor:$mainMonitorName
|
|
||||||
workspace = 16, monitor:$mainMonitorName
|
|
||||||
workspace = 17, monitor:$mainMonitorName
|
|
||||||
workspace = 18, monitor:$mainMonitorName
|
|
||||||
workspace = 19, monitor:$mainMonitorName
|
|
||||||
workspace = 20, monitor:$mainMonitorName
|
|
||||||
|
|
||||||
monitor = $mainMonitorName, $mainMonitorResolution, $mainMonitorPosition, $mainMonitorScale
|
|
||||||
@ -1,5 +1,6 @@
|
|||||||
" Pas de compatibilité a VI !
|
" Pas de compatibilité a VI !
|
||||||
set nocompatible
|
set nocompatible
|
||||||
|
set notermguicolors
|
||||||
|
|
||||||
" PLUGNIS ###########################################################{{{
|
" PLUGNIS ###########################################################{{{
|
||||||
call plug#begin()
|
call plug#begin()
|
||||||
@ -98,7 +99,6 @@ set t_Co=256
|
|||||||
set textwidth=0
|
set textwidth=0
|
||||||
" Set textwidth for latex
|
" Set textwidth for latex
|
||||||
" autocmd FileType tex set textwidth=79
|
" autocmd FileType tex set textwidth=79
|
||||||
autocmd FileType markdown set textwidth=120
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" COLOR #############################################################{{{
|
" COLOR #############################################################{{{
|
||||||
@ -110,9 +110,6 @@ catch
|
|||||||
endtry
|
endtry
|
||||||
highlight BadWhitespace ctermbg=red guibg=red
|
highlight BadWhitespace ctermbg=red guibg=red
|
||||||
match BadWhitespace / \| \+\t/
|
match BadWhitespace / \| \+\t/
|
||||||
|
|
||||||
" Use html for tera files
|
|
||||||
autocmd BufNewFile,BufRead *.tera set ft=html
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" SEARCHING #########################################################{{{
|
" SEARCHING #########################################################{{{
|
||||||
@ -225,6 +222,5 @@ inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
|
|||||||
" CUSTOM THINGS DEPENDING ON ENV ####################################{{{
|
" CUSTOM THINGS DEPENDING ON ENV ####################################{{{
|
||||||
let g:rustfmt_autosave = 1
|
let g:rustfmt_autosave = 1
|
||||||
|
|
||||||
|
|
||||||
" Apprently some people don't use vim
|
" Apprently some people don't use vim
|
||||||
" set autoread | au CursorHold * checktime | call feedkeys("lh")
|
" set autoread | au CursorHold * checktime | call feedkeys("lh")
|
||||||
227
nvim/init.lua
227
nvim/init.lua
@ -1,227 +0,0 @@
|
|||||||
local Plug = vim.fn['plug#']
|
|
||||||
|
|
||||||
-- PLUGINS
|
|
||||||
vim.call('plug#begin')
|
|
||||||
|
|
||||||
-- General plugins
|
|
||||||
Plug('vim-airline/vim-airline')
|
|
||||||
Plug('vim-airline/vim-airline-themes')
|
|
||||||
Plug('tpope/vim-abolish')
|
|
||||||
Plug('lambdalisue/suda.vim')
|
|
||||||
Plug('https://gitea.tforgione.fr/tforgione/peach.git')
|
|
||||||
|
|
||||||
-- Language specific plugins
|
|
||||||
Plug('rust-lang/rust.vim')
|
|
||||||
Plug('ElmCast/elm-vim')
|
|
||||||
Plug('cespare/vim-toml')
|
|
||||||
Plug('kaarmu/typst.vim')
|
|
||||||
|
|
||||||
vim.call('plug#end')
|
|
||||||
|
|
||||||
-- INDENTATION
|
|
||||||
vim.opt.expandtab = true
|
|
||||||
vim.opt.tabstop = 4
|
|
||||||
vim.opt.shiftwidth = 4
|
|
||||||
vim.opt.autoindent = true
|
|
||||||
vim.opt.textwidth = 120
|
|
||||||
|
|
||||||
-- UI
|
|
||||||
vim.opt.number = true
|
|
||||||
vim.opt.showcmd = true
|
|
||||||
vim.opt.wildmenu = true
|
|
||||||
vim.opt.lazyredraw = true
|
|
||||||
vim.opt.encoding = 'utf8'
|
|
||||||
vim.opt.clipboard = 'unnamedplus'
|
|
||||||
vim.opt.updatecount = 50
|
|
||||||
vim.opt.mouse = 'a'
|
|
||||||
vim.opt.guicursor = nil
|
|
||||||
vim.opt.updatetime = 300
|
|
||||||
|
|
||||||
vim.opt.list = true
|
|
||||||
vim.opt.listchars = { trail = '·', tab = ' ', nbsp = '¬' }
|
|
||||||
|
|
||||||
-- Auto remove trailing spaces
|
|
||||||
vim.api.nvim_create_autocmd({'BufWritePre'}, {
|
|
||||||
pattern = {'*'},
|
|
||||||
callback = function(ev)
|
|
||||||
vim.cmd('%s/\\s\\+$//e')
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
-- COLOR --
|
|
||||||
pcall(vim.cmd.colorscheme, 'peach')
|
|
||||||
vim.cmd.highlight({'BadWhitespace', 'ctermbg=red', 'guibg=red'})
|
|
||||||
vim.g.airline_powerline_fonts = 1
|
|
||||||
vim.g.airline_theme = 'dark'
|
|
||||||
|
|
||||||
-- SEARCHING
|
|
||||||
vim.opt.title = true
|
|
||||||
vim.opt.showmatch = true
|
|
||||||
vim.opt.hlsearch = true
|
|
||||||
vim.opt.incsearch = true
|
|
||||||
|
|
||||||
-- BACKUPS
|
|
||||||
vim.opt.undofile = true
|
|
||||||
vim.opt.undolevels = 1000
|
|
||||||
vim.opt.undoreload = 10000
|
|
||||||
vim.opt.undodir = os.getenv('HOME') .. '/.nvim/undo'
|
|
||||||
|
|
||||||
vim.g.backup_dir = os.getenv('HOME') .. '/.nvim/backups'
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({'BufWritePost'}, {
|
|
||||||
pattern = {'*'},
|
|
||||||
callback = function(ev)
|
|
||||||
local backup_path = vim.g.backup_dir .. '/' .. vim.api.nvim_buf_get_name(0):gsub('/', '\\%%')
|
|
||||||
vim.cmd('silent w! ' .. backup_path)
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
-- LSPs
|
|
||||||
-- Config
|
|
||||||
vim.opt.completeopt = { 'menuone', 'noselect' }
|
|
||||||
vim.opt.signcolumn = 'yes'
|
|
||||||
|
|
||||||
vim.diagnostic.config {
|
|
||||||
signs = {
|
|
||||||
text = {
|
|
||||||
[vim.diagnostic.severity.ERROR] = '',
|
|
||||||
[vim.diagnostic.severity.WARN] = '',
|
|
||||||
[vim.diagnostic.severity.HINT] = '',
|
|
||||||
[vim.diagnostic.severity.INFO] = '',
|
|
||||||
},
|
|
||||||
color = {},
|
|
||||||
},
|
|
||||||
float = {
|
|
||||||
header = false,
|
|
||||||
border = 'rounded',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
-- Show diagnostics on hover
|
|
||||||
vim.api.nvim_create_autocmd({'CursorHold'}, {
|
|
||||||
pattern = {'*'},
|
|
||||||
callback = function(ev)
|
|
||||||
vim.diagnostic.open_float()
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
-- Shortcuts for mapping shortcuts
|
|
||||||
local map = function(type, key, value)
|
|
||||||
vim.api.nvim_buf_set_keymap(0, type, key, value, { noremap = true, silent = true });
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Compile on F12
|
|
||||||
vim.keymap.set('n', '<F12>', function(e)
|
|
||||||
vim.cmd('wa')
|
|
||||||
vim.cmd('!mars -p %:p')
|
|
||||||
end, { silent = true, expr = true })
|
|
||||||
|
|
||||||
vim.keymap.set('i', '<F12>', function(e)
|
|
||||||
vim.cmd('wa')
|
|
||||||
vim.cmd('!mars -p %:p')
|
|
||||||
end, { silent = true, expr = true })
|
|
||||||
|
|
||||||
vim.keymap.set('i', '<F12>', function(e)
|
|
||||||
vim.cmd('wa')
|
|
||||||
vim.cmd('!mars -p %:p')
|
|
||||||
end, { silent = true, expr = true })
|
|
||||||
|
|
||||||
-- Autocomplete with tab
|
|
||||||
vim.keymap.set('v', '<Tab>', function()
|
|
||||||
if vim.fn.pumvisible() == 1 then
|
|
||||||
return '<C-n>'
|
|
||||||
else
|
|
||||||
return '<Tab>'
|
|
||||||
end
|
|
||||||
end, { silent = true, expr = true })
|
|
||||||
|
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd("LspAttach", {
|
|
||||||
callback = function(args)
|
|
||||||
local client = vim.lsp.get_client_by_id(args.data.client_id)
|
|
||||||
|
|
||||||
-- Enable auto-completion. Note: Use CTRL-Y to select an item.
|
|
||||||
if client:supports_method('textDocument/completion') then
|
|
||||||
|
|
||||||
-- Trigger autocompletion on EVERY keypress. May be slow!
|
|
||||||
local chars = {}; for i = 32, 126 do table.insert(chars, string.char(i)) end
|
|
||||||
client.server_capabilities.completionProvider.triggerCharacters = chars
|
|
||||||
|
|
||||||
vim.lsp.completion.enable(true, client.id, args.buf, {
|
|
||||||
autotrigger = true,
|
|
||||||
convert = function(item)
|
|
||||||
return { abbr = item.label:gsub('%b()', '') }
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Auto-format on save.
|
|
||||||
if not client:supports_method('textDocument/willSaveWaitUntil') and client:supports_method('textDocument/formatting') then
|
|
||||||
vim.api.nvim_create_autocmd('BufWritePre', {
|
|
||||||
group = vim.api.nvim_create_augroup('my.lsp', {clear=false}),
|
|
||||||
buffer = args.buf,
|
|
||||||
callback = function()
|
|
||||||
vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Don't use lsp to manage colorscheme
|
|
||||||
client.server_capabilities.semanticTokensProvider = nil
|
|
||||||
|
|
||||||
-- Some nice shortcuts
|
|
||||||
map('n','gD','<cmd>lua vim.lsp.buf.declaration()<CR>')
|
|
||||||
map('n','gd','<cmd>lua vim.lsp.buf.definition()<CR>')
|
|
||||||
map('n','K','<cmd>lua vim.lsp.buf.hover()<CR>')
|
|
||||||
map('n','gr','<cmd>lua vim.lsp.buf.references()<CR>')
|
|
||||||
map('n','gs','<cmd>lua vim.lsp.buf.signature_help()<CR>')
|
|
||||||
map('n','gi','<cmd>lua vim.lsp.buf.implementation()<CR>')
|
|
||||||
map('n','gt','<cmd>lua vim.lsp.buf.type_definition()<CR>')
|
|
||||||
map('n','<leader>gw','<cmd>lua vim.lsp.buf.document_symbol()<CR>')
|
|
||||||
map('n','<leader>gW','<cmd>lua vim.lsp.buf.workspace_symbol()<CR>')
|
|
||||||
map('n','<leader>ah','<cmd>lua vim.lsp.buf.hover()<CR>')
|
|
||||||
map('n','<leader>af','<cmd>lua vim.lsp.buf.code_action()<CR>')
|
|
||||||
map('n','<leader>ee','<cmd>lua vim.lsp.util.show_line_diagnostics()<CR>')
|
|
||||||
map('n','<leader>rn','<cmd>lua vim.lsp.buf.rename()<CR>')
|
|
||||||
map('n','<leader>=', '<cmd>lua vim.lsp.buf.formatting()<CR>')
|
|
||||||
map('n','<leader>ai','<cmd>lua vim.lsp.buf.incoming_calls()<CR>')
|
|
||||||
map('n','<leader>ao','<cmd>lua vim.lsp.buf.outgoing_calls()<CR>')
|
|
||||||
end,
|
|
||||||
});
|
|
||||||
|
|
||||||
-- Rust
|
|
||||||
vim.lsp.config['rust'] = {
|
|
||||||
cmd = { 'rustup', 'run', 'stable', 'rust-analyzer' },
|
|
||||||
filetypes = { 'rust' },
|
|
||||||
root_markers = { 'Cargo.toml' },
|
|
||||||
}
|
|
||||||
|
|
||||||
vim.lsp.enable('rust')
|
|
||||||
|
|
||||||
-- Elm
|
|
||||||
vim.lsp.config['elm'] = {
|
|
||||||
cmd = { 'elm-language-server' },
|
|
||||||
filetypes = { 'elm' },
|
|
||||||
root_markers = { 'elm.json' },
|
|
||||||
}
|
|
||||||
|
|
||||||
vim.lsp.enable('elm')
|
|
||||||
|
|
||||||
-- Python
|
|
||||||
vim.lsp.config['python'] = {
|
|
||||||
cmd = { 'pylsp' },
|
|
||||||
filetypes = { 'python' },
|
|
||||||
}
|
|
||||||
|
|
||||||
vim.lsp.enable('python')
|
|
||||||
|
|
||||||
-- Java
|
|
||||||
vim.lsp.config['java'] = {
|
|
||||||
cmd = { 'jdtls', '--jvm-arg=-javaagent:/usr/share/java/lombok/lombok.jar' },
|
|
||||||
filetypes = { 'java' },
|
|
||||||
root_markers = { 'Makefile' },
|
|
||||||
}
|
|
||||||
|
|
||||||
vim.lsp.enable('java')
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
[pycodestyle]
|
|
||||||
max-line-length = 160
|
|
||||||
155
waybar/config
155
waybar/config
@ -1,155 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "float",
|
|
||||||
"layer": "top",
|
|
||||||
"position": "bottom",
|
|
||||||
"exclusive": false,
|
|
||||||
"passthrough": false,
|
|
||||||
"gtk-layer-shell": true,
|
|
||||||
"margin-right": 10,
|
|
||||||
"margin-bottom": 0,
|
|
||||||
"margin-top" : 0,
|
|
||||||
"margin-left": 0,
|
|
||||||
"margin-right": 0,
|
|
||||||
"height" : 16,
|
|
||||||
"modules-left": [
|
|
||||||
],
|
|
||||||
"modules-center": [
|
|
||||||
],
|
|
||||||
"modules-right": [
|
|
||||||
"hyprland/workspaces",
|
|
||||||
"custom/cpu",
|
|
||||||
"custom/mem",
|
|
||||||
"custom/battery",
|
|
||||||
"tray",
|
|
||||||
"clock"
|
|
||||||
],
|
|
||||||
"hyprland/window": {
|
|
||||||
"format": "{}",
|
|
||||||
"max-length": 35,
|
|
||||||
"rewrite": {
|
|
||||||
"": "Harsh"
|
|
||||||
},
|
|
||||||
"separate-outputs": true,
|
|
||||||
},
|
|
||||||
"hyprland/workspaces": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"a_social": " ",
|
|
||||||
"b_mail": " ",
|
|
||||||
"c_terminal": " ",
|
|
||||||
"11": "1",
|
|
||||||
"12": "2",
|
|
||||||
"13": "3",
|
|
||||||
"14": "4",
|
|
||||||
"15": "5",
|
|
||||||
"16": "6",
|
|
||||||
"17": "7",
|
|
||||||
"18": "8",
|
|
||||||
"19": "9",
|
|
||||||
"20": "0",
|
|
||||||
"21": "1",
|
|
||||||
"22": "2",
|
|
||||||
"23": "3",
|
|
||||||
"24": "4",
|
|
||||||
"25": "5",
|
|
||||||
"26": "6",
|
|
||||||
"27": "7",
|
|
||||||
"28": "8",
|
|
||||||
"29": "9",
|
|
||||||
"30": "0",
|
|
||||||
},
|
|
||||||
"on-click": "activate",
|
|
||||||
"sort-by-number": true,
|
|
||||||
"persistent-workspaces": {
|
|
||||||
"eDP-1": [11, 12, 13, 14, 15, 16, 17, 18, 19, 20],
|
|
||||||
"DP-3": [11, 12, 13, 14, 15, 16, 17, 18, 19, 20],
|
|
||||||
"DP-2": [21, 22, 23, 24, 25, 26, 27, 28, 29, 30]
|
|
||||||
},
|
|
||||||
"show-special": true
|
|
||||||
},
|
|
||||||
"clock": {
|
|
||||||
"format": "{:L%A %d %B %H:%M}",
|
|
||||||
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
|
|
||||||
"format-alt": "{}",
|
|
||||||
"interval": 1
|
|
||||||
},
|
|
||||||
"battery": {
|
|
||||||
"states": {
|
|
||||||
"warning": 30,
|
|
||||||
"critical": 15
|
|
||||||
},
|
|
||||||
"format": "{capacity}% {icon}",
|
|
||||||
"format-full": "{icon} {capacity}%",
|
|
||||||
"format-charging": " {capacity}%",
|
|
||||||
"format-plugged": " {capacity}%",
|
|
||||||
"format-alt": "{time} {icon}",
|
|
||||||
"format-icons": ["", "", "", "", ""]
|
|
||||||
},
|
|
||||||
"pulseaudio#1": {
|
|
||||||
"format": "{volume}% {icon}",
|
|
||||||
"format-bluetooth": "{volume}% {icon} {format_source}",
|
|
||||||
"format-bluetooth-muted": " {icon} {format_source}",
|
|
||||||
"format-muted": "",
|
|
||||||
"format-icons": {
|
|
||||||
"headphone": "",
|
|
||||||
"hands-free": "",
|
|
||||||
"headset": "",
|
|
||||||
"phone": "",
|
|
||||||
"portable": "",
|
|
||||||
"car": "",
|
|
||||||
"default": ["", "", ""]
|
|
||||||
},
|
|
||||||
"on-click-right": "pavucontrol",
|
|
||||||
"on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
|
|
||||||
"on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+",
|
|
||||||
"on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
|
||||||
},
|
|
||||||
"pulseaudio#2": {
|
|
||||||
"format": "{format_source}",
|
|
||||||
"format-bluetooth": "{volume}% {icon}",
|
|
||||||
"format-muted": "{format_source}",
|
|
||||||
"format-source": "{volume}% ",
|
|
||||||
"format-source-muted": "",
|
|
||||||
"format-icons": {
|
|
||||||
"headphones": "",
|
|
||||||
"handsfree": "",
|
|
||||||
"headset": "",
|
|
||||||
"phone": "",
|
|
||||||
"portable": "",
|
|
||||||
"car": "",
|
|
||||||
"default": [
|
|
||||||
"",
|
|
||||||
"",
|
|
||||||
""
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"on-click-right": "pavucontrol",
|
|
||||||
"on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle",
|
|
||||||
"on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+",
|
|
||||||
"on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-"
|
|
||||||
},
|
|
||||||
"idle_inhibitor": {
|
|
||||||
"format": "{icon}",
|
|
||||||
"format-icons": {
|
|
||||||
"activated": "",
|
|
||||||
"deactivated": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tray": {
|
|
||||||
"icon-size": 16,
|
|
||||||
"spacing": 5
|
|
||||||
},
|
|
||||||
"custom/cpu": {
|
|
||||||
"exec": "sed '1q;d' ~/.config/dotfiles/hypr/.stat.txt",
|
|
||||||
"restart-interval": 2
|
|
||||||
},
|
|
||||||
"custom/mem": {
|
|
||||||
"exec": "sed '2q;d' ~/.config/dotfiles/hypr/.stat.txt",
|
|
||||||
"restart-interval": 2
|
|
||||||
},
|
|
||||||
"custom/battery": {
|
|
||||||
"exec": "sed '3q;d' ~/.config/dotfiles/hypr/.stat.txt",
|
|
||||||
"return-type": "json",
|
|
||||||
"restart-interval": 2
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
@define-color rosewater #f4dbd6;
|
|
||||||
@define-color flamingo #f0c6c6;
|
|
||||||
@define-color pink #f5bde6;
|
|
||||||
@define-color mauve #c6a0f6;
|
|
||||||
@define-color red #ed8796;
|
|
||||||
@define-color maroon #ee99a0;
|
|
||||||
@define-color peach #f5a97f;
|
|
||||||
@define-color yellow #eed49f;
|
|
||||||
@define-color green #a6da95;
|
|
||||||
@define-color teal #8bd5ca;
|
|
||||||
@define-color sky #91d7e3;
|
|
||||||
@define-color sapphire #7dc4e4;
|
|
||||||
@define-color blue #8aadf4;
|
|
||||||
@define-color lavender #b7bdf8;
|
|
||||||
@define-color text #cad3f5;
|
|
||||||
@define-color subtext1 #b8c0e0;
|
|
||||||
@define-color subtext0 #a5adcb;
|
|
||||||
@define-color overlay2 #939ab7;
|
|
||||||
@define-color overlay1 #8087a2;
|
|
||||||
@define-color overlay0 #6e738d;
|
|
||||||
@define-color surface2 #5b6078;
|
|
||||||
@define-color surface1 #494d64;
|
|
||||||
@define-color surface0 #363a4f;
|
|
||||||
@define-color base #24273a;
|
|
||||||
@define-color mantle #1e2030;
|
|
||||||
@define-color crust #181926;
|
|
||||||
179
waybar/style.css
179
waybar/style.css
@ -1,179 +0,0 @@
|
|||||||
@import "macchiato.css";
|
|
||||||
|
|
||||||
window#waybar {
|
|
||||||
opacity: 0.3;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
window#waybar.full {
|
|
||||||
background: @bar-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar.float {
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
font-family: "Ubuntu Mono Nerd Font", Roboto, Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 14px;
|
|
||||||
min-height: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar {
|
|
||||||
background-color: rgba(0, 0, 0, 0);
|
|
||||||
border-radius: 13px;
|
|
||||||
transition-property: background-color;
|
|
||||||
transition-duration: .5s;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
/* Use box-shadow instead of border so the text isn't offset */
|
|
||||||
box-shadow: inset 0 -3px transparent;
|
|
||||||
/* Avoid rounded borders under each button name */
|
|
||||||
border: none;
|
|
||||||
border-radius: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
|
||||||
button:hover {
|
|
||||||
background: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
padding: 0px 2px;
|
|
||||||
background-color: white;
|
|
||||||
color: #000000;
|
|
||||||
border-radius: 50px;
|
|
||||||
border-color: transparent;
|
|
||||||
border: 1px solid;
|
|
||||||
border-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.empty {
|
|
||||||
color: white;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.active {
|
|
||||||
color: black;
|
|
||||||
font-weight: bold;
|
|
||||||
background-color: @green;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.active.empty {
|
|
||||||
font-weight: bold;
|
|
||||||
background-color: transparent;
|
|
||||||
border-color: @green;
|
|
||||||
color: @green;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.active:hover {
|
|
||||||
background-color: @green;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.focused {
|
|
||||||
background-color: @lavender;
|
|
||||||
box-shadow: inset 0 -3px #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
|
||||||
background-color: #eb4d4b;
|
|
||||||
}
|
|
||||||
|
|
||||||
#mode {
|
|
||||||
background-color: #64727D;
|
|
||||||
box-shadow: inset 0 -3px #ffffff;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock,
|
|
||||||
#battery,
|
|
||||||
#cpu,
|
|
||||||
#memory,
|
|
||||||
#temperature,
|
|
||||||
#network,
|
|
||||||
#pulseaudio,
|
|
||||||
#idle_inhibitor,
|
|
||||||
#custom-cpu,
|
|
||||||
#custom-mem,
|
|
||||||
#custom-battery {
|
|
||||||
padding: 0 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-cpu {
|
|
||||||
color: @red;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-mem {
|
|
||||||
color: @blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-battery.charging {
|
|
||||||
color: @green;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-battery.low {
|
|
||||||
color: @yellow;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-battery.critical {
|
|
||||||
color: @red;
|
|
||||||
}
|
|
||||||
|
|
||||||
#custom-battery.hidden {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#network {
|
|
||||||
color: @yellow;
|
|
||||||
}
|
|
||||||
|
|
||||||
#temperature {
|
|
||||||
color: @sky;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery {
|
|
||||||
color: @green;
|
|
||||||
}
|
|
||||||
|
|
||||||
#clock {
|
|
||||||
color: @white;
|
|
||||||
}
|
|
||||||
|
|
||||||
#window {
|
|
||||||
color: @rosewater;
|
|
||||||
}
|
|
||||||
|
|
||||||
#idle_inhibitor {
|
|
||||||
color: @teal;
|
|
||||||
}
|
|
||||||
|
|
||||||
.modules-right {
|
|
||||||
background-color: @base;
|
|
||||||
border-radius: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery.charging,
|
|
||||||
#battery.plugged {
|
|
||||||
color: @sapphire;
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes blink {
|
|
||||||
to {
|
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Using steps() instead of linear as a timing function to limit cpu usage */
|
|
||||||
#battery.critical:not(.charging) {
|
|
||||||
background-color: #f53c3c;
|
|
||||||
color: #ffffff;
|
|
||||||
animation-name: blink;
|
|
||||||
animation-duration: 0.5s;
|
|
||||||
animation-timing-function: steps(12);
|
|
||||||
animation-iteration-count: infinite;
|
|
||||||
animation-direction: alternate;
|
|
||||||
}
|
|
||||||
|
|
||||||
label:focus {
|
|
||||||
background-color: #000000;
|
|
||||||
}
|
|
||||||
@ -77,16 +77,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
git_prompt_info_no_space() {
|
git_prompt_info_no_space() {
|
||||||
current="$PWD"
|
|
||||||
while [ "$PWD" != "/" ] && [ ! -d "$PWD/.git" ]; do
|
|
||||||
builtin cd ..
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -f "$PWD/.gitskipprompt" ]; then
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
builtin cd "$current"
|
|
||||||
local info=$(git_prompt_info)
|
local info=$(git_prompt_info)
|
||||||
if [ ! -z $info ]; then
|
if [ ! -z $info ]; then
|
||||||
echo " $info"
|
echo " $info"
|
||||||
103
zsh/ohmyzsh/themes/laptop.zsh-theme
Normal file
103
zsh/ohmyzsh/themes/laptop.zsh-theme
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
|
||||||
|
# Based on bira theme
|
||||||
|
|
||||||
|
# load some modules
|
||||||
|
autoload -U colors zsh/terminfo # Used in the colour alias below
|
||||||
|
colors
|
||||||
|
setopt prompt_subst
|
||||||
|
|
||||||
|
# make some aliases for the colours: (coud use normal escap.seq's too)
|
||||||
|
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
|
||||||
|
eval PR_$color='%{$fg[${(L)color}]%}'
|
||||||
|
done
|
||||||
|
eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
|
||||||
|
eval PR_BOLD="%{$terminfo[bold]%}"
|
||||||
|
|
||||||
|
# Check the UID
|
||||||
|
if [[ $UID -ge 1000 ]]; then # normal user
|
||||||
|
# If ssh
|
||||||
|
if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
|
||||||
|
eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}'
|
||||||
|
eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
|
||||||
|
local PR_ARROW_UP='${PR_GREEN}┌── ${PR_NO_COLOR}'
|
||||||
|
local PR_ARROW_DOWN='${PR_GREEN}└${PR_NO_COLOR}'
|
||||||
|
local PR_PROMPT='$PR_GREEN▷$PR_NO_COLOR'
|
||||||
|
else
|
||||||
|
eval PR_USER='${PR_MAGENTA}%n${PR_NO_COLOR}'
|
||||||
|
eval PR_USER_OP='${PR_BLUE}%#${PR_NO_COLOR}'
|
||||||
|
local PR_PROMPT='$PR_MAGENTA▷$PR_NO_COLOR'
|
||||||
|
local PR_ARROW_UP='$PR_MAGENTA┌── ${PR_NO_COLOR}'
|
||||||
|
local PR_ARROW_DOWN='$PR_MAGENTA└${PR_NO_COLOR}'
|
||||||
|
fi
|
||||||
|
elif [[ $UID -eq 0 ]]; then # root
|
||||||
|
eval PR_USER='${PR_RED}%n${PR_NO_COLOR}'
|
||||||
|
eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
|
||||||
|
local PR_ARROW_UP='${PR_RED}┌── ${PR_NO_COLOR}'
|
||||||
|
local PR_ARROW_DOWN='${PR_RED}└${PR_NO_COLOR}'
|
||||||
|
local PR_PROMPT='$PR_RED▷$PR_NO_COLOR'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if we are on SSH or not
|
||||||
|
if [[ -n "$SSH_CLIENT" || -n "$SSH2_CLIENT" ]]; then
|
||||||
|
eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' #SSH
|
||||||
|
else
|
||||||
|
eval PR_HOST='${PR_BLUE}%M${PR_NO_COLOR}' # no SSH
|
||||||
|
fi
|
||||||
|
|
||||||
|
# local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
|
||||||
|
truncated_pwd() {
|
||||||
|
local max_allowed_size=$(( `tput cols` - 30 ))
|
||||||
|
local path_name=$(print -rD $PWD)
|
||||||
|
local new_path_name=""
|
||||||
|
local truncated=0
|
||||||
|
while [ ${#path_name} -gt $max_allowed_size ]; do
|
||||||
|
truncated=1
|
||||||
|
new_path_name=`echo $path_name | cut -d '/' -f 2-`
|
||||||
|
if [[ "$new_path_name" == "$path_name" ]]; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
path_name=$new_path_name
|
||||||
|
done
|
||||||
|
if [ $truncated -eq 1 ]; then
|
||||||
|
echo "~/.../"$path_name
|
||||||
|
else
|
||||||
|
echo $path_name
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
local user_host='$PR_BOLD${PR_USER}$PR_BOLD'
|
||||||
|
local current_dir='$PR_BOLD%{$PR_BLUE%}$(truncated_pwd)$PR_NO_COLOR%}'
|
||||||
|
local rvm_ruby=''
|
||||||
|
if which rvm-prompt &> /dev/null; then
|
||||||
|
rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
|
||||||
|
else
|
||||||
|
if which rbenv &> /dev/null; then
|
||||||
|
rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
local return_code=""
|
||||||
|
local git_branch='$(git_prompt_info)'
|
||||||
|
|
||||||
|
local PR_DATE='${PR_BOLD}${PR_MAGENTA}[%D{%H:%M}]${PR_NO_COLOR}'
|
||||||
|
|
||||||
|
#PROMPT="${user_host} ${current_dir} ${rvm_ruby}${git_branch}$PR_PROMPT "
|
||||||
|
separator='${PR_YELLOW}::${PR_NO_COLOR}'
|
||||||
|
tty | read tty_value
|
||||||
|
if [[ $tty_value == *pts* ]]; then # if in a tty
|
||||||
|
PROMPT="$PR_ARROW_UP${PR_DATE} ${user_host}${separator}${PR_NO_COLOR}${current_dir} ${rvm_ruby}${git_branch}
|
||||||
|
$PR_ARROW_DOWN$PR_PROMPT ${PR_NO_COLOR}"
|
||||||
|
return_code="%(?.%{$PR_GREEN%}%? ↵%{$PR_NO_COLOR%}.%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
|
||||||
|
else
|
||||||
|
eval PR_NO_COLOR="$PR_WHITE"
|
||||||
|
PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}> ${PR_NO_COLOR}"
|
||||||
|
return_code="%(?.%{$PR_GREEN%}%? <%{$PR_NO_COLOR%}.%{$PR_RED%}%? <%{$PR_NO_COLOR%})"
|
||||||
|
fi
|
||||||
|
RPS1=" ${return_code}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$PR_NO_COLOR%}"
|
||||||
|
|
||||||
|
TMOUT=30
|
||||||
|
TRAPALRM() {
|
||||||
|
zle reset-prompt
|
||||||
|
}
|
||||||
2
zshrc
2
zshrc
@ -21,7 +21,7 @@ DISABLE_AUTO_UPDATE="true"
|
|||||||
ZSH=$HOME/.config/ohmyzsh
|
ZSH=$HOME/.config/ohmyzsh
|
||||||
ZSH_CUSTOM=$HOME/.config/dotfiles/zsh/ohmyzsh
|
ZSH_CUSTOM=$HOME/.config/dotfiles/zsh/ohmyzsh
|
||||||
|
|
||||||
ZSH_THEME="tforgione"
|
ZSH_THEME="laptop"
|
||||||
|
|
||||||
if [ -f $DOTFILES/zsh/env.zsh ]; then
|
if [ -f $DOTFILES/zsh/env.zsh ]; then
|
||||||
source $DOTFILES/zsh/env.zsh
|
source $DOTFILES/zsh/env.zsh
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user