diff --git a/README.md b/README.md index 22a4b42..96a34e5 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ configuration may be difficult to translate to a non-Nix system. However, some of the configurations are easier to lift directly: -- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/neovim/config) -- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/shell/fish/functions) -- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/fish/default.nix) -- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/shell/git.nix) +- [Neovim](https://github.com/nmasur/dotfiles/tree/master/modules/common/neovim/config) +- [Fish functions](https://github.com/nmasur/dotfiles/tree/master/modules/common/shell/fish/functions) +- [More fish aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/fish/default.nix) +- [Git aliases](https://github.com/nmasur/dotfiles/blob/master/modules/common/shell/git.nix) - [Hammerspoon](https://github.com/nmasur/dotfiles/tree/master/modules/darwin/hammerspoon) Try out my Neovim config (requires [nix](https://nixos.org/download.html)): diff --git a/apps/default.nix b/apps/default.nix index f4e9064..0d1f1d0 100644 --- a/apps/default.nix +++ b/apps/default.nix @@ -57,7 +57,7 @@ neovim = { type = "app"; program = "${ - (import ../modules/neovim/package { + (import ../modules/common/neovim/package { inherit pkgs; colors = import ../colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; }; diff --git a/flake.nix b/flake.nix index 3841029..933868e 100644 --- a/flake.nix +++ b/flake.nix @@ -161,7 +161,7 @@ }; neovim = let pkgs = import nixpkgs { inherit system overlays; }; - in import ./modules/neovim/package { + in import ./modules/common/neovim/package { inherit pkgs; colors = import ./colorscheme/gruvbox/neovim-gruvbox.nix { inherit pkgs; }; diff --git a/generators/aws/default.nix b/generators/aws/default.nix index 036679f..1480cbd 100644 --- a/generators/aws/default.nix +++ b/generators/aws/default.nix @@ -15,16 +15,16 @@ nixos-generators.nixosGenerate { gitEmail = globals.gitEmail; networking.hostName = "sheep"; gui.enable = false; - colorscheme = (import ../modules/colorscheme/gruvbox); + colorscheme = (import ../colorscheme/gruvbox); passwordHash = null; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s"; # AWS settings require this permitRootLogin = "prohibit-password"; } - ../../hosts/common.nix + ../../modules/common ../../modules/nixos - ../../modules/services/sshd.nix + ../../modules/common/services/sshd.nix ] ++ [ # Required to fix diskSize errors during build ({ ... }: { amazonImage.sizeMB = 16 * 1024; }) diff --git a/hosts/flame/default.nix b/hosts/flame/default.nix index 857f8e8..89db166 100644 --- a/hosts/flame/default.nix +++ b/hosts/flame/default.nix @@ -13,8 +13,8 @@ nixpkgs.lib.nixosSystem { specialArgs = { }; modules = [ ./hardware-configuration.nix - ../../modules - ../../nixos + ../../modules/common + ../../modules/nixos (removeAttrs globals [ "mail.server" ]) wsl.nixosModules.wsl home-manager.nixosModules.home-manager diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix index 63e3273..24006fe 100644 --- a/hosts/hydra/default.nix +++ b/hosts/hydra/default.nix @@ -9,8 +9,8 @@ nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { }; modules = [ - ../../modules - ../../nixos + ../../modules/common + ../../modules/nixos globals wsl.nixosModules.wsl home-manager.nixosModules.home-manager diff --git a/hosts/lookingglass/default.nix b/hosts/lookingglass/default.nix index 3eb9573..3f05927 100644 --- a/hosts/lookingglass/default.nix +++ b/hosts/lookingglass/default.nix @@ -9,8 +9,8 @@ darwin.lib.darwinSystem { system = "x86_64-darwin"; specialArgs = { }; modules = [ - ../../modules - ../../darwin + ../../modules/common + ../../modules/darwin (globals // { user = "Noah.Masur"; gitName = "Noah-Masur_1701"; diff --git a/hosts/swan/default.nix b/hosts/swan/default.nix index fee6e9e..024cdd4 100644 --- a/hosts/swan/default.nix +++ b/hosts/swan/default.nix @@ -10,8 +10,8 @@ nixpkgs.lib.nixosSystem { specialArgs = { }; modules = [ ./hardware-configuration.nix - ../../modules - ../../nixos + ../../modules/common + ../../modules/nixos (removeAttrs globals [ "mail.server" ]) wsl.nixosModules.wsl home-manager.nixosModules.home-manager diff --git a/hosts/tempest/default.nix b/hosts/tempest/default.nix index b6a6ab7..2341e9e 100644 --- a/hosts/tempest/default.nix +++ b/hosts/tempest/default.nix @@ -10,8 +10,8 @@ nixpkgs.lib.nixosSystem { specialArgs = { }; modules = [ ./hardware-configuration.nix - ../../modules - ../../nixos + ../../modules/common + ../../modules/nixos globals wsl.nixosModules.wsl home-manager.nixosModules.home-manager diff --git a/modules/applications/1password.nix b/modules/common/applications/1password.nix similarity index 100% rename from modules/applications/1password.nix rename to modules/common/applications/1password.nix diff --git a/modules/applications/alacritty.nix b/modules/common/applications/alacritty.nix similarity index 100% rename from modules/applications/alacritty.nix rename to modules/common/applications/alacritty.nix diff --git a/modules/applications/default.nix b/modules/common/applications/default.nix similarity index 100% rename from modules/applications/default.nix rename to modules/common/applications/default.nix diff --git a/modules/applications/discord.nix b/modules/common/applications/discord.nix similarity index 100% rename from modules/applications/discord.nix rename to modules/common/applications/discord.nix diff --git a/modules/applications/firefox.nix b/modules/common/applications/firefox.nix similarity index 100% rename from modules/applications/firefox.nix rename to modules/common/applications/firefox.nix diff --git a/modules/applications/kitty.nix b/modules/common/applications/kitty.nix similarity index 100% rename from modules/applications/kitty.nix rename to modules/common/applications/kitty.nix diff --git a/modules/applications/media.nix b/modules/common/applications/media.nix similarity index 100% rename from modules/applications/media.nix rename to modules/common/applications/media.nix diff --git a/modules/applications/nautilus.nix b/modules/common/applications/nautilus.nix similarity index 100% rename from modules/applications/nautilus.nix rename to modules/common/applications/nautilus.nix diff --git a/modules/applications/obsidian.nix b/modules/common/applications/obsidian.nix similarity index 100% rename from modules/applications/obsidian.nix rename to modules/common/applications/obsidian.nix diff --git a/modules/applications/qbittorrent.nix b/modules/common/applications/qbittorrent.nix similarity index 100% rename from modules/applications/qbittorrent.nix rename to modules/common/applications/qbittorrent.nix diff --git a/modules/default.nix b/modules/common/default.nix similarity index 100% rename from modules/default.nix rename to modules/common/default.nix diff --git a/modules/mail/aerc.nix b/modules/common/mail/aerc.nix similarity index 100% rename from modules/mail/aerc.nix rename to modules/common/mail/aerc.nix diff --git a/modules/mail/default.nix b/modules/common/mail/default.nix similarity index 100% rename from modules/mail/default.nix rename to modules/common/mail/default.nix diff --git a/modules/mail/himalaya.nix b/modules/common/mail/himalaya.nix similarity index 100% rename from modules/mail/himalaya.nix rename to modules/common/mail/himalaya.nix diff --git a/modules/neovim/config/bufferline.nix b/modules/common/neovim/config/bufferline.nix similarity index 100% rename from modules/neovim/config/bufferline.nix rename to modules/common/neovim/config/bufferline.nix diff --git a/modules/neovim/config/completion.nix b/modules/common/neovim/config/completion.nix similarity index 100% rename from modules/neovim/config/completion.nix rename to modules/common/neovim/config/completion.nix diff --git a/modules/neovim/config/gitsigns.lua b/modules/common/neovim/config/gitsigns.lua similarity index 100% rename from modules/neovim/config/gitsigns.lua rename to modules/common/neovim/config/gitsigns.lua diff --git a/modules/neovim/config/gitsigns.nix b/modules/common/neovim/config/gitsigns.nix similarity index 100% rename from modules/neovim/config/gitsigns.nix rename to modules/common/neovim/config/gitsigns.nix diff --git a/modules/neovim/config/lsp.lua b/modules/common/neovim/config/lsp.lua similarity index 100% rename from modules/neovim/config/lsp.lua rename to modules/common/neovim/config/lsp.lua diff --git a/modules/neovim/config/lsp.nix b/modules/common/neovim/config/lsp.nix similarity index 100% rename from modules/neovim/config/lsp.nix rename to modules/common/neovim/config/lsp.nix diff --git a/modules/neovim/config/misc.nix b/modules/common/neovim/config/misc.nix similarity index 100% rename from modules/neovim/config/misc.nix rename to modules/common/neovim/config/misc.nix diff --git a/modules/neovim/config/statusline.nix b/modules/common/neovim/config/statusline.nix similarity index 100% rename from modules/neovim/config/statusline.nix rename to modules/common/neovim/config/statusline.nix diff --git a/modules/neovim/config/syntax.nix b/modules/common/neovim/config/syntax.nix similarity index 100% rename from modules/neovim/config/syntax.nix rename to modules/common/neovim/config/syntax.nix diff --git a/modules/neovim/config/telescope.lua b/modules/common/neovim/config/telescope.lua similarity index 100% rename from modules/neovim/config/telescope.lua rename to modules/common/neovim/config/telescope.lua diff --git a/modules/neovim/config/telescope.nix b/modules/common/neovim/config/telescope.nix similarity index 100% rename from modules/neovim/config/telescope.nix rename to modules/common/neovim/config/telescope.nix diff --git a/modules/neovim/config/toggleterm.lua b/modules/common/neovim/config/toggleterm.lua similarity index 100% rename from modules/neovim/config/toggleterm.lua rename to modules/common/neovim/config/toggleterm.lua diff --git a/modules/neovim/config/toggleterm.nix b/modules/common/neovim/config/toggleterm.nix similarity index 100% rename from modules/neovim/config/toggleterm.nix rename to modules/common/neovim/config/toggleterm.nix diff --git a/modules/neovim/config/tree.nix b/modules/common/neovim/config/tree.nix similarity index 100% rename from modules/neovim/config/tree.nix rename to modules/common/neovim/config/tree.nix diff --git a/modules/neovim/default.nix b/modules/common/neovim/default.nix similarity index 100% rename from modules/neovim/default.nix rename to modules/common/neovim/default.nix diff --git a/modules/neovim/init.lua b/modules/common/neovim/init.lua similarity index 100% rename from modules/neovim/init.lua rename to modules/common/neovim/init.lua diff --git a/modules/neovim/lua/keybinds.lua b/modules/common/neovim/lua/keybinds.lua similarity index 100% rename from modules/neovim/lua/keybinds.lua rename to modules/common/neovim/lua/keybinds.lua diff --git a/modules/neovim/lua/packer/completion.lua b/modules/common/neovim/lua/packer/completion.lua similarity index 100% rename from modules/neovim/lua/packer/completion.lua rename to modules/common/neovim/lua/packer/completion.lua diff --git a/modules/neovim/lua/packer/lsp.lua b/modules/common/neovim/lua/packer/lsp.lua similarity index 100% rename from modules/neovim/lua/packer/lsp.lua rename to modules/common/neovim/lua/packer/lsp.lua diff --git a/modules/neovim/lua/packer/misc.lua b/modules/common/neovim/lua/packer/misc.lua similarity index 100% rename from modules/neovim/lua/packer/misc.lua rename to modules/common/neovim/lua/packer/misc.lua diff --git a/modules/neovim/lua/packer/speed.lua b/modules/common/neovim/lua/packer/speed.lua similarity index 100% rename from modules/neovim/lua/packer/speed.lua rename to modules/common/neovim/lua/packer/speed.lua diff --git a/modules/neovim/lua/packer/syntax.lua b/modules/common/neovim/lua/packer/syntax.lua similarity index 100% rename from modules/neovim/lua/packer/syntax.lua rename to modules/common/neovim/lua/packer/syntax.lua diff --git a/modules/neovim/lua/packer/telescope.lua b/modules/common/neovim/lua/packer/telescope.lua similarity index 100% rename from modules/neovim/lua/packer/telescope.lua rename to modules/common/neovim/lua/packer/telescope.lua diff --git a/modules/neovim/lua/packer/toggleterm.lua b/modules/common/neovim/lua/packer/toggleterm.lua similarity index 100% rename from modules/neovim/lua/packer/toggleterm.lua rename to modules/common/neovim/lua/packer/toggleterm.lua diff --git a/modules/neovim/lua/packer/visuals.lua b/modules/common/neovim/lua/packer/visuals.lua similarity index 100% rename from modules/neovim/lua/packer/visuals.lua rename to modules/common/neovim/lua/packer/visuals.lua diff --git a/modules/neovim/lua/packer_init.lua b/modules/common/neovim/lua/packer_init.lua similarity index 100% rename from modules/neovim/lua/packer_init.lua rename to modules/common/neovim/lua/packer_init.lua diff --git a/modules/neovim/lua/settings.lua b/modules/common/neovim/lua/settings.lua similarity index 100% rename from modules/neovim/lua/settings.lua rename to modules/common/neovim/lua/settings.lua diff --git a/modules/neovim/package/default.nix b/modules/common/neovim/package/default.nix similarity index 59% rename from modules/neovim/package/default.nix rename to modules/common/neovim/package/default.nix index 1e70496..f0991c1 100644 --- a/modules/neovim/package/default.nix +++ b/modules/common/neovim/package/default.nix @@ -13,16 +13,16 @@ # in pkgs.neovimBuilder { # package = pkgs.neovim-unwrapped; # imports = [ -# ./modules/neovim/plugins/bufferline.nix -# ./modules/neovim/plugins/completion.nix -# ./modules/neovim/plugins/gitsigns.nix -# ./modules/neovim/plugins/lsp.nix -# ./modules/neovim/plugins/misc.nix -# ./modules/neovim/plugins/statusline.nix -# ./modules/neovim/plugins/syntax.nix -# ./modules/neovim/plugins/telescope.nix -# ./modules/neovim/plugins/toggleterm.nix -# ./modules/neovim/plugins/tree.nix +# ./modules/common/neovim/plugins/bufferline.nix +# ./modules/common/neovim/plugins/completion.nix +# ./modules/common/neovim/plugins/gitsigns.nix +# ./modules/common/neovim/plugins/lsp.nix +# ./modules/common/neovim/plugins/misc.nix +# ./modules/common/neovim/plugins/statusline.nix +# ./modules/common/neovim/plugins/syntax.nix +# ./modules/common/neovim/plugins/telescope.nix +# ./modules/common/neovim/plugins/toggleterm.nix +# ./modules/common/neovim/plugins/tree.nix # ] ++ extraConfig; # } diff --git a/modules/programming/default.nix b/modules/common/programming/default.nix similarity index 100% rename from modules/programming/default.nix rename to modules/common/programming/default.nix diff --git a/modules/programming/haskell.nix b/modules/common/programming/haskell.nix similarity index 100% rename from modules/programming/haskell.nix rename to modules/common/programming/haskell.nix diff --git a/modules/programming/kubernetes.nix b/modules/common/programming/kubernetes.nix similarity index 100% rename from modules/programming/kubernetes.nix rename to modules/common/programming/kubernetes.nix diff --git a/modules/programming/lua.nix b/modules/common/programming/lua.nix similarity index 100% rename from modules/programming/lua.nix rename to modules/common/programming/lua.nix diff --git a/modules/programming/nix.nix b/modules/common/programming/nix.nix similarity index 100% rename from modules/programming/nix.nix rename to modules/common/programming/nix.nix diff --git a/modules/programming/python.nix b/modules/common/programming/python.nix similarity index 100% rename from modules/programming/python.nix rename to modules/common/programming/python.nix diff --git a/modules/programming/terraform.nix b/modules/common/programming/terraform.nix similarity index 100% rename from modules/programming/terraform.nix rename to modules/common/programming/terraform.nix diff --git a/modules/repositories/default.nix b/modules/common/repositories/default.nix similarity index 100% rename from modules/repositories/default.nix rename to modules/common/repositories/default.nix diff --git a/modules/repositories/dotfiles.nix b/modules/common/repositories/dotfiles.nix similarity index 100% rename from modules/repositories/dotfiles.nix rename to modules/common/repositories/dotfiles.nix diff --git a/modules/repositories/notes.nix b/modules/common/repositories/notes.nix similarity index 100% rename from modules/repositories/notes.nix rename to modules/common/repositories/notes.nix diff --git a/modules/shell/bash/scripts/ocr.sh b/modules/common/shell/bash/scripts/ocr.sh similarity index 100% rename from modules/shell/bash/scripts/ocr.sh rename to modules/common/shell/bash/scripts/ocr.sh diff --git a/modules/shell/charm.nix b/modules/common/shell/charm.nix similarity index 100% rename from modules/shell/charm.nix rename to modules/common/shell/charm.nix diff --git a/modules/shell/default.nix b/modules/common/shell/default.nix similarity index 100% rename from modules/shell/default.nix rename to modules/common/shell/default.nix diff --git a/modules/shell/direnv.nix b/modules/common/shell/direnv.nix similarity index 100% rename from modules/shell/direnv.nix rename to modules/common/shell/direnv.nix diff --git a/modules/shell/fish/default.nix b/modules/common/shell/fish/default.nix similarity index 100% rename from modules/shell/fish/default.nix rename to modules/common/shell/fish/default.nix diff --git a/modules/shell/fish/functions/commandline-git-commits.fish b/modules/common/shell/fish/functions/commandline-git-commits.fish similarity index 100% rename from modules/shell/fish/functions/commandline-git-commits.fish rename to modules/common/shell/fish/functions/commandline-git-commits.fish diff --git a/modules/shell/fish/functions/edit.fish b/modules/common/shell/fish/functions/edit.fish similarity index 100% rename from modules/shell/fish/functions/edit.fish rename to modules/common/shell/fish/functions/edit.fish diff --git a/modules/shell/fish/functions/fcd.fish b/modules/common/shell/fish/functions/fcd.fish similarity index 100% rename from modules/shell/fish/functions/fcd.fish rename to modules/common/shell/fish/functions/fcd.fish diff --git a/modules/shell/fish/functions/fish_user_key_bindings.fish b/modules/common/shell/fish/functions/fish_user_key_bindings.fish similarity index 100% rename from modules/shell/fish/functions/fish_user_key_bindings.fish rename to modules/common/shell/fish/functions/fish_user_key_bindings.fish diff --git a/modules/shell/fish/functions/fish_vi_cursor.fish b/modules/common/shell/fish/functions/fish_vi_cursor.fish similarity index 100% rename from modules/shell/fish/functions/fish_vi_cursor.fish rename to modules/common/shell/fish/functions/fish_vi_cursor.fish diff --git a/modules/shell/fish/functions/git-add-fuzzy.fish b/modules/common/shell/fish/functions/git-add-fuzzy.fish similarity index 100% rename from modules/shell/fish/functions/git-add-fuzzy.fish rename to modules/common/shell/fish/functions/git-add-fuzzy.fish diff --git a/modules/shell/fish/functions/git-commits.fish b/modules/common/shell/fish/functions/git-commits.fish similarity index 100% rename from modules/shell/fish/functions/git-commits.fish rename to modules/common/shell/fish/functions/git-commits.fish diff --git a/modules/shell/fish/functions/git-fuzzy-branch.fish b/modules/common/shell/fish/functions/git-fuzzy-branch.fish similarity index 100% rename from modules/shell/fish/functions/git-fuzzy-branch.fish rename to modules/common/shell/fish/functions/git-fuzzy-branch.fish diff --git a/modules/shell/fish/functions/git-history.fish b/modules/common/shell/fish/functions/git-history.fish similarity index 100% rename from modules/shell/fish/functions/git-history.fish rename to modules/common/shell/fish/functions/git-history.fish diff --git a/modules/shell/fish/functions/git-push-upstream.fish b/modules/common/shell/fish/functions/git-push-upstream.fish similarity index 100% rename from modules/shell/fish/functions/git-push-upstream.fish rename to modules/common/shell/fish/functions/git-push-upstream.fish diff --git a/modules/shell/fish/functions/git-show-fuzzy.fish b/modules/common/shell/fish/functions/git-show-fuzzy.fish similarity index 100% rename from modules/shell/fish/functions/git-show-fuzzy.fish rename to modules/common/shell/fish/functions/git-show-fuzzy.fish diff --git a/modules/shell/fish/functions/git.fish b/modules/common/shell/fish/functions/git.fish similarity index 100% rename from modules/shell/fish/functions/git.fish rename to modules/common/shell/fish/functions/git.fish diff --git a/modules/shell/fish/functions/ip.fish b/modules/common/shell/fish/functions/ip.fish similarity index 100% rename from modules/shell/fish/functions/ip.fish rename to modules/common/shell/fish/functions/ip.fish diff --git a/modules/shell/fish/functions/note.fish b/modules/common/shell/fish/functions/note.fish similarity index 100% rename from modules/shell/fish/functions/note.fish rename to modules/common/shell/fish/functions/note.fish diff --git a/modules/shell/fish/functions/recent.fish b/modules/common/shell/fish/functions/recent.fish similarity index 100% rename from modules/shell/fish/functions/recent.fish rename to modules/common/shell/fish/functions/recent.fish diff --git a/modules/shell/fish/functions/search-and-edit.fish b/modules/common/shell/fish/functions/search-and-edit.fish similarity index 100% rename from modules/shell/fish/functions/search-and-edit.fish rename to modules/common/shell/fish/functions/search-and-edit.fish diff --git a/modules/shell/fish/functions/syncnotes.fish b/modules/common/shell/fish/functions/syncnotes.fish similarity index 100% rename from modules/shell/fish/functions/syncnotes.fish rename to modules/common/shell/fish/functions/syncnotes.fish diff --git a/modules/shell/fish/functions/uncommitted.fish b/modules/common/shell/fish/functions/uncommitted.fish similarity index 100% rename from modules/shell/fish/functions/uncommitted.fish rename to modules/common/shell/fish/functions/uncommitted.fish diff --git a/modules/shell/fzf.nix b/modules/common/shell/fzf.nix similarity index 100% rename from modules/shell/fzf.nix rename to modules/common/shell/fzf.nix diff --git a/modules/shell/git.nix b/modules/common/shell/git.nix similarity index 100% rename from modules/shell/git.nix rename to modules/common/shell/git.nix diff --git a/modules/shell/github.nix b/modules/common/shell/github.nix similarity index 100% rename from modules/shell/github.nix rename to modules/common/shell/github.nix diff --git a/modules/shell/nixpkgs.nix b/modules/common/shell/nixpkgs.nix similarity index 100% rename from modules/shell/nixpkgs.nix rename to modules/common/shell/nixpkgs.nix diff --git a/modules/shell/starship.nix b/modules/common/shell/starship.nix similarity index 100% rename from modules/shell/starship.nix rename to modules/common/shell/starship.nix diff --git a/modules/shell/utilities.nix b/modules/common/shell/utilities.nix similarity index 100% rename from modules/shell/utilities.nix rename to modules/common/shell/utilities.nix diff --git a/darwin/alacritty.nix b/modules/darwin/alacritty.nix similarity index 100% rename from darwin/alacritty.nix rename to modules/darwin/alacritty.nix diff --git a/darwin/default.nix b/modules/darwin/default.nix similarity index 100% rename from darwin/default.nix rename to modules/darwin/default.nix diff --git a/darwin/fonts.nix b/modules/darwin/fonts.nix similarity index 100% rename from darwin/fonts.nix rename to modules/darwin/fonts.nix diff --git a/darwin/hammerspoon.nix b/modules/darwin/hammerspoon.nix similarity index 100% rename from darwin/hammerspoon.nix rename to modules/darwin/hammerspoon.nix diff --git a/darwin/hammerspoon/.stylua.toml b/modules/darwin/hammerspoon/.stylua.toml similarity index 100% rename from darwin/hammerspoon/.stylua.toml rename to modules/darwin/hammerspoon/.stylua.toml diff --git a/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua similarity index 100% rename from darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua rename to modules/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua diff --git a/darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js b/modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js similarity index 100% rename from darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js rename to modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js diff --git a/darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua similarity index 100% rename from darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua rename to modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua diff --git a/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua similarity index 100% rename from darwin/hammerspoon/Spoons/Launcher.spoon/init.lua rename to modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua diff --git a/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua similarity index 100% rename from darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua rename to modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua diff --git a/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua b/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua similarity index 100% rename from darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua rename to modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua diff --git a/darwin/hammerspoon/init.lua b/modules/darwin/hammerspoon/init.lua similarity index 100% rename from darwin/hammerspoon/init.lua rename to modules/darwin/hammerspoon/init.lua diff --git a/darwin/homebrew.nix b/modules/darwin/homebrew.nix similarity index 100% rename from darwin/homebrew.nix rename to modules/darwin/homebrew.nix diff --git a/darwin/kitty.nix b/modules/darwin/kitty.nix similarity index 100% rename from darwin/kitty.nix rename to modules/darwin/kitty.nix diff --git a/darwin/networking.nix b/modules/darwin/networking.nix similarity index 100% rename from darwin/networking.nix rename to modules/darwin/networking.nix diff --git a/darwin/nixpkgs.nix b/modules/darwin/nixpkgs.nix similarity index 100% rename from darwin/nixpkgs.nix rename to modules/darwin/nixpkgs.nix diff --git a/darwin/system.nix b/modules/darwin/system.nix similarity index 100% rename from darwin/system.nix rename to modules/darwin/system.nix diff --git a/darwin/tmux.nix b/modules/darwin/tmux.nix similarity index 100% rename from darwin/tmux.nix rename to modules/darwin/tmux.nix diff --git a/darwin/user.nix b/modules/darwin/user.nix similarity index 100% rename from darwin/user.nix rename to modules/darwin/user.nix diff --git a/darwin/utilities.nix b/modules/darwin/utilities.nix similarity index 95% rename from darwin/utilities.nix rename to modules/darwin/utilities.nix index 5f65a35..763dba7 100644 --- a/darwin/utilities.nix +++ b/modules/darwin/utilities.nix @@ -34,7 +34,7 @@ in { ipcalc # Make IP network calculations (mkScript { name = "ocr"; - file = ../modules/shell/bash/scripts/ocr.sh; + file = ../../modules/common/shell/bash/scripts/ocr.sh; env = [ tesseract ]; }) ]; diff --git a/nixos/applications/calibre.nix b/modules/nixos/applications/calibre.nix similarity index 100% rename from nixos/applications/calibre.nix rename to modules/nixos/applications/calibre.nix diff --git a/nixos/applications/default.nix b/modules/nixos/applications/default.nix similarity index 100% rename from nixos/applications/default.nix rename to modules/nixos/applications/default.nix diff --git a/nixos/default.nix b/modules/nixos/default.nix similarity index 100% rename from nixos/default.nix rename to modules/nixos/default.nix diff --git a/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix similarity index 100% rename from nixos/gaming/default.nix rename to modules/nixos/gaming/default.nix diff --git a/nixos/gaming/leagueoflegends.nix b/modules/nixos/gaming/leagueoflegends.nix similarity index 100% rename from nixos/gaming/leagueoflegends.nix rename to modules/nixos/gaming/leagueoflegends.nix diff --git a/nixos/gaming/legendary.nix b/modules/nixos/gaming/legendary.nix similarity index 100% rename from nixos/gaming/legendary.nix rename to modules/nixos/gaming/legendary.nix diff --git a/nixos/gaming/lutris.nix b/modules/nixos/gaming/lutris.nix similarity index 100% rename from nixos/gaming/lutris.nix rename to modules/nixos/gaming/lutris.nix diff --git a/nixos/gaming/minecraft-server.nix b/modules/nixos/gaming/minecraft-server.nix similarity index 100% rename from nixos/gaming/minecraft-server.nix rename to modules/nixos/gaming/minecraft-server.nix diff --git a/nixos/gaming/steam.nix b/modules/nixos/gaming/steam.nix similarity index 100% rename from nixos/gaming/steam.nix rename to modules/nixos/gaming/steam.nix diff --git a/nixos/graphical/default.nix b/modules/nixos/graphical/default.nix similarity index 100% rename from nixos/graphical/default.nix rename to modules/nixos/graphical/default.nix diff --git a/nixos/graphical/dmenu.nix b/modules/nixos/graphical/dmenu.nix similarity index 100% rename from nixos/graphical/dmenu.nix rename to modules/nixos/graphical/dmenu.nix diff --git a/nixos/graphical/fonts.nix b/modules/nixos/graphical/fonts.nix similarity index 100% rename from nixos/graphical/fonts.nix rename to modules/nixos/graphical/fonts.nix diff --git a/nixos/graphical/i3.nix b/modules/nixos/graphical/i3.nix similarity index 100% rename from nixos/graphical/i3.nix rename to modules/nixos/graphical/i3.nix diff --git a/nixos/graphical/picom.nix b/modules/nixos/graphical/picom.nix similarity index 100% rename from nixos/graphical/picom.nix rename to modules/nixos/graphical/picom.nix diff --git a/nixos/graphical/polybar.nix b/modules/nixos/graphical/polybar.nix similarity index 100% rename from nixos/graphical/polybar.nix rename to modules/nixos/graphical/polybar.nix diff --git a/nixos/graphical/rofi.nix b/modules/nixos/graphical/rofi.nix similarity index 100% rename from nixos/graphical/rofi.nix rename to modules/nixos/graphical/rofi.nix diff --git a/nixos/graphical/rofi/brightness.sh b/modules/nixos/graphical/rofi/brightness.sh similarity index 100% rename from nixos/graphical/rofi/brightness.sh rename to modules/nixos/graphical/rofi/brightness.sh diff --git a/nixos/graphical/xorg.nix b/modules/nixos/graphical/xorg.nix similarity index 100% rename from nixos/graphical/xorg.nix rename to modules/nixos/graphical/xorg.nix diff --git a/nixos/hardware/audio.nix b/modules/nixos/hardware/audio.nix similarity index 100% rename from nixos/hardware/audio.nix rename to modules/nixos/hardware/audio.nix diff --git a/nixos/hardware/boot.nix b/modules/nixos/hardware/boot.nix similarity index 100% rename from nixos/hardware/boot.nix rename to modules/nixos/hardware/boot.nix diff --git a/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix similarity index 100% rename from nixos/hardware/default.nix rename to modules/nixos/hardware/default.nix diff --git a/nixos/hardware/keyboard.nix b/modules/nixos/hardware/keyboard.nix similarity index 100% rename from nixos/hardware/keyboard.nix rename to modules/nixos/hardware/keyboard.nix diff --git a/nixos/hardware/monitors.nix b/modules/nixos/hardware/monitors.nix similarity index 100% rename from nixos/hardware/monitors.nix rename to modules/nixos/hardware/monitors.nix diff --git a/nixos/hardware/mouse.nix b/modules/nixos/hardware/mouse.nix similarity index 100% rename from nixos/hardware/mouse.nix rename to modules/nixos/hardware/mouse.nix diff --git a/nixos/hardware/networking.nix b/modules/nixos/hardware/networking.nix similarity index 100% rename from nixos/hardware/networking.nix rename to modules/nixos/hardware/networking.nix diff --git a/nixos/hardware/server.nix b/modules/nixos/hardware/server.nix similarity index 100% rename from nixos/hardware/server.nix rename to modules/nixos/hardware/server.nix diff --git a/nixos/hardware/sleep.nix b/modules/nixos/hardware/sleep.nix similarity index 100% rename from nixos/hardware/sleep.nix rename to modules/nixos/hardware/sleep.nix diff --git a/nixos/hardware/wifi.nix b/modules/nixos/hardware/wifi.nix similarity index 100% rename from nixos/hardware/wifi.nix rename to modules/nixos/hardware/wifi.nix diff --git a/nixos/services/backups.nix b/modules/nixos/services/backups.nix similarity index 100% rename from nixos/services/backups.nix rename to modules/nixos/services/backups.nix diff --git a/nixos/services/caddy.nix b/modules/nixos/services/caddy.nix similarity index 100% rename from nixos/services/caddy.nix rename to modules/nixos/services/caddy.nix diff --git a/nixos/services/calibre.nix b/modules/nixos/services/calibre.nix similarity index 100% rename from nixos/services/calibre.nix rename to modules/nixos/services/calibre.nix diff --git a/nixos/services/cloudflare.nix b/modules/nixos/services/cloudflare.nix similarity index 100% rename from nixos/services/cloudflare.nix rename to modules/nixos/services/cloudflare.nix diff --git a/nixos/services/default.nix b/modules/nixos/services/default.nix similarity index 100% rename from nixos/services/default.nix rename to modules/nixos/services/default.nix diff --git a/nixos/services/gitea.nix b/modules/nixos/services/gitea.nix similarity index 100% rename from nixos/services/gitea.nix rename to modules/nixos/services/gitea.nix diff --git a/nixos/services/gnupg.nix b/modules/nixos/services/gnupg.nix similarity index 100% rename from nixos/services/gnupg.nix rename to modules/nixos/services/gnupg.nix diff --git a/nixos/services/honeypot.nix b/modules/nixos/services/honeypot.nix similarity index 100% rename from nixos/services/honeypot.nix rename to modules/nixos/services/honeypot.nix diff --git a/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix similarity index 100% rename from nixos/services/jellyfin.nix rename to modules/nixos/services/jellyfin.nix diff --git a/nixos/services/keybase.nix b/modules/nixos/services/keybase.nix similarity index 100% rename from nixos/services/keybase.nix rename to modules/nixos/services/keybase.nix diff --git a/nixos/services/mullvad.nix b/modules/nixos/services/mullvad.nix similarity index 100% rename from nixos/services/mullvad.nix rename to modules/nixos/services/mullvad.nix diff --git a/nixos/services/n8n.nix b/modules/nixos/services/n8n.nix similarity index 100% rename from nixos/services/n8n.nix rename to modules/nixos/services/n8n.nix diff --git a/nixos/services/netdata.nix b/modules/nixos/services/netdata.nix similarity index 100% rename from nixos/services/netdata.nix rename to modules/nixos/services/netdata.nix diff --git a/nixos/services/nextcloud.nix b/modules/nixos/services/nextcloud.nix similarity index 100% rename from nixos/services/nextcloud.nix rename to modules/nixos/services/nextcloud.nix diff --git a/nixos/services/prometheus.nix b/modules/nixos/services/prometheus.nix similarity index 100% rename from nixos/services/prometheus.nix rename to modules/nixos/services/prometheus.nix diff --git a/nixos/services/secrets.nix b/modules/nixos/services/secrets.nix similarity index 100% rename from nixos/services/secrets.nix rename to modules/nixos/services/secrets.nix diff --git a/nixos/services/sshd.nix b/modules/nixos/services/sshd.nix similarity index 100% rename from nixos/services/sshd.nix rename to modules/nixos/services/sshd.nix diff --git a/nixos/services/transmission.nix b/modules/nixos/services/transmission.nix similarity index 100% rename from nixos/services/transmission.nix rename to modules/nixos/services/transmission.nix diff --git a/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix similarity index 100% rename from nixos/services/vaultwarden.nix rename to modules/nixos/services/vaultwarden.nix diff --git a/nixos/services/wireguard.nix b/modules/nixos/services/wireguard.nix similarity index 100% rename from nixos/services/wireguard.nix rename to modules/nixos/services/wireguard.nix diff --git a/nixos/system/default.nix b/modules/nixos/system/default.nix similarity index 100% rename from nixos/system/default.nix rename to modules/nixos/system/default.nix diff --git a/nixos/system/doas.nix b/modules/nixos/system/doas.nix similarity index 100% rename from nixos/system/doas.nix rename to modules/nixos/system/doas.nix diff --git a/nixos/system/timezone.nix b/modules/nixos/system/timezone.nix similarity index 100% rename from nixos/system/timezone.nix rename to modules/nixos/system/timezone.nix diff --git a/nixos/system/user.nix b/modules/nixos/system/user.nix similarity index 100% rename from nixos/system/user.nix rename to modules/nixos/system/user.nix diff --git a/nixos/wsl/default.nix b/modules/nixos/wsl/default.nix similarity index 100% rename from nixos/wsl/default.nix rename to modules/nixos/wsl/default.nix