From 1e41a02aa61f4c6d20bcf4625e2d93f4340c7bc6 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Fri, 8 Dec 2023 14:50:54 +0100 Subject: [PATCH] Merge --- home/fuzzel/fuzzel.ini | 7 ++ home/git/config | 53 +++++++++ home/home-configuration.scm | 218 ++++++++++++++++++------------------ home/swaylock/config | 7 ++ home/tmux/tmux.conf | 31 +++++ 5 files changed, 209 insertions(+), 107 deletions(-) create mode 100644 home/fuzzel/fuzzel.ini create mode 100644 home/git/config create mode 100644 home/swaylock/config create mode 100644 home/tmux/tmux.conf diff --git a/home/fuzzel/fuzzel.ini b/home/fuzzel/fuzzel.ini new file mode 100644 index 0000000..d456062 --- /dev/null +++ b/home/fuzzel/fuzzel.ini @@ -0,0 +1,7 @@ +[main] +fields=filename,name,generic,exec +filter-desktop=false +layer=overlay +show-actions=true +terminal=kitty +width=100 diff --git a/home/git/config b/home/git/config new file mode 100644 index 0000000..c1d3add --- /dev/null +++ b/home/git/config @@ -0,0 +1,53 @@ +[commit] + gpgSign = true + +[core] + pager = "diff-so-fancy | less '--tabs=4' '-RFX'" + +[diff-so-fancy] + changeHunkIndicators = true + markEmptyLines = true + stripLeadingSymbols = true + useUnicodeRuler = true + +[gpg] + program = "gpg2" + +[interactive] + diffFilter = "diff-so-fancy --patch" + +[pull] + rebase = true + +[push] + autoSetupRemote = true + +[rebase] + autoStash = true + +[sendemail] + smtpencryption = "starttls" + smtpserver = "lyrion.ch" + smtpserverport = 465 + smtpuser = "dziltener" + +[sendemail "LMail"] + from = "dziltener@lyrion.ch" + smtpEncryption = "tls" + smtpServer = "lyrion.ch" + smtpUser = "dziltener" + +[sendemail "RedSky"] + from = "dz@redsky.io" + smtpEncryption = "ssl" + smtpServer = "smtp.gmail.com" + smtpServerPort = 465 + smtpUser = "dz@redsky.io" + +[tag] + gpgSign = true + +[user] + email = "dziltener@lyrion.ch" + name = "Daniel Ziltener" + signingKey = "37F655BAF43BC0FF300A91A1B38976E82C9DAE42" diff --git a/home/home-configuration.scm b/home/home-configuration.scm index 32558f3..d71774a 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -34,6 +34,7 @@ "direnv" "emacs" "emacs-direnv" + "diff-so-fancy" "fuzzel" "gammastep" "guile" @@ -55,110 +56,113 @@ "wlogout"))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. - (services - (list - (service home-shepherd-service-type) - (service home-msmtp-service-type - (home-msmtp-configuration - (accounts - (list - (msmtp-account - (name "LMail") - (configuration - (msmtp-configuration - (host "lyrion.ch") - (port 587) - (user "dziltener") - (password-eval "pass Privat/Mailaccount | head -n 1")))) - (msmtp-account - (name "Red Sky") - (configuration - (msmtp-configuration - (host "gmail.com") - (port 587) - (user "dz@redsky.io") - (password-eval "pass Privat/RedSkyGMail")))))))) - (simple-service 'ziltis-environment-variable-service - home-environment-variables-service-type - `(("PATH" . "$PATH:~/.local/bin") - ("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store") - ("SSH_ASKPASS" . "ksshaskpass") - ("ELM_DISPLAY" . "wl") - ("SDL_VIDEODRIVER" . "wayland") - ("MOZ_ENABLE_WAYLAND" . "1") - ("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt") - ("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc") - ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs") - ("CHICKEN_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs") - ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local"))) - (simple-service 'ziltis-home-files-service - home-files-service-type - `(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")))) - (simple-service 'ziltis-xdg-configuration-files-service - home-xdg-configuration-files-service-type - `(("sway/config" ,(local-file "./sway/sway")) - ("waybar/config" ,(local-file "./waybar/config")) - ("waybar/style.css" ,(local-file "./waybar/style.css")) - ("emacs/init.el" ,(local-file "./emacs/init.el")) - ("emacs/init.org" ,(local-file "./emacs/init.org")) - ("emacs/templates" ,(local-file "./emacs/templates")) - ("kitty/kitty.conf" ,(local-file "./kitty/kitty.conf")) - ("senpai/senpai.scfg" ,(local-file "./senpai/senpai.scfg")))) - (service home-bash-service-type - (home-bash-configuration - (aliases - '(("hh" . "hstr") - ("l" . "ls -alh") - ("ll" . "ls -l") - ("ls" . "ls --color=tty"))) - (bashrc - (list - (local-file - "./.bashrc" - "bashrc"))) - (bash-profile - (list - (local-file - "./.bash_profile" - "bash_profile"))))) - (service home-batsignal-service-type - (home-batsignal-configuration - (ignore-missing? #t))) - (service home-mcron-service-type - (home-mcron-configuration - (jobs - '()))) - (simple-service 'ziltis-channels - home-channels-service-type - (list - (channel - (name 'ziltis-channel) - (url "https://gitea.lyrion.ch/zilti/guixchannel")) - (channel - (name 'nongnu-guix) - (url "https://gitlab.com/nonguix/nonguix")))) - (service home-openssh-service-type - (home-openssh-configuration - (hosts - (list - (openssh-host - (name "www.opencode.net") - (host-name "www.opencode.net") - (user "git") - (identity-file "~/.ssh/personal_ed")) - (openssh-host - (name "gitea.lyrion.ch") - (host-name "gitea.lyrion.ch") - (user "git") - (port 7920) - (identity-file "~/.ssh/personal_ed")))))) - (service home-gpg-agent-service-type - (home-gpg-agent-configuration - (pinentry-program - (file-append pinentry-qt "/bin/pinentry-qt")) - (ssh-support? #t) - (default-cache-ttl 7200) - (default-cache-ttl-ssh 7200) - (extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry"))) - (service home-dbus-service-type) - ))) + ( +services +(list + (service home-shepherd-service-type) + (service home-msmtp-service-type + (home-msmtp-configuration + (accounts + (list + (msmtp-account + (name "LMail") + (configuration + (msmtp-configuration + (host "lyrion.ch") + (port 587) + (user "dziltener") + (password-eval "pass Privat/Mailaccount | head -n 1")))) + (msmtp-account + (name "Red Sky") + (configuration + (msmtp-configuration + (host "gmail.com") + (port 587) + (user "dz@redsky.io") + (password-eval "pass Privat/RedSkyGMail")))))))) + (simple-service 'ziltis-environment-variable-service + home-environment-variables-service-type + `(("PATH" . "$PATH:~/.local/bin") + ("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store") + ("SSH_ASKPASS" . "ksshaskpass") + ("ELM_DISPLAY" . "wl") + ("SDL_VIDEODRIVER" . "wayland") + ("MOZ_ENABLE_WAYLAND" . "1") + ("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt") + ("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc") + ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs") + ("CHICKEN_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs") + ("CHICKEN_INSTALL_PREFIX" . "$HOME/.local"))) + (simple-service 'ziltis-home-files-service + home-files-service-type + `(#;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")))) + (simple-service 'ziltis-xdg-configuration-files-service + home-xdg-configuration-files-service-type + `(("sway/config" ,(local-file "./sway/sway")) + ("waybar/config" ,(local-file "./waybar/config")) + ("waybar/style.css" ,(local-file "./waybar/style.css")) + ("fuzzel/fuzzel.ini" ,(local-file "./fuzzel/fuzzel.ini")) + ("git/config" ,(local-file "./git/config")) + ("emacs/init.el" ,(local-file "./emacs/init.el")) + ("emacs/init.org" ,(local-file "./emacs/init.org")) + ("emacs/templates" ,(local-file "./emacs/templates")) + ("kitty/kitty.conf" ,(local-file "./kitty/kitty.conf")) + ("senpai/senpai.scfg" ,(local-file "./senpai/senpai.scfg")))) + (service home-bash-service-type + (home-bash-configuration + (aliases + '(("hh" . "hstr") + ("l" . "ls -alh") + ("ll" . "ls -l") + ("ls" . "ls --color=tty"))) + (bashrc + (list + (local-file + "./.bashrc" + "bashrc"))) + (bash-profile + (list + (local-file + "./.bash_profile" + "bash_profile"))))) + (service home-batsignal-service-type + (home-batsignal-configuration + (ignore-missing? #t))) + (service home-mcron-service-type + (home-mcron-configuration + (jobs + '()))) + (simple-service 'ziltis-channels + home-channels-service-type + (list + (channel + (name 'ziltis-channel) + (url "https://gitea.lyrion.ch/zilti/guixchannel")) + (channel + (name 'nongnu-guix) + (url "https://gitlab.com/nonguix/nonguix")))) + (service home-openssh-service-type + (home-openssh-configuration + (hosts + (list + (openssh-host + (name "www.opencode.net") + (host-name "www.opencode.net") + (user "git") + (identity-file "~/.ssh/personal_ed")) + (openssh-host + (name "gitea.lyrion.ch") + (host-name "gitea.lyrion.ch") + (user "git") + (port 7920) + (identity-file "~/.ssh/personal_ed")))))) + (service home-gpg-agent-service-type + (home-gpg-agent-configuration + (pinentry-program + (file-append pinentry-qt "/bin/pinentry-qt")) + (ssh-support? #t) + (default-cache-ttl 7200) + (default-cache-ttl-ssh 7200) + (extra-content "grab\nallow-emacs-pinentry\nallow-loopback-pinentry"))) + (service home-dbus-service-type) + ))) diff --git a/home/swaylock/config b/home/swaylock/config new file mode 100644 index 0000000..a1421e6 --- /dev/null +++ b/home/swaylock/config @@ -0,0 +1,7 @@ +clock +effect-blur=7x5 +effect-vignette=0.5:0.5 +fade-in=3 +grace=3 +indicator-idle-visible +screenshots diff --git a/home/tmux/tmux.conf b/home/tmux/tmux.conf new file mode 100644 index 0000000..b686310 --- /dev/null +++ b/home/tmux/tmux.conf @@ -0,0 +1,31 @@ +# ============================================= # +# Start with defaults from the Sensible plugin # +# --------------------------------------------- # +# FIXME: port the plugin to guix, then fix path +run-shell /share/tmux-plugins/sensible/sensible.tmux +# ============================================= # + +set -g default-terminal "screen" +set -g base-index 0 +setw -g pane-base-index 0 + + + + + +set -g status-keys emacs +set -g mode-keys emacs + + + + + + + +set -g mouse on +setw -g aggressive-resize off +setw -g clock-mode-style 12 +set -s escape-time 500 +set -g history-limit 2000 + +set-option -sa terminal-overrides ",xterm*:Tc" \ No newline at end of file