refactor home packages, update nvim config

This commit is contained in:
Freya Murphy 2024-10-28 17:40:49 -04:00
parent aa02cb8de1
commit 4195ae817d
Signed by: freya
GPG key ID: 9FBC6FFD6D2DBF17
4 changed files with 36 additions and 46 deletions

View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(branch "master") (branch "master")
(commit (commit
"4009d1de954d694cb11af391d4113d29c5c1379d") "d29090727b328f96e79285379e4fac9a7dee316e")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"
@ -25,7 +25,7 @@
(url "https://g.freya.cat/freya/sakura") (url "https://g.freya.cat/freya/sakura")
(branch "main") (branch "main")
(commit (commit
"0601aa4f570e0f8d986c67de7c57572f935e7387") "850f52efa71fe2aa9a6b165c46e822858bebb5f7")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"8fb2f9c2fa414754c41c1c73665e3e73e12693ab" "8fb2f9c2fa414754c41c1c73665e3e73e12693ab"

View file

@ -13,6 +13,12 @@ set.relativenumber = true
set.rnu = true set.rnu = true
set.swapfile = false set.swapfile = false
-- expand tabs in the following files
vim.api.nvim_create_autocmd({ "BufNewFile" }, {
pattern = { "*.scm" },
command = 'silent :set expandtab=true'
})
vim.filetype.add({ vim.filetype.add({
pattern = { pattern = {
['.*%.pl'] = 'prolog', ['.*%.pl'] = 'prolog',

View file

@ -55,7 +55,7 @@ export GROFF_NO_SGR=1
# enable zsh auto suggestions # enable zsh auto suggestions
autoload compinit && compinit autoload compinit && compinit
source $GUIX_PROFILE/share/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh source $GUIX_PROFILE/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
source $GUIX_PROFILE/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source $GUIX_PROFILE/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#696e8a" ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#696e8a"
ZSH_AUTOSUGGEST_STRATEGY=(completion history) ZSH_AUTOSUGGEST_STRATEGY=(completion history)

View file

@ -18,26 +18,34 @@
(gnu home services) (gnu home services)
(freya certs) (freya certs)
(sakura services pipewire) (sakura services pipewire)
(sakura packages shells)
(sakura packages librewolf)
(sakura packages vim)
(sakura packages gnome-xyz) (sakura packages gnome-xyz)
(sakura packages shells) (sakura packages vim))
(sakura packages wm)
(sakura packages hypr)
(sakura packages networking)
(sakura packages audio))
(home-environment (home-environment
;; Below is the list of packages that will show up in your ;; Below is the list of packages that will show up in your
;; Home profile, unser ~/.guix-home/profile. ;; Home profile, unser ~/.guix-home/profile.
(packages (append (specifications->packages (list ; sway (packages (append (specifications->packages (list ; sway
"swayfx" "swayfx"
"swaybg" "swaybg"
"swayidle" "swayidle"
"swaylock-effects" "swaylock-effects"
; hyprland
"hyprland"
"hyprlock"
"hyprpaper"
"hypridle"
"hyprland-plugins"
"hyprland-contrib"
"hyprland-plugin-hy3"
; xdg
"xdg-desktop-portal-wlr"
"xdg-desktop-portal-gtk"
"xdg-desktop-portal-hyprland"
; desktop programs ; desktop programs
"gnome-keyring" "gnome-keyring"
"gimp" "gimp"
@ -48,13 +56,16 @@
"libnotify" "libnotify"
"waybar" "waybar"
"network-manager-applet" "network-manager-applet"
"wl-clip-persist"
; xdg "easyeffects"
"xdg-desktop-portal-wlr" "librewolf-wrapped"
"xdg-desktop-portal-gtk" "gamescope"
"overskride"
; gtk ; gtk
"wxwidgets" "wxwidgets"
"lavanda-gtk-theme"
"mint-themes"
; terminal ; terminal
"alacritty" "alacritty"
@ -106,6 +117,7 @@
; shell ; shell
"zsh-syntax-highlighting" "zsh-syntax-highlighting"
"zsh-autosuggestions"
"tree-sitter-cli" "tree-sitter-cli"
"neofetch" "neofetch"
"pfetch" "pfetch"
@ -119,37 +131,9 @@
"wine64" "wine64"
"winetricks")) "winetricks"))
(list ; system ; add ca certs and ambiguous packages
freya-ca-certs (list freya-ca-certs
orchis-theme-2024)))
; programs
easyeffects
librewolf-wrapped
gamescope
; gtk
lavanda-gtk-theme
orchis-theme-2024
mint-themes
; shell
zsh-autosuggestions
vim-plug
; desktop
; bluetooth
overskride
; hyprwm
hyprland
hyprlock
hyprpaper
hypridle
hyprland-plugin-hy3
hyprland-plugins
hyprland-contrib
xdg-desktop-portal-hyprland)))
;; Below is the list of Home services. To search for available ;; Below is the list of Home services. To search for available
;; services, run 'guix home search KEYWORD' in a terminal. ;; services, run 'guix home search KEYWORD' in a terminal.