diff --git a/.config/i3status/config b/.config/i3status/config index f93b5cc..7d30fc0 100644 --- a/.config/i3status/config +++ b/.config/i3status/config @@ -34,7 +34,7 @@ path_exists VPN { wireless _first_ { #format_up = "W: (%quality at %essid) %ip" - format_up = " %essid %bitrate" + format_up = "%ip  %essid %bitrate" format_down = " " } diff --git a/.emacs.d/config.org b/.emacs.d/config.org index 5c021f9..1257bc2 100644 --- a/.emacs.d/config.org +++ b/.emacs.d/config.org @@ -18,7 +18,7 @@ V primeru napak pri nalaganju ne pozabimo na uporaben ukaz ~emacs --debug-init~. ~debug-on-error~ uresničimo, če bi radi sprožili razhroščevalnik, kadar pride do napake (zelo priročno pri reševanju težav). #+begin_src emacs-lisp - ;(setq debug-on-error t) + (setq debug-on-error t) #+end_src Pospešimo zagon z zmanjšanjem frekvence zbiranja smeti (garbage collection). @@ -339,7 +339,10 @@ Paket za dopolnjevanje, nadomestek ~ivy~. Nudi nekoliko lepšo iskušnjo priporo #+begin_src emacs-lisp (use-package nerd-icons-completion - :init (nerd-icons-completion-mode)) + :after marginalia + :config + (nerd-icons-completion-mode) + :hook (marginalia-mode-hook . #'nerd-icons-completion-marginalia-setup)) #+end_src ** Iskanje @@ -429,12 +432,14 @@ Paziti pa moramo na verzije emacsa; zaznali smo težave pri mešanju emacs 30/29 #+begin_src emacs-lisp (use-package crdt :defer t + :after general :general (start/leader-keys "c" '(:ignore t :wk "crdt") - "c c" 'crdt-connect) - :general-config - (start/leader-keys + "c c" 'crdt-connect + ; "c c" 'crdt-connect) + ;:general-config + ;(start/leader-keys "c" '(:ignore t :wk "crdt") "c u" 'crdt-list-users "c s" 'crdt-share-buffer @@ -519,6 +524,7 @@ Dodamo tudi bližnjice za ~org-capture~ ter ~org-agenda~. TODO dodaj več! #+begin_src emacs-lisp + :after general :general (start/leader-keys "o" '(:ignore t :wk "orgmode") @@ -678,7 +684,8 @@ Naslov dokumenta ter naslove in podnaslove prikaži z drugimi pisavami in veliko (let* ((variable-tuple (cond ((x-list-fonts "ETBembo") '(:font "ETBembo")) ((x-list-fonts "Lucida Grande") '(:font "Lucida Grande")) - ((x-list-fonts "Verdana") '(:font "Verdana")) + ; tale pa ni free + ;((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.")))) (headline `(:inherit default :weight bold))) @@ -1400,17 +1407,19 @@ S sledečimi nastavitvami pospešimo delovanje. #+begin_src emacs-lisp (use-package cider - :general + :after clojure-mode + :general-config (start/leader-keys - :keymaps clojure-mode-map + :keymaps 'clojure-mode-map ;; EVAL ukazi "e" '(:ignore t :wk "eval") "e b" 'cider-eval-buffer + "e c" 'cider-connect "e e" 'cider-eval-dwim + "e j" 'cider-jack-in "e r" 'cider-eval-region "b e" 'cider-eval-buffer) - :config - (add-hook 'clojure-mode-hook (lambda () (local-set-key (kbd "C-") 'cider-eval-last-sexp)))) + (cider-mode-map "C-" 'cider-eval-last-sexp)) #+end_src * E-pošta diff --git a/.emacs.d/init.el b/.emacs.d/init.el index c841676..d275c1c 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -15,6 +15,9 @@ ; (funcall (-flip #'string-join) " ") ; (grep-find))) +;; Rabimo general.el za use-pakcage macroje +(require 'general) + ;;; Code: (org-babel-load-file "~/.emacs.d/config.org") @@ -78,33 +81,6 @@ '("ba323a013c25b355eb9a0550541573d535831c557674c8d59b9ac6aa720c21d3" default)) '(helm-minibuffer-history-key "M-p") - '(package-selected-packages - '(arduino-mode benchmark-init cider company counsel-projectile crdt - dashboard diminish direnv doom-modeline drupal-mode - editorconfig evil-collection evil-org extempore-mode - faceup fluxus-mode flycheck format-all geben - geiser-guile general gruvbox-theme guix helm helpful - htmlize jq-mode list-utils loop lsp-mode magit - marginalia mu4e mu4e-dashboard mu4e-marker-icons - nyan-mode ob-mermaid openwith orderless org-bullets - org-caldav org-projectile paredit pkg-info pos-tip - pyvenv racket-mode rainbow-delimiters restclient - rjsx-mode sclang-extensions shut-up slime - smartparens smex subed svg-icon tidal toml-mode - treemacs-projectile treesit-auto undo-tree - use-package vertico vue-mode w3m web-beautify - web-mode web-server which-key writeroom-mode - yaml-mode zone-nyan)) '(package-vc-selected-packages '((svg-icon :url "https://github.com/rougier/emacs-svg-icon"))) '(sclang-indent-level 2)) -(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. - '(org-document-title ((t (:inherit default :weight bold :font "Verdana" :height 2.0 :underline nil)))) - '(org-level-1 ((t (:inherit default :weight bold :font "Verdana" :height 1.75)))) - '(org-level-2 ((t (:inherit default :weight bold :font "Verdana" :height 1.45)))) - '(org-level-3 ((t (:inherit default :weight bold :font "Verdana" :height 1.25)))) - '(org-level-4 ((t (:inherit default :weight bold :font "Verdana" :height 1.1))))) diff --git a/applications/ardour8.desktop b/applications/ardour8.desktop new file mode 100644 index 0000000..e8c0860 --- /dev/null +++ b/applications/ardour8.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Ardour +Comment=Ardour Digital Audio Workstation +Exec=env PIPEWIRE_LATENCY=128/48000 pw-jack ardour8 %F +Icon=ardour8 +Terminal=false +MimeType=application/x-ardour; +Type=Application +Categories=AudioVideo;Audio;AudioEditing;X-Recorders;X-Multitrack;X-Jack; +StartupWMClass=Ardour +X-NMS-Capable=true +X-NMS-Exec=ardour8 diff --git a/guix/config.scm b/guix/config.scm index 7d45c32..025958b 100644 --- a/guix/config.scm +++ b/guix/config.scm @@ -63,35 +63,35 @@ %base-user-accounts)) (packages (append (list ;; Osnovni WM - (specification->package "i3-wm") - (specification->package "i3status") - (specification->package "dmenu") - (specification->package "st") + "i3-wm" + "i3status" + "dmenu" + "st" ;; sistem - (specification->package "lvm2") - (specification->pacakge "amdgpu-firmware") + "lvm2" + "amdgpu-firmware" ;; WM zadeve - (specification->package "sway") - (specification->package "swaybg") - (specification->package "rofi") - (specification->package "i3-autotiling") - (specification->package "waybar") - (specification->package "gammastep") - (specification->package "foot") - (specification->package "eog") - (specification->package "nautilus") + "sway" + "swaybg" + "rofi" + "i3-autotiling" + "waybar" + "gammastep" + "foot" + "eog" + "nautilus" ;; Urejevalniki teksta - (specification->package "emacs") - (specification->package "vim") + "emacs" + "vim" ;; Razno - (specification->package "zsh") - (specification->package "git") - (specification->package "file") + "zsh" + "git" + "file" ;; Napajanje, baterija ... - (specification->package "acpi") - (specification->package "file") + "acpi" + "file" ;; Za docker (ddev) - (specification->package "docker")) + "docker") %base-packages)) @@ -123,6 +123,11 @@ (list cups-filters hplip-minimal)))) ;; fastboot kot navadni user (udev-rules-service 'android android-udev-rules) + ;; dodatna imena gostiteljev + (simple-service 'extra-hosts + (list (host "192.168.0.88" "pi") + (host "192.168.0.200" "pinenote") + (host "194.249.242.45" "p1"))) (remove (lambda (service) (eq? network-manager-service-type (service-kind service))) diff --git a/guix/home/home-configuration.scm b/guix/home/home-configuration.scm index 992d100..d097da4 100644 --- a/guix/home/home-configuration.scm +++ b/guix/home/home-configuration.scm @@ -97,17 +97,19 @@ ;"emacs-tidal" "emacs-toml-mode" "emacs-yaml-mode" + "emacs-spinner" "emacs-arduino-mode" "emacs-lsp-mode" ;"emacs-mu4e" ;"emacs-mu4e-marker-icons" + "emacs-dashboard" "emacs-mu4e-dashboard" ;"emacs-mu4e-thread-folding" "emacs-nyan-mode" "emacs-svg-icon" "emacs-scel" - "emacs-spinner" "emacs-vertico" + "emacs-queue" "emacs-cider" ;; Splet @@ -302,6 +304,7 @@ (service home-files-service-type ;; Desktop file overrides; pw-jack za supercolider `((".local/share/applications/SuperColliderIDE.desktop" ,(local-file "../../applications/SuperColliderIDE.desktop")) + (".local/share/applications/ardour8.desktop" ,(local-file "../../applications/ardour8.desktop")) (".local/share/applications/emacsPW.desktop" ,(local-file "../../applications/emacsPW.desktop")))) ;; Razni dotfajli - konfiguracije (~/.config) (service home-xdg-configuration-files-service-type