chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

updates to guix

Browse source
This commit is contained in:
Chris Cochrun 2023-10-20 14:01:16 -05:00
parent 30827efb99
commit e737704d61
6 changed files with 348 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.config/hypr/hyprland.conf
View file

@ -228,4 +228,5 @@ exec-once = dbus-update-activation-environment --all
exec-once = jellyfin-mpv-shim exec-once = jellyfin-mpv-shim
exec-once = hyprctl setcursor phinger-cursors-light 24 exec-once = hyprctl setcursor phinger-cursors-light 24
exec-once = swaybg -m fill -i ~/pics/wallpapers/adventure.jpg exec-once = swaybg -m fill -i ~/pics/wallpapers/adventure.jpg
exec-once = waybar
exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1' exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1'

24
.config/.mbsyncrc → .config/mbsyncrc
View file

@ -4,7 +4,7 @@
IMAPAccount gmail IMAPAccount gmail
Host imap.gmail.com Host imap.gmail.com
User ccochrun21@gmail.com User ccochrun21@gmail.com
PassCmd rbw get gmail PassCmd "rbw get gmail"
AuthMechs LOGIN AuthMechs LOGIN
SSLType IMAPS SSLType IMAPS
SSLVersions SSLv3 SSLVersions SSLv3
@ -13,21 +13,21 @@ SSLVersions SSLv3
IMAPAccount office IMAPAccount office
Host outlook.office365.com Host outlook.office365.com
User chris@tfcconnection.org User chris@tfcconnection.org
PassCmd rbw get 'Office 365' PassCmd "/home/chris/bin/mailpass"
AuthMechs LOGIN AuthMechs LOGIN
SSLType IMAPS SSLType IMAPS
IMAPAccount outlook IMAPAccount outlook
Host outlook.office365.com Host outlook.office365.com
User chris.cochrun@outlook.com User chris.cochrun@outlook.com
PassCmd rbw get outlook PassCmd "rbw get outlook"
AuthMechs LOGIN AuthMechs LOGIN
SSLType IMAPS SSLType IMAPS
IMAPAccount cochrun IMAPAccount cochrun
Host mail.cochrun.xyz Host mail.cochrun.xyz
User chris@cochrun.xyz User chris@cochrun.xyz
PassCmd rbw get 'Office 365' PassCmd "rbw get 'Office 365'"
AuthMechs LOGIN AuthMechs LOGIN
SSLType IMAPS SSLType IMAPS
# SSLVersions SSLv3 # SSLVersions SSLv3
@ -42,8 +42,8 @@ IMAPStore gmail-remote
Account gmail Account gmail
MaildirStore gmail-local MaildirStore gmail-local
Path ~/Maildir/gmail/ Path ~/mail/gmail/
Inbox ~/Maildir/gmail/INBOX Inbox ~/mail/gmail/INBOX
IMAPStore office-remote IMAPStore office-remote
Account office Account office
@ -51,8 +51,8 @@ Account office
# LOCAL STORAGE (CREATE DIRECTORIES with mkdir -p Maildir/gmail) # LOCAL STORAGE (CREATE DIRECTORIES with mkdir -p Maildir/gmail)
MaildirStore office-local MaildirStore office-local
Path ~/Maildir/office/ Path ~/mail/office/
Inbox ~/Maildir/office/INBOX Inbox ~/mail/office/INBOX
Subfolders Verbatim Subfolders Verbatim
@ -60,16 +60,16 @@ IMAPStore outlook-remote
Account outlook Account outlook
MaildirStore outlook-local MaildirStore outlook-local
Path ~/Maildir/outlook/ Path ~/mail/outlook/
Inbox ~/Maildir/outlook/INBOX Inbox ~/mail/outlook/INBOX
Subfolders Verbatim Subfolders Verbatim
IMAPStore cochrun-remote IMAPStore cochrun-remote
Account cochrun Account cochrun
MaildirStore cochrun-local MaildirStore cochrun-local
Path ~/Maildir/cochrun/ Path ~/mail/cochrun/
Inbox ~/Maildir/cochrun/INBOX Inbox ~/mail/cochrun/INBOX
Subfolders Verbatim Subfolders Verbatim
# CONNECTIONS SPECIFY LINKS BETWEEN REMOTE AND LOCAL FOLDERS # CONNECTIONS SPECIFY LINKS BETWEEN REMOTE AND LOCAL FOLDERS

20
.config/waybar/config
View file

@ -5,9 +5,9 @@
"height": 35, // Waybar height (to be removed for auto height) "height": 35, // Waybar height (to be removed for auto height)
"width": 1400, // Waybar width "width": 1400, // Waybar width
// Choose the order of the modules "custom/wintitle", // Choose the order of the modules "custom/wintitle",
"modules-left": ["wlr/workspaces", "hyprland/window"], "modules-left": ["hyprland/workspaces", "hyprland/window"],
"modules-center": ["clock"], "modules-center": ["clock"],
"modules-right": ["pulseaudio", "backlight", "temperature", "memory", "cpu", "battery", "tray"], "modules-right": ["pulseaudio", "backlight", "memory", "cpu", "battery", "tray"],
"margin-top": -5, "margin-top": -5,
"margin-bottom": 8, "margin-bottom": 8,
"margin-left": 6, "margin-left": 6,
@ -16,10 +16,20 @@
"hyprland/window": { "hyprland/window": {
"format": " <span style='italic'>{}</span>" "format": " <span style='italic'>{}</span>"
}, },
"wlr/workspaces": { "hyprland/workspaces": {
"format": "{icon}", "format": "{icon}",
"on-scroll-up": "hyprctl dispatch workspace e+1", "format-icons": {
"on-scroll-down": "hyprctl dispatch workspace e-1" "1": "",
"2": "",
"3": "󰈙",
"4": "󰍨",
"5": "",
"9": "",
"active": "",
"default": ""
},
// "on-scroll-up": "hyprctl dispatch workspace e+1",
// "on-scroll-down": "hyprctl dispatch workspace e-1"
}, },
"sway/mode": { "sway/mode": {
"format": "<span style=\"italic\"> {}</span>" "format": "<span style=\"italic\"> {}</span>"

534
guix/home.scm
View file

@ -11,6 +11,7 @@
#:use-module (pkgs qt5ct) #:use-module (pkgs qt5ct)
#:use-module (pkgs kdenlive) #:use-module (pkgs kdenlive)
#:use-module (home-services pipewire) #:use-module (home-services pipewire)
;; #:use-module (rde features)
;; #:use-module (emacs packages melpa) ;; #:use-module (emacs packages melpa)
#:use-module (gnu home) #:use-module (gnu home)
#:use-module (gnu home services) #:use-module (gnu home services)
@ -19,6 +20,7 @@
#:use-module (gnu home services xdg) #:use-module (gnu home services xdg)
#:use-module (gnu home services gnupg) #:use-module (gnu home services gnupg)
#:use-module (gnu home services fontutils) #:use-module (gnu home services fontutils)
#:use-module (gnu home services syncthing)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages vim) #:use-module (gnu packages vim)
#:use-module (gnu packages rust-apps) #:use-module (gnu packages rust-apps)
@ -52,270 +54,279 @@
;; (base0E . "#ff6ac1") ;; (base0E . "#ff6ac1")
;; (base0F . "#b2643c"))) ;; (base0F . "#b2643c")))
;; (define mail-config
;; "a scheme module to setup my email config"
;; (service-type (name 'mail)
;; (extensions
;; (list (service-extension
;; home-files-service-type
;; `((".mbsyncrc" ,(local-file "../.config/.mbsyncrc"))))))))
(define home-packages (define home-packages
(list ;; Let's start with some things (list ;; Let's start with some things
;; CLI apps ;; CLI apps
"vim" "vim"
"exa" "exa"
"unzip" "unzip"
"rsync" "rsync"
"openssh" "openssh"
"gcc-toolchain" "gcc-toolchain"
"make" "make"
"git" "git"
"curl" "curl"
"vlc" "vlc"
"mpv" "mpv"
"mpv-mpris" "mpv-mpris"
"libva" "libva"
"libva-utils" "libva-utils"
"neofetch" "neofetch"
"qrencode" "qrencode"
"git:send-email" "git:send-email"
"yt-dlp" "yt-dlp"
"playerctl" "playerctl"
"pavucontrol" "pavucontrol"
"alsa-utils" "alsa-utils"
"v4l-utils" "v4l-utils"
"tmux" "tmux"
"direnv" "direnv"
"dutree" "dutree"
"btop" "btop"
"htop" "htop"
"ripgrep" "ripgrep"
"imagemagick" "imagemagick"
"jq" "jq"
"bat" "bat"
"alacritty" "alacritty"
"pandoc" "pandoc"
"fd" "fd"
"bc" "bc"
"sysstat" "sysstat"
"ffmpeg" "ffmpeg"
"ydotool" "ydotool"
"mediainfo" "mediainfo"
"pulsemixer" "pulsemixer"
"pamixer" "pamixer"
"python-pulsectl" "python-pulsectl"
"rbw" "rbw"
"alsa-utils" "alsa-utils"
"wtype" "wtype"
"brightnessctl" "brightnessctl"
"transmission" "transmission"
"blesh" "blesh"
"trash-cli" "trash-cli"
;; Utilities and Libraries ;; Utilities and Libraries
"libva" "libva"
"libvpx" "libvpx"
"python" "python"
"gstreamer" "gstreamer"
"gst-plugins-base" "gst-plugins-base"
"gst-plugins-good" "gst-plugins-good"
"gst-plugins-bad" "gst-plugins-bad"
"gst-plugins-ugly" "gst-plugins-ugly"
"gst-libav" "gst-libav"
"fish-foreign-env" "fish-foreign-env"
"libnotify" "libnotify"
"ffmpegthumbs" "ffmpegthumbs"
"ffmpegthumbnailer" "ffmpegthumbnailer"
"kio" "kio"
"nim" "nim"
"kio-fuse" "kio-fuse"
"sshfs" "sshfs"
"sshfs-fuse" "sshfs-fuse"
"ifuse" "ifuse"
"libimobiledevice" "libimobiledevice"
"kio-extras" "kio-extras"
"usbmuxd" "usbmuxd"
;; "nautilus" ;; "nautilus"
"swaybg" "swaybg"
"dconf" "dconf"
"dconf-editor" "dconf-editor"
;; "tracker" ;; "tracker"
;; "tracker-miners" ;; "tracker-miners"
"gvfs" "gvfs"
;; "texlive" ;; "texlive"
;; "texlive-pdfx" ;; "texlive-pdfx"
;; "texlive-latex-pdfx" ;; "texlive-latex-pdfx"
"jmtpfs" "jmtpfs"
"libmtp" "libmtp"
"xfconf" "xfconf"
"kfind" "kfind"
"kiconthemes" "kiconthemes"
"gvfs" "gvfs"
"xfconf" "xfconf"
"kwallet" "kwallet"
"kwallet-pam" "kwallet-pam"
"openjdk" "openjdk"
"python-vosk" "python-vosk"
"gst-vosk" "gst-vosk"
"vosk-api" "vosk-api"
"python-srt" "python-srt"
"perl-image-exiftool" "perl-image-exiftool"
"srt" "srt"
"breeze-icons" "breeze-icons"
"distrobox" "distrobox"
"libreoffice" "libreoffice"
;; "nemo" ;; "nemo"
;; "tridactyl-native" ;; "tridactyl-native"
;; "qtwayland@5.15.8" ;; "qtwayland@5.15.8"
;; "qtdeclarative@5.15.8" ;; "qtdeclarative@5.15.8"
"egl-wayland" "egl-wayland"
"pinentry" "pinentry"
"pinentry-qt" "pinentry-qt"
"pinentry-rofi" "pinentry-rofi"
"flatpak" "flatpak"
"flatpak-xdg-utils" "flatpak-xdg-utils"
"xdg-utils" "xdg-utils"
"xdg-desktop-portal" "xdg-desktop-portal"
"xdg-desktop-portal-kde" "xdg-desktop-portal-kde"
"aspell" "aspell"
"aspell-dict-en" "aspell-dict-en"
"enchant" "enchant"
"ncurses" "ncurses"
"sbcl" "sbcl"
;; Theming ;; Theming
"phinger-cursors-theme" ;; Personal package of cursors "phinger-cursors-theme" ;; Personal package of cursors
"papirus-icon-theme" "papirus-icon-theme"
"sound-theme-freedesktop" "sound-theme-freedesktop"
"lightly" "lightly"
;; Gui Apps ;; Gui Apps
"nextcloud-client" "nextcloud-client"
"dunst" "dunst"
"rofi-wayland" "rofi-wayland"
"waybar" "waybar"
"qt5ct" "qt5ct"
"grim" "grim"
"slurp" "slurp"
"imv" "imv"
"mpv" "mpv"
"mpv-mpris" "mpv-mpris"
"firefox-wayland" "firefox-wayland"
"qutebrowser" "qutebrowser"
"nyxt" "nyxt"
"breeze" "breeze"
"kdeconnect" "kdeconnect"
;;"plasma" ;;"plasma"
"dolphin" "dolphin"
"darktable" "darktable"
"thunar" "thunar"
"dconf-editor" "dconf-editor"
"ark" "ark"
;;"kdenlive-fix" ;; Personal fixed kdenlive ;;"kdenlive-fix" ;; Personal fixed kdenlive
"gimp" "gimp"
"distrobox" "distrobox"
"libreoffice" "libreoffice"
"swaylock-effects" "swaylock-effects"
"swayidle" "swayidle"
"steam" "steam"
;; "tridactyl-native" ;; "tridactyl-native"
;; Fonts ;; Fonts
"font-google-noto" "font-google-noto"
"font-google-noto-emoji" "font-google-noto-emoji"
"font-victor-mono" "font-victor-mono"
;; Emacs and packages ;; Emacs and packages
"emacs-next-pgtk" "emacs-next-pgtk"
"emacs-dired-rsync" "emacs-dired-rsync"
"emacs-all-the-icons" "emacs-all-the-icons"
"emacs-org-roam" "emacs-org-roam"
"emacs-paredit" "emacs-paredit"
"emacs-evil-paredit" "emacs-evil-paredit"
"emacs-doom-modeline" "emacs-doom-modeline"
"emacs-doom-themes" "emacs-doom-themes"
"emacs-org" "emacs-org"
"emacs-elfeed" "emacs-elfeed"
"emacs-elfeed-org" "emacs-elfeed-org"
"emacs-esh-autosuggest" "emacs-esh-autosuggest"
"emacs-use-package" "emacs-use-package"
"emacs-exec-path-from-shell" "emacs-exec-path-from-shell"
"emacs-langtool" "emacs-langtool"
"emacs-avy" "emacs-avy"
"emacs-general" "emacs-general"
"emacs-evil" "emacs-evil"
"emacs-evil-collection" "emacs-evil-collection"
"emacs-no-littering" "emacs-no-littering"
"emacs-evil-escape" "emacs-evil-escape"
"emacs-smartparens" "emacs-smartparens"
"emacs-evil-org" "emacs-evil-org"
"emacs-evil-smartparens" "emacs-evil-smartparens"
"emacs-aggressive-indent" "emacs-aggressive-indent"
"emacs-adaptive-wrap" "emacs-adaptive-wrap"
"emacs-which-key" "emacs-which-key"
"emacs-evil-surround" "emacs-evil-surround"
"emacs-websocket" "emacs-websocket"
"emacs-org-modern" "emacs-org-modern"
"emacs-org-web-tools" "emacs-org-web-tools"
"emacs-org-re-reveal" "emacs-org-re-reveal"
"emacs-org-ql" "emacs-org-ql"
"emacs-org-msg" "emacs-org-msg"
"emacs-nov-el" "emacs-nov-el"
"emacs-calfw" "emacs-calfw"
"emacs-transmission" "emacs-transmission"
"emacs-emojify" "emacs-emojify"
"emacs-pulsar" "emacs-pulsar"
"emacs-vertico" "emacs-ace-link"
"emacs-consult" "emacs-vertico"
"emacs-consult-eglot" "emacs-consult"
"emacs-consult-org-roam" "emacs-consult-eglot"
"emacs-tempel" "emacs-consult-org-roam"
"emacs-tempel-collection" "emacs-tempel"
"emacs-marginalia" "emacs-tempel-collection"
"emacs-embark" "emacs-marginalia"
"emacs-wgrep" "emacs-embark"
"emacs-corfu" "emacs-wgrep"
"emacs-cape" "emacs-corfu"
"emacs-rainbow-delimiters" "emacs-cape"
"emacs-orderless" "emacs-rainbow-delimiters"
"emacs-kind-icon" "emacs-orderless"
"emacs-projectile" "emacs-kind-icon"
"emacs-simple-httpd" "emacs-projectile"
"emacs-direnv" "emacs-simple-httpd"
"emacs-sly" "emacs-direnv"
"emacs-diredfl" "emacs-sly"
"emacs-pdf-tools" "emacs-diredfl"
"emacs-vterm" "emacs-pdf-tools"
"emacs-plz" "emacs-vterm"
"emacs-empv" "emacs-plz"
"emacs-ement" "emacs-empv"
"emacs-bongo" "emacs-ement"
"emacs-emms" "emacs-bongo"
"emacs-gcmh" "emacs-emms"
"emacs-visual-fill-column" "emacs-gcmh"
"emacs-eat" "emacs-visual-fill-column"
"emacs-mpv" "emacs-eat"
"emacs-all-the-icons-dired" "emacs-mpv"
"emacs-all-the-icons-completion" "emacs-all-the-icons-dired"
"emacs-org-super-agenda" "emacs-all-the-icons-completion"
"emacs-toc-org" "emacs-org-super-agenda"
"emacs-ox-reveal" "emacs-toc-org"
"emacs-ox-pandoc" "emacs-ox-reveal"
"emacs-ox-hugo" "emacs-ox-pandoc"
"emacs-dired-sidebar" "emacs-ox-hugo"
"emacs-dired-du" "emacs-dired-sidebar"
"emacs-ledger-mode" "emacs-dired-du"
"emacs-rustic" "emacs-ledger-mode"
"emacs-lua-mode" "emacs-rustic"
"emacs-fennel-mode" "emacs-lua-mode"
"emacs-web-mode" "emacs-fennel-mode"
"emacs-qml-mode" "emacs-web-mode"
"emacs-yaml-mode" "emacs-qml-mode"
"emacs-cmake-mode" "emacs-yaml-mode"
"emacs-typescript-mode" "emacs-cmake-mode"
"emacs-fish-mode" "emacs-typescript-mode"
"emacs-markdown-mode" "emacs-fish-mode"
"emacs-restclient" "emacs-markdown-mode"
"emacs-ob-restclient" "emacs-restclient"
"emacs-guix" "emacs-ob-restclient"
"emacs-nix-mode" "emacs-guix"
"emacs-helpful" "emacs-nix-mode"
;; "emacs-mu4e" "emacs-helpful"
"isync" ;; "emacs-mu4e"
"mu")) "isync"
"mu"))
(home-environment (home-environment
(packages (specifications->packages home-packages)) (packages (specifications->packages home-packages))
@ -433,16 +444,21 @@ gtk-xft-rgba=none
("gtk-2.0" ,(local-file "../.config/gtk-2.0" #:recursive? #t)))) ("gtk-2.0" ,(local-file "../.config/gtk-2.0" #:recursive? #t))))
(simple-service 'scripts (simple-service 'scripts
home-files-service-type home-files-service-type
`(("bin" ,(local-file "../scripts" #:recursive? #t)) `(("bin" ,(local-file "../scripts" #:recursive? #t))))
(".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t)) (simple-service 'home-files
home-files-service-type
`((".mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t))
(".var/app/org.mozilla.firefox/.mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t)) (".var/app/org.mozilla.firefox/.mozilla/firefox/chris.default/chrome" ,(local-file "../.config/firefox/chrome" #:recursive? #t))
(".Xresources" ,(plain-file "Xresources" "Xcursor.theme: phinger-cursors-light (".Xresources" ,(plain-file "Xresources" "Xcursor.theme: phinger-cursors-light
Xcursor.size: 36 Xcursor.size: 36
")) "))
(".mbsyncrc" ,(local-file "../.config/mbsyncrc"))
(".icons/default/index.theme" ,(plain-file "default.theme" "[icon theme] (".icons/default/index.theme" ,(plain-file "default.theme" "[icon theme]
Inherits=phinger-cursors-light Inherits=phinger-cursors-light
")))) "))))
;; (mail-config)
(service home-syncthing-service-type)
(service home-gpg-agent-service-type (service home-gpg-agent-service-type
(home-gpg-agent-configuration (home-gpg-agent-configuration
(pinentry-program (pinentry-program

44
guix/pkgs/waybar.scm Normal file
View file

@ -0,0 +1,44 @@
(define-module (pkgs waybar))
(define-public waybar
(package
(name "waybar")
(version "0.9.22")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/Alexays/Waybar")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "07h5l7h7wmzqgg7fbp98khrxg2sq2s4ncp4fiiz1yg62r752idy4"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags #~(list "--wrap-mode=nodownload")))
(inputs (list date
fmt
gtk-layer-shell
gtkmm-3
jsoncpp
libdbusmenu
libevdev
libinput-minimal
libmpdclient
libnl
libxml2
pipewire
playerctl
pulseaudio
spdlog
wayland
wireplumber))
(native-inputs
(list `(,glib "bin") pkg-config scdoc wayland-protocols))
(home-page "https://github.com/Alexays/Waybar")
(synopsis "Wayland bar for Sway and Wlroots based compositors")
(description "Waybar is a highly customisable Wayland bar for Sway and
Wlroots based compositors.")
(license license:expat))) ; MIT license
waybar

2
qmk/qmk_firmware

@ -1 +1 @@
Subproject commit c84cf9a83ac7f3a930ca08e431057783ea469424 Subproject commit 127dcdd2277e0c73493f416fedc537391ab2444b