From 83638c33e239ff0c956805362d2576185cc4de0f Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sun, 30 Jun 2024 22:47:18 +0200 Subject: [PATCH] Rename module directories --- hosts/common.nix | 2 +- modules/{home => home-manager}/default.nix | 0 modules/{home => home-manager}/equalizer/default.nix | 0 modules/{home => home-manager}/equalizer/output/ESP95X.json | 0 modules/{home => home-manager}/equalizer/output/default.json | 0 modules/{home => home-manager}/flatpak.nix | 0 modules/{home => home-manager}/git.nix | 0 modules/{home => home-manager}/hyprland/default.nix | 0 modules/{home => home-manager}/hyprland/keybinds.nix | 0 modules/{home => home-manager}/night-light.nix | 0 modules/{home => home-manager}/shell/aliases.nix | 0 modules/{home => home-manager}/shell/default.nix | 0 modules/{home => home-manager}/shell/p10k/default.nix | 0 modules/{home => home-manager}/shell/p10k/p10k.zsh | 0 modules/{home => home-manager}/sops.nix | 0 modules/{home => home-manager}/theme.nix | 0 modules/{home => home-manager}/virtualisation.nix | 0 modules/{home => home-manager}/vscode.nix | 0 modules/{system => nixos}/auto-gc.nix | 0 modules/{system => nixos}/bluetooth.nix | 0 modules/{system => nixos}/boot.nix | 0 modules/{system => nixos}/comma.nix | 0 modules/{system => nixos}/de.nix | 0 modules/{system => nixos}/default.nix | 0 modules/{system => nixos}/dm.nix | 0 modules/{system => nixos}/flatpak.nix | 0 modules/{system => nixos}/geoclue.nix | 0 modules/{system => nixos}/nix-helper.nix | 0 modules/{system => nixos}/printing.nix | 0 modules/{system => nixos}/sops.nix | 0 modules/{system => nixos}/sound.nix | 0 modules/{system => nixos}/syncthing.nix | 0 modules/{system => nixos}/tailscale.nix | 0 modules/{system => nixos}/virtualisation.nix | 0 modules/{system => nixos}/wlan.nix | 0 users/common.nix | 2 +- 36 files changed, 2 insertions(+), 2 deletions(-) rename modules/{home => home-manager}/default.nix (100%) rename modules/{home => home-manager}/equalizer/default.nix (100%) rename modules/{home => home-manager}/equalizer/output/ESP95X.json (100%) rename modules/{home => home-manager}/equalizer/output/default.json (100%) rename modules/{home => home-manager}/flatpak.nix (100%) rename modules/{home => home-manager}/git.nix (100%) rename modules/{home => home-manager}/hyprland/default.nix (100%) rename modules/{home => home-manager}/hyprland/keybinds.nix (100%) rename modules/{home => home-manager}/night-light.nix (100%) rename modules/{home => home-manager}/shell/aliases.nix (100%) rename modules/{home => home-manager}/shell/default.nix (100%) rename modules/{home => home-manager}/shell/p10k/default.nix (100%) rename modules/{home => home-manager}/shell/p10k/p10k.zsh (100%) rename modules/{home => home-manager}/sops.nix (100%) rename modules/{home => home-manager}/theme.nix (100%) rename modules/{home => home-manager}/virtualisation.nix (100%) rename modules/{home => home-manager}/vscode.nix (100%) rename modules/{system => nixos}/auto-gc.nix (100%) rename modules/{system => nixos}/bluetooth.nix (100%) rename modules/{system => nixos}/boot.nix (100%) rename modules/{system => nixos}/comma.nix (100%) rename modules/{system => nixos}/de.nix (100%) rename modules/{system => nixos}/default.nix (100%) rename modules/{system => nixos}/dm.nix (100%) rename modules/{system => nixos}/flatpak.nix (100%) rename modules/{system => nixos}/geoclue.nix (100%) rename modules/{system => nixos}/nix-helper.nix (100%) rename modules/{system => nixos}/printing.nix (100%) rename modules/{system => nixos}/sops.nix (100%) rename modules/{system => nixos}/sound.nix (100%) rename modules/{system => nixos}/syncthing.nix (100%) rename modules/{system => nixos}/tailscale.nix (100%) rename modules/{system => nixos}/virtualisation.nix (100%) rename modules/{system => nixos}/wlan.nix (100%) diff --git a/hosts/common.nix b/hosts/common.nix index 577ebed..be88cd1 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { imports = [ - ../modules/system + ../modules/nixos ../wrappers ]; diff --git a/modules/home/default.nix b/modules/home-manager/default.nix similarity index 100% rename from modules/home/default.nix rename to modules/home-manager/default.nix diff --git a/modules/home/equalizer/default.nix b/modules/home-manager/equalizer/default.nix similarity index 100% rename from modules/home/equalizer/default.nix rename to modules/home-manager/equalizer/default.nix diff --git a/modules/home/equalizer/output/ESP95X.json b/modules/home-manager/equalizer/output/ESP95X.json similarity index 100% rename from modules/home/equalizer/output/ESP95X.json rename to modules/home-manager/equalizer/output/ESP95X.json diff --git a/modules/home/equalizer/output/default.json b/modules/home-manager/equalizer/output/default.json similarity index 100% rename from modules/home/equalizer/output/default.json rename to modules/home-manager/equalizer/output/default.json diff --git a/modules/home/flatpak.nix b/modules/home-manager/flatpak.nix similarity index 100% rename from modules/home/flatpak.nix rename to modules/home-manager/flatpak.nix diff --git a/modules/home/git.nix b/modules/home-manager/git.nix similarity index 100% rename from modules/home/git.nix rename to modules/home-manager/git.nix diff --git a/modules/home/hyprland/default.nix b/modules/home-manager/hyprland/default.nix similarity index 100% rename from modules/home/hyprland/default.nix rename to modules/home-manager/hyprland/default.nix diff --git a/modules/home/hyprland/keybinds.nix b/modules/home-manager/hyprland/keybinds.nix similarity index 100% rename from modules/home/hyprland/keybinds.nix rename to modules/home-manager/hyprland/keybinds.nix diff --git a/modules/home/night-light.nix b/modules/home-manager/night-light.nix similarity index 100% rename from modules/home/night-light.nix rename to modules/home-manager/night-light.nix diff --git a/modules/home/shell/aliases.nix b/modules/home-manager/shell/aliases.nix similarity index 100% rename from modules/home/shell/aliases.nix rename to modules/home-manager/shell/aliases.nix diff --git a/modules/home/shell/default.nix b/modules/home-manager/shell/default.nix similarity index 100% rename from modules/home/shell/default.nix rename to modules/home-manager/shell/default.nix diff --git a/modules/home/shell/p10k/default.nix b/modules/home-manager/shell/p10k/default.nix similarity index 100% rename from modules/home/shell/p10k/default.nix rename to modules/home-manager/shell/p10k/default.nix diff --git a/modules/home/shell/p10k/p10k.zsh b/modules/home-manager/shell/p10k/p10k.zsh similarity index 100% rename from modules/home/shell/p10k/p10k.zsh rename to modules/home-manager/shell/p10k/p10k.zsh diff --git a/modules/home/sops.nix b/modules/home-manager/sops.nix similarity index 100% rename from modules/home/sops.nix rename to modules/home-manager/sops.nix diff --git a/modules/home/theme.nix b/modules/home-manager/theme.nix similarity index 100% rename from modules/home/theme.nix rename to modules/home-manager/theme.nix diff --git a/modules/home/virtualisation.nix b/modules/home-manager/virtualisation.nix similarity index 100% rename from modules/home/virtualisation.nix rename to modules/home-manager/virtualisation.nix diff --git a/modules/home/vscode.nix b/modules/home-manager/vscode.nix similarity index 100% rename from modules/home/vscode.nix rename to modules/home-manager/vscode.nix diff --git a/modules/system/auto-gc.nix b/modules/nixos/auto-gc.nix similarity index 100% rename from modules/system/auto-gc.nix rename to modules/nixos/auto-gc.nix diff --git a/modules/system/bluetooth.nix b/modules/nixos/bluetooth.nix similarity index 100% rename from modules/system/bluetooth.nix rename to modules/nixos/bluetooth.nix diff --git a/modules/system/boot.nix b/modules/nixos/boot.nix similarity index 100% rename from modules/system/boot.nix rename to modules/nixos/boot.nix diff --git a/modules/system/comma.nix b/modules/nixos/comma.nix similarity index 100% rename from modules/system/comma.nix rename to modules/nixos/comma.nix diff --git a/modules/system/de.nix b/modules/nixos/de.nix similarity index 100% rename from modules/system/de.nix rename to modules/nixos/de.nix diff --git a/modules/system/default.nix b/modules/nixos/default.nix similarity index 100% rename from modules/system/default.nix rename to modules/nixos/default.nix diff --git a/modules/system/dm.nix b/modules/nixos/dm.nix similarity index 100% rename from modules/system/dm.nix rename to modules/nixos/dm.nix diff --git a/modules/system/flatpak.nix b/modules/nixos/flatpak.nix similarity index 100% rename from modules/system/flatpak.nix rename to modules/nixos/flatpak.nix diff --git a/modules/system/geoclue.nix b/modules/nixos/geoclue.nix similarity index 100% rename from modules/system/geoclue.nix rename to modules/nixos/geoclue.nix diff --git a/modules/system/nix-helper.nix b/modules/nixos/nix-helper.nix similarity index 100% rename from modules/system/nix-helper.nix rename to modules/nixos/nix-helper.nix diff --git a/modules/system/printing.nix b/modules/nixos/printing.nix similarity index 100% rename from modules/system/printing.nix rename to modules/nixos/printing.nix diff --git a/modules/system/sops.nix b/modules/nixos/sops.nix similarity index 100% rename from modules/system/sops.nix rename to modules/nixos/sops.nix diff --git a/modules/system/sound.nix b/modules/nixos/sound.nix similarity index 100% rename from modules/system/sound.nix rename to modules/nixos/sound.nix diff --git a/modules/system/syncthing.nix b/modules/nixos/syncthing.nix similarity index 100% rename from modules/system/syncthing.nix rename to modules/nixos/syncthing.nix diff --git a/modules/system/tailscale.nix b/modules/nixos/tailscale.nix similarity index 100% rename from modules/system/tailscale.nix rename to modules/nixos/tailscale.nix diff --git a/modules/system/virtualisation.nix b/modules/nixos/virtualisation.nix similarity index 100% rename from modules/system/virtualisation.nix rename to modules/nixos/virtualisation.nix diff --git a/modules/system/wlan.nix b/modules/nixos/wlan.nix similarity index 100% rename from modules/system/wlan.nix rename to modules/nixos/wlan.nix diff --git a/users/common.nix b/users/common.nix index 3f451bb..ecd977c 100644 --- a/users/common.nix +++ b/users/common.nix @@ -11,7 +11,7 @@ }; home-manager.sharedModules = [ - ../modules/home + ../modules/home-manager ../wrappers {