diff --git a/.config/sway/config b/.config/sway/config index b1a798a..cb6a0bb 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -35,7 +35,7 @@ output eDP-1 { #output "*" background ~/Slike/Wallpapers/1596344206877.jpg fill #output "*" background "~/riz0m/Photos/sri lanka/IMG_20220220_120730.jpg" fill #output "*" background "~/Slike/☭/bigstock-Sutjeska-National-Park-Bosnia-63011269.jpg" fill -output "*" background "~/sredstva/dotfiles/ozadje2.jpg" fill +output "*" background "~/sredstva/dotfiles/ozadje4.jpg" fill # Zamik dobimo z SIRINA / SCALE output HDMI-A-2 pos 1601 0 scale 1 output HDMI-A-1 pos 1601 0 scale 1 @@ -94,6 +94,7 @@ bindsym $mod+d exec $menu # # name workspaces +set $w0 0: set $w1 1: set $w2 2: set $w3 3: @@ -103,7 +104,6 @@ set $w6 6: set $w7 7:✭❀❤♫ set $w8 8:☭ set $w9 9: -set $w0 0: # switch to workspace bindsym $mod+1 workspace $w1 @@ -355,6 +355,7 @@ exec ~/bin/autotiling.py exec gammastep -m wayland -l 46.05108:14.50513 # Zagoni programov razporejeni na workspejse +workspace 0: workspace 1: #exec firefox exec librewolf diff --git a/.emacs.d/config.org b/.emacs.d/config.org index 8a6f114..1dbacae 100644 --- a/.emacs.d/config.org +++ b/.emacs.d/config.org @@ -6,6 +6,13 @@ Razdeljena je na poglavja ohlapno glede na vlogo oz področje. Področja so neko V primeru napak pri nalaganju ne pozabimo na uporaben ukaz ~emacs --debug-init~. +* Bližnjice do drugih konfiguracij + +- [[file:~/.config/sway/config][Sway window manager]] +- [[file:~/.config/i3/config][i3 window manager]] +- shell: [[file:~/.zshrc][zshrc]], [[file:~/.profile][profile]], [[file:~/.bashrc][bashrc]] +- [[file:~/sredstva/dotfiles/guix/home/home-configuration.scm][guix home config]] + * Zagon ~debug-on-error~ uresničimo, če bi radi sprožili razhroščevalnik, kadar pride do napake (zelo priročno pri reševanju težav). @@ -598,12 +605,14 @@ V HTML org izvozu obarvaj bloke kode. * Grafični vmesnik -Barvna tema je [[https://github.com/greduan/emacs-theme-gruvbox][gruvbox]], v varjanti ~gruvbox-dark-soft~. +Barvna tema je [[https://github.com/greduan/emacs-theme-gruvbox][gruvbox]], v varjanti ~gruvbox-dark-soft~, s pisavo Iosevka. #+begin_src emacs-lisp (use-package gruvbox-theme :config (load-theme 'gruvbox-dark-soft t)) + + (set-frame-font "Iosevka Medium 11" nil t) #+end_src Modeline vrstica (v bufferjih spodaj) je iz doom emacsa. @@ -1197,15 +1206,106 @@ S sledečimi nastavitvami pospešimo delovanje. Emacs že vključuje ~mu4e~ ([[https://www.djcbsoftware.nl/code/mu/][mu]] za emacs), modul ki omogoča brskanje po prejeti e-pošti. Pred uporabo je treba konfigurirati nekaj več stvari, potrebujemo recimo ~isync~ za pridobivanje pošte (tudi starejši ~mbsync~ je vredu), program ~mu~ za indeksiranje prejetih mejlov, oba pa tudi primerno nastavljena. -** isync +** Prejemanje +*** isync -TODO +**** Namestitev -** mu +Najprej namestimo isync. Primer za guix ter debian. -TODO +#+begin_src sh + guix install isync + sudo apt install isync +#+end_src -** mu4e +**** Konfiguracija +Konfiguriramo ga v ~~/.mbsyncrc~. Primer je za dva poštna nabiralnika, ki bosta shranjena znotraj ~~/.mail~. + +#+begin_src + +Create Both +Expunge Both +SyncState * + +MaildirStore local +Path ~/.mail/ +Trash Trash + +IMAPAccount acc1 +Host host1.org +User u1 +PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mailpass.acc1.gpg" +SSLType IMAPS + +IMAPAccount acc2 +Host mail.kompot.si +User u2 +PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.mailpass.acc2.gpg" +SSLType IMAPS + +IMAPStore acc1-remote +Account acc1 + +IMAPStore acc2-remote +Account acc2 + +MaildirStore acc2-local +Subfolders Verbatim +Path ~/.mail/acc2 +Inbox ~/.mail/acc2/inbox + +MaildirStore acc1-local +Subfolders Verbatim +Path ~/.mail/acc1 +Inbox ~/.mail/acc1/inbox + +Channel acc1-default +Far :acc1-remote: +Near :acc1-local: + +Channel acc2-default +Far :acc2-remote: +Near :acc2-local: +Create Both +SyncState * +Sync All + +Group user +Channel acc1-default +Channel acc2-default + +#+end_src + +***** Kriptiranje gesel +Ker sta gesli za mejle shranjeni kriptirani z gpg, ju najprej kar v navadnem tekstu shranimo v ~~/.mailpass.acc1~ ter ~~/.mailpass.acc2~, nato pa poženemo: + +#+begin_src sh + gpg -c ~/.mailpass.rs.gpg + gpg -c ~/.mailpass.kompot.gpg +#+end_src + +*** mu + +Najprej namestimo (guix oz. debian): + +#+begin_src sh + guix install mu + sudo apt install mu +#+end_src + +Nato inicializiramo. + +#+begin_src sh + mu init --maildir=~/.mail --my-address=u1@host1.org --my-address=u2@kompot.si +#+end_src + +Indeksiramo s sledečim ukazom ali pa kar iz dashboarda ~mu4e~: + +#+begin_src sh + mu index +#+end_src + +*** mu4e Vključimo paket in nastavimo ukaz za pridobivanje mejlov, ki ga sproži ~mu4e~. @@ -1226,6 +1326,8 @@ Preglednost lahko izboljšamo s paketom za ikone. (mu4e-marker-icons-mode 1)) #+end_src +**** Dodatki + ~mu4e-dashboard~ omogoča pripravo "nadzorne plošče", torej domačega zaslona pregleda mejlov, ki je pravzaprav ORG dokument z ~mu4e~ poizvedbami. Recimo, da prikaže koliko imamo skupno neprebranih sporočil in pa da skočimo na skupek vseh z zastavico označenih sporočil. #+begin_src emacs-lisp @@ -1234,9 +1336,19 @@ Preglednost lahko izboljšamo s paketom za ikone. :vc "https://github.com/rougier/mu4e-dashboard") #+end_src +~mu4e-thread-folding~ nam skrči niti v posamezne vrstice, ki jih lahko razširimo. + +#+begin_src emacs-lisp + (use-package svg-icon + :vc (svg-icon :url "https://github.com/rougier/emacs-svg-icon")) + (use-package mu4e-thread-folding + :after mu4e + :vc (mu4e-thread-folding :url "https://github.com/rougier/mu4e-thread-folding")) +#+end_src + TODO spisat dodatne konfiguracije, tega še ne uporabljam res. -** Primeri za (i)zgled +*** Primeri za (i)zgled Zanimivi paketi: - dashboard: https://github.com/rougier/mu4e-dashboard @@ -1249,6 +1361,16 @@ Pedenanje izgleda: - nano-mu4e: https://github.com/rougier/nano-emacs/blob/master/nano-mu4e.el - system crafters o emacs emailu: https://www.youtube.com/watch?v=yZRyEhi4y44&list=PLEoMzSkcN8oM-kA19xOQc8s0gr0PpFGJQ +** Pošiljanje +#+begin_src emacs-lisp +(require 'smtpmail) +(setq send-mail-function 'smtpmail-send-it + smtpmail-smtp-server "kompot.si" + smtpmail-stream-type 'ssl + smtpmail-auth-credentials "~/.mailpass.kompot.gpg" + smtpmail-stream-type 'starttls + smtpmail-smtp-service 587) +#+end_src * Razno Zone nyancat! diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 1434be0..721a5ec 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,5 +1,12 @@ -;;; -*- lexical-binding: t -*- -;; Naloži konfiguracije iz ORG datoteke +;;; init --- naloži org konfiguracijo in še kaj -*- lexical-binding: t -*- + +;;; Commentary: +;; Naloži konfiguracije iz ORG datoteke, ostanki nerazvrščenih zadev +;; ter kustomizacije. + +(setq warning-minimum-level :error) + +;;; Code: (org-babel-load-file "~/.emacs.d/config.org") ;;;;;;;;;;; @@ -16,6 +23,7 @@ ;; ELISP test (defun odpri-dnevnik () + "Dodaj dnevniški zapis v tmp folder sistema." (interactive) (find-file (format-time-string "/tmp/%Y-%m-%d_dnevnik.org")) (insert (concat "\n=====================\n" @@ -50,7 +58,7 @@ ;; Bolj fajni IELM REPL (defun g-ielm-init-history () - "Persistent ielm history." + "Obstojna ielm zgodovina." (let ((path (expand-file-name "ielm/history" user-emacs-directory))) (make-directory (file-name-directory path) t) (setq-local comint-input-ring-file-name path)) @@ -58,6 +66,7 @@ (setq-local comint-input-ignoredups t) (comint-read-input-ring)) (defun g-ielm-write-history (&rest _args) + "Tole je povezano z obstojno ielm zgodovino." (with-file-modes #o600 (comint-write-input-ring))) (use-package ielm @@ -106,63 +115,19 @@ ;; 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 - '("db3e80842b48f9decb532a1d74e7575716821ee631f30267e4991f4ba2ddf56e" - "d14f3df28603e9517eb8fb7518b662d653b25b26e83bd8e129acea042b774298" - "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" - default)) - '(iswitchb-mode t) - '(org-agenda-files - '("/home/g1smo/org/todo.org" - "/home/g1smo/rs/org/2021-05-25-spletna-stran.org" - "/home/g1smo/rs/org/2021-07-02-spletna.org" - "/home/g1smo/rs/org/README.org" - "/home/g1smo/rs/org/git-delavnica.org" - "/home/g1smo/rs/org/irs-plan-period.org" - "/home/g1smo/rs/org/irs-plan.org" "/home/g1smo/rs/org/irs.org" - "/home/g1smo/rs/org/irs_old.org" "/home/g1smo/rs/org/kaki.org" - "/home/g1smo/rs/org/prepoznava-komadov.org")) - '(package-selected-packages - '(scheme-mode direnv svg-lib slime org-pandoc-import mu4e org-mode - restclient php-ts-mode org-bullets magit-todos - treesit-auto eat zone-nyan yaml-mode writeroom-mode - which-key web-mode web-beautify vue-mode undo-tree - treemacs-projectile treemacs-evil toml-mode tidal - subed smex smartparens sclang-extensions rjsx-mode rg - rainbow-delimiters racket-mode quelpa-use-package - pyvenv org-caldav openwith ob-mermaid - mu4e-marker-icons mu4e-dashboard magit lsp-mode - htmlize helpful guix gruvbox-theme general - geiser-guile format-all flycheck fluxus-mode - extempore-mode evil-org evil-collection editorconfig - drupal-mode doom-modeline dashboard crdt - counsel-projectile company benchmark-init - arduino-mode all-the-icons 2bit)) - '(tool-bar-mode nil) - '(warning-minimum-level :error) - '(which-key-mode t)) + '(package-vc-selected-packages + '((svg-icon :url "https://github.com/rougier/emacs-svg-icon")))) (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 SS01" :foundry "BE5N" :slant normal :weight semi-bold :height 120 :width normal)))) - '(line-number ((t (:background "#32302f" :foreground "#7c6f64")))) - '(line-number-current-line ((t (:background "#32302f" :foreground "#fe8019")))) - '(org-block ((t (:extend t :background "#3c3836")))) - '(org-code ((t (:foreground "#dd6f48")))) '(org-document-title ((t (:inherit default :weight bold :family "Sans Serif" :height 2.0 :underline nil)))) '(org-level-1 ((t (:inherit default :weight bold :family "Sans Serif" :height 1.75)))) '(org-level-2 ((t (:inherit default :weight bold :family "Sans Serif" :height 1.45)))) '(org-level-3 ((t (:inherit default :weight bold :family "Sans Serif" :height 1.25)))) - '(org-level-4 ((t (:inherit default :weight bold :family "Sans Serif" :height 1.1)))) - '(org-level-5 ((t (:extend nil :weight bold :family "Sans Serif")))) - '(org-level-6 ((t (:inherit default :weight bold :foreground "#DCDCCC" :family "Sans Serif")))) - '(org-level-7 ((t (:inherit default :weight bold :foreground "#DCDCCC" :family "Sans Serif")))) - '(org-level-8 ((t (:inherit default :weight bold :foreground "#DCDCCC" :family "Sans Serif")))) - '(org-verbatim ((t (:foreground "#fb4933")))) - '(window-divider-first-pixel ((t (:foreground "#626262"))))) + '(org-level-4 ((t (:inherit default :weight bold :family "Sans Serif" :height 1.1))))) ;; supercollider mode load diff --git a/.emacs.d/projectile-bookmarks.eld b/.emacs.d/projectile-bookmarks.eld index b0600c5..2801554 100644 --- a/.emacs.d/projectile-bookmarks.eld +++ b/.emacs.d/projectile-bookmarks.eld @@ -1 +1 @@ -("~/sredstva/dotfiles/" "~/projekti/kegel/" "~/projekti/jugofuturizem/" "~/projekti/mobilizon/" "~/projekti/hm/" "~/projekti/PIfcamp 2021/" "/sshx:jurijp@dev.radiostudent.si:/var/www/new.radiostudent.si/" "~/projekti/glasbeni-indeks/" "~/projekti/PIXELSYNTH/" "~/kompot/Kompot/" "~/projekti/radio-muse/" "~/projekti/radio-muse/web/themes/custom/indiere2/") \ No newline at end of file +("~/projekti/radiostudent-d8/" "~/projekti/jugofuturizem/" "~/sredstva/dotfiles/" "~/projekti/waveywind/" "~/projekti/emacs.si/" "~/projekti/kegel/" "~/projekti/mobilizon/" "~/projekti/hm/" "~/projekti/PIfcamp 2021/" "/sshx:jurijp@dev.radiostudent.si:/var/www/new.radiostudent.si/" "~/projekti/glasbeni-indeks/" "~/projekti/PIXELSYNTH/" "~/kompot/Kompot/" "~/projekti/radio-muse/" "~/projekti/radio-muse/web/themes/custom/indiere2/") \ No newline at end of file diff --git a/.zshrc b/.zshrc index eeb119c..8fa2a2a 100644 --- a/.zshrc +++ b/.zshrc @@ -140,6 +140,8 @@ alias powersave="sudo cpupower frequency-set -g powersave" alias powerfull="sudo cpupower frequency-set -g ondemand" alias imgcrop1920="mogrify -resize 1920x1920 " +alias ustvari-drupal="composer create-project drupal/recommended-project " + # Za LXD! if command -v go &> /dev/null; then diff --git a/config.scm b/guix/config.scm similarity index 100% rename from config.scm rename to guix/config.scm diff --git a/guix/home/.bash_logout b/guix/home/.bash_logout new file mode 100644 index 0000000..de4f5f7 --- /dev/null +++ b/guix/home/.bash_logout @@ -0,0 +1,7 @@ +# ~/.bash_logout: executed by bash(1) when login shell exits. + +# when leaving the console clear the screen to increase privacy + +if [ "$SHLVL" = 1 ]; then + [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q +fi diff --git a/guix/home/.bashrc b/guix/home/.bashrc new file mode 100644 index 0000000..9360f69 --- /dev/null +++ b/guix/home/.bashrc @@ -0,0 +1,113 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color|*-256color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + #alias dir='dir --color=auto' + #alias vdir='vdir --color=auto' + + #alias grep='grep --color=auto' + #alias fgrep='fgrep --color=auto' + #alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +#alias ll='ls -l' +#alias la='ls -A' +#alias l='ls -CF' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi diff --git a/guix/home/home-configuration.scm b/guix/home/home-configuration.scm new file mode 100644 index 0000000..0eff78a --- /dev/null +++ b/guix/home/home-configuration.scm @@ -0,0 +1,98 @@ +;; This "home-environment" file can be passed to 'guix home reconfigure' +;; to reproduce the content of your profile. This is "symbolic": it only +;; specifies package names. To reproduce the exact same profile, you also +;; need to capture the channels being used, as returned by "guix describe". +;; See the "Replicating Guix" section in the manual. + +(use-modules (gnu home) + (gnu packages) + (gnu services) + (guix gexp) + (gnu home services shells)) + +(home-environment + ;; Below is the list of packages that will show up in your + ;; Home profile, under ~/.guix-home/profile. + (packages (specifications->packages (list "element-desktop" + "emacs-next-pgtk-xwidgets" + "nyxt" + "gnome-tweaks" + "calibre" + "arc-theme" + "nautilus" + "thunar" + "numix-gtk-theme" + "wine64" + "guile-goblins" + "xdg-desktop-portal" + "transmission:gui" + "transmission" + "nicotine+" + "gammastep" + "hyprland" + "mako" + "gimp-resynthesizer" + "gzdoom" + "irssi" + "gnubg" + "freegish" + "eog" + "qpwgraph" + "libreoffice" + "evince" + "krita" + "kigo" + "keepassxc" + "gedit" + "gimp" + "seahorse" + "pavucontrol" + "guile-chickadee" + "inkscape" + "pipewire" + "gdk-pixbuf-xlib" + "i3status" + "kitty" + "mesa-utils" + "mesa" + "foot" + "i3-wm" + "tumbler" + "gdk-pixbuf" + "mu" + "rust" + "sway" + "rofi-wayland" + "xorg-server-xwayland" + "non-mixer" + "swaybg" + "gnupg" + "wfetch" + "emacs-next-pgtk" + "guile3-dbd-mysql" + "artanis" + "texlive-etbb" + "hyfetch" + "guile3-dbd-sqlite3" + "guile3-dbi" + "surfraw" + "valgrind" + "guile-readline" + "emacs-scel" + "xxd" + "basu" + "icedove-wayland" + "icedove-l10n:sl" + "guile" + "nss-certs" + "glibc-locales"))) + + ;; Below is the list of Home services. To search for available + ;; services, run 'guix home search KEYWORD' in a terminal. + (services + (list (service home-bash-service-type + (home-bash-configuration + (aliases '(("ls" . "ls --color=auto"))) + (bashrc (list (local-file "home/.bashrc" "bashrc"))) + (bash-logout (list (local-file "home/.bash_logout" + "bash_logout")))))))) diff --git a/manifest.scm b/guix/manifest.scm similarity index 100% rename from manifest.scm rename to guix/manifest.scm diff --git a/ozadje2.jpg b/ozadje2.jpg index 74d9961..191af65 100644 Binary files a/ozadje2.jpg and b/ozadje2.jpg differ diff --git a/ozadje4.jpg b/ozadje4.jpg new file mode 100644 index 0000000..c168800 Binary files /dev/null and b/ozadje4.jpg differ