From bef8bf7973d6e53646f7428ecb9ad845118a9a4b Mon Sep 17 00:00:00 2001 From: opal Date: Fri, 31 Dec 2021 12:18:53 -0800 Subject: [PATCH] moved org files out of dir --- org/desktop.org => desktop.org | 23 +- org/emacs.org => emacs.org | 5 - org/guix.org => guix.org | 157 +++++++----- guix/home/files/emacs/init.el | 4 - guix/home/files/zsh/zshrc | 23 +- guix/home/guix-home.scm | 424 +++++++++++++++++---------------- guix/system/home-desktop.scm | 25 +- org/nyxt.org => nyxt.org | 0 8 files changed, 337 insertions(+), 324 deletions(-) rename org/desktop.org => desktop.org (98%) rename org/emacs.org => emacs.org (99%) rename org/guix.org => guix.org (79%) rename org/nyxt.org => nyxt.org (100%) diff --git a/org/desktop.org b/desktop.org similarity index 98% rename from org/desktop.org rename to desktop.org index 7349411..7b2bad0 100644 --- a/org/desktop.org +++ b/desktop.org @@ -302,23 +302,18 @@ del () { mv "$@" $HOME/.local/share/Trash/files/.; } mkcd () { mkdir -p -- "$1" && cd -P -- "$1" } # --- Aliases --- # -# dnf -alias install="sudo dnf -y install" -alias remove="sudo dnf remove" -alias search="dnf search" -alias update="sudo dnf update" +alias install="guix install" +alias remove="guix remove" +alias search="guix search" +alias pull="guix pull" +alias upgrade="guix package -u" +alias hreconfig="guix home reconfigure ~/dotfiles/guix/home/files/guix-home.scm" # qol alias vi="nvim" alias vim="nvim" 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 alias ga="git add" alias gc="git commit -m" @@ -329,11 +324,7 @@ alias gp="git push" alias gco="git checkout" # config -alias zshrc="vim ~/dotfiles/.config/zsh/.zshrc" -alias zshrcsource="source ~/.config/zsh/.zshrc" - -# firewalld -alias fcmd="firewall-cmd" +alias zshrcsource="source ~/dotfiles/guix/home/files/zsh/zshrc" #+end_src ** diff --git a/org/emacs.org b/emacs.org similarity index 99% rename from org/emacs.org rename to emacs.org index 508c808..e26d347 100644 --- a/org/emacs.org +++ b/emacs.org @@ -734,7 +734,6 @@ Sets HTML strings to have the background of the color they represent. #+end_src *** Ruby -<<<<<<< HEAD **** Code Completion #+begin_src emacs-lisp (use-package robe @@ -744,10 +743,6 @@ Sets HTML strings to have the background of the color they represent. #+begin_src emacs-lisp (use-package bundler :straight t) -======= -#+begin_src emacs-lisp - ->>>>>>> origin/master #+end_src *** Lisp diff --git a/org/guix.org b/guix.org similarity index 79% rename from org/guix.org rename to guix.org index 540c041..f0285b4 100644 --- a/org/guix.org +++ b/guix.org @@ -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) (gnu services desktop) (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 linux) + (gnu packages audio) + (gnu packages pulseaudio) + (gnu system setuid) (nongnu packages linux)) (use-service-modules @@ -56,7 +67,8 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (name "opal") (comment "opal") (group "users") - (home-directory "/home/opal") + (home-directory "/home/opal") + (shell (file-append zsh "/bin/zsh")) (supplementary-groups '("wheel" "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)) (packages (append (list git - wl-clipboard icecat vim nss-certs - stow exfat-utils emacs sway @@ -79,8 +89,8 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper dmenu bluez bluez-alsa - pulseaudio)) - %base-packages) + pulseaudio) + %base-packages)) (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 services) (gnu home services shells) - (gnu home services shepard) - (gnu packages libreoffice) - (gnu packages mail) - (gnu packages pdf)) + (gnu home services shepherd) + (gnu packages) + (gnu packages shells) + (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 (packages (append ;; Tools/Libraries (list - gcc-toolchain + zsh wget - grim - wlsunse curl cmake - make zip unzip libtool - openssl - openssh gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav wl-clipboard - zsh - gnupg) + pavucontrol) ;; Applications (list alacritty nyxt zathura-pdf-mupdf - thunar - firefox - wl-randr - libreoffice + nautilus + wlr-randr calibre mpv youtube-dl icedove keepassxc - nautilus - wofi) + nautilus) ;; Emacs (list 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-treemacs emacs-lsp-treemacs - emacs-parinfer + emacs-parinfer-mode emacs-yasnippet emacs-pdf-tools) ;; Languages (list ruby python - guile + guile-3.0 sbcl - perl python-lsp-server ruby-solargraph) ;; 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 (list - (local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/zsh/zshenv") - "/.config/zsh/.zshenv"))) + (local-file "files/zsh/zshenv"))) ;; .zprofile (zprofile (list - (local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/zsh/zprofile") - "/.config/zsh/.zprofile"))) + (local-file "files/zsh/zprofile"))) ;; .zshrc (zshrc (list - (local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/zsh/zshrc") - "/.config/zsh/.zshrc")))))) + (local-file "files/zsh/zshrc")))))) + ;; Files - (list - (simple-service 'sway + (list + + (simple-service 'sway-config home-files-service-type (list - `(".config/sway/config" + `("config/sway/config" ,(local-file (string-append (getenv "HOME") "/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 home-files-service-type (list - `(".config/emacs/init.el" + `("config/emacs/init.el" ,(local-file (string-append (getenv "HOME") "/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 home-files-service-type (list - `(".config/nyxt/init.lisp" + `("config/nyxt/init.lisp" ,(local-file (string-append (getenv "HOME") "/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 home-files-service-type (list - `(".config/dunst/dunstrc" + `("config/dunst/dunstrc" ,(local-file (string-append (getenv "HOME") "/dotfiles/guix/home/files/dunst/dunstrc"))))) @@ -425,31 +454,31 @@ I use GNU Guix as my operating system. I'm able to declare the state of the oper (simple-service 'mbsync-config home-files-service-type (list - `(".config/mbsync/mbsyncrc" + `("config/mbsync/mbsyncrc" ,(local-file (string-append (getenv "HOME") "/dotfiles/guix/home/files/mbsync/mbsyncrc"))))) (simple-service 'alacritty-config - home-files-service-type - (list - `(".config/alacritty/alacritty.yml" - ,(local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/alacritty/alacritty.yml")))))) + home-files-service-type + (list + `("config/alacritty/alacritty.yml" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/alacritty/alacritty.yml")))))) ;; Daemons (list - (service home-shepard-service-type - (home-shepherd-configuration - (services - (list - (shepard-service - (provision '(emacs)) - (start #~(make-system-constructor "emacs --daemon")) - (stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'"))) - (shepard-service - (provision '(gnome-keyring-daemon)) - (start #~(make-system-contructor "gnome-keyring-daemon --daemonize ")) - (stop #~(make-system-contructor "pkill gnome-keyring-daemon"))))))))))) + (service home-shepherd-service-type + (home-shepherd-configuration + (services + (list + (shepherd-service + (provision '(emacs)) + (start #~(make-system-constructor "emacs --daemon")) + (stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'"))) + (shepherd-service + (provision '(gnome-keyring-daemon)) + (start #~(make-system-contructor "gnome-keyring-daemon --daemonize ")) + (stop #~(make-system-contructor "pkill gnome-keyring-daemon"))))))))))) #+end_src diff --git a/guix/home/files/emacs/init.el b/guix/home/files/emacs/init.el index 4fd2fc5..574883d 100644 --- a/guix/home/files/emacs/init.el +++ b/guix/home/files/emacs/init.el @@ -581,10 +581,6 @@ (use-package bundler :straight t) -======= -#+begin_src emacs-lisp - ->>>>>>> origin/master (use-package parinfer :straight t diff --git a/guix/home/files/zsh/zshrc b/guix/home/files/zsh/zshrc index 5444dec..ffab3cf 100644 --- a/guix/home/files/zsh/zshrc +++ b/guix/home/files/zsh/zshrc @@ -32,23 +32,18 @@ del () { mv "$@" $HOME/.local/share/Trash/files/.; } mkcd () { mkdir -p -- "$1" && cd -P -- "$1" } # --- Aliases --- # -# dnf -alias install="sudo dnf -y install" -alias remove="sudo dnf remove" -alias search="dnf search" -alias update="sudo dnf update" +alias install="guix install" +alias remove="guix remove" +alias search="guix search" +alias pull="guix pull" +alias upgrade="guix package -u" +alias hreconfig="guix home reconfigure ~/dotfiles/guix/home/files/guix-home.scm" # qol alias vi="nvim" alias vim="nvim" 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 alias ga="git add" alias gc="git commit -m" @@ -59,8 +54,4 @@ alias gp="git push" alias gco="git checkout" # config -alias zshrc="vim ~/dotfiles/.config/zsh/.zshrc" -alias zshrcsource="source ~/.config/zsh/.zshrc" - -# firewalld -alias fcmd="firewall-cmd" +alias zshrcsource="source ~/dotfiles/guix/home/files/zsh/zshrc" diff --git a/guix/home/guix-home.scm b/guix/home/guix-home.scm index 9b32cc4..4bea6ed 100644 --- a/guix/home/guix-home.scm +++ b/guix/home/guix-home.scm @@ -1,221 +1,223 @@ (use-modules - (gnu) - (gnu home) - (gnu home services) - (gnu home services shells) - (gnu home services shepherd) - (gnu packages) - (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)) + (gnu) + (gnu home) + (gnu home services) + (gnu home services shells) + (gnu home services shepherd) + (gnu packages) + (gnu packages shells) + (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 - (packages - (append - ;; Tools/Libraries - (list - wget - curl - cmake - zip - unzip - libtool - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-libav - wl-clipboard - pavucontrol) - ;; Applications - (list - alacritty - nyxt - zathura-pdf-mupdf - nautilus - wlr-randr - calibre - mpv - youtube-dl - icedove - keepassxc - nautilus) - ;; Emacs - (list - emacs-vterm - emacs-geiser - emacs-geiser-guile - emacs-doom-modeline - emacs-all-the-icons - emacs-all-the-icons-dired - emacs-general - emacs-which-key - emacs-alert - emacs-helpful - emacs-pinentry - emacs-doom-themes - emacs-evil - emacs-evil-collection - emacs-vertico - emacs-orderless - emacs-consult - emacs-company - emacs-marginalia - emacs-perspective - emacs-dired-rsync - emacs-dired-hacks - emacs-org-bullets - emacs-org-make-toc - emacs-visual-fill-column - emacs-flycheck - emacs-rainbow-mode - emacs-rainbow-delimiters - emacs-magit - emacs-projectile - emacs-lsp-mode - emacs-lsp-ui - emacs-treemacs - emacs-lsp-treemacs - emacs-parinfer-mode - emacs-yasnippet - emacs-pdf-tools) - ;; Languages - (list - ruby - python - guile-3.0 - sbcl - python-lsp-server - ruby-solargraph) - ;; Aesthetics/Fonts - (list - gnome-tweaks - papirus-icon-theme - arc-theme - font-fira-mono - font-fira-code - font-fira-sans - font-abattis-cantarell - font-google-noto - font-awesome))) - (services - (append - ;; Shell - (list - (service home-zsh-service-type - (home-zsh-configuration - ;; Place all configs to $XDG_CONFIG_HOME/zsh. Makes - ;; ~/.zshenv set ZDOTDIR to $XDG_CONFIG_HOME/zsh - ;; and shell process starts with ~/.config/zsh/.zshenv - (xdg-flavor? #t) - ;; .zshenv - (zshenv - (list - (local-file "files/zsh/zshenv"))) - ;; .zprofile - (zprofile - (list - (local-file "files/zsh/zprofile"))) - ;; .zshrc - (zshrc - (list - (local-file "files/zsh/zshrc")))))) + (packages + (append + ;; Tools/Libraries + (list + zsh + wget + curl + cmake + zip + unzip + libtool + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-libav + wl-clipboard + pavucontrol) + ;; Applications + (list + alacritty + nyxt + zathura-pdf-mupdf + nautilus + wlr-randr + calibre + mpv + youtube-dl + icedove + keepassxc + nautilus) + ;; Emacs + (list + emacs-vterm + emacs-geiser + emacs-geiser-guile + emacs-doom-modeline + emacs-all-the-icons + emacs-all-the-icons-dired + emacs-general + emacs-which-key + emacs-alert + emacs-helpful + emacs-pinentry + emacs-doom-themes + emacs-evil + emacs-evil-collection + emacs-vertico + emacs-orderless + emacs-consult + emacs-company + emacs-marginalia + emacs-perspective + emacs-dired-rsync + emacs-dired-hacks + emacs-org-bullets + emacs-org-make-toc + emacs-visual-fill-column + emacs-flycheck + emacs-rainbow-mode + emacs-rainbow-delimiters + emacs-magit + emacs-projectile + emacs-lsp-mode + emacs-lsp-ui + emacs-treemacs + emacs-lsp-treemacs + emacs-parinfer-mode + emacs-yasnippet + emacs-pdf-tools) + ;; Languages + (list + ruby + python + guile-3.0 + sbcl + python-lsp-server + ruby-solargraph) + ;; Aesthetics/Fonts + (list + gnome-tweaks + papirus-icon-theme + arc-theme + font-fira-mono + font-fira-code + font-fira-sans + font-abattis-cantarell + font-google-noto + font-awesome))) + (services + (append + ;; Shell + (list + (service home-zsh-service-type + (home-zsh-configuration + ;; Place all configs to $XDG_CONFIG_HOME/zsh. Makes + ;; ~/.zshenv set ZDOTDIR to $XDG_CONFIG_HOME/zsh + ;; and shell process starts with ~/.config/zsh/.zshenv + (xdg-flavor? #t) + ;; .zshenv + (zshenv + (list + (local-file "files/zsh/zshenv"))) + ;; .zprofile + (zprofile + (list + (local-file "files/zsh/zprofile"))) + ;; .zshrc + (zshrc + (list + (local-file "files/zsh/zshrc")))))) - ;; Files - (list + ;; Files + (list - (simple-service 'sway-config - home-files-service-type - (list - `("config/sway/config" - ,(local-file - (string-append (getenv "HOME") - "/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 - home-files-service-type - (list - `("config/emacs/init.el" - ,(local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/emacs/init.el"))))) + (simple-service 'sway-config + home-files-service-type + (list + `("config/sway/config" + ,(local-file + (string-append (getenv "HOME") + "/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 + home-files-service-type + (list + `("config/emacs/init.el" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/emacs/init.el"))))) - (simple-service 'nyxt-config - home-files-service-type - (list - `("config/nyxt/init.lisp" - ,(local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/nyxt/init.lisp"))))) + (simple-service 'nyxt-config + home-files-service-type + (list + `("config/nyxt/init.lisp" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/nyxt/init.lisp"))))) - (simple-service 'dunst-config - home-files-service-type - (list - `("config/dunst/dunstrc" - ,(local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/dunst/dunstrc"))))) + (simple-service 'dunst-config + home-files-service-type + (list + `("config/dunst/dunstrc" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/dunst/dunstrc"))))) - (simple-service 'mbsync-config - home-files-service-type - (list - `("config/mbsync/mbsyncrc" - ,(local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/mbsync/mbsyncrc"))))) + (simple-service 'mbsync-config + home-files-service-type + (list + `("config/mbsync/mbsyncrc" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/mbsync/mbsyncrc"))))) - (simple-service 'alacritty-config - home-files-service-type - (list - `("config/alacritty/alacritty.yml" - ,(local-file - (string-append (getenv "HOME") - "/dotfiles/guix/home/files/alacritty/alacritty.yml")))))) + (simple-service 'alacritty-config + home-files-service-type + (list + `("config/alacritty/alacritty.yml" + ,(local-file + (string-append (getenv "HOME") + "/dotfiles/guix/home/files/alacritty/alacritty.yml")))))) - ;; Daemons - (list - (service home-shepherd-service-type - (home-shepherd-configuration - (services - (list - (shepherd-service - (provision '(emacs)) - (start #~(make-system-constructor "emacs --daemon")) - (stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'"))) - (shepherd-service - (provision '(gnome-keyring-daemon)) - (start #~(make-system-contructor "gnome-keyring-daemon --daemonize ")) - (stop #~(make-system-contructor "pkill gnome-keyring-daemon"))))))))))) + ;; Daemons + (list + (service home-shepherd-service-type + (home-shepherd-configuration + (services + (list + (shepherd-service + (provision '(emacs)) + (start #~(make-system-constructor "emacs --daemon")) + (stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'"))) + (shepherd-service + (provision '(gnome-keyring-daemon)) + (start #~(make-system-contructor "gnome-keyring-daemon --daemonize ")) + (stop #~(make-system-contructor "pkill gnome-keyring-daemon"))))))))))) diff --git a/guix/system/home-desktop.scm b/guix/system/home-desktop.scm index 601171c..d71827d 100644 --- a/guix/system/home-desktop.scm +++ b/guix/system/home-desktop.scm @@ -1,8 +1,19 @@ (use-modules (gnu) (gnu services desktop) (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 linux) + (gnu packages audio) + (gnu packages pulseaudio) + (gnu system setuid) (nongnu packages linux)) (use-service-modules @@ -28,7 +39,8 @@ (name "opal") (comment "opal") (group "users") - (home-directory "/home/opal") + (home-directory "/home/opal") + (shell (file-append zsh "/bin/zsh")) (supplementary-groups '("wheel" "netdev" @@ -37,7 +49,7 @@ %base-user-accounts)) (packages (append (list git - wl-clipboard + icecat vim nss-certs exfat-utils @@ -49,11 +61,8 @@ dmenu bluez bluez-alsa - pulseaudio - openssl - openssh - zsh)) - %base-packages) + pulseaudio) + %base-packages)) (services (append (modify-services %desktop-services diff --git a/org/nyxt.org b/nyxt.org similarity index 100% rename from org/nyxt.org rename to nyxt.org