moved org files out of dir
This commit is contained in:
@@ -302,23 +302,18 @@ del () { mv "$@" $HOME/.local/share/Trash/files/.; }
|
|||||||
mkcd () { mkdir -p -- "$1" && cd -P -- "$1" }
|
mkcd () { mkdir -p -- "$1" && cd -P -- "$1" }
|
||||||
|
|
||||||
# --- Aliases --- #
|
# --- Aliases --- #
|
||||||
# dnf
|
alias install="guix install"
|
||||||
alias install="sudo dnf -y install"
|
alias remove="guix remove"
|
||||||
alias remove="sudo dnf remove"
|
alias search="guix search"
|
||||||
alias search="dnf search"
|
alias pull="guix pull"
|
||||||
alias update="sudo dnf update"
|
alias upgrade="guix package -u"
|
||||||
|
alias hreconfig="guix home reconfigure ~/dotfiles/guix/home/files/guix-home.scm"
|
||||||
|
|
||||||
# qol
|
# qol
|
||||||
alias vi="nvim"
|
alias vi="nvim"
|
||||||
alias vim="nvim"
|
alias vim="nvim"
|
||||||
alias unmount="umount"
|
alias unmount="umount"
|
||||||
|
|
||||||
# systemD
|
|
||||||
alias sr="sudo systemctl restart"
|
|
||||||
alias se="sudo systemctl enable"
|
|
||||||
alias sen="sudo systemctl enable --now"
|
|
||||||
alias sd="sudo systemctl disable"
|
|
||||||
|
|
||||||
# git
|
# git
|
||||||
alias ga="git add"
|
alias ga="git add"
|
||||||
alias gc="git commit -m"
|
alias gc="git commit -m"
|
||||||
@@ -329,11 +324,7 @@ alias gp="git push"
|
|||||||
alias gco="git checkout"
|
alias gco="git checkout"
|
||||||
|
|
||||||
# config
|
# config
|
||||||
alias zshrc="vim ~/dotfiles/.config/zsh/.zshrc"
|
alias zshrcsource="source ~/dotfiles/guix/home/files/zsh/zshrc"
|
||||||
alias zshrcsource="source ~/.config/zsh/.zshrc"
|
|
||||||
|
|
||||||
# firewalld
|
|
||||||
alias fcmd="firewall-cmd"
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
**
|
**
|
||||||
@@ -734,7 +734,6 @@ Sets HTML strings to have the background of the color they represent.
|
|||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
*** Ruby
|
*** Ruby
|
||||||
<<<<<<< HEAD
|
|
||||||
**** Code Completion
|
**** Code Completion
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package robe
|
(use-package robe
|
||||||
@@ -744,10 +743,6 @@ Sets HTML strings to have the background of the color they represent.
|
|||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package bundler
|
(use-package bundler
|
||||||
:straight t)
|
:straight t)
|
||||||
=======
|
|
||||||
#+begin_src emacs-lisp
|
|
||||||
|
|
||||||
>>>>>>> origin/master
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
*** Lisp
|
*** Lisp
|
||||||
@@ -29,8 +29,19 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(use-modules (gnu)
|
(use-modules (gnu)
|
||||||
(gnu services desktop)
|
(gnu services desktop)
|
||||||
(gnu packages wm)
|
(gnu packages wm)
|
||||||
(gnu system setuid)
|
(gnu packages shells)
|
||||||
|
(gnu packages version-control)
|
||||||
|
(gnu packages emacs)
|
||||||
|
(gnu packages gnuzilla)
|
||||||
|
(gnu packages vim)
|
||||||
|
(gnu packages certs)
|
||||||
|
(gnu packages file-systems)
|
||||||
|
(gnu packages suckless)
|
||||||
(gnu packages admin)
|
(gnu packages admin)
|
||||||
|
(gnu packages linux)
|
||||||
|
(gnu packages audio)
|
||||||
|
(gnu packages pulseaudio)
|
||||||
|
(gnu system setuid)
|
||||||
(nongnu packages linux))
|
(nongnu packages linux))
|
||||||
|
|
||||||
(use-service-modules
|
(use-service-modules
|
||||||
@@ -57,6 +68,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(comment "opal")
|
(comment "opal")
|
||||||
(group "users")
|
(group "users")
|
||||||
(home-directory "/home/opal")
|
(home-directory "/home/opal")
|
||||||
|
(shell (file-append zsh "/bin/zsh"))
|
||||||
(supplementary-groups
|
(supplementary-groups
|
||||||
'("wheel"
|
'("wheel"
|
||||||
"netdev"
|
"netdev"
|
||||||
@@ -65,11 +77,9 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
%base-user-accounts))
|
%base-user-accounts))
|
||||||
|
|
||||||
(packages (append (list git
|
(packages (append (list git
|
||||||
wl-clipboard
|
|
||||||
icecat
|
icecat
|
||||||
vim
|
vim
|
||||||
nss-certs
|
nss-certs
|
||||||
stow
|
|
||||||
exfat-utils
|
exfat-utils
|
||||||
emacs
|
emacs
|
||||||
sway
|
sway
|
||||||
@@ -79,8 +89,8 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
dmenu
|
dmenu
|
||||||
bluez
|
bluez
|
||||||
bluez-alsa
|
bluez-alsa
|
||||||
pulseaudio))
|
pulseaudio)
|
||||||
%base-packages)
|
%base-packages))
|
||||||
|
|
||||||
(services
|
(services
|
||||||
(append (modify-services %desktop-services
|
(append (modify-services %desktop-services
|
||||||
@@ -253,52 +263,72 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(gnu home)
|
(gnu home)
|
||||||
(gnu home services)
|
(gnu home services)
|
||||||
(gnu home services shells)
|
(gnu home services shells)
|
||||||
(gnu home services shepard)
|
(gnu home services shepherd)
|
||||||
(gnu packages libreoffice)
|
(gnu packages)
|
||||||
(gnu packages mail)
|
(gnu packages shells)
|
||||||
(gnu packages pdf))
|
(gnu packages pulseaudio)
|
||||||
|
(gnu packages web-browsers)
|
||||||
|
(gnu packages guile)
|
||||||
|
(gnu packages wget)
|
||||||
|
(gnu packages curl)
|
||||||
|
(gnu packages pdf)
|
||||||
|
(gnu packages ebook)
|
||||||
|
(gnu packages gnome)
|
||||||
|
(gnu packages gnome-xyz)
|
||||||
|
(gnu packages compression)
|
||||||
|
(gnu packages cmake)
|
||||||
|
(gnu packages autotools)
|
||||||
|
(gnu packages gstreamer)
|
||||||
|
(gnu packages video)
|
||||||
|
(gnu packages mpd)
|
||||||
|
(gnu packages terminals)
|
||||||
|
(gnu packages xdisorg)
|
||||||
|
(gnu packages gnupg)
|
||||||
|
(gnu packages password-utils)
|
||||||
|
(gnu packages emacs)
|
||||||
|
(gnu packages emacs-xyz)
|
||||||
|
(gnu packages gnuzilla)
|
||||||
|
(gnu packages ruby)
|
||||||
|
(gnu packages python)
|
||||||
|
(gnu packages lisp)
|
||||||
|
(gnu packages python-xyz)
|
||||||
|
(gnu packages fonts)
|
||||||
|
(gnu packages wm)
|
||||||
|
(gnu services)
|
||||||
|
(guix gexp))
|
||||||
|
|
||||||
(home-environment
|
(home-environment
|
||||||
(packages
|
(packages
|
||||||
(append
|
(append
|
||||||
;; Tools/Libraries
|
;; Tools/Libraries
|
||||||
(list
|
(list
|
||||||
gcc-toolchain
|
zsh
|
||||||
wget
|
wget
|
||||||
grim
|
|
||||||
wlsunse
|
|
||||||
curl
|
curl
|
||||||
cmake
|
cmake
|
||||||
make
|
|
||||||
zip
|
zip
|
||||||
unzip
|
unzip
|
||||||
libtool
|
libtool
|
||||||
openssl
|
|
||||||
openssh
|
|
||||||
gst-plugins-bad
|
gst-plugins-bad
|
||||||
gst-plugins-base
|
gst-plugins-base
|
||||||
gst-plugins-good
|
gst-plugins-good
|
||||||
gst-plugins-ugly
|
gst-plugins-ugly
|
||||||
gst-libav
|
gst-libav
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
zsh
|
pavucontrol)
|
||||||
gnupg)
|
|
||||||
;; Applications
|
;; Applications
|
||||||
(list
|
(list
|
||||||
alacritty
|
alacritty
|
||||||
nyxt
|
nyxt
|
||||||
zathura-pdf-mupdf
|
zathura-pdf-mupdf
|
||||||
thunar
|
nautilus
|
||||||
firefox
|
wlr-randr
|
||||||
wl-randr
|
|
||||||
libreoffice
|
|
||||||
calibre
|
calibre
|
||||||
mpv
|
mpv
|
||||||
youtube-dl
|
youtube-dl
|
||||||
icedove
|
icedove
|
||||||
keepassxc
|
keepassxc
|
||||||
nautilus
|
nautilus)
|
||||||
wofi)
|
|
||||||
;; Emacs
|
;; Emacs
|
||||||
(list
|
(list
|
||||||
emacs-vterm
|
emacs-vterm
|
||||||
@@ -335,16 +365,15 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
emacs-lsp-ui
|
emacs-lsp-ui
|
||||||
emacs-treemacs
|
emacs-treemacs
|
||||||
emacs-lsp-treemacs
|
emacs-lsp-treemacs
|
||||||
emacs-parinfer
|
emacs-parinfer-mode
|
||||||
emacs-yasnippet
|
emacs-yasnippet
|
||||||
emacs-pdf-tools)
|
emacs-pdf-tools)
|
||||||
;; Languages
|
;; Languages
|
||||||
(list
|
(list
|
||||||
ruby
|
ruby
|
||||||
python
|
python
|
||||||
guile
|
guile-3.0
|
||||||
sbcl
|
sbcl
|
||||||
perl
|
|
||||||
python-lsp-server
|
python-lsp-server
|
||||||
ruby-solargraph)
|
ruby-solargraph)
|
||||||
;; Aesthetics/Fonts
|
;; Aesthetics/Fonts
|
||||||
@@ -371,37 +400,37 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
;; .zshenv
|
;; .zshenv
|
||||||
(zshenv
|
(zshenv
|
||||||
(list
|
(list
|
||||||
(local-file
|
(local-file "files/zsh/zshenv")))
|
||||||
(string-append (getenv "HOME")
|
|
||||||
"/dotfiles/guix/home/files/zsh/zshenv")
|
|
||||||
"/.config/zsh/.zshenv")))
|
|
||||||
;; .zprofile
|
;; .zprofile
|
||||||
(zprofile
|
(zprofile
|
||||||
(list
|
(list
|
||||||
(local-file
|
(local-file "files/zsh/zprofile")))
|
||||||
(string-append (getenv "HOME")
|
|
||||||
"/dotfiles/guix/home/files/zsh/zprofile")
|
|
||||||
"/.config/zsh/.zprofile")))
|
|
||||||
;; .zshrc
|
;; .zshrc
|
||||||
(zshrc
|
(zshrc
|
||||||
(list
|
(list
|
||||||
(local-file
|
(local-file "files/zsh/zshrc"))))))
|
||||||
(string-append (getenv "HOME")
|
|
||||||
"/dotfiles/guix/home/files/zsh/zshrc")
|
|
||||||
"/.config/zsh/.zshrc"))))))
|
|
||||||
;; Files
|
;; Files
|
||||||
(list
|
(list
|
||||||
(simple-service 'sway
|
|
||||||
|
(simple-service 'sway-config
|
||||||
home-files-service-type
|
home-files-service-type
|
||||||
(list
|
(list
|
||||||
`(".config/sway/config"
|
`("config/sway/config"
|
||||||
,(local-file
|
,(local-file
|
||||||
(string-append (getenv "HOME")
|
(string-append (getenv "HOME")
|
||||||
"/dotfiles/guix/home/files/sway/config")))))
|
"/dotfiles/guix/home/files/sway/config")))))
|
||||||
|
(simple-service 'user-dirs-config
|
||||||
|
home-files-service-type
|
||||||
|
(list
|
||||||
|
`("config/user-dirs.dirs"
|
||||||
|
,(local-file
|
||||||
|
(string-append (getenv "HOME")
|
||||||
|
"/dotfiles/guix/home/files/user-dirs.dirs")))))
|
||||||
(simple-service 'emacs-config
|
(simple-service 'emacs-config
|
||||||
home-files-service-type
|
home-files-service-type
|
||||||
(list
|
(list
|
||||||
`(".config/emacs/init.el"
|
`("config/emacs/init.el"
|
||||||
,(local-file
|
,(local-file
|
||||||
(string-append (getenv "HOME")
|
(string-append (getenv "HOME")
|
||||||
"/dotfiles/guix/home/files/emacs/init.el")))))
|
"/dotfiles/guix/home/files/emacs/init.el")))))
|
||||||
@@ -409,7 +438,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(simple-service 'nyxt-config
|
(simple-service 'nyxt-config
|
||||||
home-files-service-type
|
home-files-service-type
|
||||||
(list
|
(list
|
||||||
`(".config/nyxt/init.lisp"
|
`("config/nyxt/init.lisp"
|
||||||
,(local-file
|
,(local-file
|
||||||
(string-append (getenv "HOME")
|
(string-append (getenv "HOME")
|
||||||
"/dotfiles/guix/home/files/nyxt/init.lisp")))))
|
"/dotfiles/guix/home/files/nyxt/init.lisp")))))
|
||||||
@@ -417,7 +446,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(simple-service 'dunst-config
|
(simple-service 'dunst-config
|
||||||
home-files-service-type
|
home-files-service-type
|
||||||
(list
|
(list
|
||||||
`(".config/dunst/dunstrc"
|
`("config/dunst/dunstrc"
|
||||||
,(local-file
|
,(local-file
|
||||||
(string-append (getenv "HOME")
|
(string-append (getenv "HOME")
|
||||||
"/dotfiles/guix/home/files/dunst/dunstrc")))))
|
"/dotfiles/guix/home/files/dunst/dunstrc")))))
|
||||||
@@ -425,7 +454,7 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(simple-service 'mbsync-config
|
(simple-service 'mbsync-config
|
||||||
home-files-service-type
|
home-files-service-type
|
||||||
(list
|
(list
|
||||||
`(".config/mbsync/mbsyncrc"
|
`("config/mbsync/mbsyncrc"
|
||||||
,(local-file
|
,(local-file
|
||||||
(string-append (getenv "HOME")
|
(string-append (getenv "HOME")
|
||||||
"/dotfiles/guix/home/files/mbsync/mbsyncrc")))))
|
"/dotfiles/guix/home/files/mbsync/mbsyncrc")))))
|
||||||
@@ -433,22 +462,22 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper
|
|||||||
(simple-service 'alacritty-config
|
(simple-service 'alacritty-config
|
||||||
home-files-service-type
|
home-files-service-type
|
||||||
(list
|
(list
|
||||||
`(".config/alacritty/alacritty.yml"
|
`("config/alacritty/alacritty.yml"
|
||||||
,(local-file
|
,(local-file
|
||||||
(string-append (getenv "HOME")
|
(string-append (getenv "HOME")
|
||||||
"/dotfiles/guix/home/files/alacritty/alacritty.yml"))))))
|
"/dotfiles/guix/home/files/alacritty/alacritty.yml"))))))
|
||||||
|
|
||||||
;; Daemons
|
;; Daemons
|
||||||
(list
|
(list
|
||||||
(service home-shepard-service-type
|
(service home-shepherd-service-type
|
||||||
(home-shepherd-configuration
|
(home-shepherd-configuration
|
||||||
(services
|
(services
|
||||||
(list
|
(list
|
||||||
(shepard-service
|
(shepherd-service
|
||||||
(provision '(emacs))
|
(provision '(emacs))
|
||||||
(start #~(make-system-constructor "emacs --daemon"))
|
(start #~(make-system-constructor "emacs --daemon"))
|
||||||
(stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'")))
|
(stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'")))
|
||||||
(shepard-service
|
(shepherd-service
|
||||||
(provision '(gnome-keyring-daemon))
|
(provision '(gnome-keyring-daemon))
|
||||||
(start #~(make-system-contructor "gnome-keyring-daemon --daemonize "))
|
(start #~(make-system-contructor "gnome-keyring-daemon --daemonize "))
|
||||||
(stop #~(make-system-contructor "pkill gnome-keyring-daemon")))))))))))
|
(stop #~(make-system-contructor "pkill gnome-keyring-daemon")))))))))))
|
||||||
@@ -581,10 +581,6 @@
|
|||||||
|
|
||||||
(use-package bundler
|
(use-package bundler
|
||||||
:straight t)
|
:straight t)
|
||||||
=======
|
|
||||||
#+begin_src emacs-lisp
|
|
||||||
|
|
||||||
>>>>>>> origin/master
|
|
||||||
|
|
||||||
(use-package parinfer
|
(use-package parinfer
|
||||||
:straight t
|
:straight t
|
||||||
|
|||||||
@@ -32,23 +32,18 @@ del () { mv "$@" $HOME/.local/share/Trash/files/.; }
|
|||||||
mkcd () { mkdir -p -- "$1" && cd -P -- "$1" }
|
mkcd () { mkdir -p -- "$1" && cd -P -- "$1" }
|
||||||
|
|
||||||
# --- Aliases --- #
|
# --- Aliases --- #
|
||||||
# dnf
|
alias install="guix install"
|
||||||
alias install="sudo dnf -y install"
|
alias remove="guix remove"
|
||||||
alias remove="sudo dnf remove"
|
alias search="guix search"
|
||||||
alias search="dnf search"
|
alias pull="guix pull"
|
||||||
alias update="sudo dnf update"
|
alias upgrade="guix package -u"
|
||||||
|
alias hreconfig="guix home reconfigure ~/dotfiles/guix/home/files/guix-home.scm"
|
||||||
|
|
||||||
# qol
|
# qol
|
||||||
alias vi="nvim"
|
alias vi="nvim"
|
||||||
alias vim="nvim"
|
alias vim="nvim"
|
||||||
alias unmount="umount"
|
alias unmount="umount"
|
||||||
|
|
||||||
# systemD
|
|
||||||
alias sr="sudo systemctl restart"
|
|
||||||
alias se="sudo systemctl enable"
|
|
||||||
alias sen="sudo systemctl enable --now"
|
|
||||||
alias sd="sudo systemctl disable"
|
|
||||||
|
|
||||||
# git
|
# git
|
||||||
alias ga="git add"
|
alias ga="git add"
|
||||||
alias gc="git commit -m"
|
alias gc="git commit -m"
|
||||||
@@ -59,8 +54,4 @@ alias gp="git push"
|
|||||||
alias gco="git checkout"
|
alias gco="git checkout"
|
||||||
|
|
||||||
# config
|
# config
|
||||||
alias zshrc="vim ~/dotfiles/.config/zsh/.zshrc"
|
alias zshrcsource="source ~/dotfiles/guix/home/files/zsh/zshrc"
|
||||||
alias zshrcsource="source ~/.config/zsh/.zshrc"
|
|
||||||
|
|
||||||
# firewalld
|
|
||||||
alias fcmd="firewall-cmd"
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
(gnu home services shells)
|
(gnu home services shells)
|
||||||
(gnu home services shepherd)
|
(gnu home services shepherd)
|
||||||
(gnu packages)
|
(gnu packages)
|
||||||
|
(gnu packages shells)
|
||||||
(gnu packages pulseaudio)
|
(gnu packages pulseaudio)
|
||||||
(gnu packages web-browsers)
|
(gnu packages web-browsers)
|
||||||
(gnu packages guile)
|
(gnu packages guile)
|
||||||
@@ -41,6 +42,7 @@
|
|||||||
(append
|
(append
|
||||||
;; Tools/Libraries
|
;; Tools/Libraries
|
||||||
(list
|
(list
|
||||||
|
zsh
|
||||||
wget
|
wget
|
||||||
curl
|
curl
|
||||||
cmake
|
cmake
|
||||||
|
|||||||
@@ -1,8 +1,19 @@
|
|||||||
(use-modules (gnu)
|
(use-modules (gnu)
|
||||||
(gnu services desktop)
|
(gnu services desktop)
|
||||||
(gnu packages wm)
|
(gnu packages wm)
|
||||||
(gnu system setuid)
|
(gnu packages shells)
|
||||||
|
(gnu packages version-control)
|
||||||
|
(gnu packages emacs)
|
||||||
|
(gnu packages gnuzilla)
|
||||||
|
(gnu packages vim)
|
||||||
|
(gnu packages certs)
|
||||||
|
(gnu packages file-systems)
|
||||||
|
(gnu packages suckless)
|
||||||
(gnu packages admin)
|
(gnu packages admin)
|
||||||
|
(gnu packages linux)
|
||||||
|
(gnu packages audio)
|
||||||
|
(gnu packages pulseaudio)
|
||||||
|
(gnu system setuid)
|
||||||
(nongnu packages linux))
|
(nongnu packages linux))
|
||||||
|
|
||||||
(use-service-modules
|
(use-service-modules
|
||||||
@@ -29,6 +40,7 @@
|
|||||||
(comment "opal")
|
(comment "opal")
|
||||||
(group "users")
|
(group "users")
|
||||||
(home-directory "/home/opal")
|
(home-directory "/home/opal")
|
||||||
|
(shell (file-append zsh "/bin/zsh"))
|
||||||
(supplementary-groups
|
(supplementary-groups
|
||||||
'("wheel"
|
'("wheel"
|
||||||
"netdev"
|
"netdev"
|
||||||
@@ -37,7 +49,7 @@
|
|||||||
%base-user-accounts))
|
%base-user-accounts))
|
||||||
|
|
||||||
(packages (append (list git
|
(packages (append (list git
|
||||||
wl-clipboard
|
icecat
|
||||||
vim
|
vim
|
||||||
nss-certs
|
nss-certs
|
||||||
exfat-utils
|
exfat-utils
|
||||||
@@ -49,11 +61,8 @@
|
|||||||
dmenu
|
dmenu
|
||||||
bluez
|
bluez
|
||||||
bluez-alsa
|
bluez-alsa
|
||||||
pulseaudio
|
pulseaudio)
|
||||||
openssl
|
%base-packages))
|
||||||
openssh
|
|
||||||
zsh))
|
|
||||||
%base-packages)
|
|
||||||
|
|
||||||
(services
|
(services
|
||||||
(append (modify-services %desktop-services
|
(append (modify-services %desktop-services
|
||||||
|
|||||||
Reference in New Issue
Block a user