diff --git a/modules/darwin/alacritty.nix b/darwin/alacritty.nix similarity index 100% rename from modules/darwin/alacritty.nix rename to darwin/alacritty.nix diff --git a/modules/darwin/default.nix b/darwin/default.nix similarity index 100% rename from modules/darwin/default.nix rename to darwin/default.nix diff --git a/modules/darwin/fonts.nix b/darwin/fonts.nix similarity index 100% rename from modules/darwin/fonts.nix rename to darwin/fonts.nix diff --git a/modules/darwin/hammerspoon.nix b/darwin/hammerspoon.nix similarity index 100% rename from modules/darwin/hammerspoon.nix rename to darwin/hammerspoon.nix diff --git a/modules/darwin/hammerspoon/.stylua.toml b/darwin/hammerspoon/.stylua.toml similarity index 100% rename from modules/darwin/hammerspoon/.stylua.toml rename to darwin/hammerspoon/.stylua.toml diff --git a/modules/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua b/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua similarity index 100% rename from modules/darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua rename to darwin/hammerspoon/Spoons/ControlEscape.spoon/init.lua diff --git a/modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js b/darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js similarity index 100% rename from modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js rename to darwin/hammerspoon/Spoons/DismissAlerts.spoon/close_notifications_applescript.js diff --git a/modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua b/darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua similarity index 100% rename from modules/darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua rename to darwin/hammerspoon/Spoons/DismissAlerts.spoon/init.lua diff --git a/modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua b/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua similarity index 100% rename from modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua rename to darwin/hammerspoon/Spoons/Launcher.spoon/init.lua diff --git a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua b/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua similarity index 100% rename from modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua rename to darwin/hammerspoon/Spoons/MoveWindow.spoon/init.lua diff --git a/modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua b/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua similarity index 100% rename from modules/darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua rename to darwin/hammerspoon/Spoons/MoveWindow.spoon/worklayout.lua diff --git a/modules/darwin/hammerspoon/init.lua b/darwin/hammerspoon/init.lua similarity index 100% rename from modules/darwin/hammerspoon/init.lua rename to darwin/hammerspoon/init.lua diff --git a/modules/darwin/homebrew.nix b/darwin/homebrew.nix similarity index 100% rename from modules/darwin/homebrew.nix rename to darwin/homebrew.nix diff --git a/modules/darwin/kitty.nix b/darwin/kitty.nix similarity index 100% rename from modules/darwin/kitty.nix rename to darwin/kitty.nix diff --git a/modules/darwin/networking.nix b/darwin/networking.nix similarity index 100% rename from modules/darwin/networking.nix rename to darwin/networking.nix diff --git a/modules/darwin/nixpkgs.nix b/darwin/nixpkgs.nix similarity index 100% rename from modules/darwin/nixpkgs.nix rename to darwin/nixpkgs.nix diff --git a/modules/darwin/system.nix b/darwin/system.nix similarity index 100% rename from modules/darwin/system.nix rename to darwin/system.nix diff --git a/modules/darwin/tmux.nix b/darwin/tmux.nix similarity index 100% rename from modules/darwin/tmux.nix rename to darwin/tmux.nix diff --git a/modules/darwin/user.nix b/darwin/user.nix similarity index 100% rename from modules/darwin/user.nix rename to darwin/user.nix diff --git a/modules/darwin/utilities.nix b/darwin/utilities.nix similarity index 96% rename from modules/darwin/utilities.nix rename to darwin/utilities.nix index 90dd067..5f65a35 100644 --- a/modules/darwin/utilities.nix +++ b/darwin/utilities.nix @@ -34,7 +34,7 @@ in { ipcalc # Make IP network calculations (mkScript { name = "ocr"; - file = ../shell/bash/scripts/ocr.sh; + file = ../modules/shell/bash/scripts/ocr.sh; env = [ tesseract ]; }) ]; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index c2ece6d..b1bc604 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -7,6 +7,9 @@ nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { }; modules = [ + ./hardware-configuration.nix + ../../modules + ../../nixos globals home-manager.nixosModules.home-manager { @@ -42,8 +45,5 @@ nixpkgs.lib.nixosSystem { nixlang.enable = true; dotfiles.enable = true; } - - ./hardware-configuration.nix - ../../modules ]; } diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix index cd5d2da..52dec24 100644 --- a/hosts/macbook/default.nix +++ b/hosts/macbook/default.nix @@ -8,6 +8,7 @@ darwin.lib.darwinSystem { specialArgs = { }; modules = [ ../../modules + ../../darwin (globals // { user = "Noah.Masur"; gitName = "Noah-Masur_1701"; @@ -26,7 +27,6 @@ darwin.lib.darwinSystem { nixpkgs.overlays = [ firefox-darwin.overlay ] ++ overlays; # Set registry to flake packages, used for nix X commands nix.registry.nixpkgs.flake = nixpkgs; - mail.aerc.enable = true; mail.himalaya.enable = true; kitty.enable = true; diff --git a/hosts/oracle/default.nix b/hosts/oracle/default.nix index 265b03e..ad1eee5 100644 --- a/hosts/oracle/default.nix +++ b/hosts/oracle/default.nix @@ -13,6 +13,7 @@ nixpkgs.lib.nixosSystem { modules = [ ./hardware-configuration.nix ../../modules + ../../nixos (removeAttrs globals [ "mail.server" ]) home-manager.nixosModules.home-manager { diff --git a/hosts/wsl/default.nix b/hosts/wsl/default.nix index b9b8250..edfc27f 100644 --- a/hosts/wsl/default.nix +++ b/hosts/wsl/default.nix @@ -11,6 +11,7 @@ nixpkgs.lib.nixosSystem { wsl.nixosModules.wsl home-manager.nixosModules.home-manager ../../modules + ../../nixos { networking.hostName = "wsl"; # Set registry to flake packages, used for nix X commands diff --git a/modules/applications/default.nix b/modules/applications/default.nix index ee01e55..957b460 100644 --- a/modules/applications/default.nix +++ b/modules/applications/default.nix @@ -3,7 +3,6 @@ imports = [ ./1password.nix ./alacritty.nix - ./calibre.nix ./discord.nix ./firefox.nix ./kitty.nix diff --git a/modules/default.nix b/modules/default.nix index e5526b7..ce4219a 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,20 +1,7 @@ { config, lib, pkgs, ... }: { - imports = [ - ./applications - ./darwin - ./gaming - ./graphical - ./hardware - ./mail - ./neovim - ./nixos - ./programming - ./repositories - ./services - ./shell - ./wsl - ]; + imports = + [ ./applications ./mail ./neovim ./programming ./repositories ./shell ]; options = { user = lib.mkOption { diff --git a/modules/applications/calibre.nix b/nixos/applications/calibre.nix similarity index 100% rename from modules/applications/calibre.nix rename to nixos/applications/calibre.nix diff --git a/nixos/default.nix b/nixos/default.nix new file mode 100644 index 0000000..19b0a27 --- /dev/null +++ b/nixos/default.nix @@ -0,0 +1,13 @@ +{ ... }: { + + imports = [ + ./applications + ./gaming + ./graphical + ./hardware + ./services + ./system + ./wsl + ]; + +} diff --git a/modules/gaming/default.nix b/nixos/gaming/default.nix similarity index 100% rename from modules/gaming/default.nix rename to nixos/gaming/default.nix diff --git a/modules/gaming/leagueoflegends.nix b/nixos/gaming/leagueoflegends.nix similarity index 100% rename from modules/gaming/leagueoflegends.nix rename to nixos/gaming/leagueoflegends.nix diff --git a/modules/gaming/legendary.nix b/nixos/gaming/legendary.nix similarity index 100% rename from modules/gaming/legendary.nix rename to nixos/gaming/legendary.nix diff --git a/modules/gaming/lutris.nix b/nixos/gaming/lutris.nix similarity index 100% rename from modules/gaming/lutris.nix rename to nixos/gaming/lutris.nix diff --git a/modules/gaming/minecraft-server.nix b/nixos/gaming/minecraft-server.nix similarity index 100% rename from modules/gaming/minecraft-server.nix rename to nixos/gaming/minecraft-server.nix diff --git a/modules/gaming/steam.nix b/nixos/gaming/steam.nix similarity index 100% rename from modules/gaming/steam.nix rename to nixos/gaming/steam.nix diff --git a/modules/graphical/default.nix b/nixos/graphical/default.nix similarity index 100% rename from modules/graphical/default.nix rename to nixos/graphical/default.nix diff --git a/modules/graphical/dmenu.nix b/nixos/graphical/dmenu.nix similarity index 100% rename from modules/graphical/dmenu.nix rename to nixos/graphical/dmenu.nix diff --git a/modules/graphical/fonts.nix b/nixos/graphical/fonts.nix similarity index 100% rename from modules/graphical/fonts.nix rename to nixos/graphical/fonts.nix diff --git a/modules/graphical/i3.nix b/nixos/graphical/i3.nix similarity index 100% rename from modules/graphical/i3.nix rename to nixos/graphical/i3.nix diff --git a/modules/graphical/picom.nix b/nixos/graphical/picom.nix similarity index 100% rename from modules/graphical/picom.nix rename to nixos/graphical/picom.nix diff --git a/modules/graphical/polybar.nix b/nixos/graphical/polybar.nix similarity index 100% rename from modules/graphical/polybar.nix rename to nixos/graphical/polybar.nix diff --git a/modules/graphical/rofi.nix b/nixos/graphical/rofi.nix similarity index 100% rename from modules/graphical/rofi.nix rename to nixos/graphical/rofi.nix diff --git a/modules/graphical/rofi/brightness.sh b/nixos/graphical/rofi/brightness.sh similarity index 100% rename from modules/graphical/rofi/brightness.sh rename to nixos/graphical/rofi/brightness.sh diff --git a/modules/graphical/xorg.nix b/nixos/graphical/xorg.nix similarity index 100% rename from modules/graphical/xorg.nix rename to nixos/graphical/xorg.nix diff --git a/modules/hardware/audio.nix b/nixos/hardware/audio.nix similarity index 100% rename from modules/hardware/audio.nix rename to nixos/hardware/audio.nix diff --git a/modules/hardware/boot.nix b/nixos/hardware/boot.nix similarity index 100% rename from modules/hardware/boot.nix rename to nixos/hardware/boot.nix diff --git a/modules/hardware/default.nix b/nixos/hardware/default.nix similarity index 100% rename from modules/hardware/default.nix rename to nixos/hardware/default.nix diff --git a/modules/hardware/keyboard.nix b/nixos/hardware/keyboard.nix similarity index 100% rename from modules/hardware/keyboard.nix rename to nixos/hardware/keyboard.nix diff --git a/modules/hardware/monitors.nix b/nixos/hardware/monitors.nix similarity index 100% rename from modules/hardware/monitors.nix rename to nixos/hardware/monitors.nix diff --git a/modules/hardware/mouse.nix b/nixos/hardware/mouse.nix similarity index 100% rename from modules/hardware/mouse.nix rename to nixos/hardware/mouse.nix diff --git a/modules/hardware/networking.nix b/nixos/hardware/networking.nix similarity index 100% rename from modules/hardware/networking.nix rename to nixos/hardware/networking.nix diff --git a/modules/hardware/server.nix b/nixos/hardware/server.nix similarity index 100% rename from modules/hardware/server.nix rename to nixos/hardware/server.nix diff --git a/modules/hardware/sleep.nix b/nixos/hardware/sleep.nix similarity index 100% rename from modules/hardware/sleep.nix rename to nixos/hardware/sleep.nix diff --git a/modules/hardware/wifi.nix b/nixos/hardware/wifi.nix similarity index 100% rename from modules/hardware/wifi.nix rename to nixos/hardware/wifi.nix diff --git a/modules/services/backups.nix b/nixos/services/backups.nix similarity index 100% rename from modules/services/backups.nix rename to nixos/services/backups.nix diff --git a/modules/services/caddy.nix b/nixos/services/caddy.nix similarity index 100% rename from modules/services/caddy.nix rename to nixos/services/caddy.nix diff --git a/modules/services/calibre.nix b/nixos/services/calibre.nix similarity index 100% rename from modules/services/calibre.nix rename to nixos/services/calibre.nix diff --git a/modules/services/cloudflare.nix b/nixos/services/cloudflare.nix similarity index 100% rename from modules/services/cloudflare.nix rename to nixos/services/cloudflare.nix diff --git a/modules/services/default.nix b/nixos/services/default.nix similarity index 100% rename from modules/services/default.nix rename to nixos/services/default.nix diff --git a/modules/services/gitea.nix b/nixos/services/gitea.nix similarity index 100% rename from modules/services/gitea.nix rename to nixos/services/gitea.nix diff --git a/modules/services/gnupg.nix b/nixos/services/gnupg.nix similarity index 100% rename from modules/services/gnupg.nix rename to nixos/services/gnupg.nix diff --git a/modules/services/honeypot.nix b/nixos/services/honeypot.nix similarity index 100% rename from modules/services/honeypot.nix rename to nixos/services/honeypot.nix diff --git a/modules/services/jellyfin.nix b/nixos/services/jellyfin.nix similarity index 100% rename from modules/services/jellyfin.nix rename to nixos/services/jellyfin.nix diff --git a/modules/services/keybase.nix b/nixos/services/keybase.nix similarity index 100% rename from modules/services/keybase.nix rename to nixos/services/keybase.nix diff --git a/modules/services/mullvad.nix b/nixos/services/mullvad.nix similarity index 100% rename from modules/services/mullvad.nix rename to nixos/services/mullvad.nix diff --git a/modules/services/n8n.nix b/nixos/services/n8n.nix similarity index 100% rename from modules/services/n8n.nix rename to nixos/services/n8n.nix diff --git a/modules/services/netdata.nix b/nixos/services/netdata.nix similarity index 100% rename from modules/services/netdata.nix rename to nixos/services/netdata.nix diff --git a/modules/services/nextcloud.nix b/nixos/services/nextcloud.nix similarity index 100% rename from modules/services/nextcloud.nix rename to nixos/services/nextcloud.nix diff --git a/modules/services/prometheus.nix b/nixos/services/prometheus.nix similarity index 100% rename from modules/services/prometheus.nix rename to nixos/services/prometheus.nix diff --git a/modules/services/secrets.nix b/nixos/services/secrets.nix similarity index 100% rename from modules/services/secrets.nix rename to nixos/services/secrets.nix diff --git a/modules/services/sshd.nix b/nixos/services/sshd.nix similarity index 100% rename from modules/services/sshd.nix rename to nixos/services/sshd.nix diff --git a/modules/services/transmission.nix b/nixos/services/transmission.nix similarity index 100% rename from modules/services/transmission.nix rename to nixos/services/transmission.nix diff --git a/modules/services/vaultwarden.nix b/nixos/services/vaultwarden.nix similarity index 100% rename from modules/services/vaultwarden.nix rename to nixos/services/vaultwarden.nix diff --git a/modules/services/wireguard.nix b/nixos/services/wireguard.nix similarity index 100% rename from modules/services/wireguard.nix rename to nixos/services/wireguard.nix diff --git a/modules/nixos/default.nix b/nixos/system/default.nix similarity index 100% rename from modules/nixos/default.nix rename to nixos/system/default.nix diff --git a/modules/nixos/doas.nix b/nixos/system/doas.nix similarity index 100% rename from modules/nixos/doas.nix rename to nixos/system/doas.nix diff --git a/modules/nixos/timezone.nix b/nixos/system/timezone.nix similarity index 100% rename from modules/nixos/timezone.nix rename to nixos/system/timezone.nix diff --git a/modules/nixos/user.nix b/nixos/system/user.nix similarity index 100% rename from modules/nixos/user.nix rename to nixos/system/user.nix diff --git a/modules/wsl/default.nix b/nixos/wsl/default.nix similarity index 100% rename from modules/wsl/default.nix rename to nixos/wsl/default.nix