From 8678e6b598da6a3bbec887b6eedca30f8efd129e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Mon, 9 Oct 2023 21:15:13 +0200 Subject: [PATCH] Posodobitve (UX305U) --- .emacs.d/bookmarks | 10 --- .emacs.d/init.el | 81 ++++++++++++++++++++++ .emacs.d/projectile-bookmarks.eld | 1 - .profile | 14 ++-- guix/.bash_profile | 14 ++++ guix/.bashrc | 64 ++++++++++++++++++ guix/home-configuration.scm | 108 ++++++++++++++++++++++++++++++ 7 files changed, 275 insertions(+), 17 deletions(-) create mode 100644 guix/.bash_profile create mode 100644 guix/.bashrc create mode 100644 guix/home-configuration.scm diff --git a/.emacs.d/bookmarks b/.emacs.d/bookmarks index 209aaa4..6efdaba 100644 --- a/.emacs.d/bookmarks +++ b/.emacs.d/bookmarks @@ -2,13 +2,3 @@ ;;; This format is meant to be slightly human-readable; ;;; nevertheless, you probably don't want to edit it. ;;; -*- End Of Bookmark File Format Version Stamp -*- -(("org-capture-last-stored" (filename . "~/org/zapiski.org") - (front-context-string . "** TODO Vrstni r") - (rear-context-string . "2024-01-05 pet]\n") (position . 661) - (last-modified 26008 34892 637157 892000)) -("FLUXUS navodilo" - (filename . "~/sredstva/fluxus/docs/fluxus-manual.[en].org") - (front-context-string . "#+TITLE: Fluxus:") (rear-context-string) - (position . 1) (last-modified 25693 29993 875550 300000)) -("IRS" (filename . "~/rs/megla-sync/org/irs.org")) -) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 00b6221..4c4ed8a 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -115,6 +115,87 @@ ;; 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. + '(connection-local-criteria-alist + '(((:application tramp) + tramp-connection-local-default-system-profile tramp-connection-local-default-shell-profile))) + '(connection-local-profile-alist + '((tramp-connection-local-darwin-ps-profile + (tramp-process-attributes-ps-args "-acxww" "-o" "pid,uid,user,gid,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "-o" "state=abcde" "-o" "ppid,pgid,sess,tty,tpgid,minflt,majflt,time,pri,nice,vsz,rss,etime,pcpu,pmem,args") + (tramp-process-attributes-ps-format + (pid . number) + (euid . number) + (user . string) + (egid . number) + (comm . 52) + (state . 5) + (ppid . number) + (pgrp . number) + (sess . number) + (ttname . string) + (tpgid . number) + (minflt . number) + (majflt . number) + (time . tramp-ps-time) + (pri . number) + (nice . number) + (vsize . number) + (rss . number) + (etime . tramp-ps-time) + (pcpu . number) + (pmem . number) + (args))) + (tramp-connection-local-busybox-ps-profile + (tramp-process-attributes-ps-args "-o" "pid,user,group,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "-o" "stat=abcde" "-o" "ppid,pgid,tty,time,nice,etime,args") + (tramp-process-attributes-ps-format + (pid . number) + (user . string) + (group . string) + (comm . 52) + (state . 5) + (ppid . number) + (pgrp . number) + (ttname . string) + (time . tramp-ps-time) + (nice . number) + (etime . tramp-ps-time) + (args))) + (tramp-connection-local-bsd-ps-profile + (tramp-process-attributes-ps-args "-acxww" "-o" "pid,euid,user,egid,egroup,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "-o" "state,ppid,pgid,sid,tty,tpgid,minflt,majflt,time,pri,nice,vsz,rss,etimes,pcpu,pmem,args") + (tramp-process-attributes-ps-format + (pid . number) + (euid . number) + (user . string) + (egid . number) + (group . string) + (comm . 52) + (state . string) + (ppid . number) + (pgrp . number) + (sess . number) + (ttname . string) + (tpgid . number) + (minflt . number) + (majflt . number) + (time . tramp-ps-time) + (pri . number) + (nice . number) + (vsize . number) + (rss . number) + (etime . number) + (pcpu . number) + (pmem . number) + (args))) + (tramp-connection-local-default-shell-profile + (shell-file-name . "/bin/sh") + (shell-command-switch . "-c")) + (tramp-connection-local-default-system-profile + (path-separator . ":") + (null-device . "/dev/null")))) + '(custom-safe-themes + '("db3e80842b48f9decb532a1d74e7575716821ee631f30267e4991f4ba2ddf56e" "d14f3df28603e9517eb8fb7518b662d653b25b26e83bd8e129acea042b774298" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default)) + '(iswitchb-mode t) + '(org-agenda-files + '("~/Dokumenti/todo.org" "/home/g1smo/Dokumenti/plac.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" "/home/g1smo/Dokumenti/agenda.org" "/home/g1smo/Dokumenti/blurb.org" "/home/g1smo/Dokumenti/delo.org" "/home/g1smo/Dokumenti/emanat.org" "/home/g1smo/Dokumenti/kompot.org" "/home/g1smo/Dokumenti/ljudmila.org" "/home/g1smo/Dokumenti/mu4e-setup.org" "/home/g1smo/Dokumenti/muska.org" "/home/g1smo/Dokumenti/org.org" "/home/g1smo/Dokumenti/projekti.org" "/home/g1smo/Dokumenti/recepti.org" "/home/g1smo/Dokumenti/samozaposlitev-prijava.org" "/home/g1smo/Dokumenti/shta.org" "/home/g1smo/Dokumenti/wtf.org" "/home/g1smo/Dokumenti/zapisi.org")) '(package-selected-packages '(2bit aggressive-indent all-the-icons arduino-mode benchmark-init company counsel-projectile crdt dap-mode dashboard direnv diff --git a/.emacs.d/projectile-bookmarks.eld b/.emacs.d/projectile-bookmarks.eld index 107d29d..e69de29 100644 --- a/.emacs.d/projectile-bookmarks.eld +++ b/.emacs.d/projectile-bookmarks.eld @@ -1 +0,0 @@ -("~/projekti/jugofuturizem/" "~/projekti/coopcycle-app/" "~/projekti/coopcycle-web/" "~/sredstva/dotfiles/" "~/projekti/waveywind/" "~/.local/share/SuperCollider/downloaded-quarks/MathLib/" "~/.local/share/SuperCollider/downloaded-quarks/SLIPDecoder/") \ No newline at end of file diff --git a/.profile b/.profile index 33e5e8d..5022cee 100644 --- a/.profile +++ b/.profile @@ -1,3 +1,5 @@ +. /etc/profile + # <3 default editor (za manjse urejanje) export EDITOR="vim" export VISUAL="vim" @@ -52,13 +54,13 @@ export GUILE_SITE_DIR="$HOME/.local/guile/site_dir" export XDG_CURRENT_DESKTOP=sway # Guix -export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" -export GUIX_PROFILE="$HOME/.guix-profile" -export XDG_DATA_DIRS="/usr/local/share:/usr/share:$XDG_DATA_DIRS" -export XDG_DATA_DIRS="${GUIX_PROFILE}/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" export GUIX_PACKAGE_PATH="$HOME/projekti/guix-paketi" -export PATH="$HOME/.config/guix/current/bin:$PATH" -. "$GUIX_PROFILE/etc/profile" +#export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" +#export GUIX_PROFILE="$HOME/.guix-profile" +#export XDG_DATA_DIRS="/usr/local/share:/usr/share:$XDG_DATA_DIRS" +#export XDG_DATA_DIRS="${GUIX_PROFILE}/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" +#export PATH="$HOME/.config/guix/current/bin:$PATH" +#. "$GUIX_PROFILE/etc/profile" # Loadamo sway na tty1! # If running from tty1 start sway diff --git a/guix/.bash_profile b/guix/.bash_profile new file mode 100644 index 0000000..7736e39 --- /dev/null +++ b/guix/.bash_profile @@ -0,0 +1,14 @@ +# Set up Guix Home profile +if [ -f ~/.profile ]; then . ~/.profile; fi + +# Honor per-interactive-shell startup file +if [ -f ~/.bashrc ]; then . ~/.bashrc; fi + +# Merge search-paths from multiple profiles, the order matters. +eval "$(guix package --search-paths \ +-p $HOME/.config/guix/current \ +-p $HOME/.guix-profile \ +-p /run/current-system/profile)" + +# Prepend setuid programs. +export PATH=/run/setuid-programs:$PATH diff --git a/guix/.bashrc b/guix/.bashrc new file mode 100644 index 0000000..df10255 --- /dev/null +++ b/guix/.bashrc @@ -0,0 +1,64 @@ +# Bash initialization for interactive non-login shells and +# for remote shells (info "(bash) Bash Startup Files"). + +# Export 'SHELL' to child processes. Programs such as 'screen' +# honor it and otherwise use /bin/sh. +export SHELL + +if [[ $- != *i* ]] +then + # We are being invoked from a non-interactive shell. If this + # is an SSH session (as in "ssh host command"), source + # /etc/profile so we get PATH and other essential variables. + [[ -n "$SSH_CLIENT" ]] && source /etc/profile + + # Don't do anything else. + return +fi + +# Source the system-wide file. +[ -f /etc/bashrc ] && source /etc/bashrc + + +source /etc/profile + +# Term compatibility +export TERM=rxvt-256color + +# Aliasi +alias ls='ls -p --color=auto' +alias ll='ls -l' +alias grep='grep --color=auto' +alias ls='ls --color -C' +alias vi='vim' +alias sudo='sudo env PATH=$PATH ' +alias ag="rg" +alias less="less -R" + +alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done" +alias sctl="systemctl" +alias ddrush="ddev exec drush" +alias dcomposer="ddev exec composer" +alias offer-files="python3 -m http.server" + +# X on wayland +alias wxon="xhost +local:" +alias kill-element='kill $(ps aux | grep element | awk '\''{print $2;}'\'')' +alias run-gamma="pkill -f gammastep; sleep 3; screen -dm -- gammastep -m wayland -l 46.05108:14.50513" + +# RŠ ssh +srs() { + ssh "jurijp@$1.radiostudent.local" +} +srr() { + ssh "root@$1.radiostudent.local" +} +rss() { + ssh "jurijp@$1.radiostudent.si" +} +rsr() { + ssh "root@$1.radiostudent.si" +} + +export BSD_GAMES_DIR=~/.local/share/bsd-games + diff --git a/guix/home-configuration.scm b/guix/home-configuration.scm new file mode 100644 index 0000000..6bd8e5a --- /dev/null +++ b/guix/home-configuration.scm @@ -0,0 +1,108 @@ +;; 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 "crawl-tiles" + "acpi" + "zynaddsubfx" + "gnome-tweaks" + "papirus-icon-theme" + "gimp" + "supercollider" + "ardour" + "slurp" + "wireplumber" + "pipewire" + "qjackctl" + "mplayer" + "ffmpeg" + "libcaca" + "kigo" + "lierolibre" + "transmission:gui" + "wine64" + "wine" + "audacity" + "numix-gtk-theme" + "nextcloud-client" + "nyxt" + "icedove-wayland" + "ungoogled-chromium-wayland" + "keepassxc" + "libappindicator" + "snixembed" + "vlc" + "emacs-next-pgtk" + "qpwgraph" + "pamixer" + "element-desktop" + "pavucontrol" + "libreoffice" + "mako" + "firefox" + "alacritty" + "gammastep" + "i3status" + "rofi-wayland" + "sway" + "wev" + "grim" + "xjackfreak" + "ncdu" + "bind:utils" + "python-i3ipc" + "python" + "screen" + "bibata-cursor-theme" + "ripgrep" + "brightnessctl" + "foot" + "jack" + "amb-plugins" + "fil-plugins" + "gnugo" + "bsd-games" + "file" + "nmap" + "font-fira-code" + "font-awesome" + "unzip" + "curl"))) + + ;; 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 '(("ag" . "rg") + ("dcomposer" . "ddev exec composer") + ("ddrush" . "ddev exec drush") + ("gitclean" . "git fetch -p && for branch in $(git branch -vv | grep '\\'': gone]'\\'' | gawk '\\''{print $1}'\\''); do git branch -D $branch; echo '\\''deleted $branch'\\''; done") + ("grep" . "grep --color=auto") + ("kill-element" . "kill $(ps aux | grep element | awk '\\''{print $2;}'\\'')") + ("less" . "less -R") + ("ll" . "ls -l") + ("ls" . "ls --color -C") + ("offer-files" . "python3 -m http.server") + ("run-gamma" . "pkill -f gammastep; sleep 3; screen -dm -- gammastep -m wayland -l 46.05108:14.50513") + ("sctl" . "systemctl") + ("sudo" . "sudo env PATH=$PATH ") + ("vi" . "vim") + ("wxon" . "xhost +local:"))) + (bashrc (list (local-file + "/home/g1smo/sredstva/dotfiles/guix/home.scm/.bashrc" + "bashrc"))) + (bash-profile (list (local-file + "/home/g1smo/sredstva/dotfiles/guix/home.scm/.bash_profile" + "bash_profile"))))))))