From ffe452fe242b1964c0833522a4ea9a4f20ef7282 Mon Sep 17 00:00:00 2001 From: Arthur Khachaturov Date: Thu, 4 Jul 2024 13:31:45 +0300 Subject: [PATCH] move script folders to a correct place, some vim config changes, etc... --- .Xresources | 4 +- .config/X11/autostart | 2 +- .config/gtk-3.0/settings.ini | 2 +- .config/nvim/lua/config/lsp/ansiblels.lua | 1 + .config/nvim/lua/config/lsp/init.lua | 13 +- .config/nvim/lua/config/mappings.lua | 3 +- .config/zsh/.zcompdump | 405 +++++++++++----------- .config/zsh/.zshenv | 52 +-- .config/zsh/.zshrc | 14 +- .fonts/.uuid | 1 + .gitconfig | 13 - .gtkrc-2.0 | 2 +- .local/{ => bin}/scripts/cast | 21 +- .local/{ => bin}/scripts/dmenu_askpass | 0 .local/{ => bin}/scripts/dual_monitor | 2 + .local/{ => bin}/scripts/gdt | 0 .local/bin/scripts/mnt | 11 + .local/{ => bin}/scripts/vpn | 2 +- .local/{ => bin}/scripts/xr | 10 +- .local/bin/source/src_example | 6 + .local/bin/source/src_venv | 62 ++++ .local/bin/statusbar/sb-battery | 18 + .local/{ => bin}/statusbar/sb-cast | 0 .local/{ => bin}/statusbar/sb-vpn | 0 .local/scripts/_venv | 72 ---- .local/statusbar/sb-battery | 18 - .xinitrc | 2 +- .xsettingsd | 4 +- 28 files changed, 380 insertions(+), 360 deletions(-) create mode 100644 .config/nvim/lua/config/lsp/ansiblels.lua create mode 100644 .fonts/.uuid rename .local/{ => bin}/scripts/cast (65%) rename .local/{ => bin}/scripts/dmenu_askpass (100%) rename .local/{ => bin}/scripts/dual_monitor (98%) rename .local/{ => bin}/scripts/gdt (100%) create mode 100755 .local/bin/scripts/mnt rename .local/{ => bin}/scripts/vpn (97%) rename .local/{ => bin}/scripts/xr (73%) create mode 100644 .local/bin/source/src_example create mode 100644 .local/bin/source/src_venv create mode 100755 .local/bin/statusbar/sb-battery rename .local/{ => bin}/statusbar/sb-cast (100%) rename .local/{ => bin}/statusbar/sb-vpn (100%) delete mode 100644 .local/scripts/_venv delete mode 100755 .local/statusbar/sb-battery diff --git a/.Xresources b/.Xresources index 7081bd2..87001fc 100644 --- a/.Xresources +++ b/.Xresources @@ -1,3 +1,3 @@ -Xft.dpi: 96 -Xcursor.size: 24 +Xft.dpi: 192 +Xcursor.size: 48 Xcursor.theme: Breeze diff --git a/.config/X11/autostart b/.config/X11/autostart index 807e128..4cbae53 100755 --- a/.config/X11/autostart +++ b/.config/X11/autostart @@ -1,6 +1,6 @@ set -x -setxkbmap -layout us,ru -option grp:win_space_toggle +# setxkbmap -layout us,ru -option grp:win_space_toggle xset r rate 300 40 xwallpaper --zoom ${HOME}/.local/share/wallpaper/wallpaper.png diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 37f92ad..982f0d9 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -2,7 +2,7 @@ gtk-theme-name=Yaru-dark gtk-icon-theme-name=Yaru-dark gtk-font-name=Sans 10 -gtk-cursor-theme-size=24 +gtk-cursor-theme-size=48 gtk-toolbar-style=GTK_TOOLBAR_TEXT gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/.config/nvim/lua/config/lsp/ansiblels.lua b/.config/nvim/lua/config/lsp/ansiblels.lua new file mode 100644 index 0000000..a564707 --- /dev/null +++ b/.config/nvim/lua/config/lsp/ansiblels.lua @@ -0,0 +1 @@ +return {} diff --git a/.config/nvim/lua/config/lsp/init.lua b/.config/nvim/lua/config/lsp/init.lua index a38c85f..0fed119 100644 --- a/.config/nvim/lua/config/lsp/init.lua +++ b/.config/nvim/lua/config/lsp/init.lua @@ -22,7 +22,7 @@ local on_attach = function(_, bufnr) nmap("i", vim.diagnostic.open_float) nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + -- nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') -- See `:help K` for why this keymap nmap('K', vim.lsp.buf.hover, 'Hover Documentation') @@ -30,11 +30,11 @@ local on_attach = function(_, bufnr) -- Lesser used LSP functionality nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') - nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') - nmap('wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, '[W]orkspace [L]ist Folders') + -- nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') + -- nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') + -- nmap('wl', function() + -- print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + -- end, '[W]orkspace [L]ist Folders') -- require("config.lsp.keybinds").init_keymap(bufnr) vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) @@ -43,6 +43,7 @@ local on_attach = function(_, bufnr) end local servers = { + ansiblels = require("config.lsp.ansiblels"), clangd = require("config.lsp.clangd"), pyright = require("config.lsp.pyright"), lua_ls = require("config.lsp.lua_ls"), diff --git a/.config/nvim/lua/config/mappings.lua b/.config/nvim/lua/config/mappings.lua index 5730d2b..d9e934b 100644 --- a/.config/nvim/lua/config/mappings.lua +++ b/.config/nvim/lua/config/mappings.lua @@ -2,7 +2,8 @@ local map = vim.keymap.set -- Unbind keys map('n', '', '') --- map('v', 'K', '') +map({ 'n', 'v' }, 'H', '') +map({ 'n', 'v' }, 'L', '') -- Movement between buffers map({ 'n', 'v' }, '', ':bp', { silent = true }) diff --git a/.config/zsh/.zcompdump b/.config/zsh/.zcompdump index 59599ca..f486627 100644 --- a/.config/zsh/.zcompdump +++ b/.config/zsh/.zcompdump @@ -1,4 +1,4 @@ -#files: 1006 version: 5.9 +#files: 1005 version: 5.9 _comps=( '-' '_precommand' @@ -241,7 +241,6 @@ _comps=( 'ctags' '_ctags' 'ctags-exuberant' '_ctags' 'ctags-universal' '_ctags' -'ctr' '_ctr' 'cu' '_cu' 'curl' '_curl' 'cut' '_cut' @@ -1897,207 +1896,207 @@ bindkey '^[,' _history-complete-newer bindkey '^[/' _history-complete-older bindkey '^[~' _bash_complete-word -autoload -Uz _alacritty _bootctl _busctl _bwrap _ctr \ - _curl _docker _dpkg-parsechangelog _flatpak _hostnamectl \ - _journalctl _kernel-install _lf _localectl _loginctl \ - _lsd _machinectl _mpv _networkctl _pulseaudio \ - _resolvectl _rg _sd_hosts_or_user_at_host _sd_machines _sd_outputmodes \ - _sd_unit_files _systemctl _systemd _systemd-analyze _systemd-delta \ - _systemd-inhibit _systemd-nspawn _systemd-path _systemd-run _systemd-tmpfiles \ - _timedatectl _udevadm _vlc _xwallpaper _zathura \ - _cdr _floppy _logical_volumes _lscfg _lsdev \ - _lslv _lspv _lsvg _object_classes _physical_volumes \ - _smit _volume_groups _bsdconfig _bsd_disks _bsdinstall \ - _bsd_pkg _chflags _csup _cu _cvsup \ - _fbsd_architectures _fbsd_device_types _fetch _file_flags _freebsd-update \ - _fstat _fw_update _gstat _ipfw _jail \ - _jails _jexec _jls _jot _kdump \ - _kld _ktrace _ktrace_points _ldap _login_classes \ - _mixerctl _nbsd_architectures _obsd_architectures _pfctl _pkgin \ - _portaudit _portlint _portmaster _portsnap _powerd \ - _procstat _rcctl _routing_domains _routing_tables _signify \ - _sockstat _sysclean _sysmerge _syspatch _sysrc \ - _systat _sysupgrade _usbconfig _vmctl _watch-snoop \ - _all_labels _all_matches _alternative _approximate _arg_compile \ - _arguments _bash_completions _cache_invalid _call_function _combination \ - _complete _complete_debug _complete_help _complete_help_generic _complete_tag \ - _comp_locale _correct _correct_filename _correct_word _describe \ - _description _dispatch _expand _expand_alias _expand_word \ - _extensions _external_pwds _generic _guard _history \ - _history_complete_word _ignored _list _main_complete _match \ - _menu _message _most_recent_file _multi_parts _next_label \ - _next_tags _normal _nothing _numbers _oldlist \ - _pick_variant _prefix _read_comp _regex_arguments _regex_words \ - _requested _retrieve_cache _sep_parts _sequence _set_command \ - _setup _store_cache _sub_commands _tags _user_expand \ - _values _wanted _cygcheck _cygpath _cygrunsrv \ - _cygserver _cygstart _dumper _getclip _mkshortcut \ - _mkzsh _pscp _putclip _readshortcut _caffeinate \ - _defaults _fink _fs_usage _hdiutil _mac_applications \ - _mac_files_for_application _mdfind _mdls _mdutil _networksetup \ - _nvram _open _osascript _otool _pbcopy \ - _plutil _qtplay _retrieve_mac_apps _say _scselect \ - _sc_usage _scutil _softwareupdate _sw_vers _system_profiler \ - _trash _xcode-select _a2utils _apt _apt-file \ - _aptitude _apt-move _apt-show-versions _auto-apt _axi-cache \ - _bts _bug _cdbs-edit-patch _dak _dchroot \ - _dchroot-dsa _dcut _deb_architectures _debbugs_bugnumber _debchange \ - _debcheckout _deb_codenames _debdiff _deb_files _debfoster \ - _deborphan _deb_packages _debsign _debsnap _debuild \ - _dlocate _dpatch-edit-patch _dpkg _dpkg-buildpackage _dpkg-cross \ - _dpkg-repack _dpkg_source _dput _dscverify _dupload \ - _git-buildpackage _grep-excuses _invoke-rc.d _lighttpd _lintian \ - _madison _make-kpkg _members _mergechanges _module-assistant \ - _pbuilder _piuparts _reprepro _sbuild _schroot \ - _svn-buildpackage _toolchain-source _update-alternatives _update-rc.d _uscan \ - _vim-addons _wajig _wanna-build _acpi _acpitool \ - _alsa-utils _analyseplugin _basenc _brctl _btrfs \ - _capabilities _chattr _chcon _choom _chrt \ - _cpupower _cryptsetup _dkms _e2label _ethtool \ - _findmnt _free _fuse_arguments _fusermount _fuse_values \ - _gpasswd _htop _iconvconfig _ionice _ipset \ - _iptables _iwconfig _kpartx _losetup _lsattr \ - _lsblk _lsns _lsusb _ltrace _mat \ - _mat2 _mdadm _mii-tool _modutils _mondo \ - _networkmanager _nsenter _opkg _perf _pidof \ - _pkgtool _pmap _qdbus _schedtool _selinux_contexts \ - _selinux_roles _selinux_types _selinux_users _setpriv _setsid \ - _slabtop _ss _sshfs _strace _sysstat \ - _tload _tpb _tracepath _tune2fs _uml \ - _unshare _valgrind _vserver _wakeup_capable_devices _wipefs \ - _wpa_cli _rebootin _urpmi _dnf _rpm \ - _scl _yum _beadm _be_name _coreadm \ - _dhcpinfo _dladm _dtrace _dumpadm _flowadm \ - _fmadm _inetadm _ipadm _pfexec _pkg5 \ - _prstat _ptree _savecore _snoop _svcadm \ - _svccfg _svcprop _svcs _svcs_fmri _zlogin \ - _zoneadm _zones _a2ps _aap _abcde \ - _absolute_command_paths _ack _adb _ansible _ant \ - _antiword _apachectl _apm _arch_archives _arch_namespace \ - _arp _arping _asciidoctor _asciinema _at \ - _attr _augeas _avahi _awk _base64 \ - _basename _bash _baudrates _baz _beep \ - _bibtex _bind_addresses _bison _bittorrent _bogofilter \ - _bpf_filters _bpython _bzip2 _bzr _cabal \ - _cal _calendar _canonical_paths _cat _ccal \ - _cdcd _cdrdao _cdrecord _chkconfig _chmod \ - _chown _chroot _chsh _cksum _clay \ - _cmdambivalent _cmdstring _cmp _column _comm \ - _composer _compress _configure _cowsay _cp \ - _cpio _cplay _crontab _cscope _csplit \ - _cssh _ctags _ctags_tags _curl _cut \ - _cvs _darcs _date _date_formats _dates \ - _dbus _dconf _dd _devtodo _df \ - _dhclient _dict _dict_words _diff _diff3 \ - _diff_options _diffstat _dig _directories _dir_list \ - _django _dmesg _dmidecode _dns_types _doas \ - _domains _dos2unix _drill _dropbox _dsh \ - _dtruss _du _dvi _ecasound _ed \ - _elfdump _elinks _email_addresses _enscript _entr \ - _env _espeak _etags _fakeroot _feh \ - _fetchmail _ffmpeg _figlet _file_modes _files \ - _file_systems _find _find_net_interfaces _finger _flac \ - _flex _fmt _fold _fortune _fsh \ - _fuser _gcc _gcore _gdb _gem \ - _genisoimage _getconf _getent _getfacl _getmail \ - _getopt _ghostscript _git _global _global_tags \ - _gnu_generic _gnupod _gnutls _go _gpg \ - _gphoto2 _gprof _gradle _graphicsmagick _grep \ - _groff _groups _growisofs _gsettings _guilt \ - _gzip _have_glob_qual _head _hexdump _host \ - _hostname _hosts _iconv _id _ifconfig \ - _iftop _imagemagick _initctl _init_d _install \ - _iostat _ip _ipsec _irssi _ispell \ - _java _java_class _joe _join _jq \ - _killall _knock _kvno _last _ldconfig \ - _ldd _ld_debug _less _lha _libvirt \ - _links _list_files _lldb _ln _loadkeys \ - _locale _localedef _locales _locate _logger \ - _look _lp _ls _lsof _lua \ - _luarocks _lynx _lz4 _lzop _mail \ - _mailboxes _make _man _md5sum _mencal \ - _mh _mime_types _mkdir _mkfifo _mknod \ - _mktemp _module _monotone _moosic _mosh \ - _mount _mpc _mt _mtools _mtr \ - _mutt _mv _my_accounts _myrepos _mysqldiff \ - _mysql_utils _ncftp _netcat _net_interfaces _netstat \ - _newsgroups _nginx _ngrep _nice _nkf \ - _nl _nm _nmap _npm _nslookup \ - _numfmt _objdump _object_files _od _openstack \ - _opustools _other_accounts _pack _pandoc _paste \ - _patch _patchutils _path_commands _path_files _pax \ - _pbm _pdf _perforce _perl _perl_basepods \ - _perldoc _perl_modules _pgids _pgrep _php \ - _picocom _pids _pine _ping _pip \ - _pkgadd _pkg-config _pkginfo _pkg_instance _pkgrm \ - _pon _ports _postfix _postgresql _postscript \ - _pr _printenv _printers _process_names _prove \ - _ps _pspdf _psutils _ptx _pump \ - _pv _pwgen _pydoc _python _python_modules \ - _qemu _quilt _rake _ranlib _rar \ - _rclone _rcs _readelf _readlink _remote_files \ - _renice _ri _rlogin _rm _rmdir \ - _route _rrdtool _rsync _rubber _ruby \ - _runit _samba _sccs _scons _screen \ - _script _seafile _sed _seq _service \ - _services _setfacl _sh _shasum _showmount \ - _shred _shuf _shutdown _signals _sisu \ - _slrn _smartmontools _socket _sort _spamassassin \ - _split _sqlite _sqsh _ssh _ssh_hosts \ - _stat _stdbuf _stgit _stow _strings \ - _strip _stty _su _subversion _sudo \ - _surfraw _swaks _swanctl _swift _sys_calls \ - _sysctl _tac _tail _tar _tar_archive \ - _tardy _tcpdump _tcptraceroute _tee _telnet \ - _terminals _tex _texi _texinfo _tidy \ - _tiff _tilde_files _timeout _time_zone _tin \ - _tla _tmux _todo.sh _toilet _top \ - _topgit _totd _touch _tput _tr \ - _transmission _tree _truncate _truss _tty \ - _ttys _twidge _twisted _umountable _unace \ - _uname _unexpand _uniq _unison _units \ - _uptime _urls _user_admin _user_at_host _users \ - _users_on _vi _vim _visudo _vmstat \ - _vorbis _vpnc _w _w3m _watch \ - _wc _webbrowser _wget _whereis _who \ - _whois _wiggle _xargs _xmlsoft _xmlstarlet \ - _xmms2 _xxd _xz _yafc _yodl \ - _yp _zcat _zdump _zfs _zfs_dataset \ - _zfs_pool _zip _zsh _acroread _code \ - _dcop _eog _evince _geany _gnome-gv \ - _gqview _gv _kdeconnect _kfmclient _matlab \ - _mozilla _mplayer _mupdf _nautilus _nedit \ - _netscape _okular _pdftk _qiv _rdesktop \ - _setxkbmap _sublimetext _urxvt _vnc _x_arguments \ - _xauth _xautolock _x_borderwidth _xclip _x_color \ - _x_colormapid _x_cursor _x_display _xdvi _x_extension \ - _xfig _x_font _xft_fonts _x_geometry _xinput \ - _x_keysym _xloadimage _x_locale _x_modifier _xmodmap \ - _x_name _xournal _xpdf _xrandr _x_resource \ - _xscreensaver _x_selection_timeout _xset _xt_arguments _xterm \ - _x_title _xt_session_id _x_utils _xv _x_visual \ - _x_window _xwit _zeal _add-zle-hook-widget _add-zsh-hook \ - _alias _aliases __arguments _arrays _assign \ - _autocd _bindkey _brace_parameter _builtin _cd \ - _command _command_names _compadd _compdef _completers \ - _condition _default _delimiters _directory_stack _dirs \ - _disable _dynamic_directory_name _echotc _echoti _emulate \ - _enable _equal _exec _fc _file_descriptors \ - _first _functions _globflags _globqual_delims _globquals \ - _hash _history_modifiers _in_vared _jobs _jobs_bg \ - _jobs_builtin _jobs_fg _kill _limit _limits \ - _math _math_params _mere _module_math_func _options \ - _options_set _options_unset _parameter _parameters _precommand \ - _print _prompt _ps1234 _read _redirect \ - _run-help _sched _set _setopt _source \ - _strftime _subscript _suffix_alias_files _tcpsys _tilde \ - _trap _ttyctl _typeset _ulimit _unhash \ - _user_math_func _value _vared _vars _vcs_info \ - _vcs_info_hooks _wait _which _widgets _zargs \ - _zattr _zcalc _zcalc_line _zcompile _zed \ - _zftp _zle _zmodload _zmv _zparseopts \ - _zpty _zsh-mime-handler _zsocket _zstyle _ztodo \ - _hwinfo _osc _SUSEconfig _yast _zypper +autoload -Uz _alacritty _bootctl _busctl _bwrap _curl \ + _docker _dpkg-parsechangelog _flatpak _hostnamectl _journalctl \ + _kernel-install _lf _localectl _loginctl _lsd \ + _machinectl _mpv _networkctl _pulseaudio _resolvectl \ + _rg _sd_hosts_or_user_at_host _sd_machines _sd_outputmodes _sd_unit_files \ + _systemctl _systemd _systemd-analyze _systemd-delta _systemd-inhibit \ + _systemd-nspawn _systemd-path _systemd-run _systemd-tmpfiles _timedatectl \ + _udevadm _vlc _xwallpaper _zathura _cdr \ + _floppy _logical_volumes _lscfg _lsdev _lslv \ + _lspv _lsvg _object_classes _physical_volumes _smit \ + _volume_groups _bsdconfig _bsd_disks _bsdinstall _bsd_pkg \ + _chflags _csup _cu _cvsup _fbsd_architectures \ + _fbsd_device_types _fetch _file_flags _freebsd-update _fstat \ + _fw_update _gstat _ipfw _jail _jails \ + _jexec _jls _jot _kdump _kld \ + _ktrace _ktrace_points _ldap _login_classes _mixerctl \ + _nbsd_architectures _obsd_architectures _pfctl _pkgin _portaudit \ + _portlint _portmaster _portsnap _powerd _procstat \ + _rcctl _routing_domains _routing_tables _signify _sockstat \ + _sysclean _sysmerge _syspatch _sysrc _systat \ + _sysupgrade _usbconfig _vmctl _watch-snoop _all_labels \ + _all_matches _alternative _approximate _arg_compile _arguments \ + _bash_completions _cache_invalid _call_function _combination _complete \ + _complete_debug _complete_help _complete_help_generic _complete_tag _comp_locale \ + _correct _correct_filename _correct_word _describe _description \ + _dispatch _expand _expand_alias _expand_word _extensions \ + _external_pwds _generic _guard _history _history_complete_word \ + _ignored _list _main_complete _match _menu \ + _message _most_recent_file _multi_parts _next_label _next_tags \ + _normal _nothing _numbers _oldlist _pick_variant \ + _prefix _read_comp _regex_arguments _regex_words _requested \ + _retrieve_cache _sep_parts _sequence _set_command _setup \ + _store_cache _sub_commands _tags _user_expand _values \ + _wanted _cygcheck _cygpath _cygrunsrv _cygserver \ + _cygstart _dumper _getclip _mkshortcut _mkzsh \ + _pscp _putclip _readshortcut _caffeinate _defaults \ + _fink _fs_usage _hdiutil _mac_applications _mac_files_for_application \ + _mdfind _mdls _mdutil _networksetup _nvram \ + _open _osascript _otool _pbcopy _plutil \ + _qtplay _retrieve_mac_apps _say _scselect _sc_usage \ + _scutil _softwareupdate _sw_vers _system_profiler _trash \ + _xcode-select _a2utils _apt _apt-file _aptitude \ + _apt-move _apt-show-versions _auto-apt _axi-cache _bts \ + _bug _cdbs-edit-patch _dak _dchroot _dchroot-dsa \ + _dcut _deb_architectures _debbugs_bugnumber _debchange _debcheckout \ + _deb_codenames _debdiff _deb_files _debfoster _deborphan \ + _deb_packages _debsign _debsnap _debuild _dlocate \ + _dpatch-edit-patch _dpkg _dpkg-buildpackage _dpkg-cross _dpkg-repack \ + _dpkg_source _dput _dscverify _dupload _git-buildpackage \ + _grep-excuses _invoke-rc.d _lighttpd _lintian _madison \ + _make-kpkg _members _mergechanges _module-assistant _pbuilder \ + _piuparts _reprepro _sbuild _schroot _svn-buildpackage \ + _toolchain-source _update-alternatives _update-rc.d _uscan _vim-addons \ + _wajig _wanna-build _acpi _acpitool _alsa-utils \ + _analyseplugin _basenc _brctl _btrfs _capabilities \ + _chattr _chcon _choom _chrt _cpupower \ + _cryptsetup _dkms _e2label _ethtool _findmnt \ + _free _fuse_arguments _fusermount _fuse_values _gpasswd \ + _htop _iconvconfig _ionice _ipset _iptables \ + _iwconfig _kpartx _losetup _lsattr _lsblk \ + _lsns _lsusb _ltrace _mat _mat2 \ + _mdadm _mii-tool _modutils _mondo _networkmanager \ + _nsenter _opkg _perf _pidof _pkgtool \ + _pmap _qdbus _schedtool _selinux_contexts _selinux_roles \ + _selinux_types _selinux_users _setpriv _setsid _slabtop \ + _ss _sshfs _strace _sysstat _tload \ + _tpb _tracepath _tune2fs _uml _unshare \ + _valgrind _vserver _wakeup_capable_devices _wipefs _wpa_cli \ + _rebootin _urpmi _dnf _rpm _scl \ + _yum _beadm _be_name _coreadm _dhcpinfo \ + _dladm _dtrace _dumpadm _flowadm _fmadm \ + _inetadm _ipadm _pfexec _pkg5 _prstat \ + _ptree _savecore _snoop _svcadm _svccfg \ + _svcprop _svcs _svcs_fmri _zlogin _zoneadm \ + _zones _a2ps _aap _abcde _absolute_command_paths \ + _ack _adb _ansible _ant _antiword \ + _apachectl _apm _arch_archives _arch_namespace _arp \ + _arping _asciidoctor _asciinema _at _attr \ + _augeas _avahi _awk _base64 _basename \ + _bash _baudrates _baz _beep _bibtex \ + _bind_addresses _bison _bittorrent _bogofilter _bpf_filters \ + _bpython _bzip2 _bzr _cabal _cal \ + _calendar _canonical_paths _cat _ccal _cdcd \ + _cdrdao _cdrecord _chkconfig _chmod _chown \ + _chroot _chsh _cksum _clay _cmdambivalent \ + _cmdstring _cmp _column _comm _composer \ + _compress _configure _cowsay _cp _cpio \ + _cplay _crontab _cscope _csplit _cssh \ + _ctags _ctags_tags _curl _cut _cvs \ + _darcs _date _date_formats _dates _dbus \ + _dconf _dd _devtodo _df _dhclient \ + _dict _dict_words _diff _diff3 _diff_options \ + _diffstat _dig _directories _dir_list _django \ + _dmesg _dmidecode _dns_types _doas _domains \ + _dos2unix _drill _dropbox _dsh _dtruss \ + _du _dvi _ecasound _ed _elfdump \ + _elinks _email_addresses _enscript _entr _env \ + _espeak _etags _fakeroot _feh _fetchmail \ + _ffmpeg _figlet _file_modes _files _file_systems \ + _find _find_net_interfaces _finger _flac _flex \ + _fmt _fold _fortune _fsh _fuser \ + _gcc _gcore _gdb _gem _genisoimage \ + _getconf _getent _getfacl _getmail _getopt \ + _ghostscript _git _global _global_tags _gnu_generic \ + _gnupod _gnutls _go _gpg _gphoto2 \ + _gprof _gradle _graphicsmagick _grep _groff \ + _groups _growisofs _gsettings _guilt _gzip \ + _have_glob_qual _head _hexdump _host _hostname \ + _hosts _iconv _id _ifconfig _iftop \ + _imagemagick _initctl _init_d _install _iostat \ + _ip _ipsec _irssi _ispell _java \ + _java_class _joe _join _jq _killall \ + _knock _kvno _last _ldconfig _ldd \ + _ld_debug _less _lha _libvirt _links \ + _list_files _lldb _ln _loadkeys _locale \ + _localedef _locales _locate _logger _look \ + _lp _ls _lsof _lua _luarocks \ + _lynx _lz4 _lzop _mail _mailboxes \ + _make _man _md5sum _mencal _mh \ + _mime_types _mkdir _mkfifo _mknod _mktemp \ + _module _monotone _moosic _mosh _mount \ + _mpc _mt _mtools _mtr _mutt \ + _mv _my_accounts _myrepos _mysqldiff _mysql_utils \ + _ncftp _netcat _net_interfaces _netstat _newsgroups \ + _nginx _ngrep _nice _nkf _nl \ + _nm _nmap _npm _nslookup _numfmt \ + _objdump _object_files _od _openstack _opustools \ + _other_accounts _pack _pandoc _paste _patch \ + _patchutils _path_commands _path_files _pax _pbm \ + _pdf _perforce _perl _perl_basepods _perldoc \ + _perl_modules _pgids _pgrep _php _picocom \ + _pids _pine _ping _pip _pkgadd \ + _pkg-config _pkginfo _pkg_instance _pkgrm _pon \ + _ports _postfix _postgresql _postscript _pr \ + _printenv _printers _process_names _prove _ps \ + _pspdf _psutils _ptx _pump _pv \ + _pwgen _pydoc _python _python_modules _qemu \ + _quilt _rake _ranlib _rar _rclone \ + _rcs _readelf _readlink _remote_files _renice \ + _ri _rlogin _rm _rmdir _route \ + _rrdtool _rsync _rubber _ruby _runit \ + _samba _sccs _scons _screen _script \ + _seafile _sed _seq _service _services \ + _setfacl _sh _shasum _showmount _shred \ + _shuf _shutdown _signals _sisu _slrn \ + _smartmontools _socket _sort _spamassassin _split \ + _sqlite _sqsh _ssh _ssh_hosts _stat \ + _stdbuf _stgit _stow _strings _strip \ + _stty _su _subversion _sudo _surfraw \ + _swaks _swanctl _swift _sys_calls _sysctl \ + _tac _tail _tar _tar_archive _tardy \ + _tcpdump _tcptraceroute _tee _telnet _terminals \ + _tex _texi _texinfo _tidy _tiff \ + _tilde_files _timeout _time_zone _tin _tla \ + _tmux _todo.sh _toilet _top _topgit \ + _totd _touch _tput _tr _transmission \ + _tree _truncate _truss _tty _ttys \ + _twidge _twisted _umountable _unace _uname \ + _unexpand _uniq _unison _units _uptime \ + _urls _user_admin _user_at_host _users _users_on \ + _vi _vim _visudo _vmstat _vorbis \ + _vpnc _w _w3m _watch _wc \ + _webbrowser _wget _whereis _who _whois \ + _wiggle _xargs _xmlsoft _xmlstarlet _xmms2 \ + _xxd _xz _yafc _yodl _yp \ + _zcat _zdump _zfs _zfs_dataset _zfs_pool \ + _zip _zsh _acroread _code _dcop \ + _eog _evince _geany _gnome-gv _gqview \ + _gv _kdeconnect _kfmclient _matlab _mozilla \ + _mplayer _mupdf _nautilus _nedit _netscape \ + _okular _pdftk _qiv _rdesktop _setxkbmap \ + _sublimetext _urxvt _vnc _x_arguments _xauth \ + _xautolock _x_borderwidth _xclip _x_color _x_colormapid \ + _x_cursor _x_display _xdvi _x_extension _xfig \ + _x_font _xft_fonts _x_geometry _xinput _x_keysym \ + _xloadimage _x_locale _x_modifier _xmodmap _x_name \ + _xournal _xpdf _xrandr _x_resource _xscreensaver \ + _x_selection_timeout _xset _xt_arguments _xterm _x_title \ + _xt_session_id _x_utils _xv _x_visual _x_window \ + _xwit _zeal _add-zle-hook-widget _add-zsh-hook _alias \ + _aliases __arguments _arrays _assign _autocd \ + _bindkey _brace_parameter _builtin _cd _command \ + _command_names _compadd _compdef _completers _condition \ + _default _delimiters _directory_stack _dirs _disable \ + _dynamic_directory_name _echotc _echoti _emulate _enable \ + _equal _exec _fc _file_descriptors _first \ + _functions _globflags _globqual_delims _globquals _hash \ + _history_modifiers _in_vared _jobs _jobs_bg _jobs_builtin \ + _jobs_fg _kill _limit _limits _math \ + _math_params _mere _module_math_func _options _options_set \ + _options_unset _parameter _parameters _precommand _print \ + _prompt _ps1234 _read _redirect _run-help \ + _sched _set _setopt _source _strftime \ + _subscript _suffix_alias_files _tcpsys _tilde _trap \ + _ttyctl _typeset _ulimit _unhash _user_math_func \ + _value _vared _vars _vcs_info _vcs_info_hooks \ + _wait _which _widgets _zargs _zattr \ + _zcalc _zcalc_line _zcompile _zed _zftp \ + _zle _zmodload _zmv _zparseopts _zpty \ + _zsh-mime-handler _zsocket _zstyle _ztodo _hwinfo \ + _osc _SUSEconfig _yast _zypper autoload -Uz +X _call_program typeset -gUa _comp_assocs diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 008ea8b..84faca2 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -1,34 +1,36 @@ set -a -export PATH="${$(find ~/.local/bin -type d -printf %p:)%%:}:$PATH" -# +PATH="${$(find -L ~/.local/bin -type d -printf %p:)%%:}:$PATH" + # lc vars -export LANG="en_US.UTF-8" -export LC_CTYPE="en_US.UTF-8" -export LC_NUMERIC="en_US.UTF-8" -export LC_TIME="en_US.UTF-8" -export LC_COLLATE="en_US.UTF-8" -export LC_MONETARY="en_US.UTF-8" -export LC_MESSAGES="en_US.UTF-8" -export LC_PAPER="en_US.UTF-8" -export LC_NAME="en_US.UTF-8" -export LC_ADDRESS="en_US.UTF-8" -export LC_TELEPHONE="en_US.UTF-8" -export LC_MEASUREMENT="en_US.UTF-8" -export LC_IDENTIFICATION="en_US.UTF-8" -export LC_ALL="en_US.UTF-8" +LANGUAGE="en_US.UTF-8" +LANG="en_US.UTF-8" +LC_CTYPE="en_US.UTF-8" +LC_NUMERIC="en_US.UTF-8" +LC_TIME="en_US.UTF-8" +LC_COLLATE="en_US.UTF-8" +LC_MONETARY="en_US.UTF-8" +LC_MESSAGES="en_US.UTF-8" +LC_PAPER="en_US.UTF-8" +LC_NAME="en_US.UTF-8" +LC_ADDRESS="en_US.UTF-8" +LC_TELEPHONE="en_US.UTF-8" +LC_MEASUREMENT="en_US.UTF-8" +LC_IDENTIFICATION="en_US.UTF-8" +LC_ALL="en_US.UTF-8" # default apps -export EDITOR="/usr/bin/nvim" -export GPG_TTY="$(tty)" -export MANPAGER="sh -c 'col -bx | batcat -l man -p'" -export MANROFFOPT="-c" -export MTR_OPTIONS="-t" +EDITOR="/usr/bin/nvim" +GPG_TTY="$(tty)" +MANPAGER="sh -c 'col -bx | batcat -l man -p'" +MANROFFOPT="-c" +MTR_OPTIONS="-t" +MOZ_USE_XINPUT2=1 -export XDG_CURRENT_DESKTOP="gtk" -export XDG_SESSION_DESKTOP="$XDG_CURRENT_DESKTOP" -export WINDOW_MANAGER="dwm" +XDG_CURRENT_DESKTOP="gtk" +XDG_SESSION_DESKTOP="$XDG_CURRENT_DESKTOP" +WINDOW_MANAGER="dwm" -export SUDO_ASKPASS="${HOME}/.local/bin/scripts/dmenu_askpass" +SUDO_ASKPASS="${HOME}/.local/bin/scripts/dmenu_askpass" set +a diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 4a6128b..198f550 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -67,19 +67,26 @@ alias .......="cd ../../../../../../" # aliases alias rz="exec zsh" -alias venv="source _venv" +alias venv="source src_venv" +alias ex="source src_example" alias cdb="compiledb " alias info="pinfo " alias bat="batcat " alias img="nsxiv " alias xclip="xclip -selection clipboard" alias d="diff --color -u " +alias rgf="rg --files | rg " +alias 7z="7zz" # for whatever reason 7z provides 7zz binary in debian +alias wt="watch -d -cn 0.1 " # function aliases bl () { brightnessctl set $1% &> /dev/null } clines() { find $@ \( -name '*.cpp' -o -name '*.[ch]' \) -a ! -path '*cmake-build*' | xargs wc -l } nosw() { alacritty --class 'noswallow' -e "$@" }; compdef _command nosw -t() { if [ -z "$1" ]; then taskell ~/.taskell.md; else taskell "$1"; fi } +t() { [ -z "$1" ] && taskell ~/.taskell.md || taskell "$1" } +vims() { vim "$(whereis $1 | cut -d ' ' -f 2)" }; compdef _command vims +bc() { unbuffer "$@" | bat }; compdef _command bc + # git aliases alias gitignore="cp ${HOME}/.local/share/gitignore-template ./.gitignore" @@ -93,5 +100,8 @@ alias gb="git branch" alias gd="git diff" alias gr="git restore" +# docker aliases +alias dc="docker compose" + # disable xon controll chars stty -ixon diff --git a/.fonts/.uuid b/.fonts/.uuid new file mode 100644 index 0000000..cf94c13 --- /dev/null +++ b/.fonts/.uuid @@ -0,0 +1 @@ +dfd883e0-6bd9-4092-b2b9-ed2bafee9997 \ No newline at end of file diff --git a/.gitconfig b/.gitconfig index 0878e79..7ccfcbc 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,18 +1,5 @@ [user] email = me@wzray.ru name = Arthur Khachaturov -[commit] - gpgsign = true [init] defaultBranch = main -[core] - pager = delta -[interactive] - diffFilter = delta --color-only -[delta] - navigate = true - light = false -[merge] - conflictstyle = diff3 -[diff] - colorMoved = default diff --git a/.gtkrc-2.0 b/.gtkrc-2.0 index eb57564..3f55746 100644 --- a/.gtkrc-2.0 +++ b/.gtkrc-2.0 @@ -6,7 +6,7 @@ gtk-theme-name="Yaru-dark" gtk-icon-theme-name="Yaru-dark" gtk-font-name="Sans 10" gtk-cursor-theme-name="Breeze" -gtk-cursor-theme-size=24 +gtk-cursor-theme-size=48 gtk-toolbar-style=GTK_TOOLBAR_TEXT gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=0 diff --git a/.local/scripts/cast b/.local/bin/scripts/cast similarity index 65% rename from .local/scripts/cast rename to .local/bin/scripts/cast index 11d610d..a08e44c 100755 --- a/.local/scripts/cast +++ b/.local/bin/scripts/cast @@ -5,7 +5,9 @@ PIDFILE="${XDG_RUNTIME_DIR}/mkchromecast.pid" WIDTH=1440 HEIGHT=1080 ASPECT_OFFSET=240 -OUTPUT_NAME='DVI-I-1-1' +OUTPUT_NAME='DVI-I-2-2' + +inhibit_pid='' command() { echo "ffmpeg -ac 2 -ar 44100 -frame_size 2048 -fragment_size 2048 -f pulse -ac 2 -i Mkchromecast.monitor -f x11grab -r 30 -s ${WIDTH}x${HEIGHT} -i :0.0+$1,0 -vcodec libx264 -preset veryfast -tune zerolatency -maxrate 10000k -bufsize 20000k -pix_fmt yuv420p -g 60 -f mp4 -vf scale=1280:720 -movflags frag_keyframe+empty_moov -ar 44100 -acodec libvorbis pipe:1" @@ -13,8 +15,15 @@ command() { set -x +sigint() { + kill -9 ${inhibit_pid} +} + +trap 'sigint' SIGINT + cleanup() { - xrandr --output DVI-I-1-1 --off + xrandr --output ${OUTPUT_NAME} --off + xrandr --delmode ${OUTPUT_NAME} "1920x1080" pid="$(cat ${PIDFILE})" rm "${PIDFILE}" pkill -35 dwmblocks @@ -23,14 +32,14 @@ cleanup() { run() { xrandr --setprovideroutputsource 1 0 - xrandr --addmode DVI-I-1-1 1920x1080 + xrandr --addmode ${OUTPUT_NAME} 1920x1080 xrandr --output ${OUTPUT_NAME} --mode 1920x1080 --rate 60 --right-of eDP-1 echo $$ > "${PIDFILE}" pkill -35 dwmblocks - offset=$(( "$(xrandr | grep DVI | cut -d ' ' -f 3 | cut -d '+' -f 2)" + ${ASPECT_OFFSET} )) - systemd-inhibit --what=handle-lid-switch sleep 2592000 & - exec mkchromecast --video --command "$(command ${offset})" + offset=$(( "$(xrandr | grep ${OUTPUT_NAME} | cut -d ' ' -f 3 | cut -d '+' -f 2)" + ${ASPECT_OFFSET} )) + systemd-inhibit --what=handle-lid-switch sleep 2592000 & inhibit_pid="$!" + mkchromecast --video --command "$(command ${offset})" } if [ "$1" = "-k" ]; then diff --git a/.local/scripts/dmenu_askpass b/.local/bin/scripts/dmenu_askpass similarity index 100% rename from .local/scripts/dmenu_askpass rename to .local/bin/scripts/dmenu_askpass diff --git a/.local/scripts/dual_monitor b/.local/bin/scripts/dual_monitor similarity index 98% rename from .local/scripts/dual_monitor rename to .local/bin/scripts/dual_monitor index b12ea3a..1a13aa9 100755 --- a/.local/scripts/dual_monitor +++ b/.local/bin/scripts/dual_monitor @@ -1,5 +1,7 @@ #!/bin/bash +set -x + MODELINE=$(cvt 4120 1440 144 | tail -1 | cut -d " " -f 2- | tr -d '"') RES="$(echo $MODELINE | cut -d ' ' -f 1 | tr -d '\"')" OUTPUT="DVI-I-1-1" diff --git a/.local/scripts/gdt b/.local/bin/scripts/gdt similarity index 100% rename from .local/scripts/gdt rename to .local/bin/scripts/gdt diff --git a/.local/bin/scripts/mnt b/.local/bin/scripts/mnt new file mode 100755 index 0000000..e586cbb --- /dev/null +++ b/.local/bin/scripts/mnt @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +[ -z "$1" ] && (echo "No arguments supplied!" ; exit 1) + +if [ "$(udisksctl info -b "$1" | grep -c 'MountPoints:\s\{8\}.')" -eq 0 ]; then + udisksctl mount -b "$1" +else + udisksctl unmount -b "$1" +fi diff --git a/.local/scripts/vpn b/.local/bin/scripts/vpn similarity index 97% rename from .local/scripts/vpn rename to .local/bin/scripts/vpn index 194e1a7..1ce0d3c 100755 --- a/.local/scripts/vpn +++ b/.local/bin/scripts/vpn @@ -1,6 +1,6 @@ #!/bin/bash -IFNAME="wg_swe" +IFNAME="wg_lva" while [ "$#" -gt 0 ]; do case "$1" in diff --git a/.local/scripts/xr b/.local/bin/scripts/xr similarity index 73% rename from .local/scripts/xr rename to .local/bin/scripts/xr index 59df412..b888984 100755 --- a/.local/scripts/xr +++ b/.local/bin/scripts/xr @@ -4,12 +4,12 @@ exec 2> /dev/null change_dpi() { - sed -i -E "s/Xft\.dpi: .*?/Xft\.dpi: $1/g" ~/.Xresources - sed -i -E "s/Xcursor\.size: .*?/Xcursor\.size: $2/g" ~/.Xresources + sed -i -E --follow-symlinks "s/Xft\.dpi: .*?/Xft\.dpi: $1/g" ~/.Xresources + sed -i -E --follow-symlinks "s/Xcursor\.size: .*?/Xcursor\.size: $2/g" ~/.Xresources - sed -i -E "s/gtk-cursor-theme-size=.*?/gtk-cursor-theme-size=$2/g" ~/.config/gtk-3.0/settings.ini + sed -i -E --follow-symlinks "s/gtk-cursor-theme-size=.*?/gtk-cursor-theme-size=$2/g" ~/.config/gtk-3.0/settings.ini - sed -i -E "s/gtk-cursor-theme-size=.*?/gtk-cursor-theme-size=$2/g" ~/.gtkrc-2.0 + sed -i -E --follow-symlinks "s/gtk-cursor-theme-size=.*?/gtk-cursor-theme-size=$2/g" ~/.gtkrc-2.0 echo "Xft/DPI $(expr $1 \* 1024)" > ~/.xsettingsd echo "Gtk/CursorThemeSize $2" >> ~/.xsettingsd @@ -24,9 +24,9 @@ INT_MODELINE=$(cvt 1560 1040 90 | grep "Modeline" | cut -d " " -f 2- | tr -d '"' INT_RES="$(echo $INT_MODELINE | cut -d ' ' -f 1 | tr -d '\"')" if [[ -z "${EXT_MON}" ]]; then + xrandr --output eDP-1 --pos 0x0 --mode "3120x2080" --rate 90 --primary --output DP-1 --off --output DP-2 --off --output DP-3 --off --output DP-4 --off xrandr --delmode eDP-1 "${INT_RES}" xrandr --rmmode "${INT_RES}" - xrandr --output eDP-1 --pos 0x0 --mode "3120x2080" --rate 90 --primary --output DP-1 --off --output DP-2 --off --output DP-3 --off --output DP-4 --off change_dpi 192 48 else xrandr --rmmode "${INT_RES}" diff --git a/.local/bin/source/src_example b/.local/bin/source/src_example new file mode 100644 index 0000000..862bc74 --- /dev/null +++ b/.local/bin/source/src_example @@ -0,0 +1,6 @@ +#!/bin/bash + +clear +echo "$ $@" +echo +eval $@ diff --git a/.local/bin/source/src_venv b/.local/bin/source/src_venv new file mode 100644 index 0000000..3e29344 --- /dev/null +++ b/.local/bin/source/src_venv @@ -0,0 +1,62 @@ +SCRIPT_PATH="$0" +VENV_FOLDER_PATH="$(dirname ${VIRTUAL_ENV:-./})" +VENV_FOLDER_NAME="$(basename ${VIRTUAL_ENV:-.venv})" + +[ -z "${VIRTUAL_ENV}" ] && OPERATION=c || OPERATION=d + + +help() { + echo "USAGE:" + echo " venv [OPTIONS] []" + echo + echo "ARGS:" + echo " VENV_FOLDER_PATH Folder containing virtual environment" + echo + echo "OPTIONS:" + echo " -c, --create Create virtual environment" + echo " -d, --deactivate Exit virtual environment" + echo " -f, --folder Specify venv folder name" + echo " -h, --help Print this message" + echo " -r, --remove Deactivate and remove virtual environment" +} + + +remove() { + [ ! -z "${VIRTUAL_ENV}" ] && deactivate + rm -rf "${VENV_FOLDER}" +} + + +create_or_activate() { + if [ -d "${VENV_FOLDER}" ]; then + source ${VENV_FOLDER}/bin/activate + else + python3 -m venv "${VENV_FOLDER}" + source ${VENV_FOLDER}/bin/activate + fi +} + + +while [ "$#" -gt 0 ]; do + case "$1" in + '-c'|'--create') OPERATION=c;; + '-d'|'--deactivate') OPERATION=d; return;; + '-r'|'--remove') OPERATION=r;; + '-f'|'--folder') shift; VENV_FOLDER_NAME="$1";; + -*) help; return;; + *) shift; VENV_FOLDER_PATH="$1";; + esac + shift +done + + +VENV_FOLDER="${VENV_FOLDER_PATH}/${VENV_FOLDER_NAME}" + + +case "${OPERATION}" in + c) [ -z "${VIRTUAL_ENV}" ] && create_or_activate || help;; + d) [ ! -z "${VIRTUAL_ENV}" ] && deactivate || help;; + r) [ -d "${VENV_FOLDER}" ] && remove || help;; +esac + +# vim: set ft=sh diff --git a/.local/bin/statusbar/sb-battery b/.local/bin/statusbar/sb-battery new file mode 100755 index 0000000..c731eab --- /dev/null +++ b/.local/bin/statusbar/sb-battery @@ -0,0 +1,18 @@ +#!/bin/bash + +BATTERY_PATH="/sys/class/power_supply/BAT0" +status="$(cat ${BATTERY_PATH}/status)" + +case "${status}" in + "Full") status_string="⚡" ;; + "Discharging") status_string="🔋" ;; + "Charging") status_string="🔌" ;; + "Not charging") status_string="🛑" ;; + "Unknown") status_string="♻️" ;; + *) exit 1 ;; +esac + +capacity="$(cat ${BATTERY_PATH}/capacity)" +[ "$status" = "Discharging" ] && [ "$capacity" -le 25 ] && status_string="❗" + +echo "${status_string} ${capacity}%" diff --git a/.local/statusbar/sb-cast b/.local/bin/statusbar/sb-cast similarity index 100% rename from .local/statusbar/sb-cast rename to .local/bin/statusbar/sb-cast diff --git a/.local/statusbar/sb-vpn b/.local/bin/statusbar/sb-vpn similarity index 100% rename from .local/statusbar/sb-vpn rename to .local/bin/statusbar/sb-vpn diff --git a/.local/scripts/_venv b/.local/scripts/_venv deleted file mode 100644 index 3eddbad..0000000 --- a/.local/scripts/_venv +++ /dev/null @@ -1,72 +0,0 @@ -VENV_FOLDER=".venv" -OPERATION=c - -deactivate_() { - if [ ! -z "${VIRTUAL_ENV}" ]; then - deactivate - fi -} - -create_or_activate() { - if [ -z "${VIRTUAL_ENV}" ]; then - if [ -d "${VENV_FOLDER}" ]; then - source ./${VENV_FOLDER}/bin/activate - else - python3 -m venv "${VENV_FOLDER}" - source ./${VENV_FOLDER}/bin/activate - fi - else - deactivate - fi -} - - -remove() { - deactivate_ - if [ -d "${VENV_FOLDER}" ]; then - rm -r "${VENV_FOLDER}" - fi -} - -while [ "$#" -gt 0 ]; do - case "$1" in - '-c'|"--create") - OPERATION=c - ;; - - '-r'|"--remove") - OPERATION=r - ;; - - '-d'|"--deactivate") - deactivate_ - return - ;; - - '-h'|"--help") - echo "venv [OPTION] [VENV_FOLDER]" - echo - echo "ARGUMENTS:" - echo "\t VENV_FOLDER \t\t Folder containing virtual environment" - echo - echo "OPTIONS:" - echo "\t -c, --create \t\t Create virtual environment" - echo "\t -d, --deactivate \t Exit virtual environment" - echo "\t -r, --remove \t\t Deactivate and remove virtual environment" - echo "\t -h, --help \t\t Print this message" - return - ;; - - *) - VENV_FOLDER="$1" - ;; - esac - shift -done - -case "${OPERATION}" in - c) create_or_activate;; - r) remove;; -esac - -# vim: set ft=sh diff --git a/.local/statusbar/sb-battery b/.local/statusbar/sb-battery deleted file mode 100755 index 8971ba9..0000000 --- a/.local/statusbar/sb-battery +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -for battery in /sys/class/power_supply/BAT?*; do - [ -n "${capacity+x}" ] && printf " " - case "$(cat "$battery/status" 2>&1)" in - "Full") status="⚡ " ;; - "Discharging") status="🔋" ;; - "Charging") status="🔌" ;; - "Not charging") status="🛑" ;; - "Unknown") status="♻️" ;; - *) exit 1 ;; - esac - capacity="$(cat "$battery/capacity" 2>&1)" - # Will make a warn variable if discharging and low - [ "$status" = "🔋" ] && [ "$capacity" -le 25 ] && warn="❗" - # Prints the info - printf "%s%s%d%%" "$status" "$warn" "$capacity"; unset warn -done && printf "\\n" diff --git a/.xinitrc b/.xinitrc index 07628fa..7390e57 100644 --- a/.xinitrc +++ b/.xinitrc @@ -2,5 +2,5 @@ xr # . ${HOME}/.config/X11/autostart -exec dbus-run-session ssh-agent ${HOME}/.local/src/dwm/dwm +exec ssh-agent ${HOME}/.local/src/dwm/dwm # ssh-agent /usr/bin/dwm diff --git a/.xsettingsd b/.xsettingsd index 2f9ef25..ada32d3 100644 --- a/.xsettingsd +++ b/.xsettingsd @@ -1,2 +1,2 @@ -Xft/DPI 98304 -Gtk/CursorThemeSize 24 +Xft/DPI 196608 +Gtk/CursorThemeSize 48