Loudaj ikone in font z neta, emacs update, barve v sway
parent
e9754f74d6
commit
a92b3c8851
|
|
@ -95,7 +95,7 @@ bindsym $mod+d exec $menu
|
||||||
|
|
||||||
# name workspaces
|
# name workspaces
|
||||||
set $w1 1:
|
set $w1 1:
|
||||||
set $w2 2:λ
|
set $w2 2:
|
||||||
set $w3 3:
|
set $w3 3:
|
||||||
set $w4 4:
|
set $w4 4:
|
||||||
set $w5 5:
|
set $w5 5:
|
||||||
|
|
@ -215,6 +215,9 @@ mode "resize" {
|
||||||
}
|
}
|
||||||
bindsym $mod+r mode "resize"
|
bindsym $mod+r mode "resize"
|
||||||
|
|
||||||
|
set $ospredje #cccccc
|
||||||
|
set $ospredjeTrans #cccccccc
|
||||||
|
set $ospredjeNefokusiran #ebdbb2cc
|
||||||
set $ozadje #32302f
|
set $ozadje #32302f
|
||||||
set $ozadjeTrans #32302fcc
|
set $ozadjeTrans #32302fcc
|
||||||
|
|
||||||
|
|
@ -224,35 +227,35 @@ set $ozadjeTrans #32302fcc
|
||||||
# Read `man 5 sway-bar` for more information about this section.
|
# Read `man 5 sway-bar` for more information about this section.
|
||||||
bar {
|
bar {
|
||||||
position top
|
position top
|
||||||
# status_command i3blocks
|
|
||||||
# status_command i3status-rs
|
|
||||||
status_command i3status
|
status_command i3status
|
||||||
colors {
|
colors {
|
||||||
#focused_background #272727E5
|
|
||||||
focused_background $ozadje
|
focused_background $ozadje
|
||||||
#background #272727B8
|
|
||||||
background $ozadjeTrans
|
background $ozadjeTrans
|
||||||
#statusline #ebdbb2E5
|
statusline $ospredje
|
||||||
statusline #DCDCDC
|
|
||||||
|
|
||||||
focused_workspace #32302f #32302f #ffffff
|
focused_workspace $ospredje $ospredje $ozadje
|
||||||
active_workspace #32302fcc #32302fcc #888888
|
active_workspace $ospredjeTrans $ospredjeTrans $ozadje
|
||||||
inactive_workspace #32302fcc #32302fcc #888888
|
inactive_workspace $ozadje $ozadje $ospredje
|
||||||
}
|
}
|
||||||
font pango:FontAwesome Regular 12, Iosevka SS01 Medium 12
|
font pango:FontAwesome, Iosevka SS01 Medium 12
|
||||||
strip_workspace_numbers yes
|
strip_workspace_numbers yes
|
||||||
height 26
|
height 26
|
||||||
#tray_padding 2
|
#tray_padding 2
|
||||||
separator_symbol " "
|
separator_symbol ""
|
||||||
}
|
}
|
||||||
|
|
||||||
include /etc/sway/config.d/*
|
#include /etc/sway/config.d/*
|
||||||
|
|
||||||
|
set $zelena #b8bb26
|
||||||
|
set $temnoZelena #98971a
|
||||||
|
set $okvir #665c54
|
||||||
|
set $bg0_s #32302f
|
||||||
|
set $fg3 #bdae93
|
||||||
|
|
||||||
# Colors
|
# Colors
|
||||||
client.focused #444444 #444444 #A9D000 #8c9825 #444444
|
client.focused $okvir $ozadje $ospredje $ospredje $okvir
|
||||||
client.focused_inactive #444444 #444444 #A9D000 #5c7825 #444444
|
client.focused_inactive #444444 #444444 #A9D000 $fg3 $bg0_s
|
||||||
client.unfocused #222222 #222222 #888888 #292d2e #222222
|
client.unfocused #222222 #222222 #888888 #292d2e #222222
|
||||||
client.background #222222
|
|
||||||
|
|
||||||
# gaps between windows
|
# gaps between windows
|
||||||
gaps inner 6
|
gaps inner 6
|
||||||
|
|
@ -356,7 +359,7 @@ workspace 1:
|
||||||
#exec firefox
|
#exec firefox
|
||||||
exec librewolf
|
exec librewolf
|
||||||
|
|
||||||
workspace 2:λ
|
workspace 2:
|
||||||
exec emacs
|
exec emacs
|
||||||
|
|
||||||
workspace 3:
|
workspace 3:
|
||||||
|
|
|
||||||
395
.emacs.d/init.el
395
.emacs.d/init.el
|
|
@ -26,121 +26,79 @@
|
||||||
(add-to-list 'package-archives '("elpa" . "https://elpa.gnu.org/packages/") t)
|
(add-to-list 'package-archives '("elpa" . "https://elpa.gnu.org/packages/") t)
|
||||||
(package-initialize)
|
(package-initialize)
|
||||||
|
|
||||||
|
(use-package benchmark-init
|
||||||
|
:config
|
||||||
|
;; To disable collection of benchmark data after init is done.
|
||||||
|
(add-hook 'after-init-hook 'benchmark-init/deactivate))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;;
|
;;;;;;;;;;
|
||||||
;; EVIL ;;
|
;; EVIL ;;
|
||||||
;;;;;;;;;;
|
;;;;;;;;;;
|
||||||
(use-package evil
|
(setq evil-want-integration t
|
||||||
:init (setq evil-want-integration t
|
evil-want-keybinding nil)
|
||||||
evil-want-keybinding nil
|
;org-return-follows-link t
|
||||||
;org-return-follows-link t
|
(require 'evil)
|
||||||
)
|
|
||||||
:config
|
;; Evil mode toggle <3
|
||||||
;; Evil mode toggle <3
|
(evil-mode 1)
|
||||||
(evil-mode 1))
|
|
||||||
|
|
||||||
(use-package general
|
(use-package general
|
||||||
:after (evil evil-collection org projectile)
|
|
||||||
:config
|
:config
|
||||||
(general-evil-setup)
|
(general-evil-setup)
|
||||||
|
|
||||||
(defun odpri-org-link ()
|
;; Leader key nastavitev (za prozenje ukazov)
|
||||||
"Odpri link v ORG fajlu pod kurzorjem"
|
|
||||||
(interactive)
|
|
||||||
(if (org-in-regexp org-link-any-re nil t)
|
|
||||||
(org-open-at-point)
|
|
||||||
nil))
|
|
||||||
|
|
||||||
(general-evil-define-key
|
|
||||||
'normal
|
|
||||||
org-mode-map
|
|
||||||
"RET" 'odpri-org-link)
|
|
||||||
|
|
||||||
(general-create-definer start/leader-keys
|
(general-create-definer start/leader-keys
|
||||||
:states '(normal insert visual emacs)
|
:states '(normal insert visual emacs)
|
||||||
:keymaps 'override
|
:keymaps 'override
|
||||||
:prefix "SPC" ;; set leader
|
:prefix "SPC" ;; set leader
|
||||||
:global-prefix "C-SPC") ;; access leader in insert mode
|
:global-prefix "C-SPC") ;; access leader in insert mode
|
||||||
|
|
||||||
;; Osnovne bliznjice
|
|
||||||
(start/leader-keys
|
|
||||||
"[" 'previous-buffer
|
|
||||||
"]" 'next-buffer
|
|
||||||
"," 'ivy-switch-buffer
|
|
||||||
"RET" 'counsel-bookmark
|
|
||||||
"/" 'counsel-projectile-rg
|
|
||||||
"t" 'treemacs-add-and-display-current-project
|
|
||||||
"p" 'projectile-command-map
|
|
||||||
"g" 'magit-status)
|
|
||||||
|
|
||||||
;; WINDOW ukazi
|
|
||||||
(define-prefix-command 'evil-window-map)
|
|
||||||
(define-key evil-window-map "j" 'windmove-down)
|
|
||||||
(define-key evil-window-map "k" 'windmove-up)
|
|
||||||
(define-key evil-window-map "h" 'windmove-left)
|
|
||||||
(define-key evil-window-map "l" 'windmove-right)
|
|
||||||
(define-key evil-window-map "s" 'split-window-below)
|
|
||||||
(define-key evil-window-map "v" 'split-window-right)
|
|
||||||
(define-key evil-window-map "d" 'kill-buffer-and-window)
|
|
||||||
(start/leader-keys "w" 'evil-window-map)
|
|
||||||
|
|
||||||
;; BUFFER ukazi
|
|
||||||
(define-prefix-command 'evil-buffer-map)
|
|
||||||
(define-key evil-buffer-map "b" 'ivy-switch-buffer)
|
|
||||||
(define-key evil-buffer-map "p" 'previous-buffer)
|
|
||||||
(define-key evil-buffer-map "n" 'next-buffer)
|
|
||||||
(define-key evil-buffer-map "e" 'eval-buffer)
|
|
||||||
(defun switch-to-scratch () (interactive) (switch-to-buffer "*scratch*"))
|
|
||||||
(define-key evil-buffer-map "s" 'switch-to-scratch)
|
|
||||||
(define-key evil-buffer-map "h" 'dashboard-open)
|
|
||||||
(defun open-config () (interactive) (find-file-literally "~/.emacs.d/init.el"))
|
|
||||||
(define-key evil-buffer-map "c" 'open-config)
|
|
||||||
(define-key evil-buffer-map "d" 'kill-current-buffer)
|
|
||||||
(define-key evil-buffer-map "k" 'kill-buffer)
|
|
||||||
(start/leader-keys "b" 'evil-buffer-map)
|
|
||||||
|
|
||||||
;; EVAL ukazi
|
|
||||||
(define-prefix-command 'evil-eval-map)
|
|
||||||
(define-key evil-eval-map "b" 'eval-buffer)
|
|
||||||
(define-key evil-eval-map "e" 'eval-expression)
|
|
||||||
(define-key evil-eval-map "r" 'eval-region)
|
|
||||||
(start/leader-keys "e" 'evil-eval-map)
|
|
||||||
|
|
||||||
;; Geiser ukazi
|
|
||||||
(define-prefix-command 'evil-geiser-map)
|
|
||||||
(define-key evil-geiser-map "b" 'geiser-eval-buffer)
|
|
||||||
(define-key evil-geiser-map "e" 'geiser-eval-expression)
|
|
||||||
(defun geiser-start-and-eval-buffer ()
|
|
||||||
(interactive)
|
|
||||||
(geiser-guile)
|
|
||||||
(previous-buffer)
|
|
||||||
(geiser-eval-buffer))
|
|
||||||
(define-key evil-geiser-map "s" 'geiser-start-and-eval-buffer)
|
|
||||||
(define-key evil-geiser-map "g" 'geiser)
|
|
||||||
(define-key evil-geiser-map "c" 'geiser-connect)
|
|
||||||
(define-key evil-geiser-map "k" 'geiser-exit-repl)
|
|
||||||
(defun geiser-restart ()
|
|
||||||
;(interactive)
|
|
||||||
(geiser-exit-repl)
|
|
||||||
(geiser-start-and-eval-buffer))
|
|
||||||
(define-key evil-geiser-map "r" 'geiser-restart)
|
|
||||||
(start/leader-keys "s" 'evil-geiser-map)
|
|
||||||
|
|
||||||
;; FILE ukazi
|
|
||||||
(define-prefix-command 'evil-file-map)
|
|
||||||
(define-key evil-file-map "f" 'counsel-find-file)
|
|
||||||
(defun load-config () (interactive) (find-file "~/.emacs.d/init.el"))
|
(defun load-config () (interactive) (find-file "~/.emacs.d/init.el"))
|
||||||
(define-key evil-file-map "c" 'load-config)
|
|
||||||
(start/leader-keys "f" 'evil-file-map)
|
|
||||||
|
|
||||||
;; ORG ukazi
|
(start/leader-keys
|
||||||
(define-prefix-command 'evil-org-map)
|
;; Osnovne bliznjice
|
||||||
(define-key evil-org-map "c" 'org-capture)
|
"[" 'previous-buffer
|
||||||
(define-key evil-org-map "a" 'org-agenda)
|
"]" 'next-buffer
|
||||||
(start/leader-keys "o" 'evil-org-map)
|
|
||||||
|
|
||||||
)
|
;; WINDOW ukazi
|
||||||
|
"w" '(:ignore t :wk "window")
|
||||||
|
"w j" 'windmove-down
|
||||||
|
"w k" 'windmove-up
|
||||||
|
"w h" 'windmove-left
|
||||||
|
"w l" 'windmove-right
|
||||||
|
"w s" 'split-window-below
|
||||||
|
"w v" 'split-window-right
|
||||||
|
"w d" 'kill-buffer-and-window
|
||||||
|
|
||||||
|
;; BUFFER ukazi
|
||||||
|
"b" '(:ignore t :wk "buffer")
|
||||||
|
"b b" 'switch-to-buffer
|
||||||
|
"b p" 'previous-buffer
|
||||||
|
"b n" 'next-buffer
|
||||||
|
"b e" 'eval-buffer
|
||||||
|
"b s" (defun scratch-buffer () "Show scratch buffer" (interactive) (switch-to-buffer "*scratch*"))
|
||||||
|
"b c" 'load-config
|
||||||
|
"b d" 'kill-current-buffer
|
||||||
|
"b k" 'kill-buffer
|
||||||
|
|
||||||
|
;; EVAL ukazi
|
||||||
|
"e" '(:ignore t :wk "eval")
|
||||||
|
"e b" 'eval-buffer
|
||||||
|
"e e" 'eval-expression
|
||||||
|
"e r" 'eval-region
|
||||||
|
|
||||||
|
;; FILE ukazi
|
||||||
|
"f" '(:ignore t :wk "file")
|
||||||
|
"f f" 'counsel-find-file
|
||||||
|
"f c" 'load-config
|
||||||
|
|
||||||
|
;; Vpogled / introspekcija
|
||||||
|
"d" '(:ignore :t :wk "describe")
|
||||||
|
"d f" 'describe-function
|
||||||
|
"d k" 'describe-key
|
||||||
|
"d m" 'describe-mode))
|
||||||
|
|
||||||
;; Dodatne evil bližnjice
|
;; Dodatne evil bližnjice
|
||||||
(use-package evil-collection
|
(use-package evil-collection
|
||||||
|
|
@ -148,22 +106,6 @@
|
||||||
:config
|
:config
|
||||||
(evil-collection-init))
|
(evil-collection-init))
|
||||||
|
|
||||||
;; Evil orgmode
|
|
||||||
(use-package evil-org
|
|
||||||
:hook (org-mode . (lambda ()
|
|
||||||
;; Odpri ORG linke kar s tipko enter
|
|
||||||
;(define-key org-mode-map (kbd "RET") 'odpri-org-link)
|
|
||||||
;(local-set-key (kbd "RET") 'odpri-org-link)
|
|
||||||
(evil-org-mode)))
|
|
||||||
:config
|
|
||||||
(require 'evil-org-agenda)
|
|
||||||
(evil-org-set-key-theme '(navigation insert textobjects additional calendar))
|
|
||||||
(evil-org-agenda-set-keys))
|
|
||||||
|
|
||||||
(use-package treemacs-evil
|
|
||||||
:defer t
|
|
||||||
:after treemacs)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;
|
;;;;;;;;;
|
||||||
|
|
@ -199,8 +141,8 @@
|
||||||
|
|
||||||
;; Doom modeline - lepsi status bar spodaj
|
;; Doom modeline - lepsi status bar spodaj
|
||||||
(use-package doom-modeline
|
(use-package doom-modeline
|
||||||
:config
|
:defer t
|
||||||
(doom-modeline-mode))
|
:init (doom-modeline-mode 1))
|
||||||
|
|
||||||
;; Lepse ikone!
|
;; Lepse ikone!
|
||||||
(use-package nerd-icons)
|
(use-package nerd-icons)
|
||||||
|
|
@ -249,9 +191,13 @@
|
||||||
;; Lepse file drevo
|
;; Lepse file drevo
|
||||||
(use-package treemacs
|
(use-package treemacs
|
||||||
:defer t
|
:defer t
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
"t" 'treemacs)
|
||||||
:hook ((treemacs-mode . (lambda () ;; Brez stevilk vrstic v file drevesu!
|
:hook ((treemacs-mode . (lambda () ;; Brez stevilk vrstic v file drevesu!
|
||||||
(display-line-numbers-mode -1)))))
|
(display-line-numbers-mode -1)))))
|
||||||
(use-package treemacs-projectile :after treemacs)
|
(use-package treemacs-projectile :after treemacs)
|
||||||
|
(use-package treemacs-evil :after treemacs)
|
||||||
|
|
||||||
;; Uporabi drevesne razveljavitve, undo tree
|
;; Uporabi drevesne razveljavitve, undo tree
|
||||||
(use-package undo-tree
|
(use-package undo-tree
|
||||||
|
|
@ -272,7 +218,10 @@
|
||||||
|
|
||||||
;; Projektni mgmt
|
;; Projektni mgmt
|
||||||
(use-package projectile
|
(use-package projectile
|
||||||
:after ivy
|
; :defer t
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
"p" 'projectile-command-map)
|
||||||
:config
|
:config
|
||||||
(setq projectile-globally-ignored-directories '("node_modules"))
|
(setq projectile-globally-ignored-directories '("node_modules"))
|
||||||
(setq projectile-completion-system 'ivy)
|
(setq projectile-completion-system 'ivy)
|
||||||
|
|
@ -314,7 +263,7 @@
|
||||||
(company-mode))
|
(company-mode))
|
||||||
|
|
||||||
;; LSP potrebuje dependency iz npm: "sudo npm install -g vue-language-server
|
;; LSP potrebuje dependency iz npm: "sudo npm install -g vue-language-server
|
||||||
(use-package lsp-mode :after company)
|
(use-package lsp-mode :defer t)
|
||||||
|
|
||||||
;; Vuejs moud
|
;; Vuejs moud
|
||||||
(use-package vue-mode
|
(use-package vue-mode
|
||||||
|
|
@ -326,13 +275,38 @@
|
||||||
(set-face-background 'mmm-default-submode-face nil)))
|
(set-face-background 'mmm-default-submode-face nil)))
|
||||||
|
|
||||||
;; PHP ko je treba
|
;; PHP ko je treba
|
||||||
(use-package php-mode :mode "\\.(php|module)\\'")
|
(use-package php-mode
|
||||||
|
:mode "\\.(php|module)\\'"
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
:infix "d"
|
||||||
|
"" '(:ignore t :wk "drupal")
|
||||||
|
"d" (defun drupal-cache-rebuild ()
|
||||||
|
(interactive)
|
||||||
|
(shell-command "drush cr"))))
|
||||||
|
|
||||||
;; Guile scheme
|
;; Guile scheme
|
||||||
(use-package geiser)
|
|
||||||
|
|
||||||
(use-package geiser-guile
|
(use-package geiser-guile
|
||||||
:after geiser
|
:mode "\\.scm\\'"
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
:infix "s"
|
||||||
|
"" '(:ignore t :wk "geiser")
|
||||||
|
"b" 'geiser-eval-buffer
|
||||||
|
"e" 'geiser-eval-expression
|
||||||
|
"s" (defun geiser-start-and-eval-buffer ()
|
||||||
|
(interactive)
|
||||||
|
(geiser-guile)
|
||||||
|
(previous-buffer)
|
||||||
|
(geiser-eval-buffer))
|
||||||
|
"s" 'geiser-start-and-eval-buffer
|
||||||
|
"g" 'geiser
|
||||||
|
"c" 'geiser-connect
|
||||||
|
"k" 'geiser-exit-repl
|
||||||
|
"r" (defun geiser-restart ()
|
||||||
|
;(interactive)
|
||||||
|
(geiser-exit-repl)
|
||||||
|
(geiser-start-and-eval-buffer)))
|
||||||
:init (setq scheme-program-name "guile"))
|
:init (setq scheme-program-name "guile"))
|
||||||
|
|
||||||
;; Racket podpora
|
;; Racket podpora
|
||||||
|
|
@ -353,7 +327,16 @@
|
||||||
(use-package flycheck :defer t)
|
(use-package flycheck :defer t)
|
||||||
|
|
||||||
;; Vmesnik za GIT
|
;; Vmesnik za GIT
|
||||||
(use-package magit :defer t)
|
(use-package magit
|
||||||
|
:defer t
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
"g" '(:ignore t :wk "magit")
|
||||||
|
"g s" 'magit-status))
|
||||||
|
|
||||||
|
(use-package magit-todos
|
||||||
|
:after magit
|
||||||
|
:config (magit-todos-mode 1))
|
||||||
|
|
||||||
;; Drupal pomocnik
|
;; Drupal pomocnik
|
||||||
(use-package drupal-mode :after php-mode)
|
(use-package drupal-mode :after php-mode)
|
||||||
|
|
@ -410,6 +393,7 @@
|
||||||
|
|
||||||
;; Python virtualenv podpora
|
;; Python virtualenv podpora
|
||||||
(use-package pyvenv
|
(use-package pyvenv
|
||||||
|
:mode "\\.py\\'"
|
||||||
:config
|
:config
|
||||||
(pyvenv-mode t)
|
(pyvenv-mode t)
|
||||||
|
|
||||||
|
|
@ -421,6 +405,12 @@
|
||||||
(list (lambda ()
|
(list (lambda ()
|
||||||
(setq python-shell-interpreter "python3")))))
|
(setq python-shell-interpreter "python3")))))
|
||||||
|
|
||||||
|
;; REST web client
|
||||||
|
(use-package restclient
|
||||||
|
:defer t)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;; =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
;; =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
|
||||||
;; SARDINE MODE
|
;; SARDINE MODE
|
||||||
|
|
@ -462,12 +452,91 @@
|
||||||
(global-set-key (kbd "C-M-x") #'sardine/eval-block)
|
(global-set-key (kbd "C-M-x") #'sardine/eval-block)
|
||||||
(global-set-key (kbd "C-M-.") #'sardine/stop-code)
|
(global-set-key (kbd "C-M-.") #'sardine/stop-code)
|
||||||
|
|
||||||
|
; Avtomatski tree sitter loader!
|
||||||
|
(use-package treesit-auto :defer t)
|
||||||
|
|
||||||
|
;; Tree sitter asociacije za programske jezike
|
||||||
|
(dolist
|
||||||
|
(item (list '("\\.css\\'" . css-ts-mode)
|
||||||
|
'("\\.json\\'" . json-ts-mode)
|
||||||
|
'("\\.php\\'" . php-ts-mode)
|
||||||
|
'("\\.py\\'" . python-ts-mode)
|
||||||
|
'("\\.js\\'" . js-ts-mode)))
|
||||||
|
(add-to-list 'auto-mode-alist item))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;
|
;;;;;;;;;;;;;
|
||||||
;; ORGMODE ;;
|
;; ORGMODE ;;
|
||||||
;;;;;;;;;;;;;
|
;;;;;;;;;;;;;
|
||||||
|
|
||||||
|
(use-package org
|
||||||
|
:mode "\\.org\\'"
|
||||||
|
:config
|
||||||
|
;; Skrij znake za oblikovanje (* za bold, / za podcrtanje...)
|
||||||
|
(setq org-hide-emphasis-markers t)
|
||||||
|
;; pikice v sredini za sezname
|
||||||
|
(font-lock-add-keywords
|
||||||
|
'org-mode
|
||||||
|
'(("^ *\\([-]\\) "
|
||||||
|
(0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
|
||||||
|
;; Drugačne pisave za naslove, svoje velikosti
|
||||||
|
(let* ((variable-tuple
|
||||||
|
(cond ((x-list-fonts "ETBembo") '(:font "ETBembo"))
|
||||||
|
((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro"))
|
||||||
|
((x-list-fonts "Lucida Grande") '(:font "Lucida Grande"))
|
||||||
|
((x-list-fonts "Verdana") '(:font "Verdana"))
|
||||||
|
((x-family-fonts "Sans Serif") '(:family "Sans Serif"))
|
||||||
|
(nil (warn "Cannot find a Sans Serif Font. Install Source Sans Pro."))))
|
||||||
|
;(base-font-color (face-foreground 'default nil 'default))
|
||||||
|
(base-font-color "#FF0000")
|
||||||
|
(headline `(:inherit default :weight bold :foreground ,base-font-color)))
|
||||||
|
|
||||||
|
(custom-theme-set-faces
|
||||||
|
`(org-level-8 ((t (,@headline ,@variable-tuple))))
|
||||||
|
`(org-level-7 ((t (,@headline ,@variable-tuple))))
|
||||||
|
`(org-level-6 ((t (,@headline ,@variable-tuple))))
|
||||||
|
`(org-level-5 ((t (,@headline ,@variable-tuple))))
|
||||||
|
`(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1))))
|
||||||
|
`(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25))))
|
||||||
|
`(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5))))
|
||||||
|
`(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75))))
|
||||||
|
`(org-document-title ((t (,@headline ,@variable-tuple :height 2.0 :underline nil)))))))
|
||||||
|
|
||||||
|
;; Evil orgmode
|
||||||
|
(use-package evil-org
|
||||||
|
:after org
|
||||||
|
:hook (org-mode . 'evil-org-mode)
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
;; ORGmode ukazi
|
||||||
|
"o" '(:ignore t :wk "orgmode")
|
||||||
|
"o c" 'org-capture
|
||||||
|
"o a" 'org-agenda)
|
||||||
|
:config
|
||||||
|
(require 'evil-org-agenda)
|
||||||
|
(evil-org-set-key-theme '(navigation insert textobjects additional calendar))
|
||||||
|
(evil-org-agenda-set-keys)
|
||||||
|
|
||||||
|
;; Odpiranje linkov kar z enter v ORG dokumentih
|
||||||
|
(defun odpri-org-link ()
|
||||||
|
"Odpri link v ORG fajlu pod kurzorjem"
|
||||||
|
(interactive)
|
||||||
|
(if (org-in-regexp org-link-any-re nil t)
|
||||||
|
(org-open-at-point)
|
||||||
|
nil))
|
||||||
|
|
||||||
|
(general-evil-define-key
|
||||||
|
'normal
|
||||||
|
org-mode-map
|
||||||
|
"RET" 'odpri-org-link))
|
||||||
|
|
||||||
|
;; Šminka za naslove
|
||||||
|
(use-package org-bullets
|
||||||
|
:after org
|
||||||
|
:config
|
||||||
|
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
|
||||||
|
|
||||||
;; Lepsi fonti
|
;; Lepsi fonti
|
||||||
(setq org-src-fontify-natively t)
|
(setq org-src-fontify-natively t)
|
||||||
|
|
||||||
|
|
@ -495,6 +564,7 @@
|
||||||
|
|
||||||
;; Nacin za pisanje brez distrakcij
|
;; Nacin za pisanje brez distrakcij
|
||||||
(use-package writeroom-mode
|
(use-package writeroom-mode
|
||||||
|
:defer t
|
||||||
:config
|
:config
|
||||||
:hook ((org-mode . (lambda ()
|
:hook ((org-mode . (lambda ()
|
||||||
(display-line-numbers-mode -1)))))
|
(display-line-numbers-mode -1)))))
|
||||||
|
|
@ -549,7 +619,7 @@
|
||||||
;(use-package quelpa-use-package)
|
;(use-package quelpa-use-package)
|
||||||
|
|
||||||
(use-package mu4e-dashboard
|
(use-package mu4e-dashboard
|
||||||
:ensure f
|
:defer t
|
||||||
:after mu4e
|
:after mu4e
|
||||||
:vc "https://github.com/rougier/mu4e-dashboard")
|
:vc "https://github.com/rougier/mu4e-dashboard")
|
||||||
;:quelpa (mu4e-dashboard
|
;:quelpa (mu4e-dashboard
|
||||||
|
|
@ -575,6 +645,10 @@
|
||||||
|
|
||||||
;; IVY autocomplete! <3
|
;; IVY autocomplete! <3
|
||||||
(use-package ivy
|
(use-package ivy
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
"," 'ivy-switch-buffer
|
||||||
|
"b b" 'ivy-switch-buffer)
|
||||||
:config
|
:config
|
||||||
(ivy-mode)
|
(ivy-mode)
|
||||||
(setq ivy-use-virtual-buffers t)
|
(setq ivy-use-virtual-buffers t)
|
||||||
|
|
@ -597,7 +671,6 @@
|
||||||
|
|
||||||
;; Izboljsani default ukazi bolj prijazni
|
;; Izboljsani default ukazi bolj prijazni
|
||||||
(use-package counsel
|
(use-package counsel
|
||||||
:defer t
|
|
||||||
:config
|
:config
|
||||||
(global-set-key (kbd "M-x") 'counsel-M-x)
|
(global-set-key (kbd "M-x") 'counsel-M-x)
|
||||||
(global-set-key (kbd "C-x C-f") 'counsel-find-file)
|
(global-set-key (kbd "C-x C-f") 'counsel-find-file)
|
||||||
|
|
@ -613,6 +686,10 @@
|
||||||
(global-set-key (kbd "C-x l") 'counsel-locate)
|
(global-set-key (kbd "C-x l") 'counsel-locate)
|
||||||
(define-key minibuffer-local-map (kbd "C-r") 'counsel-minibuffer-history)
|
(define-key minibuffer-local-map (kbd "C-r") 'counsel-minibuffer-history)
|
||||||
|
|
||||||
|
(start/leader-keys
|
||||||
|
"RET" 'counsel-bookmark
|
||||||
|
"/" 'counsel-projectile-rg)
|
||||||
|
|
||||||
;; Ripgrep ignore
|
;; Ripgrep ignore
|
||||||
(defvar my-rg-excludes '("node_modules")
|
(defvar my-rg-excludes '("node_modules")
|
||||||
"List of directories to exclude from `counsel-rg' results.")
|
"List of directories to exclude from `counsel-rg' results.")
|
||||||
|
|
@ -681,7 +758,15 @@
|
||||||
(openwith-mode t))
|
(openwith-mode t))
|
||||||
|
|
||||||
;; Kolaborativno urejanje
|
;; Kolaborativno urejanje
|
||||||
(use-package crdt :defer t)
|
(use-package crdt
|
||||||
|
:defer t
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
"c" '(:ignore t :wk "crdt")
|
||||||
|
"c c" 'crdt-connect
|
||||||
|
"c u" 'crdt-list-users
|
||||||
|
"c s" 'crdt-share-buffer
|
||||||
|
"c b" 'crdt-list-buffers))
|
||||||
|
|
||||||
;; ELISP test
|
;; ELISP test
|
||||||
(defun odpri-dnevnik ()
|
(defun odpri-dnevnik ()
|
||||||
|
|
@ -694,10 +779,13 @@
|
||||||
(global-set-key (kbd "C-M-d") 'odpri-dnevnik)
|
(global-set-key (kbd "C-M-d") 'odpri-dnevnik)
|
||||||
|
|
||||||
;; GNU guix
|
;; GNU guix
|
||||||
(use-package guix)
|
(use-package guix :defer t)
|
||||||
|
|
||||||
;; Dashboard - homescreen
|
;; Dashboard - homescreen
|
||||||
(use-package dashboard
|
(use-package dashboard
|
||||||
|
:general
|
||||||
|
(start/leader-keys
|
||||||
|
"b h" 'dashboard-open)
|
||||||
;:after nerd-icons
|
;:after nerd-icons
|
||||||
:init
|
:init
|
||||||
(dashboard-setup-startup-hook)
|
(dashboard-setup-startup-hook)
|
||||||
|
|
@ -716,6 +804,7 @@
|
||||||
|
|
||||||
;; Bolj fajni IELM REPL
|
;; Bolj fajni IELM REPL
|
||||||
(use-package ielm
|
(use-package ielm
|
||||||
|
:defer t
|
||||||
:hook (ielm-mode-hook . (lambda ()
|
:hook (ielm-mode-hook . (lambda ()
|
||||||
(eldoc-mode)
|
(eldoc-mode)
|
||||||
;(paredit-mode)
|
;(paredit-mode)
|
||||||
|
|
@ -762,18 +851,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;; ELISP test
|
|
||||||
(defun odpri-dnevnik ()
|
|
||||||
(interactive)
|
|
||||||
(find-file (format-time-string "/tmp/%Y-%m-%d_dnevnik.org"))
|
|
||||||
(insert (concat "\n=====================\n"
|
|
||||||
(shell-command-to-string "date") "\n"
|
|
||||||
(format-time-string "%Y-%m-%d") "\n"
|
|
||||||
"ŠE VEČ TEKSTA!" "\n")))
|
|
||||||
(global-set-key (kbd "C-M-d") 'odpri-dnevnik)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;;;;
|
;;;;;;;;;;;;
|
||||||
;; CUSTOM ;;
|
;; CUSTOM ;;
|
||||||
;;;;;;;;;;;;
|
;;;;;;;;;;;;
|
||||||
|
|
@ -799,26 +876,19 @@
|
||||||
"/home/g1smo/rs/org/irs_old.org" "/home/g1smo/rs/org/kaki.org"
|
"/home/g1smo/rs/org/irs_old.org" "/home/g1smo/rs/org/kaki.org"
|
||||||
"/home/g1smo/rs/org/prepoznava-komadov.org"))
|
"/home/g1smo/rs/org/prepoznava-komadov.org"))
|
||||||
'(package-selected-packages
|
'(package-selected-packages
|
||||||
'(quelpa-use-package 2bit counsel-projectile mu4e-dashboard
|
'(restclient php-ts-mode org-bullets magit-todos treesit-auto eat
|
||||||
sclang-extensions mu4e-marker-icons mu4e
|
zone-nyan yaml-mode writeroom-mode which-key web-mode
|
||||||
pyvenv chuck-mode subed elisp-refs autothemer
|
web-beautify vue-mode undo-tree treemacs-projectile
|
||||||
posframe avy dashboard sclang php-mode
|
treemacs-evil toml-mode tidal subed smex smartparens
|
||||||
zone-nyan org-evil guix ess 2048-game
|
sclang-extensions rjsx-mode rg rainbow-delimiters
|
||||||
toml-mode smartparens crdt.el openwith
|
racket-mode quelpa-use-package pyvenv org-caldav
|
||||||
evil-org-agenda company-org-block
|
openwith ob-mermaid mu4e-marker-icons mu4e-dashboard
|
||||||
org-block-capf writeroom-mode htmlize
|
magit lsp-mode htmlize helpful guix gruvbox-theme
|
||||||
company-lsp tidal org-caldav format-all
|
general geiser-guile format-all flycheck fluxus-mode
|
||||||
company-phpactor phpactor extempore-mode
|
extempore-mode evil-org evil-collection editorconfig
|
||||||
ob-mermaid use-package lsp-mode drupal-mode
|
drupal-mode doom-modeline dashboard crdt
|
||||||
magit markdown-mode flycheck arduino-mode
|
counsel-projectile company benchmark-init arduino-mode
|
||||||
rjsx-mode gdscript-mode rainbow-delimiters
|
all-the-icons 2bit))
|
||||||
paredit geiser-guile geiser web-beautify
|
|
||||||
vue-mode treemacs-evil treemacs-projectile
|
|
||||||
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)
|
'(tool-bar-mode nil)
|
||||||
'(warning-minimum-level :error)
|
'(warning-minimum-level :error)
|
||||||
'(which-key-mode t))
|
'(which-key-mode t))
|
||||||
|
|
@ -829,7 +899,16 @@
|
||||||
;; If there is more than one, they won't work right.
|
;; If there is more than one, they won't work right.
|
||||||
'(default ((t (:family "Iosevka SS01" :foundry "BE5N" :slant normal :weight semi-bold :height 120 :width normal))))
|
'(default ((t (:family "Iosevka SS01" :foundry "BE5N" :slant normal :weight semi-bold :height 120 :width normal))))
|
||||||
'(line-number ((t (:background "#32302f" :foreground "#7c6f64"))))
|
'(line-number ((t (:background "#32302f" :foreground "#7c6f64"))))
|
||||||
'(line-number-current-line ((t (:background "#32302f" :foreground "#fe8019")))))
|
'(line-number-current-line ((t (:background "#32302f" :foreground "#fe8019"))))
|
||||||
|
'(org-document-title ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif" :height 2.0 :underline nil))))
|
||||||
|
'(org-level-1 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif" :height 1.75))))
|
||||||
|
'(org-level-2 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif" :height 1.5))))
|
||||||
|
'(org-level-3 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif" :height 1.25))))
|
||||||
|
'(org-level-4 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif" :height 1.1))))
|
||||||
|
'(org-level-5 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif"))))
|
||||||
|
'(org-level-6 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif"))))
|
||||||
|
'(org-level-7 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif"))))
|
||||||
|
'(org-level-8 ((t (:inherit default :weight bold :foreground "#ebdbb2" :family "Sans Serif")))))
|
||||||
|
|
||||||
|
|
||||||
;; Make gc pauses faster by decreasing the threshold.
|
;; Make gc pauses faster by decreasing the threshold.
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
("~/projekti/esp32cam/galbot/" "~/sredstva/dotfiles/" "~/kompot/Kompot/" "~/projekti/radio-muse/" "~/projekti/hm/" "~/projekti/jugofuturizem/" "~/projekti/javnakoda.si/" "~/projekti/radio-muse/web/themes/custom/indiere2/")
|
("~/projekti/jugofuturizem/" "~/sredstva/dotfiles/" "/sshx:jurijp@dev.radiostudent.si:/var/www/new.radiostudent.si/" "~/projekti/glasbeni-indeks/" "~/projekti/PIXELSYNTH/" "~/projekti/hm/" "~/kompot/Kompot/" "~/projekti/radio-muse/" "~/projekti/radio-muse/web/themes/custom/indiere2/")
|
||||||
|
|
@ -11,35 +11,41 @@ general {
|
||||||
interval = 5
|
interval = 5
|
||||||
color_good = "#2AA198"
|
color_good = "#2AA198"
|
||||||
color_bad = "#586E75"
|
color_bad = "#586E75"
|
||||||
color_degraded = "#DC322F"
|
color_degraded = "#D79921"
|
||||||
separator = ""
|
separator = ""
|
||||||
}
|
}
|
||||||
|
|
||||||
order += "ipv6"
|
order += "wireless _first_"
|
||||||
order += "ethernet _first_"
|
order += "ethernet _first_"
|
||||||
|
order += "path_exists VPN"
|
||||||
|
order += "ipv6"
|
||||||
order += "disk /"
|
order += "disk /"
|
||||||
order += "disk /home"
|
order += "disk /home"
|
||||||
order += "wireless _first_"
|
|
||||||
order += "load"
|
order += "load"
|
||||||
order += "memory"
|
order += "memory"
|
||||||
order += "volume master"
|
order += "volume master"
|
||||||
order += "battery all"
|
order += "battery all"
|
||||||
order += "tztime local"
|
order += "tztime local"
|
||||||
|
|
||||||
|
path_exists VPN {
|
||||||
|
path = "/proc/sys/net/ipv4/conf/ppp0"
|
||||||
|
format = " %status"
|
||||||
|
}
|
||||||
|
|
||||||
wireless _first_ {
|
wireless _first_ {
|
||||||
#format_up = "W: (%quality at %essid) %ip"
|
#format_up = "W: (%quality at %essid) %ip"
|
||||||
format_up = " %essid %ip %bitrate "
|
format_up = " %essid %bitrate"
|
||||||
format_down = " "
|
format_down = " "
|
||||||
}
|
}
|
||||||
|
|
||||||
ethernet _first_ {
|
ethernet _first_ {
|
||||||
# if you use %speed, i3status requires root privileges
|
# if you use %speed, i3status requires root privileges
|
||||||
format_up = "E: %ip (%speed)"
|
format_up = " (%speed)"
|
||||||
format_down = "E: "
|
format_down = " "
|
||||||
}
|
}
|
||||||
|
|
||||||
battery all {
|
battery all {
|
||||||
format = " %status %percentage %remaining "
|
format = " %status %percentage %remaining "
|
||||||
status_bat = ""
|
status_bat = ""
|
||||||
status_chr = ""
|
status_chr = ""
|
||||||
status_full = ""
|
status_full = ""
|
||||||
|
|
@ -48,7 +54,7 @@ battery all {
|
||||||
}
|
}
|
||||||
|
|
||||||
tztime local {
|
tztime local {
|
||||||
format = "%d.%m.%Y %H:%M"
|
format = " %d.%m.%Y %H:%M "
|
||||||
}
|
}
|
||||||
|
|
||||||
load {
|
load {
|
||||||
|
|
@ -56,25 +62,25 @@ load {
|
||||||
}
|
}
|
||||||
|
|
||||||
disk "/" {
|
disk "/" {
|
||||||
format = " %avail"
|
format = " %avail"
|
||||||
}
|
}
|
||||||
|
|
||||||
disk "/home" {
|
disk "/home" {
|
||||||
format = " %avail "
|
format = " %avail "
|
||||||
}
|
}
|
||||||
|
|
||||||
ipv6 {
|
ipv6 {
|
||||||
format_up = "IPv6 up"
|
format_up = "IPv6 "
|
||||||
#format_down = "no IPv6"
|
format_down = "IPv6 "
|
||||||
}
|
}
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
format = " %used "
|
format = " %used "
|
||||||
}
|
}
|
||||||
|
|
||||||
volume master {
|
volume master {
|
||||||
device = "pulse"
|
device = "pulse"
|
||||||
format = " %volume"
|
format = " %volume "
|
||||||
format_muted = ""
|
format_muted = " "
|
||||||
mixer = "Master"
|
mixer = "Master"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
.zshrc
2
.zshrc
|
|
@ -97,6 +97,8 @@ alias srs='f(){ ssh jurijp@$1.radiostudent.local };f'
|
||||||
alias srr='f(){ ssh root@$1.radiostudent.local };f'
|
alias srr='f(){ ssh root@$1.radiostudent.local };f'
|
||||||
alias rss='f(){ ssh jurijp@$1.radiostudent.si };f'
|
alias rss='f(){ ssh jurijp@$1.radiostudent.si };f'
|
||||||
alias rsr='f(){ ssh root@$1.radiostudent.si };f'
|
alias rsr='f(){ ssh root@$1.radiostudent.si };f'
|
||||||
|
alias rs='ssh radiostudent.si'
|
||||||
|
alias rr='ssh root@radiostudent.si'
|
||||||
|
|
||||||
# Poslusaj snemanje
|
# Poslusaj snemanje
|
||||||
alias poslusaj='pactl load-module module-loopback latency_msec=1'
|
alias poslusaj='pactl load-module module-loopback latency_msec=1'
|
||||||
|
|
|
||||||
31
init.sh
31
init.sh
|
|
@ -1,12 +1,29 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Instaliraj vim plug!
|
# Instaliraj vim plug!
|
||||||
curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
if [ ! -f ~/.vim/autoload/plug.vim ]; then
|
||||||
|
curl -fLo ~/.vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||||
|
fi
|
||||||
|
|
||||||
# Zloudaj font (statusbar, emacs)
|
# Zloudaj font (statusbar, emacs)
|
||||||
mkdir ~/.fonts
|
if [ ! -d ~/.fonts ]; then
|
||||||
curl -fLo ~/.fonts/iosevka.zip https://github.com/be5invis/Iosevka/releases/download/v20.0.0/super-ttc-iosevka-ss01-20.0.0.zip
|
mkdir ~/.fonts
|
||||||
cd ~/.fonts
|
fi
|
||||||
unzip iosevka.zip
|
if [ ! -d ~/.fonts/iosevka ]; then
|
||||||
rm iosevka.zip
|
curl -fLo ~/.fonts/iosevka.zip https://github.com/be5invis/Iosevka/releases/download/v20.0.0/super-ttc-iosevka-ss01-20.0.0.zip
|
||||||
fc-cache -f
|
cd ~/.fonts || exit 1
|
||||||
|
unzip iosevka.zip
|
||||||
|
rm iosevka.zip
|
||||||
|
fc-cache -f
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Zloudaj gruvbox ikone
|
||||||
|
if [ ! -d ~/.icons ]; then
|
||||||
|
mkdir ~/.icons
|
||||||
|
fi
|
||||||
|
if [ ! -d ~/.icons/Gruvbox-Plus-Dark ]; then
|
||||||
|
curl -fLo ~/.icons/Gruvbox-Plus-Dark.zip https://github.com/SylEleuth/gruvbox-plus-icon-pack/releases/download/v4.0/gruvbox-plus-icon-pack-4.0.zip
|
||||||
|
cd ~/.icons || exit 1
|
||||||
|
unzip Gruvbox-Plus-Dark.zip
|
||||||
|
rm Gruvbox-Plus-Dark.zip
|
||||||
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue