Update env, packages and fix some scripts
This commit is contained in:
parent
e411075acb
commit
1458d5b334
10 changed files with 54 additions and 25 deletions
|
@ -10,18 +10,28 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo "==================================================================="
|
printf "\n=== REMOVE UNUSED PACKAGES ==========================================\n"
|
||||||
|
|
||||||
# shellcheck disable=SC2046
|
# shellcheck disable=SC2046
|
||||||
sudo pacman -Rns --noconfirm $(pacman -Qtdq)
|
sudo pacman -Rns --noconfirm $(pacman -Qtdq)
|
||||||
|
|
||||||
if sudo checkservices; then
|
printf "\n=== FLATPAK UPDATE ==================================================\n"
|
||||||
echo "CHECKSERVICES SUCCEDEED"
|
|
||||||
else
|
|
||||||
echo "CHECKSERVICES FAILED"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
flatpak update -y
|
flatpak update -y
|
||||||
|
|
||||||
|
printf "\n=== RUN PACDIFF =====================================================\n"
|
||||||
|
|
||||||
|
if sudo pacdiff; then
|
||||||
|
echo "PACDIFF SUCCEDEED"
|
||||||
|
else
|
||||||
|
echo "PACDIFF FAILED"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
#if sudo checkservices; then
|
||||||
|
# echo "CHECKSERVICES SUCCEDEED"
|
||||||
|
#else
|
||||||
|
# echo "CHECKSERVICES FAILED"
|
||||||
|
# exit 1
|
||||||
|
#fi
|
||||||
|
|
||||||
|
printf "\n\n\n\n=== DONE ============================================================\n"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
action=$(printf "shutdown\nreboot\nlogout\nautostart" | $MENU)
|
action=$(printf "shutdown\nreboot\nlogout\nautostart" | $DMENU)
|
||||||
|
|
||||||
case "$action" in
|
case "$action" in
|
||||||
shutdown) systemctl poweroff -i ;;
|
shutdown) systemctl poweroff -i ;;
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
rclone_remote="s3-serguzim-me:public/screenshots"
|
rclone_remote="s3-serguzim-me:public/screenshots"
|
||||||
screenshot_host="https://s3.serguzim.me/public/screenshots"
|
screenshot_host="https://s3.serguzim.me/public/screenshots"
|
||||||
path="/tmp/screenshot.png"
|
path="/tmp/screenshot.webp"
|
||||||
file="$(date '+%F_%H-%M-%S').png"
|
file="$(date '+%F_%H-%M-%S').webp"
|
||||||
|
|
||||||
clip_image()
|
clip_image()
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,11 @@ local config = {
|
||||||
default_theme = function(highlights) -- or a function that returns one
|
default_theme = function(highlights) -- or a function that returns one
|
||||||
local C = require "default_theme.colors"
|
local C = require "default_theme.colors"
|
||||||
|
|
||||||
highlights.Normal = { fg = C.fg, bg = C.bg }
|
highlights.Normal = {
|
||||||
|
fg = C.fg,
|
||||||
|
bg = C.bg,
|
||||||
|
ctermbg = None
|
||||||
|
}
|
||||||
return highlights
|
return highlights
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
@ -53,6 +57,10 @@ local config = {
|
||||||
-- Configure plugins
|
-- Configure plugins
|
||||||
plugins = {
|
plugins = {
|
||||||
-- All other entries override the setup() call for default plugins
|
-- All other entries override the setup() call for default plugins
|
||||||
|
indent_blankline = {
|
||||||
|
show_current_context = true,
|
||||||
|
show_current_context_start = false,
|
||||||
|
},
|
||||||
notify = {
|
notify = {
|
||||||
background_colour = "#000000"
|
background_colour = "#000000"
|
||||||
},
|
},
|
||||||
|
|
|
@ -7,13 +7,4 @@ return {
|
||||||
|
|
||||||
-- Eye-Candy
|
-- Eye-Candy
|
||||||
{ "dracula/vim" },
|
{ "dracula/vim" },
|
||||||
{
|
|
||||||
"lukas-reineke/indent-blankline.nvim",
|
|
||||||
config = function()
|
|
||||||
require("indent_blankline").setup({
|
|
||||||
show_current_context = true,
|
|
||||||
show_current_context_start = true,
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ export BEMENU_OPTS="--tb '#6272a4'\
|
||||||
--scf '#ff79c6'\
|
--scf '#ff79c6'\
|
||||||
--list 25 --ignorecase -p ''"
|
--list 25 --ignorecase -p ''"
|
||||||
|
|
||||||
|
export DMENU="bemenu"
|
||||||
export DOCKER_BUILDKIT=1
|
export DOCKER_BUILDKIT=1
|
||||||
export DRONE_SERVER='https://ci.serguzim.me'
|
export DRONE_SERVER='https://ci.serguzim.me'
|
||||||
|
|
||||||
|
@ -42,7 +43,6 @@ export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
|
||||||
_makeflags=$(grep -c ^processor /proc/cpuinfo)
|
_makeflags=$(grep -c ^processor /proc/cpuinfo)
|
||||||
export MAKEFLAGS="-j$_makeflags"
|
export MAKEFLAGS="-j$_makeflags"
|
||||||
export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
|
export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
|
||||||
export MENU="bemenu"
|
|
||||||
|
|
||||||
_whoami=$(whoami)
|
_whoami=$(whoami)
|
||||||
export NIX_PATH="$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/$_whoami/channels${NIX_PATH:+:$NIX_PATH}"
|
export NIX_PATH="$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/$_whoami/channels${NIX_PATH:+:$NIX_PATH}"
|
||||||
|
@ -58,7 +58,8 @@ export PATH="$HOME/.local/bin:$HOME/.bin:$PATH"
|
||||||
export PATH="$GOPATH/bin:$HOME/.cargo/bin:$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
|
export PATH="$GOPATH/bin:$HOME/.cargo/bin:$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
|
||||||
export PS1='\$ '
|
export PS1='\$ '
|
||||||
|
|
||||||
export QT_QPA_PLATFORM="wayland;xcb"
|
#export QT_QPA_PLATFORM="wayland;xcb"
|
||||||
|
export QT_QPA_PLATFORM="xcb"
|
||||||
export QT_QPA_PLATFORMTHEME="qt5ct"
|
export QT_QPA_PLATFORMTHEME="qt5ct"
|
||||||
|
|
||||||
#export SDL_VIDEODRIVER="wayland"
|
#export SDL_VIDEODRIVER="wayland"
|
||||||
|
@ -81,6 +82,8 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
|
||||||
[ -x "$(command -v moar)" ] && export MANPAGER="moar"
|
[ -x "$(command -v moar)" ] && export MANPAGER="moar"
|
||||||
[ -x "$(command -v moar)" ] && export PAGER="moar"
|
[ -x "$(command -v moar)" ] && export PAGER="moar"
|
||||||
|
|
||||||
|
[ -x "$(command -v gpgconf)" ] && export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
|
|
||||||
[ -x "$(command -v home-manager)" ] \
|
[ -x "$(command -v home-manager)" ] \
|
||||||
&& [ -x "$(command -v nix)" ] \
|
&& [ -x "$(command -v nix)" ] \
|
||||||
&& [ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ] \
|
&& [ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ] \
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
# Javascript
|
# Javascript
|
||||||
/node_modules/
|
/node_modules/
|
||||||
|
.npmrc
|
||||||
|
|
||||||
# PHP
|
# PHP
|
||||||
/vendor/
|
/vendor/
|
||||||
|
|
|
@ -11,12 +11,17 @@
|
||||||
git # git
|
git # git
|
||||||
gitflow # tool for git workflow
|
gitflow # tool for git workflow
|
||||||
git-lfs # git support for large files
|
git-lfs # git support for large files
|
||||||
|
#git-secret # tool for secrets in git (gpg based)
|
||||||
jq # tool for JSON
|
jq # tool for JSON
|
||||||
moar # moar is less
|
moar # moar is less
|
||||||
nix-direnv # allow better nix and direnv integration
|
nix-direnv # allow better nix and direnv integration
|
||||||
|
neovim # alternative to vim
|
||||||
|
libnotify # allows sending notifications
|
||||||
|
lsof # who uses that drive/directory
|
||||||
openssh # ssh client and server
|
openssh # ssh client and server
|
||||||
pass # password-store
|
pass # password-store
|
||||||
playerctl # control media players
|
playerctl # control media players
|
||||||
|
p7zip # tool to extract 7z archives
|
||||||
rclone # tool for remote storages
|
rclone # tool for remote storages
|
||||||
restic # backup tool
|
restic # backup tool
|
||||||
ripgrep # grep-alternative
|
ripgrep # grep-alternative
|
||||||
|
@ -27,6 +32,7 @@
|
||||||
tokei # project-language statistics
|
tokei # project-language statistics
|
||||||
unzip # unzip
|
unzip # unzip
|
||||||
vimHugeX # vim with clipboard support
|
vimHugeX # vim with clipboard support
|
||||||
|
xdg-user-dirs # tool manage user directories
|
||||||
yq # tool for YAML
|
yq # tool for YAML
|
||||||
yt-dlp # tool to download videos from the internet
|
yt-dlp # tool to download videos from the internet
|
||||||
zip # zip
|
zip # zip
|
||||||
|
@ -46,4 +52,6 @@
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
targets.genericLinux.enable = true;
|
targets.genericLinux.enable = true;
|
||||||
|
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,17 +12,25 @@
|
||||||
dunst # notification-daemon
|
dunst # notification-daemon
|
||||||
feh # image viewer and wallpaper-tool
|
feh # image viewer and wallpaper-tool
|
||||||
flameshot # screenshot tool
|
flameshot # screenshot tool
|
||||||
|
gspell # spell highlighting for gtk applications
|
||||||
helvum # Pipewire GUI
|
helvum # Pipewire GUI
|
||||||
j4-dmenu-desktop # collects .desktop files for a menu
|
j4-dmenu-desktop # collects .desktop files for a menu
|
||||||
|
keepassxc # password manager
|
||||||
|
libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
|
||||||
parcellite # clipboard-manager
|
parcellite # clipboard-manager
|
||||||
pavucontrol # Pulseaudio GUI
|
pavucontrol # Pulseaudio GUI
|
||||||
polybar # desktop bar
|
polybar # desktop bar
|
||||||
|
#python310Packages.adblock # pylib for adblocking in qutebrowser
|
||||||
|
#python310Packages.pynacl # pylib for qutebrowser-keepassxc support
|
||||||
|
#(qutebrowser.override { enableWideVine = true; }) # vim-like browser
|
||||||
solaar # Logitech tool
|
solaar # Logitech tool
|
||||||
sxhkd # hotkey daemon
|
sxhkd # hotkey daemon
|
||||||
#vagrant # tool for automated virtual machines
|
#vagrant # tool for automated virtual machines
|
||||||
#virtualbox # tool for virtual machines
|
#virtualbox # tool for virtual machines
|
||||||
xclip # clipboard CLI for X
|
xclip # clipboard CLI for X
|
||||||
|
xcompmgr # compositor for X
|
||||||
xfce.thunar # file manager
|
xfce.thunar # file manager
|
||||||
xfce.tumbler # thumbnail tool
|
xfce.tumbler # thumbnail tool
|
||||||
|
xorg.xsetroot # tool to set x background stuff
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ super + Return
|
||||||
|
|
||||||
# program launcher
|
# program launcher
|
||||||
super + d
|
super + d
|
||||||
j4-dmenu-desktop --dmenu="$MENU"
|
j4-dmenu-desktop --dmenu="$DMENU"
|
||||||
#LANG=C rofi -show
|
#LANG=C rofi -show
|
||||||
|
|
||||||
# make sxhkd reload its configuration files:
|
# make sxhkd reload its configuration files:
|
||||||
|
|
Loading…
Reference in a new issue