Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/arch'
Browse files Browse the repository at this point in the history
* origin/arch: (113 commits)
  use feh instead of nitrogen
  favor feh
  Add wallpapers for feh
  add more wallpapers
  Add a program to display programs eating up most RAM
  Bump yapf from 0.30.0 to 0.31.0 (#1440)
  Bump cfn-lint from 0.47.1 to 0.47.2 (#1437)
  Bump setuptools from 54.1.1 to 54.1.2 (#1439)
  Bump flake8 from 3.8.4 to 3.9.0 (#1438)
  Bump dotbot from `eb7f3fb` to `4722233` (#1436)
  Bump cfn-lint from 0.47.0 to 0.47.1 (#1434)
  Bump npm from 7.6.2 to 7.6.3 (#1435)
  Bump npm from 7.6.1 to 7.6.2 (#1433)
  Bump cfn-lint from 0.46.0 to 0.47.0 (#1432)
  Bump dependencies/pyenv from `abcbf6e` to `80e418e` (#1431)
  Bump vim-language-server from 2.1.2 to 2.1.3 (#1430)
  Bump flake8-bugbear from 21.3.1 to 21.3.2 (#1429)
  Bump setuptools from 54.0.0 to 54.1.1 (#1428)
  Bump typescript from 4.2.2 to 4.2.3 (#1425)
  Bump npm from 7.6.0 to 7.6.1 (#1427)
  ...
  • Loading branch information
kornicameister committed Mar 16, 2021
2 parents 441afc3 + 547dcfd commit 3ae5ed2
Show file tree
Hide file tree
Showing 26 changed files with 166 additions and 137 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Expand Up @@ -17,8 +17,6 @@ updates:
interval: daily
time: '04:00'
open-pull-requests-limit: 10
reviewers:
- kornicameister
labels:
- dependabot
- automerge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: automerge
uses: pascalgn/automerge-action@v0.13.0
uses: pascalgn/automerge-action@v0.13.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MERGE_REMOVE_LABELS: automerge
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/misspell.yml
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: sobolevn/misspell-fixer-action@0.1.0
- uses: peter-evans/create-pull-request@v3.6.0
- uses: peter-evans/create-pull-request@v3.7.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
title: "Dotfiles spell good must be..."
Expand Down
11 changes: 11 additions & 0 deletions bin/top_mem
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
# Display the top applications of memory usage
# http://www.cyberciti.biz/faq/linux-check-memory-usage/#comment-51021

while read -r command percent rss; do
if [[ "${command}" != "COMMAND" ]]; then
rss="$(bc <<<"scale=2;${rss}/1024")"
fi
printf " %-26s%-8s%s\n" "${command}" "${percent}" "${rss} MB" |
sed 's/COMMAND/PROGRAM/' | sed 's/RSS MB/#MEM/'
done < <(ps -A --sort -rss -o comm,pmem,rss | head -n 20)
36 changes: 18 additions & 18 deletions config/i3/config
Expand Up @@ -43,11 +43,11 @@ client.background $bg

###--- Autostart ---###
exec_always --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec_always --no-startup-id "$HOME/.config/polybar/launch.sh"
exec_always --no-startup-id feh --bg-center "$HOME/.dotfiles/wallpapers/05_lake.jpg"
exec_always --no-startup-id wal --vte -R
exec_always --no-startup-id "$HOME/.config/polybar/launch.sh"
exec --no-startup-id wal-vtop
exec --no-startup-id picom -cC # compositor
exec --no-startup-id nitrogen --restore # wallpaper
exec --no-startup-id xset s 480 dpms 600 600 600 # powersavings for display:
exec --no-startup-id sleep 2 ; /usr/bin/dunst # notifications
exec --no-startup-id dex -a -s /etc/xdg/autostart/:~/.config/autostart # dex execute .desktop files
Expand All @@ -67,26 +67,28 @@ bindsym $mod+d exec --no-startup-id i3-dmenu-desktop

# change focus:
bindsym $mod+j focus left
bindsym $mod+k focus down
bindsym $mod+u focus up
bindsym $mod+ntilde focus right

# alternatively, you can use the cursor keys:
bindsym $mod+Left focus left

bindsym $mod+k focus down
bindsym $mod+Down focus down

bindsym $mod+u focus up
bindsym $mod+Up focus up

bindsym $mod+ntilde focus right
bindsym $mod+Right focus right

# move focused window:
bindsym $mod+Shift+j move left
bindsym $mod+Shift+k move down
bindsym $mod+Shift+l move up
bindsym $mod+Shift+ntilde move right

# alternatively, you can use the cursor keys:
bindsym $mod+Shift+Left move left

bindsym $mod+Shift+k move down
bindsym $mod+Shift+Down move down

bindsym $mod+Shift+l move up
bindsym $mod+Shift+Up move up

bindsym $mod+Shift+ntilde move right
bindsym $mod+Shift+Right move right

# split in horizontal orientation:
Expand Down Expand Up @@ -154,9 +156,7 @@ bindsym $mod+Shift+7 move container to workspace $ws7
bindsym $mod+Shift+8 move container to workspace $ws8
bindsym $mod+Shift+9 move container to workspace $ws9

# reload the configuration file:
bindsym $mod+Shift+c reload
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3):
bindsym $mod+Shift+r restart

# exit i3 (logs you out of your X session):
Expand Down Expand Up @@ -205,13 +205,12 @@ exec_always --no-startup-id "avizo-service"
for_window [class="Avizo"] border pixel 0 floating enable

# App shortcuts
bindsym $mod+b exec "/usr/bin/brave-nightly"
bindsym $mod+Shift+b exec "/usr/bin/brave-nightly --incognito"
bindsym $mod+b exec "/usr/bin/brave"
bindsym $mod+Shift+b exec "/usr/bin/brave --incognito"
bindsym $mod+n exec "/usr/bin/thunar"
bindsym $mod+l exec i3lock -i ~/.config/i3/i3-lock-screen.png -t -f
bindsym Print exec "scrot ~/%Y-%m-%d-%T-screenshot.png"


# rofi bindings fancy application menu
bindsym $mod+i exec rofi -modi drun -show drun -line-padding 4 \
-columns 2 -padding 50 -hide-scrollbar \
Expand All @@ -223,7 +222,6 @@ bindsym $mod+s exec ssh -show window -line-padding 4 \
-lines 6 -padding 50 -hide-scrollbar \
-show-icons -drun-icon-theme "Arc-X-D"


# per window customizations
for_window [class="Spotify"] move to workspace $ws9
for_window [class="jetbrains-pycharm" title="^ $"] floating enable
Expand All @@ -234,4 +232,6 @@ for_window [class="Xsane" instance="xsane"] floating enable
for_window [class="Pavucontrol" instance="pavucontrol"] floating enable
for_window [class="qt5ct" instance="qt5ct"] floating enable
for_window [class="Bluetooth-sendto" instance="bluetooth-sendto"] floating enable


for_window [class="Pamac-manager"] floating enable
37 changes: 36 additions & 1 deletion config/polybar/config.ini
Expand Up @@ -21,6 +21,8 @@ red = ${xrdb:color1:#FF5250}
green = ${xrdb:color2:#43a047}
yellow = ${xrdb:color3:#fdd835}

active = ${xrdb:color10:#222}
inactive = ${xrdb:color11:#222}
alert = ${xrdb:color9:#222}

[bar]
Expand Down Expand Up @@ -54,7 +56,7 @@ module-margin-right = 0

font-0 = "Iosevka Nerd Font:pixelsize=9;3"
font-1 = "Iosevka Nerd Font:pixelsize=11;4"
font-2 = "Font Awesome 5 Free;9;4"
font-2 = "Font Awesome 5 Free;8;4"

[bar/top]
inherit = bar/main
Expand Down Expand Up @@ -395,3 +397,36 @@ format-foreground = ${colors.yellow}

hook-0 = echo "%{A1:notify-send "DUNST_COMMAND_PAUSE" && polybar-msg hook dunst 2:}%{A}" &
hook-1 = echo "%{A1:notify-send "DUNST_COMMAND_RESUME" && polybar-msg hook dunst 1:}%{A}" &

[module/workspaces]
type = internal/xworkspaces

pin-workspaces = true
enable-click = true
enable-scroll = true

format-font = 3
icon-default = ""

format = <label-state>
format-background = ${color.background-alt}
format-padding = 0

label-monitor = %name%

label-active = %index% %icon%
label-active-foreground = ${color.primary}
label-active-overline = ${color.active}

label-occupied = %icon%
label-occupied-foreground = ${color.inactive}

label-urgent = %icon%
label-urgent-foreground = ${color.alert}

label-empty = %icon%

label-active-padding = 1
label-urgent-padding = 1
label-occupied-padding = 1
label-empty-padding = 1
88 changes: 0 additions & 88 deletions config/polybar/modules.ini
Expand Up @@ -304,91 +304,3 @@ bar-volume-foreground-4 = ${color.red}

bar-volume-empty = ${bar.empty}
bar-volume-empty-foreground = ${color.foreground-alt}

;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_


;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_

[module/workspaces]
type = internal/xworkspaces

; Only show workspaces defined on the same output as the bar
;
; Useful if you want to show monitor specific workspaces
; on different bars
;
; Default: false
pin-workspaces = true

; Create click handler used to focus desktop
; Default: true
enable-click = true

; Create scroll handlers used to cycle desktops
; Default: true
enable-scroll = true

; icon-[0-9]+ = <desktop-name>;<icon>
; NOTE: The desktop name needs to match the name configured by the WM
; You can get a list of the defined desktops using:
; $ xprop -root _NET_DESKTOP_NAMES
icon-0 = 1;
icon-1 = 2;
icon-2 = 3;
icon-3 = 4;
icon-4 = 5;
icon-default = 


; Available tags:
; <label-monitor>
; <label-state> - gets replaced with <label-(active|urgent|occupied|empty)>
; Default: <label-state>
format = <label-state>
format-background = ${color.background}
format-padding = 0

; Available tokens:
; %name%
; Default: %name%
label-monitor = %name%

; Available tokens:
; %name%
; %icon%
; %index%
; Default: %icon% %name%
label-active = %icon%
label-active-foreground = ${color.red}
label-active-overline = ${color.red}

; Available tokens:
; %name%
; %icon%
; %index%
; Default: %icon% %name%
label-occupied = %icon%
label-occupied-foreground = ${color.yellow}

; Available tokens:
; %name%
; %icon%
; %index%
; Default: %icon% %name%
label-urgent = %icon%
label-urgent-foreground = ${color.green}

; Available tokens:
; %name%
; %icon%
; %index%
; Default: %icon% %name%
label-empty = %icon%

label-active-padding = 1
label-urgent-padding = 1
label-occupied-padding = 1
label-empty-padding = 1

;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
1 change: 1 addition & 0 deletions config/systemd/user/.gitignore
@@ -0,0 +1 @@
*.wants/
10 changes: 10 additions & 0 deletions config/systemd/user/docker-prune.service
@@ -0,0 +1,10 @@
[Unit]
Description=docker system pruner service

[Service]
Type=oneshot
ExecStartPre=echo "Prunning docker"
ExecStart=docker system prune -a -f ; docker volume prune -f

[Install]
WantedBy=docker-prune.timer
11 changes: 11 additions & 0 deletions config/systemd/user/docker-prune.timer
@@ -0,0 +1,11 @@
[Unit]
Description=Run docker prune in intervals

[Timer]
OnStartupSec=1min
OnCalendar=daily
Persistent=true

[Install]
WantedBy=timers.target

10 changes: 10 additions & 0 deletions config/systemd/user/eos-update-notifier.service
@@ -0,0 +1,10 @@
[Unit]
Description=EOS update notifier service

[Service]
Type=oneshot
Environment=DISPLAY=:0
ExecStart=/usr/bin/eos-update-notifier -systemd

[Install]
WantedBy=eos-update-notifier.timer
10 changes: 10 additions & 0 deletions config/systemd/user/eos-update-notifier.timer
@@ -0,0 +1,10 @@
[Unit]
Description=Run EOS update notifier periodically

[Timer]
OnStartupSec=30sec
OnCalendar=daily
Persistent=true

[Install]
WantedBy=timers.target
2 changes: 1 addition & 1 deletion dependencies/goenv
Submodule goenv updated from d970d0 to 037dce
2 changes: 1 addition & 1 deletion dependencies/pyenv
Submodule pyenv updated 71 files
+36 −0 .github/workflows/ubuntu_tests.yml
+7 −6 .travis.yml
+21 −0 CHANGELOG.md
+10 −1 README.md
+2 −19 libexec/pyenv
+1 −1 libexec/pyenv---version
+2 −2 libexec/pyenv-help
+3 −1 libexec/pyenv-prefix
+57 −41 libexec/pyenv-rehash
+2 −2 libexec/pyenv-sh-shell
+20 −4 libexec/pyenv-versions
+10 −2 libexec/pyenv-which
+15 −3 plugins/python-build/bin/python-build
+10 −0 plugins/python-build/share/python-build/3.10.0a6
+9 −0 plugins/python-build/share/python-build/3.6.13
+10 −0 plugins/python-build/share/python-build/3.7.10
+10 −0 plugins/python-build/share/python-build/3.8.8
+11 −0 plugins/python-build/share/python-build/3.9.2
+19 −0 plugins/python-build/share/python-build/miniconda3-3.7-4.8.2
+19 −0 plugins/python-build/share/python-build/miniconda3-3.7-4.8.3
+19 −0 plugins/python-build/share/python-build/miniconda3-3.7-4.9.2
+19 −0 plugins/python-build/share/python-build/miniconda3-3.8-4.8.2
+19 −0 plugins/python-build/share/python-build/miniconda3-3.8-4.8.3
+19 −0 plugins/python-build/share/python-build/miniconda3-3.8-4.9.2
+19 −0 plugins/python-build/share/python-build/miniconda3-3.9-4.9.2
+7 −4 plugins/python-build/share/python-build/miniforge3-4.9.2
+0 −24 plugins/python-build/share/python-build/pypy-1.5
+1 −1 plugins/python-build/share/python-build/pypy-1.5-src
+1 −1 plugins/python-build/share/python-build/pypy-2.3.1-src
+1 −1 plugins/python-build/share/python-build/pypy-2.4.0
+1 −1 plugins/python-build/share/python-build/pypy-2.4.0-src
+1 −1 plugins/python-build/share/python-build/pypy-2.5.0-src
+2 −2 plugins/python-build/share/python-build/pypy-4.0.0
+9 −9 plugins/python-build/share/python-build/pypy-4.0.1
+1 −1 plugins/python-build/share/python-build/pypy-5.0.1
+1 −9 plugins/python-build/share/python-build/pypy-5.1.1
+8 −6 plugins/python-build/share/python-build/pypy-c-jit-latest
+0 −35 plugins/python-build/share/python-build/pypy-c-nojit-latest
+1 −1 plugins/python-build/share/python-build/pypy-dev
+7 −2 plugins/python-build/share/python-build/pypy2.7-6.0.0
+1 −1 plugins/python-build/share/python-build/pypy3.5-5.10.1
+1 −1 plugins/python-build/share/python-build/pypy3.5-5.7-beta
+1 −1 plugins/python-build/share/python-build/pypy3.5-5.8.0
+0 −1 plugins/python-build/share/python-build/pypy3.5-6.0.0
+26 −26 plugins/python-build/share/python-build/pypy3.5-c-jit-latest
+6 −6 plugins/python-build/share/python-build/pypy3.6-7.3.2
+4 −0 plugins/python-build/share/python-build/pypy3.6-7.3.2-src
+39 −0 plugins/python-build/share/python-build/pypy3.6-7.3.3
+4 −0 plugins/python-build/share/python-build/pypy3.6-7.3.3-src
+39 −0 plugins/python-build/share/python-build/pypy3.7-c-jit-latest
+1 −1 plugins/python-build/share/python-build/stackless-2.7.10
+1 −1 plugins/python-build/share/python-build/stackless-2.7.11
+1 −1 plugins/python-build/share/python-build/stackless-2.7.12
+1 −1 plugins/python-build/share/python-build/stackless-2.7.2
+1 −1 plugins/python-build/share/python-build/stackless-2.7.3
+1 −1 plugins/python-build/share/python-build/stackless-2.7.4
+1 −1 plugins/python-build/share/python-build/stackless-2.7.5
+1 −1 plugins/python-build/share/python-build/stackless-2.7.6
+1 −1 plugins/python-build/share/python-build/stackless-2.7.7
+1 −1 plugins/python-build/share/python-build/stackless-2.7.8
+1 −1 plugins/python-build/share/python-build/stackless-2.7.9
+1 −1 plugins/python-build/share/python-build/stackless-3.2.2
+1 −1 plugins/python-build/share/python-build/stackless-3.2.5
+1 −1 plugins/python-build/share/python-build/stackless-3.3.5
+0 −4 plugins/python-build/share/python-build/stackless-3.4.1
+1 −1 plugins/python-build/share/python-build/stackless-3.4.2
+3 −3 plugins/python-build/test/pyenv_ext.bats
+547 −0 pyenv.1
+7 −0 pyenv.d/install/latest.bash
+0 −25 test/pyenv_ext.bats
+2 −2 test/shell.bats
8 changes: 6 additions & 2 deletions install
Expand Up @@ -109,7 +109,7 @@ install_packages() {

log_notice "Installing browsers" "${icon}"
yay -Syq --needed --noconfirm --combinedupgrade --batchinstall \
brave-nightly-bin \
brave-bin \
firefox \
google-chrome-dev

Expand All @@ -122,6 +122,7 @@ install_packages() {
yay -Syq --needed --noconfirm --combinedupgrade --batchinstall \
docker \
docker-compose \
ctop \
fuse-overlayfs \
hadolint-bin \
virtualbox && {
Expand Down Expand Up @@ -157,6 +158,7 @@ EOF
yay -Syq --needed --noconfirm --combinedupgrade --batchinstall \
ttf-iosevka \
ttf-font-awesome \
ttf-material-design-icons \
ant-dracula-gtk-theme

log_notice "Installing " "${icon}"
Expand Down Expand Up @@ -202,6 +204,7 @@ _remove_redundant_packages() {
alacritty \
xterm \
terminator \
nitrogen \
xterm || true
_yay_clean
}
Expand Down Expand Up @@ -583,8 +586,9 @@ gen_ssh_key() {
local name="${1}"
local password="${2}"
local comment="${3}"
local type="${4:-ed25519}"
ssh-keygen \
-t ed25519 \
-t "${type}" \
-b 4096 \
-C "${comment}" \
-f "${HOME}/.ssh/${name}" \
Expand Down
2 changes: 1 addition & 1 deletion neovim-requirements.txt
Expand Up @@ -3,7 +3,7 @@
msgpack==1.0.2
neovim==0.3.1
neovim-remote==2.4.0 ; python_version > '3.0'
pynvim==0.4.2
pynvim==0.4.3

python-language-server==0.36.2
jedi>=0.17.2
Expand Down

0 comments on commit 3ae5ed2

Please sign in to comment.