Browse Source

Dopedenan sway, emacs

t460s-fhd
Jurij Podgoršek 8 months ago
parent
commit
bf9b4eed0a
  1. 15
      .config/sway/config
  2. 59
      .emacs.d/init.el
  3. 10
      .zshrc
  4. 8
      bin/backmeup

15
.config/sway/config

@ -89,7 +89,7 @@ set $w1 1:
set $w2 2:λ
set $w3 3:
set $w4 4:
set $w5 5:
set $w5 5:
set $w6 6:
set $w7 7:✭❀❤♫
set $w8 8:☭
@ -303,6 +303,10 @@ bindsym $mod+shift+p exec "swaymsg output HDMI-A-2 disable"
# Skrinsot
bindsym 0xff61 exec ~/bin/screenshot
# Scaling toggle
bindsym $mod+i exec "swaymsg output eDP-1 scale 1"
bindsym $mod+o exec "swaymsg output eDP-1 scale 1.25"
######
# AUTOSTART
###
@ -321,7 +325,8 @@ exec gammastep-indicator -m wayland -l 46.05108:14.50513
# Zagoni programov razporejeni na workspejse
workspace 1:
exec firefox
#exec firefox
exec librewolf
workspace 2:λ
exec emacs
@ -336,3 +341,9 @@ exec element-desktop
workspace 9:
exec gnome-keyring-daemon --start
exec keepassxc
# autolock in te fore
#exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg"output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f-c 000000'
# prazna baterija tezenje
exec ~/bin/swaynag-battery

59
.emacs.d/init.el

@ -26,9 +26,6 @@
doom-themes
;; Oblikovanje teksta
editorconfig
;; PHProgamiranje
php-mode
fennel-mode
;; Projekti
projectile
;; Completion
@ -50,8 +47,20 @@
smex
;; Programiranje
js2-mode
rjsx-mode
vue-mode
clojure-mode
geiser
geiser-guile
paredit
rainbow-delimiters
gdscript-mode
php-mode
fennel-mode
arduino-mode
markdown-mode
;; Checker za syntax?
flycheck
;; Lepšanje fajlov na webu
web-beautify
;; Tab alignment
@ -59,7 +68,12 @@
;; Dreva fajlov
treemacs
treemacs-projectile
treemacs-evil))
treemacs-evil
;; Pomoc za keybinde
which-key
;; Git paket
magit
))
(setq nema (seq-filter (lambda (p) (not (package-installed-p p))) paketi))
(when nema
@ -114,6 +128,7 @@
;; Mapiranje ukazov
(evil-global-set-key 'motion (kbd "SPC") my-leader-map)
;(evil-local-set-key 'motion (kbd "SPC") my-leader-map)
;(define-key evil-normal-state-map (kbd "SPC") my-leader-map)
(define-key my-leader-map "w" 'evil-window-map)
(define-key my-leader-map "b" 'evil-buffer-map)
@ -138,8 +153,9 @@
'("7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default))
'(iswitchb-mode t)
'(package-selected-packages
'(web-beautify vue-mode treemacs-evil treemacs-projectile treemacs smart-tabs-mode smart-tabs js2-mode smex clojure-mode helpful doom-themes counsel swiper all-the-icons doom-modeline evil-collection fennel-mode rg ivy company projectile evil))
'(tool-bar-mode nil))
'(magit markdown-mode flycheck arduino-mode rjsx-mode gdscript-mode rainbow-delimiters which-key paredit geiser-guile geiser web-beautify vue-mode treemacs-evil treemacs-projectile treemacs smart-tabs-mode smart-tabs js2-mode smex clojure-mode helpful doom-themes counsel swiper all-the-icons doom-modeline evil-collection fennel-mode rg ivy company projectile evil))
'(tool-bar-mode nil)
'(which-key-mode t))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@ -205,6 +221,24 @@
;; Org tudi kdaj
(add-to-list 'auto-mode-alist '("\\.org$" . org-mode))
;; Vue nacin
(add-to-list 'auto-mode-alist '("\\.vue$" . vue-mode))
;; Guile scheme
(setq scheme-program-name "guile")
;; Rainbowz
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode)
;; Boljse urejanje lispy jezikov
(autoload 'enable-paredit-mode "paredit" "Turn on pseudo-structural editing of Lisp code." t)
(add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode)
(add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)
(add-hook 'ielm-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
(add-hook 'scheme-mode-hook #'enable-paredit-mode)
;; Stanja taskov
(setq org-todo-keywords
'((sequence "TODO" "V DELU" "TESTIRANJE" "DOKUMENTIRANJE" "KONČANO")))
@ -228,6 +262,10 @@
;; Pametni tabi za js2-mode
(smart-tabs-advice js2-indent-line js2-basic-offset)
;; css indent
(setq css-indent-level 2)
(setq css-indent-offset 2)
;; Kompletiranje ukazov
(company-mode)
@ -278,6 +316,13 @@
;; Pomoc
;(require 'helpful)
;; Allow C-h to trigger which-key before it is done automatically
(setq which-key-show-early-on-C-h t)
;; make sure which-key doesn't show normally but refreshes quickly after it is
;; triggered.
(setq which-key-idle-delay 0.4)
(setq which-key-idle-secondary-delay 0.05)
(which-key-mode)
;; Prikazi startup time
(add-to-list 'after-init-hook
@ -288,7 +333,7 @@
(setq
backup-by-copying t ; don't clobber symlinks
backup-directory-alist
'(("." . "~/.saves/")) ; don't litter my fs tree
`((".*" . "~/.saves/")) ; don't litter my fs tree
delete-old-versions t
kept-new-versions 6
kept-old-versions 2

10
.zshrc

@ -112,7 +112,7 @@ alias tisina='pactl unload-module module-loopback'
alias spi='ssh pi@192.168.64.112'
# Kill element
alias kill-element='kill $(ps aux | grep element | awk "{print $2;}")'
alias kill-element='kill $(ps aux | grep element | awk '\''{print $2;}'\'')'
alias nmc='nmcli con up '
@ -122,6 +122,10 @@ alias wine32="WINEPREFIX=~/.wine32 WINEARCH=win32 wine "
# OBS fix
#alias obs="QT_QPA_PLATFORM=xcb obs"
# Build deb pkg
#alias deb-build="dpkg-buildpackage -us -uc"
alias deb-build="dpkg-buildpackage -b -rfakeroot -us -uc"
# Guile
export GUILE_LOAD_COMPILED_PATH="/usr/local/lib/guile/3.0/ccache:/usr/local/lib/guile/3.0/site-ccache"
@ -129,5 +133,5 @@ export GUILE_LOAD_COMPILED_PATH="/usr/local/lib/guile/3.0/ccache:/usr/local/lib/
export XDG_CURRENT_DESKTOP=sway
# Guix
GUIX_PROFILE="/home/g1smo/.config/guix/current"
. "$GUIX_PROFILE/etc/profile"
#GUIX_PROFILE="/home/g1smo/.config/guix/current"
#. "$GUIX_PROFILE/etc/profile"

8
bin/backmeup

@ -3,11 +3,11 @@
datum=$(date +"%y-%m-%d")
backuplog=/root/backup-log
#sudo sshfs pi@192.168.64.112:/home/pi/mast/bak/tp /root/.bak
sudo sshfs pi@pi:/home/pi/mast/bak/dbn /root/.bak
#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
#rsync -avz /etc /home /opt /root /srv /var pi@pi:~/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
sudo umount /root/.bak
Loading…
Cancel
Save