diff --git a/apps/neovim/scripts/pipeline.vim b/apps/neovim/scripts/pipeline.vim
deleted file mode 100644
index c6af3cd..0000000
--- a/apps/neovim/scripts/pipeline.vim
+++ /dev/null
@@ -1,20 +0,0 @@
-edit $PIPELINE_IN
-split $PIPELINE_TRANSFORM
-split $PIPELINE_OUT
-
-let s:refresh_output = {j, d, e -> execute('checktime')}
-let s:refresh_output_job = {'spec': ['inotifywait', '-m', '-e', 'close_write,delete', $PIPELINE_OUT], 'opts': {'detach': 1, 'on_stdout': s:refresh_output}}
-let s:refresh_output_job_id = jobstart(s:refresh_output_job['spec'], s:refresh_output_job['opts'])
-
-function s:RunPipeline()
-	execute "!".g:pipeline_transform
-endfunction
-
-let s:refresh_output_job_id = jobstart(s:refresh_output_job['spec'], s:refresh_output_job['opts'])
-
-set updatetime=250
-" only autosave the input buffer
-autocmd CursorHold,CursorHoldI <buffer> silent write
-autocmd FileWritePost silent call s:RunPipeline()
-autocmd VimLeavePre call jobstop(s:refresh_output_job_id)
-autocmd VimLeavePre call jobstop(s:run_pipeline_job_id)
diff --git a/apps/weechat/.gitignore b/apps/weechat/.gitignore
deleted file mode 100644
index 332a435..0000000
--- a/apps/weechat/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-!/alias.conf
-!/buflist.conf
-!/charset.conf
-!/exec.conf
-!/fifo.conf
-!/fset.conf
-!/irc.conf
-!/logger.conf
-!/lua.conf
-!/perl.conf
-!/python.conf
-!/relay.conf
-!/script.conf
-!/spell.conf
-!/tcl.conf
-!/trigger.conf
-!/weechat.conf
-!/xfer.conf
diff --git a/bin/N b/common/bin/N
similarity index 100%
rename from bin/N
rename to common/bin/N
diff --git a/bin/app-launcher b/common/bin/app-launcher
similarity index 100%
rename from bin/app-launcher
rename to common/bin/app-launcher
diff --git a/bin/archive b/common/bin/archive
similarity index 100%
rename from bin/archive
rename to common/bin/archive
diff --git a/bin/archupdate b/common/bin/archupdate
similarity index 100%
rename from bin/archupdate
rename to common/bin/archupdate
diff --git a/bin/at b/common/bin/at
similarity index 100%
rename from bin/at
rename to common/bin/at
diff --git a/bin/b b/common/bin/b
similarity index 100%
rename from bin/b
rename to common/bin/b
diff --git a/bin/backupify b/common/bin/backupify
similarity index 100%
rename from bin/backupify
rename to common/bin/backupify
diff --git a/bin/bspwm_load_state b/common/bin/bspwm_load_state
similarity index 100%
rename from bin/bspwm_load_state
rename to common/bin/bspwm_load_state
diff --git a/bin/bspwm_load_state_canvas b/common/bin/bspwm_load_state_canvas
similarity index 100%
rename from bin/bspwm_load_state_canvas
rename to common/bin/bspwm_load_state_canvas
diff --git a/bin/bspwm_load_state_rules b/common/bin/bspwm_load_state_rules
similarity index 100%
rename from bin/bspwm_load_state_rules
rename to common/bin/bspwm_load_state_rules
diff --git a/bin/bspwm_save_state b/common/bin/bspwm_save_state
similarity index 100%
rename from bin/bspwm_save_state
rename to common/bin/bspwm_save_state
diff --git a/bin/bupstash-wip b/common/bin/bupstash-wip
similarity index 100%
rename from bin/bupstash-wip
rename to common/bin/bupstash-wip
diff --git a/bin/calc b/common/bin/calc
similarity index 100%
rename from bin/calc
rename to common/bin/calc
diff --git a/bin/cdp b/common/bin/cdp
similarity index 100%
rename from bin/cdp
rename to common/bin/cdp
diff --git a/bin/check-port b/common/bin/check-port
similarity index 100%
rename from bin/check-port
rename to common/bin/check-port
diff --git a/bin/check_domain b/common/bin/check_domain
similarity index 100%
rename from bin/check_domain
rename to common/bin/check_domain
diff --git a/bin/choose-common-env b/common/bin/choose-common-env
similarity index 100%
rename from bin/choose-common-env
rename to common/bin/choose-common-env
diff --git a/bin/clip b/common/bin/clip
similarity index 100%
rename from bin/clip
rename to common/bin/clip
diff --git a/bin/clipshot b/common/bin/clipshot
similarity index 100%
rename from bin/clipshot
rename to common/bin/clipshot
diff --git a/bin/clipstatus b/common/bin/clipstatus
similarity index 100%
rename from bin/clipstatus
rename to common/bin/clipstatus
diff --git a/bin/compress b/common/bin/compress
similarity index 100%
rename from bin/compress
rename to common/bin/compress
diff --git a/bin/countdown b/common/bin/countdown
similarity index 100%
rename from bin/countdown
rename to common/bin/countdown
diff --git a/bin/decompress b/common/bin/decompress
similarity index 100%
rename from bin/decompress
rename to common/bin/decompress
diff --git a/bin/devtunnel b/common/bin/devtunnel
similarity index 100%
rename from bin/devtunnel
rename to common/bin/devtunnel
diff --git a/bin/disable-laptop-keyboard b/common/bin/disable-laptop-keyboard
similarity index 100%
rename from bin/disable-laptop-keyboard
rename to common/bin/disable-laptop-keyboard
diff --git a/bin/dns b/common/bin/dns
similarity index 100%
rename from bin/dns
rename to common/bin/dns
diff --git a/bin/dotfiles-make-env b/common/bin/dotfiles-make-env
similarity index 100%
rename from bin/dotfiles-make-env
rename to common/bin/dotfiles-make-env
diff --git a/bin/dotfiles-update b/common/bin/dotfiles-update
similarity index 100%
rename from bin/dotfiles-update
rename to common/bin/dotfiles-update
diff --git a/bin/editscrot b/common/bin/editscrot
similarity index 100%
rename from bin/editscrot
rename to common/bin/editscrot
diff --git a/bin/email-via-mailgun-smtp b/common/bin/email-via-mailgun-smtp
similarity index 100%
rename from bin/email-via-mailgun-smtp
rename to common/bin/email-via-mailgun-smtp
diff --git a/bin/enable-laptop-keyboard b/common/bin/enable-laptop-keyboard
similarity index 100%
rename from bin/enable-laptop-keyboard
rename to common/bin/enable-laptop-keyboard
diff --git a/bin/ezln b/common/bin/ezln
similarity index 100%
rename from bin/ezln
rename to common/bin/ezln
diff --git a/bin/field b/common/bin/field
similarity index 100%
rename from bin/field
rename to common/bin/field
diff --git a/bin/floating-term b/common/bin/floating-term
similarity index 100%
rename from bin/floating-term
rename to common/bin/floating-term
diff --git a/bin/fsw b/common/bin/fsw
similarity index 100%
rename from bin/fsw
rename to common/bin/fsw
diff --git a/bin/fswi b/common/bin/fswi
similarity index 100%
rename from bin/fswi
rename to common/bin/fswi
diff --git a/bin/fzf-history-weight b/common/bin/fzf-history-weight
similarity index 100%
rename from bin/fzf-history-weight
rename to common/bin/fzf-history-weight
diff --git a/bin/fzfemoji b/common/bin/fzfemoji
similarity index 100%
rename from bin/fzfemoji
rename to common/bin/fzfemoji
diff --git a/bin/fzfp b/common/bin/fzfp
similarity index 100%
rename from bin/fzfp
rename to common/bin/fzfp
diff --git a/bin/fzfy b/common/bin/fzfy
similarity index 100%
rename from bin/fzfy
rename to common/bin/fzfy
diff --git a/bin/gcwd b/common/bin/gcwd
similarity index 100%
rename from bin/gcwd
rename to common/bin/gcwd
diff --git a/bin/getip b/common/bin/getip
similarity index 100%
rename from bin/getip
rename to common/bin/getip
diff --git a/bin/git-authors b/common/bin/git-authors
similarity index 100%
rename from bin/git-authors
rename to common/bin/git-authors
diff --git a/bin/glancepath b/common/bin/glancepath
similarity index 100%
rename from bin/glancepath
rename to common/bin/glancepath
diff --git a/bin/grb b/common/bin/grb
similarity index 100%
rename from bin/grb
rename to common/bin/grb
diff --git a/bin/has_command b/common/bin/has_command
similarity index 100%
rename from bin/has_command
rename to common/bin/has_command
diff --git a/bin/image-viewer b/common/bin/image-viewer
similarity index 100%
rename from bin/image-viewer
rename to common/bin/image-viewer
diff --git a/bin/init-dotfiles b/common/bin/init-dotfiles
similarity index 100%
rename from bin/init-dotfiles
rename to common/bin/init-dotfiles
diff --git a/bin/is_wayland b/common/bin/is_wayland
similarity index 100%
rename from bin/is_wayland
rename to common/bin/is_wayland
diff --git a/bin/k8s-yaml-diff b/common/bin/k8s-yaml-diff
similarity index 100%
rename from bin/k8s-yaml-diff
rename to common/bin/k8s-yaml-diff
diff --git a/bin/k8s-yaml-sort b/common/bin/k8s-yaml-sort
similarity index 100%
rename from bin/k8s-yaml-sort
rename to common/bin/k8s-yaml-sort
diff --git a/bin/keyrepeat b/common/bin/keyrepeat
similarity index 100%
rename from bin/keyrepeat
rename to common/bin/keyrepeat
diff --git a/bin/kubeline b/common/bin/kubeline
similarity index 100%
rename from bin/kubeline
rename to common/bin/kubeline
diff --git a/bin/kubfc b/common/bin/kubfc
similarity index 100%
rename from bin/kubfc
rename to common/bin/kubfc
diff --git a/bin/kubfn b/common/bin/kubfn
similarity index 100%
rename from bin/kubfn
rename to common/bin/kubfn
diff --git a/bin/launch b/common/bin/launch
similarity index 100%
rename from bin/launch
rename to common/bin/launch
diff --git a/env/common/setup_helpers.bash b/common/bin/lib/setup_helpers.bash
similarity index 100%
rename from env/common/setup_helpers.bash
rename to common/bin/lib/setup_helpers.bash
diff --git a/bin/linewise b/common/bin/linewise
similarity index 100%
rename from bin/linewise
rename to common/bin/linewise
diff --git a/bin/ltl b/common/bin/ltl
similarity index 100%
rename from bin/ltl
rename to common/bin/ltl
diff --git a/bin/ltld b/common/bin/ltld
similarity index 100%
rename from bin/ltld
rename to common/bin/ltld
diff --git a/bin/lyte-nixos-cleanup b/common/bin/lyte-nixos-cleanup
similarity index 100%
rename from bin/lyte-nixos-cleanup
rename to common/bin/lyte-nixos-cleanup
diff --git a/bin/maybe_source_env_file b/common/bin/maybe_source_env_file
similarity index 100%
rename from bin/maybe_source_env_file
rename to common/bin/maybe_source_env_file
diff --git a/bin/murxvt b/common/bin/murxvt
similarity index 100%
rename from bin/murxvt
rename to common/bin/murxvt
diff --git a/bin/nd b/common/bin/nd
similarity index 100%
rename from bin/nd
rename to common/bin/nd
diff --git a/bin/nf b/common/bin/nf
similarity index 100%
rename from bin/nf
rename to common/bin/nf
diff --git a/bin/note b/common/bin/note
similarity index 100%
rename from bin/note
rename to common/bin/note
diff --git a/bin/nsync b/common/bin/nsync
similarity index 100%
rename from bin/nsync
rename to common/bin/nsync
diff --git a/bin/nvimdiff b/common/bin/nvimdiff
similarity index 100%
rename from bin/nvimdiff
rename to common/bin/nvimdiff
diff --git a/bin/optimize-image-for-web b/common/bin/optimize-image-for-web
similarity index 100%
rename from bin/optimize-image-for-web
rename to common/bin/optimize-image-for-web
diff --git a/bin/pass-chooser b/common/bin/pass-chooser
similarity index 100%
rename from bin/pass-chooser
rename to common/bin/pass-chooser
diff --git a/bin/pass-otp b/common/bin/pass-otp
similarity index 100%
rename from bin/pass-otp
rename to common/bin/pass-otp
diff --git a/bin/paths b/common/bin/paths
similarity index 100%
rename from bin/paths
rename to common/bin/paths
diff --git a/bin/pbin b/common/bin/pbin
similarity index 100%
rename from bin/pbin
rename to common/bin/pbin
diff --git a/bin/pipeline b/common/bin/pipeline
similarity index 100%
rename from bin/pipeline
rename to common/bin/pipeline
diff --git a/bin/pr-for-commit b/common/bin/pr-for-commit
similarity index 100%
rename from bin/pr-for-commit
rename to common/bin/pr-for-commit
diff --git a/bin/prelude b/common/bin/prelude
similarity index 100%
rename from bin/prelude
rename to common/bin/prelude
diff --git a/bin/qute b/common/bin/qute
similarity index 100%
rename from bin/qute
rename to common/bin/qute
diff --git a/bin/reload-xresources b/common/bin/reload-xresources
similarity index 100%
rename from bin/reload-xresources
rename to common/bin/reload-xresources
diff --git a/bin/remote b/common/bin/remote
similarity index 100%
rename from bin/remote
rename to common/bin/remote
diff --git a/bin/resource-usage b/common/bin/resource-usage
similarity index 100%
rename from bin/resource-usage
rename to common/bin/resource-usage
diff --git a/bin/restartbar b/common/bin/restartbar
similarity index 100%
rename from bin/restartbar
rename to common/bin/restartbar
diff --git a/bin/s b/common/bin/s
similarity index 100%
rename from bin/s
rename to common/bin/s
diff --git a/bin/scn b/common/bin/scn
similarity index 100%
rename from bin/scn
rename to common/bin/scn
diff --git a/bin/scount b/common/bin/scount
similarity index 100%
rename from bin/scount
rename to common/bin/scount
diff --git a/bin/screenshot b/common/bin/screenshot
similarity index 100%
rename from bin/screenshot
rename to common/bin/screenshot
diff --git a/bin/script-opts b/common/bin/script-opts
similarity index 100%
rename from bin/script-opts
rename to common/bin/script-opts
diff --git a/bin/scrup b/common/bin/scrup
similarity index 100%
rename from bin/scrup
rename to common/bin/scrup
diff --git a/bin/scwd b/common/bin/scwd
similarity index 100%
rename from bin/scwd
rename to common/bin/scwd
diff --git a/bin/setbg b/common/bin/setbg
similarity index 100%
rename from bin/setbg
rename to common/bin/setbg
diff --git a/bin/setup-dotfiles b/common/bin/setup-dotfiles
similarity index 100%
rename from bin/setup-dotfiles
rename to common/bin/setup-dotfiles
diff --git a/bin/simple-otp b/common/bin/simple-otp
similarity index 100%
rename from bin/simple-otp
rename to common/bin/simple-otp
diff --git a/bin/source_if_exists b/common/bin/source_if_exists
similarity index 100%
rename from bin/source_if_exists
rename to common/bin/source_if_exists
diff --git a/bin/startbar b/common/bin/startbar
similarity index 100%
rename from bin/startbar
rename to common/bin/startbar
diff --git a/bin/stopbar b/common/bin/stopbar
similarity index 100%
rename from bin/stopbar
rename to common/bin/stopbar
diff --git a/env/common/sudo_setup b/common/bin/sudo_setup
similarity index 100%
rename from env/common/sudo_setup
rename to common/bin/sudo_setup
diff --git a/bin/sw b/common/bin/sw
similarity index 100%
rename from bin/sw
rename to common/bin/sw
diff --git a/bin/terminal-rendering-test b/common/bin/terminal-rendering-test
similarity index 100%
rename from bin/terminal-rendering-test
rename to common/bin/terminal-rendering-test
diff --git a/bin/termrec b/common/bin/termrec
similarity index 100%
rename from bin/termrec
rename to common/bin/termrec
diff --git a/bin/tmux-save-buffer b/common/bin/tmux-save-buffer
similarity index 100%
rename from bin/tmux-save-buffer
rename to common/bin/tmux-save-buffer
diff --git a/bin/tmuxswitcher b/common/bin/tmuxswitcher
similarity index 100%
rename from bin/tmuxswitcher
rename to common/bin/tmuxswitcher
diff --git a/bin/unarchive b/common/bin/unarchive
similarity index 100%
rename from bin/unarchive
rename to common/bin/unarchive
diff --git a/bin/unbackupify b/common/bin/unbackupify
similarity index 100%
rename from bin/unbackupify
rename to common/bin/unbackupify
diff --git a/bin/upload b/common/bin/upload
similarity index 100%
rename from bin/upload
rename to common/bin/upload
diff --git a/bin/wifi-list b/common/bin/wifi-list
similarity index 100%
rename from bin/wifi-list
rename to common/bin/wifi-list
diff --git a/bin/wm b/common/bin/wm
similarity index 100%
rename from bin/wm
rename to common/bin/wm
diff --git a/bin/work-journal-entry b/common/bin/work-journal-entry
similarity index 100%
rename from bin/work-journal-entry
rename to common/bin/work-journal-entry
diff --git a/bin/work-mode b/common/bin/work-mode
similarity index 100%
rename from bin/work-mode
rename to common/bin/work-mode
diff --git a/bin/yamldiff b/common/bin/yamldiff
similarity index 100%
rename from bin/yamldiff
rename to common/bin/yamldiff
diff --git a/env/common/colors/generator/.gitignore b/common/colors/generator/.gitignore
similarity index 100%
rename from env/common/colors/generator/.gitignore
rename to common/colors/generator/.gitignore
diff --git a/env/common/colors/generator/gen.bash b/common/colors/generator/gen.bash
similarity index 100%
rename from env/common/colors/generator/gen.bash
rename to common/colors/generator/gen.bash
diff --git a/env/common/colors/generator/gen.moon b/common/colors/generator/gen.moon
similarity index 100%
rename from env/common/colors/generator/gen.moon
rename to common/colors/generator/gen.moon
diff --git a/env/common/colors/generator/schemes/bright.yml b/common/colors/generator/schemes/bright.yml
similarity index 100%
rename from env/common/colors/generator/schemes/bright.yml
rename to common/colors/generator/schemes/bright.yml
diff --git a/env/common/colors/generator/schemes/donokai.moon b/common/colors/generator/schemes/donokai.moon
similarity index 100%
rename from env/common/colors/generator/schemes/donokai.moon
rename to common/colors/generator/schemes/donokai.moon
diff --git a/env/common/colors/generator/schemes/donokai.yml b/common/colors/generator/schemes/donokai.yml
similarity index 100%
rename from env/common/colors/generator/schemes/donokai.yml
rename to common/colors/generator/schemes/donokai.yml
diff --git a/env/common/colors/generator/schemes/donokaiblack.yml b/common/colors/generator/schemes/donokaiblack.yml
similarity index 100%
rename from env/common/colors/generator/schemes/donokaiblack.yml
rename to common/colors/generator/schemes/donokaiblack.yml
diff --git a/env/common/colors/generator/schemes/holodized.yml b/common/colors/generator/schemes/holodized.yml
similarity index 100%
rename from env/common/colors/generator/schemes/holodized.yml
rename to common/colors/generator/schemes/holodized.yml
diff --git a/env/common/colors/generator/templates/shell b/common/colors/generator/templates/shell
similarity index 100%
rename from env/common/colors/generator/templates/shell
rename to common/colors/generator/templates/shell
diff --git a/env/common/colors/generator/templates/shell.moon b/common/colors/generator/templates/shell.moon
similarity index 100%
rename from env/common/colors/generator/templates/shell.moon
rename to common/colors/generator/templates/shell.moon
diff --git a/env/common/colors/set-theme.bash b/common/colors/set-theme.bash
similarity index 100%
rename from env/common/colors/set-theme.bash
rename to common/colors/set-theme.bash
diff --git a/env/common/colors/shell b/common/colors/shell
similarity index 100%
rename from env/common/colors/shell
rename to common/colors/shell
diff --git a/env/common/colors/vconsole b/common/colors/vconsole
similarity index 100%
rename from env/common/colors/vconsole
rename to common/colors/vconsole
diff --git a/env/common/colors/vim b/common/colors/vim
similarity index 100%
rename from env/common/colors/vim
rename to common/colors/vim
diff --git a/env/common/colors/xresources b/common/colors/xresources
similarity index 100%
rename from env/common/colors/xresources
rename to common/colors/xresources
diff --git a/env/common/ansi_graphics_codes.tsv b/common/data/ansi_graphics_codes.tsv
similarity index 100%
rename from env/common/ansi_graphics_codes.tsv
rename to common/data/ansi_graphics_codes.tsv
diff --git a/env/common/data/pipelines/b64/transform b/common/data/pipelines/b64/transform
similarity index 100%
rename from env/common/data/pipelines/b64/transform
rename to common/data/pipelines/b64/transform
diff --git a/env/common/data/pipelines/base64/transform b/common/data/pipelines/base64/transform
similarity index 100%
rename from env/common/data/pipelines/base64/transform
rename to common/data/pipelines/base64/transform
diff --git a/env/common/data/pipelines/linewise/transform b/common/data/pipelines/linewise/transform
similarity index 100%
rename from env/common/data/pipelines/linewise/transform
rename to common/data/pipelines/linewise/transform
diff --git a/env/common/data/pipelines/test/transform b/common/data/pipelines/test/transform
similarity index 100%
rename from env/common/data/pipelines/test/transform
rename to common/data/pipelines/test/transform
diff --git a/env/common/data/pipelines/xxd/transform b/common/data/pipelines/xxd/transform
similarity index 100%
rename from env/common/data/pipelines/xxd/transform
rename to common/data/pipelines/xxd/transform
diff --git a/apps/shell/user-dirs b/common/data/user-dirs
similarity index 100%
rename from apps/shell/user-dirs
rename to common/data/user-dirs
diff --git a/apps/shell/vt_colors b/common/data/vt_colors
similarity index 100%
rename from apps/shell/vt_colors
rename to common/data/vt_colors
diff --git a/apps/elixir/iex.exs b/common/elixir/iex.exs
similarity index 100%
rename from apps/elixir/iex.exs
rename to common/elixir/iex.exs
diff --git a/apps/emacs/.gitignore b/common/emacs/.gitignore
similarity index 100%
rename from apps/emacs/.gitignore
rename to common/emacs/.gitignore
diff --git a/apps/emacs/config.org b/common/emacs/config.org
similarity index 100%
rename from apps/emacs/config.org
rename to common/emacs/config.org
diff --git a/apps/emacs/init.el b/common/emacs/init.el
similarity index 100%
rename from apps/emacs/init.el
rename to common/emacs/init.el
diff --git a/common/fish/fish_variables b/common/fish/fish_variables
new file mode 100644
index 0000000..c4319ab
--- /dev/null
+++ b/common/fish/fish_variables
@@ -0,0 +1,71 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR --export BROWSER:firefox\x2ddeveloper\x2dedition
+SETUVAR --export CLUTTER_BACKEND:wayland
+SETUVAR --export --path DOTFILES_PATH:/home/daniel/\x2ehome/\x2econfig/lytedev\x2ddotfiles
+SETUVAR --export EDITOR:nvim
+SETUVAR --export --path ENV_PATH:/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv
+SETUVAR --export ERL_AFLAGS:\x2dkernel\x20shell_history\x20enabled\x20\x2dkernel\x20shell_history_file_bytes\x201024000
+SETUVAR --export EXA_COLORS:\x2a\x3d0
+SETUVAR --export --path FISH_PATH:/home/daniel/\x2ehome/\x2econfig/fish
+SETUVAR --export --path GOPATH:/home/daniel/\x2ehome/\x2ego
+SETUVAR --export LESS:\x2dr
+SETUVAR --export LS_COLORS:ow\x3d01\x3b36\x3b40
+SETUVAR --export MANPAGER:env\x20MANWIDTH\x3d\x22\x22\x20nvim\x20\x2d\x2dcmd\x20\x22let\x20g\x3aprosession_on_startup\x3d0\x22\x20\x2bMan\x21
+SETUVAR --export MOZ_ENABLE_WAYLAND:1
+SETUVAR --export NICE_HOME:/home/daniel
+SETUVAR --export --path NIX_PATH:\x1d
+SETUVAR --export NNN_COLORS:1234
+SETUVAR --export NNN_FCOLORS:030304020005050805030501
+SETUVAR --export NNN_OPTS:EHacdx
+SETUVAR --export NNN_PLUG:p\x3apreview
+SETUVAR --export --path NOTES_PATH:/home/daniel/doc/notes
+SETUVAR --export PAGER:less
+SETUVAR --export --path SCROTS_PATH:/home/daniel/img/scrots
+SETUVAR --export SDL_VIDEODRIVER:wayland
+SETUVAR --export TERMINAL:kitty
+SETUVAR --export --path TMUX_PLUGIN_MANAGER_PATH:/home/daniel/\x2ehome/\x2econfig/tmux/plugins/
+SETUVAR --export --path USER_LOGS_PATH:/home/daniel/doc/logs
+SETUVAR --export VISUAL:nvim
+SETUVAR --export XDG_CONFIG_HOME:/home/daniel/\x2ehome/\x2econfig
+SETUVAR --export XDG_DESKTOP_DIR:/home/daniel/\x2ehome/desktop
+SETUVAR --export XDG_DOCUMENTS_DIR:/home/daniel/doc
+SETUVAR --export XDG_DOWNLOAD_DIR:/home/daniel/dl
+SETUVAR --export XDG_GAMES_DIR:/home/daniel/games
+SETUVAR --export XDG_MUSIC_DIR:/home/daniel/music
+SETUVAR --export XDG_PICTURES_DIR:/home/daniel/img
+SETUVAR --export XDG_PUBLICSHARE_DIR:/home/daniel/\x2ehome/public
+SETUVAR --export XDG_TEMPLATES_DIR:/home/daniel/\x2ehome/templates
+SETUVAR --export XDG_VIDEOS_DIR:/home/daniel/video
+SETUVAR --export _JAVA_AWT_WM_NONREPARENTING:1
+SETUVAR __fish_initialized:3100
+SETUVAR fish_color_autosuggestion:666\x1ebrblack
+SETUVAR fish_color_cancel:333\x1ebrblack
+SETUVAR fish_color_command:white
+SETUVAR fish_color_comment:666\x1ebrblack
+SETUVAR fish_color_cwd:magenta
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:red
+SETUVAR fish_color_escape:yellow
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_match:blue
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:blue
+SETUVAR fish_color_param:white
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:blue
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3d333
+SETUVAR fish_color_selection:blue
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:blue
+SETUVAR fish_color_valid_path:yellow
+SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
+SETUVAR fish_key_bindings:fish_vi_key_bindings
+SETUVAR fish_pager_color_completion:white
+SETUVAR fish_pager_color_description:magenta
+SETUVAR fish_pager_color_prefix:blue
+SETUVAR fish_pager_color_progress:white\x1e\x2d\x2dbackground\x3d333
+SETUVAR fish_user_paths:/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2elocal/bin\x1e/home/daniel/\x2ehome/\x2ego\x1e/home/daniel/\x2ehome/\x2ego/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2ddotfiles/common/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/\x2ehidden/bin\x1e/home/daniel/\x2ehome/\x2ebin\x1e/home/daniel/\x2ehome/\x2ecargo/bin\x1e/home/daniel/\x2ehome/\x2enimble/bin\x1e/home/daniel/\x2ehome/\x2eyarn/bin\x1e/home/daniel/\x2ehome/\x2enetlify/helper/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/linux/bin\x1e/home/daniel/\x2ehome/\x2econfig/lytedev\x2denv/third/bin
diff --git a/apps/git/config b/common/git/config
similarity index 100%
rename from apps/git/config
rename to common/git/config
diff --git a/apps/gpg/agent.conf b/common/gpg/agent.conf
similarity index 100%
rename from apps/gpg/agent.conf
rename to common/gpg/agent.conf
diff --git a/apps/htop/rc b/common/htop/rc
similarity index 100%
rename from apps/htop/rc
rename to common/htop/rc
diff --git a/apps/kak/.gitignore b/common/kak/.gitignore
similarity index 100%
rename from apps/kak/.gitignore
rename to common/kak/.gitignore
diff --git a/apps/kak/colors/selenized-black.kak b/common/kak/colors/selenized-black.kak
similarity index 100%
rename from apps/kak/colors/selenized-black.kak
rename to common/kak/colors/selenized-black.kak
diff --git a/apps/kak/colors/selenized-dark.kak b/common/kak/colors/selenized-dark.kak
similarity index 100%
rename from apps/kak/colors/selenized-dark.kak
rename to common/kak/colors/selenized-dark.kak
diff --git a/apps/kak/colors/selenized-light.kak b/common/kak/colors/selenized-light.kak
similarity index 100%
rename from apps/kak/colors/selenized-light.kak
rename to common/kak/colors/selenized-light.kak
diff --git a/apps/kak/colors/selenized-white.kak b/common/kak/colors/selenized-white.kak
similarity index 100%
rename from apps/kak/colors/selenized-white.kak
rename to common/kak/colors/selenized-white.kak
diff --git a/apps/kak/kakrc b/common/kak/kakrc
similarity index 100%
rename from apps/kak/kakrc
rename to common/kak/kakrc
diff --git a/apps/kak/setup-plugins.sh b/common/kak/setup-plugins.sh
similarity index 100%
rename from apps/kak/setup-plugins.sh
rename to common/kak/setup-plugins.sh
diff --git a/apps/kitty/kitty.conf b/common/kitty/kitty.conf
similarity index 100%
rename from apps/kitty/kitty.conf
rename to common/kitty/kitty.conf
diff --git a/apps/mpd/mpd.conf b/common/mpd/mpd.conf
similarity index 100%
rename from apps/mpd/mpd.conf
rename to common/mpd/mpd.conf
diff --git a/apps/mutt/rc b/common/mutt/rc
similarity index 100%
rename from apps/mutt/rc
rename to common/mutt/rc
diff --git a/apps/ncmpcpp/config b/common/ncmpcpp/config
similarity index 100%
rename from apps/ncmpcpp/config
rename to common/ncmpcpp/config
diff --git a/apps/neovim/.gitignore b/common/neovim/.gitignore
similarity index 100%
rename from apps/neovim/.gitignore
rename to common/neovim/.gitignore
diff --git a/apps/neovim/ftplugin/nim.vim b/common/neovim/ftplugin/nim.vim
similarity index 100%
rename from apps/neovim/ftplugin/nim.vim
rename to common/neovim/ftplugin/nim.vim
diff --git a/apps/neovim/init.vim b/common/neovim/init.vim
similarity index 100%
rename from apps/neovim/init.vim
rename to common/neovim/init.vim
diff --git a/apps/neovim/nvim_lsp.lua b/common/neovim/nvim_lsp.lua
similarity index 100%
rename from apps/neovim/nvim_lsp.lua
rename to common/neovim/nvim_lsp.lua
diff --git a/apps/nnn/.gitignore b/common/nnn/.gitignore
similarity index 100%
rename from apps/nnn/.gitignore
rename to common/nnn/.gitignore
diff --git a/apps/nnn/config.fish b/common/nnn/config.fish
similarity index 100%
rename from apps/nnn/config.fish
rename to common/nnn/config.fish
diff --git a/apps/nnn/plugins/preview b/common/nnn/plugins/preview
similarity index 100%
rename from apps/nnn/plugins/preview
rename to common/nnn/plugins/preview
diff --git a/apps/qutebrowser/keys.conf b/common/qutebrowser/keys.conf
similarity index 100%
rename from apps/qutebrowser/keys.conf
rename to common/qutebrowser/keys.conf
diff --git a/apps/qutebrowser/qutebrowser.conf b/common/qutebrowser/qutebrowser.conf
similarity index 100%
rename from apps/qutebrowser/qutebrowser.conf
rename to common/qutebrowser/qutebrowser.conf
diff --git a/apps/scim/lua/dice.lua b/common/scim/lua/dice.lua
similarity index 100%
rename from apps/scim/lua/dice.lua
rename to common/scim/lua/dice.lua
diff --git a/apps/scim/lua/h.lua b/common/scim/lua/h.lua
similarity index 100%
rename from apps/scim/lua/h.lua
rename to common/scim/lua/h.lua
diff --git a/apps/scim/rc b/common/scim/rc
similarity index 100%
rename from apps/scim/rc
rename to common/scim/rc
diff --git a/apps/shell/fish/.gitignore b/common/shell/fish/.gitignore
similarity index 100%
rename from apps/shell/fish/.gitignore
rename to common/shell/fish/.gitignore
diff --git a/apps/shell/fish/aliases.fish b/common/shell/fish/aliases.fish
similarity index 100%
rename from apps/shell/fish/aliases.fish
rename to common/shell/fish/aliases.fish
diff --git a/apps/shell/fish/colors.fish b/common/shell/fish/colors.fish
similarity index 100%
rename from apps/shell/fish/colors.fish
rename to common/shell/fish/colors.fish
diff --git a/apps/shell/fish/completions/fisher.fish b/common/shell/fish/completions/fisher.fish
similarity index 100%
rename from apps/shell/fish/completions/fisher.fish
rename to common/shell/fish/completions/fisher.fish
diff --git a/apps/shell/fish/completions/kubectl.fish b/common/shell/fish/completions/kubectl.fish
similarity index 100%
rename from apps/shell/fish/completions/kubectl.fish
rename to common/shell/fish/completions/kubectl.fish
diff --git a/apps/shell/fish/config.fish b/common/shell/fish/config.fish
similarity index 100%
rename from apps/shell/fish/config.fish
rename to common/shell/fish/config.fish
diff --git a/apps/shell/fish/fish_plugins b/common/shell/fish/fish_plugins
similarity index 100%
rename from apps/shell/fish/fish_plugins
rename to common/shell/fish/fish_plugins
diff --git a/apps/shell/fish/key-bindings.fish b/common/shell/fish/key-bindings.fish
similarity index 100%
rename from apps/shell/fish/key-bindings.fish
rename to common/shell/fish/key-bindings.fish
diff --git a/apps/shell/fish/paths.fish b/common/shell/fish/paths.fish
similarity index 100%
rename from apps/shell/fish/paths.fish
rename to common/shell/fish/paths.fish
diff --git a/apps/shell/fish/prompt.fish b/common/shell/fish/prompt.fish
similarity index 100%
rename from apps/shell/fish/prompt.fish
rename to common/shell/fish/prompt.fish
diff --git a/apps/shell/tmux/conf b/common/shell/tmux/conf
similarity index 100%
rename from apps/shell/tmux/conf
rename to common/shell/tmux/conf
diff --git a/apps/shell/tmux/layouts/dev.tmux b/common/shell/tmux/layouts/dev.tmux
similarity index 100%
rename from apps/shell/tmux/layouts/dev.tmux
rename to common/shell/tmux/layouts/dev.tmux
diff --git a/apps/weechat/alias.conf b/common/weechat/alias.conf
similarity index 100%
rename from apps/weechat/alias.conf
rename to common/weechat/alias.conf
diff --git a/apps/weechat/buflist.conf b/common/weechat/buflist.conf
similarity index 100%
rename from apps/weechat/buflist.conf
rename to common/weechat/buflist.conf
diff --git a/apps/weechat/charset.conf b/common/weechat/charset.conf
similarity index 100%
rename from apps/weechat/charset.conf
rename to common/weechat/charset.conf
diff --git a/apps/weechat/exec.conf b/common/weechat/exec.conf
similarity index 100%
rename from apps/weechat/exec.conf
rename to common/weechat/exec.conf
diff --git a/apps/weechat/fifo.conf b/common/weechat/fifo.conf
similarity index 100%
rename from apps/weechat/fifo.conf
rename to common/weechat/fifo.conf
diff --git a/apps/weechat/fset.conf b/common/weechat/fset.conf
similarity index 100%
rename from apps/weechat/fset.conf
rename to common/weechat/fset.conf
diff --git a/apps/weechat/irc.conf b/common/weechat/irc.conf
similarity index 100%
rename from apps/weechat/irc.conf
rename to common/weechat/irc.conf
diff --git a/apps/weechat/logger.conf b/common/weechat/logger.conf
similarity index 100%
rename from apps/weechat/logger.conf
rename to common/weechat/logger.conf
diff --git a/apps/weechat/lua.conf b/common/weechat/lua.conf
similarity index 100%
rename from apps/weechat/lua.conf
rename to common/weechat/lua.conf
diff --git a/apps/weechat/perl.conf b/common/weechat/perl.conf
similarity index 100%
rename from apps/weechat/perl.conf
rename to common/weechat/perl.conf
diff --git a/apps/weechat/python.conf b/common/weechat/python.conf
similarity index 100%
rename from apps/weechat/python.conf
rename to common/weechat/python.conf
diff --git a/apps/weechat/relay.conf b/common/weechat/relay.conf
similarity index 100%
rename from apps/weechat/relay.conf
rename to common/weechat/relay.conf
diff --git a/apps/weechat/script.conf b/common/weechat/script.conf
similarity index 100%
rename from apps/weechat/script.conf
rename to common/weechat/script.conf
diff --git a/apps/weechat/spell.conf b/common/weechat/spell.conf
similarity index 100%
rename from apps/weechat/spell.conf
rename to common/weechat/spell.conf
diff --git a/apps/weechat/tcl.conf b/common/weechat/tcl.conf
similarity index 100%
rename from apps/weechat/tcl.conf
rename to common/weechat/tcl.conf
diff --git a/apps/weechat/trigger.conf b/common/weechat/trigger.conf
similarity index 100%
rename from apps/weechat/trigger.conf
rename to common/weechat/trigger.conf
diff --git a/apps/weechat/weechat.conf b/common/weechat/weechat.conf
similarity index 100%
rename from apps/weechat/weechat.conf
rename to common/weechat/weechat.conf
diff --git a/apps/weechat/xfer.conf b/common/weechat/xfer.conf
similarity index 100%
rename from apps/weechat/xfer.conf
rename to common/weechat/xfer.conf
diff --git a/env/common/machines/laptop/laptop b/env/common/machines/laptop/laptop
deleted file mode 120000
index e6d7f01..0000000
--- a/env/common/machines/laptop/laptop
+++ /dev/null
@@ -1 +0,0 @@
-/home/daniel/.home/.config/dotfiles/env/common/machines/laptop
\ No newline at end of file
diff --git a/env/common/machines/desktop/bin/minecraft b/host/desktop/bin/minecraft
similarity index 100%
rename from env/common/machines/desktop/bin/minecraft
rename to host/desktop/bin/minecraft
diff --git a/env/common/machines/desktop/bin/reboot-to-windows b/host/desktop/bin/reboot-to-windows
similarity index 100%
rename from env/common/machines/desktop/bin/reboot-to-windows
rename to host/desktop/bin/reboot-to-windows
diff --git a/env/common/machines/desktop/fstab b/host/desktop/fstab
similarity index 100%
rename from env/common/machines/desktop/fstab
rename to host/desktop/fstab
diff --git a/env/anonode/gitconfig b/host/headless/anonode/gitconfig
similarity index 100%
rename from env/anonode/gitconfig
rename to host/headless/anonode/gitconfig
diff --git a/env/common/machines/laptop/bin/disable-touchscreen b/host/laptop/bin/disable-touchscreen
similarity index 100%
rename from env/common/machines/laptop/bin/disable-touchscreen
rename to host/laptop/bin/disable-touchscreen
diff --git a/env/common/machines/laptop/sway/main b/host/laptop/third/sway/main
similarity index 100%
rename from env/common/machines/laptop/sway/main
rename to host/laptop/third/sway/main
diff --git a/makefile b/makefile
deleted file mode 100644
index f3e9dae..0000000
--- a/makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-MAKEFILE_PATH ?= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-
-.PHONY: install
-install:
-	@cd ${MAKEFILE_PATH} && ./bin/setup-dotfiles
diff --git a/env/arch-linux/provision.d/00-add-user.bash b/os/linux/arch-linux/provision.d/00-add-user.bash
similarity index 100%
rename from env/arch-linux/provision.d/00-add-user.bash
rename to os/linux/arch-linux/provision.d/00-add-user.bash
diff --git a/env/arch-linux/provision.d/10-install-yay.bash b/os/linux/arch-linux/provision.d/10-install-yay.bash
similarity index 100%
rename from env/arch-linux/provision.d/10-install-yay.bash
rename to os/linux/arch-linux/provision.d/10-install-yay.bash
diff --git a/env/arch-linux/provision.d/20-install-packages.bash b/os/linux/arch-linux/provision.d/20-install-packages.bash
similarity index 100%
rename from env/arch-linux/provision.d/20-install-packages.bash
rename to os/linux/arch-linux/provision.d/20-install-packages.bash
diff --git a/env/arch-linux/provision.d/50-install-tmux-plugins.bash b/os/linux/arch-linux/provision.d/50-install-tmux-plugins.bash
similarity index 100%
rename from env/arch-linux/provision.d/50-install-tmux-plugins.bash
rename to os/linux/arch-linux/provision.d/50-install-tmux-plugins.bash
diff --git a/env/arch-linux/provision.d/optional/amd-cpu.bash b/os/linux/arch-linux/provision.d/optional/amd-cpu.bash
similarity index 100%
rename from env/arch-linux/provision.d/optional/amd-cpu.bash
rename to os/linux/arch-linux/provision.d/optional/amd-cpu.bash
diff --git a/env/arch-linux/provision.d/optional/amd-gpu.bash b/os/linux/arch-linux/provision.d/optional/amd-gpu.bash
similarity index 100%
rename from env/arch-linux/provision.d/optional/amd-gpu.bash
rename to os/linux/arch-linux/provision.d/optional/amd-gpu.bash
diff --git a/env/arch-linux/provision.sh b/os/linux/arch-linux/provision.sh
similarity index 100%
rename from env/arch-linux/provision.sh
rename to os/linux/arch-linux/provision.sh
diff --git a/apps/de/desktop/neovimterm.desktop b/os/linux/de/desktop/neovimterm.desktop
similarity index 100%
rename from apps/de/desktop/neovimterm.desktop
rename to os/linux/de/desktop/neovimterm.desktop
diff --git a/apps/de/gnome/gdm-tap-to-click b/os/linux/de/gnome/gdm-tap-to-click
similarity index 100%
rename from apps/de/gnome/gdm-tap-to-click
rename to os/linux/de/gnome/gdm-tap-to-click
diff --git a/apps/de/gtk/2rc b/os/linux/de/gtk/2rc
similarity index 100%
rename from apps/de/gtk/2rc
rename to os/linux/de/gtk/2rc
diff --git a/apps/de/gtk/3settings.ini b/os/linux/de/gtk/3settings.ini
similarity index 100%
rename from apps/de/gtk/3settings.ini
rename to os/linux/de/gtk/3settings.ini
diff --git a/apps/de/kanshi/config b/os/linux/de/kanshi/config
similarity index 100%
rename from apps/de/kanshi/config
rename to os/linux/de/kanshi/config
diff --git a/apps/de/kanshi/desktop-H-workspaces.sh b/os/linux/de/kanshi/desktop-H-workspaces.sh
similarity index 100%
rename from apps/de/kanshi/desktop-H-workspaces.sh
rename to os/linux/de/kanshi/desktop-H-workspaces.sh
diff --git a/apps/de/kanshi/desktop-single-workspace.sh b/os/linux/de/kanshi/desktop-single-workspace.sh
similarity index 100%
rename from apps/de/kanshi/desktop-single-workspace.sh
rename to os/linux/de/kanshi/desktop-single-workspace.sh
diff --git a/apps/de/libinput/gestures.conf b/os/linux/de/libinput/gestures.conf
similarity index 100%
rename from apps/de/libinput/gestures.conf
rename to os/linux/de/libinput/gestures.conf
diff --git a/apps/de/libinput/sway-gestures.conf b/os/linux/de/libinput/sway-gestures.conf
similarity index 100%
rename from apps/de/libinput/sway-gestures.conf
rename to os/linux/de/libinput/sway-gestures.conf
diff --git a/apps/de/mako/config b/os/linux/de/mako/config
similarity index 100%
rename from apps/de/mako/config
rename to os/linux/de/mako/config
diff --git a/apps/de/sway/config b/os/linux/de/sway/config
similarity index 100%
rename from apps/de/sway/config
rename to os/linux/de/sway/config
diff --git a/apps/de/sway/dm-entry b/os/linux/de/sway/dm-entry
similarity index 100%
rename from apps/de/sway/dm-entry
rename to os/linux/de/sway/dm-entry
diff --git a/apps/de/sway/init b/os/linux/de/sway/init
similarity index 100%
rename from apps/de/sway/init
rename to os/linux/de/sway/init
diff --git a/apps/de/sway/lock b/os/linux/de/sway/lock
similarity index 100%
rename from apps/de/sway/lock
rename to os/linux/de/sway/lock
diff --git a/apps/de/sway/mimeapps.list b/os/linux/de/sway/mimeapps.list
similarity index 100%
rename from apps/de/sway/mimeapps.list
rename to os/linux/de/sway/mimeapps.list
diff --git a/apps/de/waybar/config b/os/linux/de/waybar/config
similarity index 100%
rename from apps/de/waybar/config
rename to os/linux/de/waybar/config
diff --git a/apps/de/waybar/style.css b/os/linux/de/waybar/style.css
similarity index 100%
rename from apps/de/waybar/style.css
rename to os/linux/de/waybar/style.css
diff --git a/env/debian/provisioning/create-my-user.bash b/os/linux/debian/provisioning/create-my-user.bash
similarity index 100%
rename from env/debian/provisioning/create-my-user.bash
rename to os/linux/debian/provisioning/create-my-user.bash
diff --git a/env/debian/provisioning/install-packages.bash b/os/linux/debian/provisioning/install-packages.bash
similarity index 100%
rename from env/debian/provisioning/install-packages.bash
rename to os/linux/debian/provisioning/install-packages.bash
diff --git a/env/debian/provisioning/install-tmux-plugins.bash b/os/linux/debian/provisioning/install-tmux-plugins.bash
similarity index 100%
rename from env/debian/provisioning/install-tmux-plugins.bash
rename to os/linux/debian/provisioning/install-tmux-plugins.bash
diff --git a/env/nix/machines/third.nix b/os/linux/nix/machines/third.nix
similarity index 100%
rename from env/nix/machines/third.nix
rename to os/linux/nix/machines/third.nix
diff --git a/env/nix/machines/virt.nix b/os/linux/nix/machines/virt.nix
similarity index 100%
rename from env/nix/machines/virt.nix
rename to os/linux/nix/machines/virt.nix
diff --git a/env/nix/machines/wallwart.nix b/os/linux/nix/machines/wallwart.nix
similarity index 100%
rename from env/nix/machines/wallwart.nix
rename to os/linux/nix/machines/wallwart.nix
diff --git a/env/nix/modules/amd-gpu.nix b/os/linux/nix/modules/amd-gpu.nix
similarity index 100%
rename from env/nix/modules/amd-gpu.nix
rename to os/linux/nix/modules/amd-gpu.nix
diff --git a/env/nix/modules/amd.nix b/os/linux/nix/modules/amd.nix
similarity index 100%
rename from env/nix/modules/amd.nix
rename to os/linux/nix/modules/amd.nix
diff --git a/env/nix/modules/bash.nix b/os/linux/nix/modules/bash.nix
similarity index 100%
rename from env/nix/modules/bash.nix
rename to os/linux/nix/modules/bash.nix
diff --git a/env/nix/modules/bluetooth.nix b/os/linux/nix/modules/bluetooth.nix
similarity index 100%
rename from env/nix/modules/bluetooth.nix
rename to os/linux/nix/modules/bluetooth.nix
diff --git a/env/nix/modules/de/gnome.nix b/os/linux/nix/modules/de/gnome.nix
similarity index 100%
rename from env/nix/modules/de/gnome.nix
rename to os/linux/nix/modules/de/gnome.nix
diff --git a/env/nix/modules/de/graphics.nix b/os/linux/nix/modules/de/graphics.nix
similarity index 100%
rename from env/nix/modules/de/graphics.nix
rename to os/linux/nix/modules/de/graphics.nix
diff --git a/env/nix/modules/de/sway.nix b/os/linux/nix/modules/de/sway.nix
similarity index 100%
rename from env/nix/modules/de/sway.nix
rename to os/linux/nix/modules/de/sway.nix
diff --git a/env/nix/modules/docker.nix b/os/linux/nix/modules/docker.nix
similarity index 100%
rename from env/nix/modules/docker.nix
rename to os/linux/nix/modules/docker.nix
diff --git a/env/nix/modules/fish.nix b/os/linux/nix/modules/fish.nix
similarity index 100%
rename from env/nix/modules/fish.nix
rename to os/linux/nix/modules/fish.nix
diff --git a/env/nix/modules/gdm.nix b/os/linux/nix/modules/gdm.nix
similarity index 100%
rename from env/nix/modules/gdm.nix
rename to os/linux/nix/modules/gdm.nix
diff --git a/env/nix/modules/intel.nix b/os/linux/nix/modules/intel.nix
similarity index 100%
rename from env/nix/modules/intel.nix
rename to os/linux/nix/modules/intel.nix
diff --git a/env/nix/modules/lightdm.nix b/os/linux/nix/modules/lightdm.nix
similarity index 100%
rename from env/nix/modules/lightdm.nix
rename to os/linux/nix/modules/lightdm.nix
diff --git a/env/nix/modules/neovim.nix b/os/linux/nix/modules/neovim.nix
similarity index 100%
rename from env/nix/modules/neovim.nix
rename to os/linux/nix/modules/neovim.nix
diff --git a/env/nix/modules/network-manager.nix b/os/linux/nix/modules/network-manager.nix
similarity index 100%
rename from env/nix/modules/network-manager.nix
rename to os/linux/nix/modules/network-manager.nix
diff --git a/env/nix/modules/pulseaudio.nix b/os/linux/nix/modules/pulseaudio.nix
similarity index 100%
rename from env/nix/modules/pulseaudio.nix
rename to os/linux/nix/modules/pulseaudio.nix
diff --git a/env/nix/modules/ripcord.nix b/os/linux/nix/modules/ripcord.nix
similarity index 100%
rename from env/nix/modules/ripcord.nix
rename to os/linux/nix/modules/ripcord.nix
diff --git a/env/nix/modules/systemd-boot-efi.nix b/os/linux/nix/modules/systemd-boot-efi.nix
similarity index 100%
rename from env/nix/modules/systemd-boot-efi.nix
rename to os/linux/nix/modules/systemd-boot-efi.nix
diff --git a/env/nix/modules/tmux.nix b/os/linux/nix/modules/tmux.nix
similarity index 100%
rename from env/nix/modules/tmux.nix
rename to os/linux/nix/modules/tmux.nix
diff --git a/env/nix/modules/users/daniel.nix b/os/linux/nix/modules/users/daniel.nix
similarity index 100%
rename from env/nix/modules/users/daniel.nix
rename to os/linux/nix/modules/users/daniel.nix
diff --git a/env/nix/modules/users/valerie.nix b/os/linux/nix/modules/users/valerie.nix
similarity index 100%
rename from env/nix/modules/users/valerie.nix
rename to os/linux/nix/modules/users/valerie.nix
diff --git a/env/nix/pkgs/config.nix b/os/linux/nix/pkgs/config.nix
similarity index 100%
rename from env/nix/pkgs/config.nix
rename to os/linux/nix/pkgs/config.nix
diff --git a/env/nix/pkgs/home.nix b/os/linux/nix/pkgs/home.nix
similarity index 100%
rename from env/nix/pkgs/home.nix
rename to os/linux/nix/pkgs/home.nix
diff --git a/env/nix/profiles/base.nix b/os/linux/nix/profiles/base.nix
similarity index 100%
rename from env/nix/profiles/base.nix
rename to os/linux/nix/profiles/base.nix
diff --git a/env/nix/profiles/desktop.nix b/os/linux/nix/profiles/desktop.nix
similarity index 100%
rename from env/nix/profiles/desktop.nix
rename to os/linux/nix/profiles/desktop.nix
diff --git a/env/nix/profiles/laptop.nix b/os/linux/nix/profiles/laptop.nix
similarity index 100%
rename from env/nix/profiles/laptop.nix
rename to os/linux/nix/profiles/laptop.nix
diff --git a/apps/tmpfiles/disable-lid-wakeup b/os/linux/tmpfiles/disable-lid-wakeup
similarity index 100%
rename from apps/tmpfiles/disable-lid-wakeup
rename to os/linux/tmpfiles/disable-lid-wakeup
diff --git a/apps/udev-rules/gcadapter b/os/linux/udev-rules/gcadapter
similarity index 100%
rename from apps/udev-rules/gcadapter
rename to os/linux/udev-rules/gcadapter