diff options
| -rw-r--r-- | .config/alacritty/alacritty.toml | 2 | ||||
| -rw-r--r-- | .config/emacs/init.el | 133 | ||||
| -rw-r--r-- | .xinitrc | 10 | ||||
| -rw-r--r-- | guix/home.scm | 14 | ||||
| -rw-r--r-- | guix/system-create.scm | 9 | ||||
| -rw-r--r-- | guix/uranus.scm | 4 |
6 files changed, 80 insertions, 92 deletions
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index a434c6b..fb15bfc 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,5 +1,5 @@ [window] -opacity = 0.6 +opacity = 0.8 [colors] primary.background="#1d1f21" diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 5133715..183ccc3 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -41,26 +41,28 @@ (defvar is-zeus (string= (system-name) "zeus")) (defvar is-hermes (string= (system-name) "hermes")) (defvar is-phone (string= (system-name) "localhost")) +(defvar is-uranus (string= (system-name) "uranus")) ;; Font (custom-set-faces - (if is-hermes '(default ((t (:inherit nil :height 130 :family "Jetbrains Mono")))) - '(default ((t (:inherit nil :height 140 :family "Jetbrains Mono"))))) - '(variable-pitch ((t (:inherit t :height 140 :family "Iosevka Aile")))) + (if is-hermes '(default ((t (:inherit nil :height 130 :family "Fira Mono")))) + '(default ((t (:inherit nil :height 140 :family "Fira Mono"))))) + '(variable-pitch ((t (:inherit t :height 140 :family "Fira Mono")))) '(org-modern-symbol ((t (:inherit t :family "Iosevka Aile"))))) -(set-fontset-font t 'greek (font-spec :family "Iosevka Aile" :size 20)) - ;; Autoinsert (auto-insert-mode 1) (setq auto-insert-alist '((python-mode . "python.template")) auto-insert-directory (locate-user-emacs-file "insert")) +;; Completions (add-to-list 'completion-styles 'initials t) - (setf tab-always-indent 'complete) +;; Search +(setf search-default-mode #'char-fold-to-regexp) ;; make it easier to search Greek chars + ;; xref (setf xref-show-xrefs-function #'consult-xref xref-show-definitions-function #'consult-xref) @@ -413,60 +415,61 @@ (use-package org-roam-ui :defer t) -(use-package modus-themes - :straight t - :config - (setf modus-themes-italic-constructs nil - modus-themes-bold-constructs nil - modus-themes-mixed-fonts nil - modus-themes-variable-pitch-ui nil - modus-themes-custom-auto-reload t - modus-themes-disable-other-themes t - modus-themes-prompts '(italic) - modus-themes-completions '((matches . (extrabold)) - (selection . (semibold italic text-also underline))) - modus-themes-org-blocks 'tinted-background) - ;; Palette overrides - (setf modus-themes-common-palette-overrides - '((fg-line-number-active cyan-intense) - ;; (bg-main "#1d2021") ;;grubox-hard - ;; (bg-main "#191919") ;; 1337 - ;; (bg-main "#1d1f21") ;; tomorrow night - ;; (bg-main "#151515") ;; jazz - ;; (bg-main "#0C0C0C") ;; random black - ;; (bg-main "#171717") ;; badger - ;; (overline-heading-1 gold) - (fg-heading-1 red-warmer) - ;; (bg-heading-1 bg-blue-nuanced) - (bg-line-number-inactive unspecified) - (bg-line-number-active unspecified) - (bg-paren-match bg-magenta-intense) - (underline-paren-match fg-main) - (underline-err red-intense) - (underline-warning yellow-faint) - (underline-note cyan-faint) - (string "#86B187") - (border-mode-line-active unspecified) - (border-mode-line-inactive unspecified) - (bg-mode-line-active "#433F4f") ;; subtle lavender - (bg-mode-line-inactive "#1D1D1D") - ;; set fg from badger theme - (fg-mode-line-active "#F6F3E8") - (bg-hl-line bg-dim) - (cursor slate) - (prose-todo green-intense) - (prose-done bg-term-white) - (fg-prompt yellow-faint) - ,@modus-themes-preset-overrides-intense)) - ;; Headings - (setf modus-themes-headings - '((1 . (ultrabold 1.35)) - (2 . (semibold 1.2)) - (agenda-date . (1.3)) - (agenda-structure . (variable-pitch light 1.8)) - (t . (1.15)))) - ;; Load modus - (load-theme 'modus-vivendi t)) +(unless (or is-phone is-uranus) + (use-package modus-themes + :straight t + :config + (setf modus-themes-italic-constructs nil + modus-themes-bold-constructs nil + modus-themes-mixed-fonts nil + modus-themes-variable-pitch-ui nil + modus-themes-custom-auto-reload t + modus-themes-disable-other-themes t + modus-themes-prompts '(italic) + modus-themes-completions '((matches . (underline)) + (selection . (semibold italic text-also underline))) + modus-themes-org-blocks 'tinted-background) + ;; Palette overrides + (setf modus-themes-common-palette-overrides + '((fg-line-number-active cyan-intense) + ;; (bg-main "#1d2021") ;;grubox-hard + ;; (bg-main "#191919") ;; 1337 + ;; (bg-main "#1d1f21") ;; tomorrow night + ;; (bg-main "#151515") ;; jazz + ;; (bg-main "#0C0C0C") ;; random black + ;; (bg-main "#171717") ;; badger + ;; (overline-heading-1 gold) + (fg-heading-1 red-warmer) + ;; (bg-heading-1 bg-blue-nuanced) + (bg-line-number-inactive unspecified) + (bg-line-number-active unspecified) + (bg-paren-match bg-magenta-intense) + (underline-paren-match fg-main) + (underline-err red-intense) + (underline-warning yellow-faint) + (underline-note cyan-faint) + (string "#86B187") + (border-mode-line-active unspecified) + (border-mode-line-inactive unspecified) + (bg-mode-line-active "#433F4f") ;; subtle lavender + (bg-mode-line-inactive "#1D1D1D") + ;; set fg from badger theme + (fg-mode-line-active "#F6F3E8") + (bg-hl-line bg-dim) + (cursor slate) + (prose-todo green-intense) + (prose-done bg-term-white) + (fg-prompt yellow-faint) + ,@modus-themes-preset-overrides-intense)) + ;; Headings + (setf modus-themes-headings + '((1 . (ultrabold 1.35)) + (2 . (semibold 1.2)) + (agenda-date . (1.3)) + (agenda-structure . (variable-pitch light 1.8)) + (t . (1.15)))) + ;; Load modus + (load-theme 'modus-vivendi t))) (use-package vertico :ensure t @@ -662,6 +665,9 @@ rss.xml" anna piracy) corfu-echo-mode t) (setf indent-tabs-mode nil)) +(when (or is-phone is-uranus) + (use-package corfu-terminal)) + (defun insert-brackets (&optional arg) "Insert ARG brackets." (interactive "P") @@ -1282,7 +1288,8 @@ Create a temporary frame to execute BODY, which will then be deleted." (add-variable-watcher 'wallpaper-current #'thanos/wallpaper-watcher) ;; Set wallpaper -(thanos/wallpaper-startup) +(when (or is-zeus is-hermes) + (thanos/wallpaper-startup)) (defvar-keymap thanos/applications-map :doc "Thanos commonly used programs" @@ -1360,6 +1367,10 @@ Create a temporary frame to execute BODY, which will then be deleted." (dotimes (i (1+ (- end str))) (insert (format "%s" (+ i str))) (org-return))) + +(use-package greek-polytonic + :straight (greek-polytonic :local-repo "~/Dev/emacs-lisp/greek-polytonic")) + (require 'server) (unless (server-running-p) (server-start)) diff --git a/.xinitrc b/.xinitrc deleted file mode 100644 index 385cdc1..0000000 --- a/.xinitrc +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -source /etc/profile - -export PATH="/usr/bin:$PATH" -export XDG_SESSION_TYPE="x11" -export SBCL_HOME=/usr/lib64/sbcl - -/usr/bin/qtile start -#/usr/local/bin/stumpwm diff --git a/guix/home.scm b/guix/home.scm index a750eeb..7522465 100644 --- a/guix/home.scm +++ b/guix/home.scm @@ -1,8 +1,4 @@ -;; 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. +;; Welcome to my ~ (define-module (home) #:use-module (guix gexp) @@ -24,7 +20,7 @@ (define thanos/fonts-packages '("font-jetbrains-mono" "font-iosevka-aile" "font-fira-mono" - "font-google-noto-sans-cjk" "font-iosevka")) + "font-fira-code" "font-google-noto-sans-cjk" "font-iosevka")) (define thanos/emacs-packages @@ -38,13 +34,13 @@ (home-environment (packages (specifications->packages - (append '("mu" "perl" "tree" "yt-dlp" "icecat" "gcc-toolchain" "wl-clipboard" - "syncthing" "hyfetch" "transmission" "isync" "mpv" "steam" "signal-desktop" + (append '("yt-dlp" "icecat" "gcc-toolchain" "wl-clipboard" + "hyfetch" "transmission" "isync" "mpv" "steam" "signal-desktop" "git" "fuzzel" "wl-clipboard" "alacritty" "password-store" "curl" "dino" "bind" "nmap" "hunspell" "wtype" "hunspell-dict-en-med" "hunspell-dict-el" "mlocate" "rsync" "grimshot" "nyxt" "swayidle" "wl-clipboard" "htop" "net-tools" "gnupg" "texlive" "texlive-collection-latexrecommended" - "libtree" "notmuch" "hunspell-dict-en-us" "sbcl" "xkeyboard-config") + "notmuch" "hunspell-dict-en-us" "sbcl" "xkeyboard-config") thanos/emacs-packages thanos/python-packages thanos/fonts-packages))) (services (list (service home-bash-service-type diff --git a/guix/system-create.scm b/guix/system-create.scm index cb5dccc..70f7570 100644 --- a/guix/system-create.scm +++ b/guix/system-create.scm @@ -80,14 +80,7 @@ (service wpa-supplicant-service-type) ;; Needed by NetworkManager (service network-manager-service-type) - (service transmission-daemon-service-type - (transmission-daemon-configuration - ;; Accept requests from this and other hosts on the - ;; local network - (rpc-whitelist-enabled? #t) - (rpc-whitelist '("::1" "127.0.0.1" "192.168.*")) - (rpc-username "z3us") - (rpc-password "{eab35f5df5b1e2691acf11f49be1b1dcffa55a59FyE5eNd8"))) + (service transmission-daemon-service-type) ;; tty login (service elogind-service-type) diff --git a/guix/uranus.scm b/guix/uranus.scm index ac8d63f..2a02fd5 100644 --- a/guix/uranus.scm +++ b/guix/uranus.scm @@ -5,9 +5,7 @@ #:use-module (gnu services dbus) #:use-module (gnu services docker) #:use-module (gnu services version-control) - #:use-module (gnu services cgit) - #:use-module (rosenthal services child-error) - #:use-module (rosenthal services networking)) + #:use-module (gnu services cgit)) (use-service-modules cups desktop networking ssh docker xorg) |