Browse Source

Razni popravki, dodan emacs config, bliznjice z DPI fixi

t460s-fhd
Jurij Podgoršek 1 year ago
parent
commit
ae9723001c
  1. 1
      .Xresources
  2. 2
      .config/i3/config
  3. 18
      .config/sway/config
  4. 118
      .emacs.d/init.el
  5. 6
      .guile
  6. 11
      .profile
  7. 16
      .zshrc
  8. 15
      applications/com.obsproject.Studio.desktop
  9. 16
      applications/dbeaver.desktop
  10. 3
      bin/backmeup
  11. 13
      povezi.sh

1
.Xresources

@ -1,4 +1,5 @@
!!! Scaling, fonts !!!
!Xft.dpi: 95
Xft.dpi: 158
Xft.autohint: 0
!Xft.autohint: 1

2
.config/i3/config

@ -252,7 +252,7 @@ exec nm-applet &
exec_always --no-startup-id "setxkbmap -layout us,si -option grp:win_space_toggle -option compose:caps"
# Change layout
bindym $mod+space exec "i3-keyboard-layout cycle us si"
exec_always setxkbmap -option "grp:win_space_toggle"
# gaps between windows
gaps inner 7

18
.config/sway/config

@ -31,6 +31,7 @@ output eDP-1 {
output "*" background ~/Slike/Wallpapers/1596344206877.jpg fill
# Zamik dobimo z SIRINA / SCALE
output HDMI-A-2 pos 1536 0 scale 1
output DP-5 pos 1536 0 scale 1
# start a terminal
bindsym $mod+Return exec $term
@ -139,7 +140,6 @@ assign [class="Transmission"] $w3
assign [class="Nicotine+"] $w3
# Program startup
#exec firefox &
#exec lollypop &
@ -272,13 +272,16 @@ bindsym Mod1+shift+x exec playerctl play-pause
bindsym Mod1+shift+c exec playerctl play-pause
# Zvok
set $vol_down_cmd amixer -q sset Master 3%-
set $vol_up_cmd amixer -q sset Master 3%+
set $vol_down_cmd amixer -q sset Master 5%-
set $vol_up_cmd amixer -q sset Master 5%+
set $vol_toggle_cmd amixer -q sset Master toggle
bindsym $mod+shift+d exec "$vol_up_cmd"
bindsym XF86AudioRaiseVolume exec "$vol_up_cmd"
bindsym $mod+shift+s exec "$vol_down_cmd"
bindsym XF86AudioLowerVolume exec "$vol_down_cmd"
bindsym XF86AudioMute exec "pamixer -t"
bindsym XF86AudioMute exec "$vol_toggle_cmd"
bindsym $mod+shift+a exec "$vol_toggle_cmd"
# GTK tema
set $gnome-schema org.gnome.desktop.interface
@ -313,11 +316,11 @@ exec mako --default-timeout=10000
exec ~/.local/bin/autotiling
# Rdece, da lahko spim, hvala
exec gammastep-indicator -m wayland
exec gammastep-indicator -m wayland -l 46.05108:14.50513
# Zagoni programov razporejeni na workspejse
workspace 1:
exec /home/g1smo/sredstva/firefox/firefox-bin
exec firefox
workspace 2:λ
exec emacs
@ -326,7 +329,8 @@ workspace 3:
exec thunderbird
workspace 4:
exec revolt
#exec revolt
exec element-desktop
workspace 9:
exec keepassxc

118
.emacs.d/init.el

@ -0,0 +1,118 @@
;;;;;;;;;;;;
;; PAKETI ;;
;;;;;;;;;;;;
;; Set up package.el to work with MELPA
(require 'package)
;; Sekvence n'shiat
(require 'seq)
;; Loudamo melpa paketice
(add-to-list 'package-archives
'("melpa" . "https://melpa.org/packages/"))
;; Kaj vse naj bo namesceno?
(setq paketi '(;; Evil mode
evil
;; Global undo tree
undo-tree
;; Gruvbox tema
gruvbox-theme
;; Hemisu tema
hemisu-theme
;; Oblikovanje teksta
editorconfig
;; PHProgamiranje
php-mode
fennel-mode
;; Projekti
projectile
;; Completion
company
;; Completion2
ivy
;; Iskanje po fajlih
rg))
(setq nema (seq-filter (lambda (p) (not (package-installed-p p))) paketi))
(when nema
(package-initialize)
(package-refresh-contents)
(dolist (p nema)
(package-install p)))
;;;;;;;;;;
;; EVIL ;;
;;;;;;;;;;
(require 'evil)
(defvar my-leader-map (make-sparse-keymap)
"Mapiranje za evil bliznjice (leader trigger)")
(define-key evil-normal-state-map (kbd "SPC") my-leader-map)
(define-key my-leader-map "b" 'list-buffers)
;;;;;;;;;;;;;;;;;;;
;; Custom (tema) ;;
;;;;;;;;;;;;;;;;;;;
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(custom-safe-themes
'("7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default))
'(package-selected-packages '(fennel-mode rg ivy company projectile evil))
'(tool-bar-mode nil))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(default ((t (:family "Iosevka SS05" :foundry "BE5N" :slant normal :weight semi-bold :height 120 :width normal)))))
;;;;;;;;;;;;;;;;
;; UI cleanup ;;
;;;;;;;;;;;;;;;;
;; Menu bar off
(menu-bar-mode -1)
(tool-bar-mode -1)
;; No dialog box plx
(setq use-dialog-box nil)
;; Brez ikon zgoraj
(setq ns-use-proxy-icon nil)
(setq frame-title-format nil)
;; Undo tree
(global-undo-tree-mode)
(evil-set-undo-system 'undo-tree)
;; Theme
;;(load-theme 'gruvbox-dark-medium t)
(load-theme 'hemisu-light t)
;;;;;;;;;;
;; Text ;;
;;;;;;;;;;
(setq-default tab-width 2)
(setq-default indent-tabs-mode nil)
(display-line-numbers-mode)
(editorconfig-mode 1)
;; Evil mode <3
(evil-mode)
;; PhP ko je treba
(add-to-list 'auto-mode-alist '("\\.php$" . php-mode))
;; Org tudi kdaj
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
;; Kompletiranje ukazov
(company-mode)
(ivy-mode)
;; Iskanje po fajlih (fulltext)
(rg-enable-default-bindings)

6
.guile

@ -0,0 +1,6 @@
;; Readline fix (za smerne tipke v replu)
(use-modules (ice-9 readline))
(activate-readline)
;; Dodaj lokalno kompajlane knjižnice
(append! %load-compiled-path '("/usr/local/lib/guile/3.0/ccache" "/usr/local/lib/guile/3.0/site-ccache"))

11
.profile

@ -29,21 +29,24 @@ export MOZ_WEBRENDER=1
# Wayland pls!
export KITTY_ENABLE_WAYLAND=1
export MOZ_ENABLE_WAYLAND=1
export XDG_SESSION_TYPE=wayland
#export XDG_SESSION_TYPE=wayland
# Tole bojda ni dobra ideja (pravi wiki!)
#export GDK_BACKEND=wayland
# QT nastavitve
export QT_QPA_PLATFORMTHEME="qt5ct"
export QT_FONT_DPI=95
export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=lcd -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $_JAVA_OPTIONS"
export JAVA_FONTS="/usr/share/fonts/TTF"
export QT_QPA_PLATFORM=wayland-egl
#export QT_QPA_PLATFORM=wayland-egl
export QT_WAYLAND_FORCE_DPI=physical
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export SDL_VIDEODRIVER=wayland
export _JAVA_AWT_WM_NONREPARENTING=1
# Loadamo sway na tty5!
# If running from tty1 start sway
if [ "$(tty)" = "/dev/tty1" ]; then
exec sway
QT_QPA_PLATFORM=wayland-egl SDL_VIDEODRIVER=wayland exec sway
fi

16
.zshrc

@ -68,6 +68,7 @@ alias ls='ls --color=auto'
alias vi='vim'
alias sudo="sudo "
alias grep="grep --color=auto"
alias ag="rg"
# Kitty terminal ssh fix
alias ssh="kitty +kitten ssh"
@ -86,6 +87,7 @@ alias omnom="ssh root@debeli"
# Ljudmila
alias scdev="ssh culture@milci.ljudmila.org"
alias scnew="ssh culture@zala.ljudmila.org"
# Dolzina mp3 fajlov
alias mp3len="for i in \$(ls *.mp3); do echo \$i; soxi -d \$i; done"
@ -108,3 +110,17 @@ alias tisina='pactl unload-module module-loopback'
# PI ssh
alias spi='ssh pi@192.168.64.112'
# Kill element
alias kill-element='kill $(ps aux | grep element | awk "{print $2;}")'
alias nmc='nmcli con up '
# OBS fix
#alias obs="QT_QPA_PLATFORM=xcb obs"
# Guile
export GUILE_LOAD_COMPILED_PATH="/usr/local/lib/guile/3.0/ccache:/usr/local/lib/guile/3.0/site-ccache"
# (FULL)Screen share
export XDG_CURRENT_DESKTOP=sway

15
applications/com.obsproject.Studio.desktop

@ -0,0 +1,15 @@
[Desktop Entry]
Version=1.0
Name=OBS Studio
GenericName=Streaming/Recording Software
GenericName[fr]=Logiciel d'enregistrement/diffusion
Comment=Free and Open Source Streaming/Recording Software
Comment[fr]=Logiciel libre d'enregistrement et de diffusion sur Internet
Comment[ru]=Бесплатная программа с открытым кодом для записи/трансляции видео
Exec=env QT_QPA_PLATFORM=xcb obs
Icon=com.obsproject.Studio
Terminal=false
Type=Application
Categories=AudioVideo;Recorder;
StartupNotify=true
StartupWMClass=obs

16
applications/dbeaver.desktop

@ -0,0 +1,16 @@
[Desktop Entry]
Version=1.0
Type=Application
Terminal=false
Name=DBeaver Community
GenericName=UniversaL Database Manager
Comment=Universal Database Manager and SQL Client.
Path=/usr/share/dbeaver/
Exec=env QT_QPA_PLATFORM=xcb dbeaver
Icon=/usr/share/dbeaver/dbeaver.png
Categories=IDE;Development
WM_CLASS=DBeaver
StartupWMClass=DBeaver
StartupNotify=true
Keywords=Database;SQL;IDE;JDBC;ODBC;MySQL;PostgreSQL;Oracle;DB2;MariaDB
MimeType=application/sql

3
bin/backmeup

@ -5,8 +5,9 @@ backuplog=/root/backup-log
#sudo sshfs pi@192.168.64.112:/home/pi/mast/bak/tp /root/.bak
borg create -svp pi@192.168.64.112:~/mast/bak/tp::$datum /etc /home /opt /root /srv /var | sudo tee -a $backuplog
#borg create -svp pi@192.168.64.112:~/mast/bak/tp::$datum /etc /home /opt /root /srv /var | sudo tee -a $backuplog
echo "Backup sistema $datum" | sudo tee -a $backuplog
rsync -avz /etc /home /opt /root /srv /var pi@192.168.64.112:~/mast/bak/tp | tee -a $backuplog
#sudo borg create --stats --verbose --compression=lz4 "/root/.bak::$datum" /etc /home /opt /root /srv /var | sudo tee -a $backuplog
#sudo umount /root/.bak

13
povezi.sh

@ -75,5 +75,14 @@ ln -s $DIR/bin/inactive-windows-transparency.py ~/bin/inactive-windows-transpare
ln -s $DIR/bin/png2ico ~/bin/png2ico
# png v ico konverzija
ln -s $DIR/bin/vmpk-pa ~/bin/vmpk-pa
# dbeaver popravek skaliranja na waylandu
ln -s $DIR/bin/dbeaver ~/bin/dbeaver
# Guile
ln -s $DIR/.guile ~/.guile
# X11 popravki aplikacij
ln -s $DIR/applications/dbeaver.desktop ~/.local/share/applications/dbeaver.desktop
ln -s $DIR/applications/dbeaver.desktop ~/.local/share/applications/com.obsproject.Studio.desktop
# Emacs
mkdir ~/.emacs.d
ln -s $DIR/.emacs.d/init.el ~/.emacs.d/init.el
Loading…
Cancel
Save