From c1101e7b45b53ce9c6d04256c297b830de73916a Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 11 Sep 2025 14:00:31 +0200 Subject: [PATCH] Move modules folders --- flake.nix | 108 ++++++------- hm/{modules => }/alacritty.nix | 0 hm/{modules => }/autorandr.nix | 0 hm/{modules => }/bash.nix | 0 hm/{modules => }/bat.nix | 0 hm/{modules => }/biblio.nix | 0 hm/{modules => }/bitwarden.nix | 0 hm/{modules => }/blender.nix | 0 hm/{modules => }/blender_nvidia.nix | 0 hm/{modules => }/bottom.nix | 0 hm/{modules => }/broot.nix | 0 hm/{modules => }/carapace.nix | 0 hm/{modules => }/cava.nix | 0 hm/{modules => }/combined/basics.nix | 0 hm/{modules => }/combined/minimal.nix | 0 hm/{modules => }/configurations.nix | 0 hm/{modules => }/development/cpp.nix | 0 hm/{modules => }/development/data.nix | 0 hm/{modules => }/development/database.nix | 0 hm/{modules => }/development/docker.nix | 0 hm/{modules => }/development/go.nix | 0 hm/{modules => }/development/javascript.nix | 0 hm/{modules => }/development/kubernetes.nix | 0 hm/{modules => }/development/latex.nix | 0 hm/{modules => }/development/markdown.nix | 0 hm/{modules => }/development/nix.nix | 0 hm/{modules => }/development/python.nix | 0 hm/{modules => }/development/rust.nix | 0 hm/{modules => }/development/web.nix | 0 hm/{modules => }/dircolors.nix | 0 hm/{modules => }/direnv.nix | 0 hm/{modules => }/dunst.nix | 0 hm/{modules => }/dwarf-fortress.nix | 0 hm/{modules => }/easyeffects.nix | 0 hm/{modules => }/eza.nix | 0 hm/{modules => }/firefox.nix | 0 hm/{modules => }/fonts.nix | 0 hm/{modules => }/foot.nix | 0 hm/{modules => }/fzf.nix | 0 hm/{modules => }/git.nix | 0 hm/{modules => }/gnome_shell.nix | 0 hm/{modules => }/gpg.nix | 0 hm/{modules => }/grobi.nix | 0 hm/{modules => }/gtk_theme.nix | 0 hm/{modules => }/heif.nix | 0 hm/{modules => }/helix.nix | 0 .../hyprland-bluetooth-keyboard.nix | 0 hm/{modules => }/hyprland.nix | 4 +- hm/{modules => }/hyprlock.nix | 0 hm/{modules => }/info.nix | 0 hm/{modules => }/java.nix | 0 hm/{modules => }/jellyfin-player.nix | 0 hm/{modules => }/joshuto.nix | 0 hm/{modules => }/joystickwake.nix | 0 hm/{modules => }/jq.nix | 0 hm/{modules => }/kakoune.nix | 0 hm/{modules => }/kdeconnect.nix | 0 hm/{modules => }/keepassxc.nix | 0 hm/{modules => }/keychain.nix | 0 hm/{modules => }/kicad.nix | 0 hm/{modules => }/kitty.nix | 0 hm/{modules => }/lf.nix | 0 hm/{modules => }/libinput-gestures.nix | 0 hm/{modules => }/lorri.nix | 0 hm/{modules => }/lsd.nix | 0 hm/{modules => }/lutris.nix | 0 hm/{modules => }/man.nix | 0 hm/{modules => }/mangohud.nix | 0 hm/{modules => }/megasync.nix | 0 hm/{modules => }/mpv.nix | 0 hm/{modules => }/nautilus.nix | 0 hm/{modules => }/ncspot.nix | 0 hm/{modules => }/nemo.nix | 0 hm/{modules => }/nix-index.nix | 0 hm/{modules => }/noti.nix | 0 hm/{modules => }/ntfy.nix | 0 hm/{modules => }/nushell.nix | 0 hm/{modules => }/nvim/nvim-cmp-config.lua | 0 .../nvim/nvim-lspconfig-config.lua | 0 hm/{modules => }/nvim/snippets/markdown.json | 0 hm/{modules => }/nvim/snippets/package.json | 0 hm/{modules => }/nvim/telescope-config.lua | 0 hm/{modules => }/obs-studio.nix | 0 hm/{modules => }/office.nix | 0 hm/{modules => }/onedrive.nix | 0 hm/{modules => }/pass.nix | 0 hm/{modules => }/picom.nix | 0 hm/{modules => }/polybar.nix | 0 hm/{modules => }/pro_audio.nix | 0 hm/{modules => }/pycharm.nix | 0 hm/{modules => }/rclone-mount-bertof.nix | 0 hm/{modules => }/rclone-mount-tiziano.nix | 0 hm/{modules => }/rclone-mount.nix | 0 hm/{modules => }/readme.md | 0 hm/{modules => }/research.nix | 0 hm/{modules => }/rofi.nix | 0 hm/{modules => }/screen_locker.nix | 0 hm/{modules => }/security.nix | 0 hm/{modules => }/shell_aliases.nix | 0 hm/{modules => }/spotifyd.nix | 0 hm/{modules => }/ssh.nix | 0 hm/{modules => }/starship.nix | 0 hm/{modules => }/swayidle.nix | 0 hm/{modules => }/swaynotificationcenter.nix | 0 hm/{modules => }/syncthing.nix | 0 hm/{modules => }/syncthing_tiziano.nix | 0 hm/{modules => }/terminator.nix | 0 hm/{modules => }/thunar.nix | 0 hm/{modules => }/tmux.nix | 0 hm/{modules => }/twmn.nix | 0 hm/{modules => }/update_background.nix | 0 hm/{modules => }/vim.nix | 0 hm/{modules => }/virtualization.nix | 0 hm/{modules => }/vivaldi.nix | 0 hm/{modules => }/vscode.nix | 0 hm/{modules => }/waybar.nix | 0 hm/{modules => }/webapp.nix | 0 hm/{modules => }/wl_update_background.nix | 0 hm/{modules => }/wlsunset.nix | 0 hm/{modules => }/xidlehook.nix | 0 hm/{modules => }/xresources.nix | 0 hm/{modules => }/yazi.nix | 0 hm/{modules => }/yt-dlp.nix | 0 hm/{modules => }/zathura.nix | 0 hm/{modules => }/zellij.nix | 0 hm/{modules => }/zoxide.nix | 0 hm/{modules => }/zsh.nix | 0 instances/baldur/hm.nix | 26 ++-- instances/baldur/hm_tiziano.nix | 4 +- instances/freya/hm.nix | 8 +- instances/heimdall/hm.nix | 14 +- instances/loki/hm.nix | 30 ++-- instances/odin/hm.nix | 140 ++++++++--------- instances/odin/hm_tiziano.nix | 8 +- instances/sif/hm.nix | 146 +++++++++--------- instances/thor/hm.nix | 142 ++++++++--------- .../basics/automatic-garbage-collection.nix | 0 .../nixos => nixos}/basics/btrfs-scrub.nix | 0 {modules/nixos => nixos}/basics/default.nix | 0 .../nixos => nixos}/basics/distributed.nix | 0 {modules/nixos => nixos}/basics/docker.nix | 0 .../basics/extended-registry.nix | 0 {modules/nixos => nixos}/basics/fstrim.nix | 0 {modules/nixos => nixos}/basics/fwupd.nix | 0 {modules/nixos => nixos}/basics/git.nix | 0 .../nixos => nixos}/basics/remote-deploy.nix | 0 {modules/nixos => nixos}/basics/resolved.nix | 0 {modules/nixos => nixos}/basics/tailscale.nix | 2 +- {modules/nixos => nixos}/basics/zerotier.nix | 2 +- {modules/nixos => nixos}/big_data.nix | 0 {modules/nixos => nixos}/cuda_support.nix | 0 {modules/nixos => nixos}/defcon.nix | 0 {modules/nixos => nixos}/digitalocean.nix | 0 {modules/nixos => nixos}/dnsmasq.nix | 0 {modules/nixos => nixos}/garage.nix | 2 +- {modules/nixos => nixos}/hyprland.nix | 0 {modules/nixos => nixos}/immich.nix | 0 {modules/nixos => nixos}/installer.nix | 0 {modules/nixos => nixos}/ip_forwarding.nix | 0 {modules/nixos => nixos}/k3s.nix | 0 {modules/nixos => nixos}/kavita.nix | 2 +- {modules/nixos => nixos}/kdeconnect.nix | 0 {modules/nixos => nixos}/mind.nix | 0 {modules/nixos => nixos}/minio_local.nix | 2 +- {modules/nixos => nixos}/minio_server.nix | 2 +- {modules/nixos => nixos}/musa.nix | 0 {modules/nixos => nixos}/nextcloud.nix | 6 +- {modules/nixos => nixos}/ntfy.nix | 0 {modules/nixos => nixos}/ollama.nix | 0 {modules/nixos => nixos}/pentablet.nix | 0 {modules/nixos => nixos}/plasma6.nix | 0 {modules/nixos => nixos}/plymouth.nix | 0 {modules/nixos => nixos}/pro_audio.nix | 0 {modules/nixos => nixos}/rice.nix | 0 {modules/nixos => nixos}/s3_cache_read.nix | 2 +- {modules/nixos => nixos}/s3_cache_write.nix | 2 +- .../server/automatic-upgrade.nix | 0 {modules/nixos => nixos}/server/default.nix | 0 {modules/nixos => nixos}/steam.nix | 0 {modules/nixos => nixos}/torrentbox.nix | 0 {modules/nixos => nixos}/users/bertof.nix | 0 {modules/nixos => nixos}/users/tiziano.nix | 0 pkgs/wl-lockscreen/default.nix | 2 +- 183 files changed, 327 insertions(+), 327 deletions(-) rename hm/{modules => }/alacritty.nix (100%) rename hm/{modules => }/autorandr.nix (100%) rename hm/{modules => }/bash.nix (100%) rename hm/{modules => }/bat.nix (100%) rename hm/{modules => }/biblio.nix (100%) rename hm/{modules => }/bitwarden.nix (100%) rename hm/{modules => }/blender.nix (100%) rename hm/{modules => }/blender_nvidia.nix (100%) rename hm/{modules => }/bottom.nix (100%) rename hm/{modules => }/broot.nix (100%) rename hm/{modules => }/carapace.nix (100%) rename hm/{modules => }/cava.nix (100%) rename hm/{modules => }/combined/basics.nix (100%) rename hm/{modules => }/combined/minimal.nix (100%) rename hm/{modules => }/configurations.nix (100%) rename hm/{modules => }/development/cpp.nix (100%) rename hm/{modules => }/development/data.nix (100%) rename hm/{modules => }/development/database.nix (100%) rename hm/{modules => }/development/docker.nix (100%) rename hm/{modules => }/development/go.nix (100%) rename hm/{modules => }/development/javascript.nix (100%) rename hm/{modules => }/development/kubernetes.nix (100%) rename hm/{modules => }/development/latex.nix (100%) rename hm/{modules => }/development/markdown.nix (100%) rename hm/{modules => }/development/nix.nix (100%) rename hm/{modules => }/development/python.nix (100%) rename hm/{modules => }/development/rust.nix (100%) rename hm/{modules => }/development/web.nix (100%) rename hm/{modules => }/dircolors.nix (100%) rename hm/{modules => }/direnv.nix (100%) rename hm/{modules => }/dunst.nix (100%) rename hm/{modules => }/dwarf-fortress.nix (100%) rename hm/{modules => }/easyeffects.nix (100%) rename hm/{modules => }/eza.nix (100%) rename hm/{modules => }/firefox.nix (100%) rename hm/{modules => }/fonts.nix (100%) rename hm/{modules => }/foot.nix (100%) rename hm/{modules => }/fzf.nix (100%) rename hm/{modules => }/git.nix (100%) rename hm/{modules => }/gnome_shell.nix (100%) rename hm/{modules => }/gpg.nix (100%) rename hm/{modules => }/grobi.nix (100%) rename hm/{modules => }/gtk_theme.nix (100%) rename hm/{modules => }/heif.nix (100%) rename hm/{modules => }/helix.nix (100%) rename hm/{modules => }/hyprland-bluetooth-keyboard.nix (100%) rename hm/{modules => }/hyprland.nix (98%) rename hm/{modules => }/hyprlock.nix (100%) rename hm/{modules => }/info.nix (100%) rename hm/{modules => }/java.nix (100%) rename hm/{modules => }/jellyfin-player.nix (100%) rename hm/{modules => }/joshuto.nix (100%) rename hm/{modules => }/joystickwake.nix (100%) rename hm/{modules => }/jq.nix (100%) rename hm/{modules => }/kakoune.nix (100%) rename hm/{modules => }/kdeconnect.nix (100%) rename hm/{modules => }/keepassxc.nix (100%) rename hm/{modules => }/keychain.nix (100%) rename hm/{modules => }/kicad.nix (100%) rename hm/{modules => }/kitty.nix (100%) rename hm/{modules => }/lf.nix (100%) rename hm/{modules => }/libinput-gestures.nix (100%) rename hm/{modules => }/lorri.nix (100%) rename hm/{modules => }/lsd.nix (100%) rename hm/{modules => }/lutris.nix (100%) rename hm/{modules => }/man.nix (100%) rename hm/{modules => }/mangohud.nix (100%) rename hm/{modules => }/megasync.nix (100%) rename hm/{modules => }/mpv.nix (100%) rename hm/{modules => }/nautilus.nix (100%) rename hm/{modules => }/ncspot.nix (100%) rename hm/{modules => }/nemo.nix (100%) rename hm/{modules => }/nix-index.nix (100%) rename hm/{modules => }/noti.nix (100%) rename hm/{modules => }/ntfy.nix (100%) rename hm/{modules => }/nushell.nix (100%) rename hm/{modules => }/nvim/nvim-cmp-config.lua (100%) rename hm/{modules => }/nvim/nvim-lspconfig-config.lua (100%) rename hm/{modules => }/nvim/snippets/markdown.json (100%) rename hm/{modules => }/nvim/snippets/package.json (100%) rename hm/{modules => }/nvim/telescope-config.lua (100%) rename hm/{modules => }/obs-studio.nix (100%) rename hm/{modules => }/office.nix (100%) rename hm/{modules => }/onedrive.nix (100%) rename hm/{modules => }/pass.nix (100%) rename hm/{modules => }/picom.nix (100%) rename hm/{modules => }/polybar.nix (100%) rename hm/{modules => }/pro_audio.nix (100%) rename hm/{modules => }/pycharm.nix (100%) rename hm/{modules => }/rclone-mount-bertof.nix (100%) rename hm/{modules => }/rclone-mount-tiziano.nix (100%) rename hm/{modules => }/rclone-mount.nix (100%) rename hm/{modules => }/readme.md (100%) rename hm/{modules => }/research.nix (100%) rename hm/{modules => }/rofi.nix (100%) rename hm/{modules => }/screen_locker.nix (100%) rename hm/{modules => }/security.nix (100%) rename hm/{modules => }/shell_aliases.nix (100%) rename hm/{modules => }/spotifyd.nix (100%) rename hm/{modules => }/ssh.nix (100%) rename hm/{modules => }/starship.nix (100%) rename hm/{modules => }/swayidle.nix (100%) rename hm/{modules => }/swaynotificationcenter.nix (100%) rename hm/{modules => }/syncthing.nix (100%) rename hm/{modules => }/syncthing_tiziano.nix (100%) rename hm/{modules => }/terminator.nix (100%) rename hm/{modules => }/thunar.nix (100%) rename hm/{modules => }/tmux.nix (100%) rename hm/{modules => }/twmn.nix (100%) rename hm/{modules => }/update_background.nix (100%) rename hm/{modules => }/vim.nix (100%) rename hm/{modules => }/virtualization.nix (100%) rename hm/{modules => }/vivaldi.nix (100%) rename hm/{modules => }/vscode.nix (100%) rename hm/{modules => }/waybar.nix (100%) rename hm/{modules => }/webapp.nix (100%) rename hm/{modules => }/wl_update_background.nix (100%) rename hm/{modules => }/wlsunset.nix (100%) rename hm/{modules => }/xidlehook.nix (100%) rename hm/{modules => }/xresources.nix (100%) rename hm/{modules => }/yazi.nix (100%) rename hm/{modules => }/yt-dlp.nix (100%) rename hm/{modules => }/zathura.nix (100%) rename hm/{modules => }/zellij.nix (100%) rename hm/{modules => }/zoxide.nix (100%) rename hm/{modules => }/zsh.nix (100%) rename {modules/nixos => nixos}/basics/automatic-garbage-collection.nix (100%) rename {modules/nixos => nixos}/basics/btrfs-scrub.nix (100%) rename {modules/nixos => nixos}/basics/default.nix (100%) rename {modules/nixos => nixos}/basics/distributed.nix (100%) rename {modules/nixos => nixos}/basics/docker.nix (100%) rename {modules/nixos => nixos}/basics/extended-registry.nix (100%) rename {modules/nixos => nixos}/basics/fstrim.nix (100%) rename {modules/nixos => nixos}/basics/fwupd.nix (100%) rename {modules/nixos => nixos}/basics/git.nix (100%) rename {modules/nixos => nixos}/basics/remote-deploy.nix (100%) rename {modules/nixos => nixos}/basics/resolved.nix (100%) rename {modules/nixos => nixos}/basics/tailscale.nix (90%) rename {modules/nixos => nixos}/basics/zerotier.nix (87%) rename {modules/nixos => nixos}/big_data.nix (100%) rename {modules/nixos => nixos}/cuda_support.nix (100%) rename {modules/nixos => nixos}/defcon.nix (100%) rename {modules/nixos => nixos}/digitalocean.nix (100%) rename {modules/nixos => nixos}/dnsmasq.nix (100%) rename {modules/nixos => nixos}/garage.nix (96%) rename {modules/nixos => nixos}/hyprland.nix (100%) rename {modules/nixos => nixos}/immich.nix (100%) rename {modules/nixos => nixos}/installer.nix (100%) rename {modules/nixos => nixos}/ip_forwarding.nix (100%) rename {modules/nixos => nixos}/k3s.nix (100%) rename {modules/nixos => nixos}/kavita.nix (87%) rename {modules/nixos => nixos}/kdeconnect.nix (100%) rename {modules/nixos => nixos}/mind.nix (100%) rename {modules/nixos => nixos}/minio_local.nix (82%) rename {modules/nixos => nixos}/minio_server.nix (87%) rename {modules/nixos => nixos}/musa.nix (100%) rename {modules/nixos => nixos}/nextcloud.nix (93%) rename {modules/nixos => nixos}/ntfy.nix (100%) rename {modules/nixos => nixos}/ollama.nix (100%) rename {modules/nixos => nixos}/pentablet.nix (100%) rename {modules/nixos => nixos}/plasma6.nix (100%) rename {modules/nixos => nixos}/plymouth.nix (100%) rename {modules/nixos => nixos}/pro_audio.nix (100%) rename {modules/nixos => nixos}/rice.nix (100%) rename {modules/nixos => nixos}/s3_cache_read.nix (64%) rename {modules/nixos => nixos}/s3_cache_write.nix (66%) rename {modules/nixos => nixos}/server/automatic-upgrade.nix (100%) rename {modules/nixos => nixos}/server/default.nix (100%) rename {modules/nixos => nixos}/steam.nix (100%) rename {modules/nixos => nixos}/torrentbox.nix (100%) rename {modules/nixos => nixos}/users/bertof.nix (100%) rename {modules/nixos => nixos}/users/tiziano.nix (100%) diff --git a/flake.nix b/flake.nix index 8c62504..1376161 100644 --- a/flake.nix +++ b/flake.nix @@ -99,20 +99,20 @@ # Nix rice inputs.nix-rice.modules.default - ./modules/nixos/rice.nix + ./nixos/rice.nix # # S3 cache read - # ./modules/nixos/s3_cache_read.nix + # ./nixos/s3_cache_read.nix # Agenix configuration inputs.ragenix.nixosModules.default # inputs.agenix.nixosModules.default # { services.userborn.enable = true; } - ./modules/nixos/users/bertof.nix + ./nixos/users/bertof.nix # Some basic defaults - ./modules/nixos/basics + ./nixos/basics { age.secrets = { @@ -121,7 +121,7 @@ } ]; - installerModules = commonModules ++ [ ./modules/nixos/installer.nix ]; + installerModules = commonModules ++ [ ./nixos/installer.nix ]; in inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = import inputs.systems; @@ -254,20 +254,20 @@ ./instances/thor/configuration.nix # # S3 cache write - # ./modules/nixos/s3_cache_write.nix + # ./nixos/s3_cache_write.nix - ./modules/nixos/plasma6.nix - # ./modules/nixos/cuda_support.nix - # ./modules/nixos/ollama.nix - ./modules/nixos/pro_audio.nix - ./modules/nixos/kdeconnect.nix - ./modules/nixos/steam.nix - # ./modules/nixos/minio_local.nix + ./nixos/plasma6.nix + # ./nixos/cuda_support.nix + # ./nixos/ollama.nix + ./nixos/pro_audio.nix + ./nixos/kdeconnect.nix + ./nixos/steam.nix + # ./nixos/minio_local.nix - ./modules/nixos/hyprland.nix - { home-manager.users.bertof.imports = [ ./hm/modules/hyprland.nix ]; } + ./nixos/hyprland.nix + { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; } - ./modules/nixos/musa.nix + ./nixos/musa.nix ] ++ homeManagerUModules ++ [{ age.secrets = { minio_bertof = { file = ./secrets/minio_bertof.age; owner = "bertof"; }; @@ -286,20 +286,20 @@ ./instances/sif/configuration.nix # S3 cache write - # ./modules/nixos/s3_cache_write.nix + # ./nixos/s3_cache_write.nix # { age.secrets.s3_sif = { file = ./secrets/s3_sif.age; owner = "bertof"; }; } - # ./modules/nixos/plasma6.nix - # ./modules/nixos/ollama.nix - ./modules/nixos/pro_audio.nix - ./modules/nixos/kdeconnect.nix - ./modules/nixos/steam.nix - # ./modules/nixos/minio_local.nix + # ./nixos/plasma6.nix + # ./nixos/ollama.nix + ./nixos/pro_audio.nix + ./nixos/kdeconnect.nix + ./nixos/steam.nix + # ./nixos/minio_local.nix - ./modules/nixos/hyprland.nix - { home-manager.users.bertof.imports = [ ./hm/modules/hyprland.nix ]; } + ./nixos/hyprland.nix + { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; } - ./modules/nixos/musa.nix + ./nixos/musa.nix ] ++ homeManagerUModules ++ [{ age.secrets = { minio_bertof = { file = ./secrets/minio_bertof.age; owner = "bertof"; }; @@ -317,12 +317,12 @@ ./instances/odin/hardware-configuration.nix ./instances/odin/configuration.nix - ./modules/nixos/users/tiziano.nix + ./nixos/users/tiziano.nix - ./modules/nixos/server - ./modules/nixos/ip_forwarding.nix - # ./modules/nixos/plasma6.nix - ./modules/nixos/steam.nix + ./nixos/server + ./nixos/ip_forwarding.nix + # ./nixos/plasma6.nix + ./nixos/steam.nix ] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; home-manager.users.tiziano = import ./instances/odin/hm_tiziano.nix; @@ -339,24 +339,24 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd inputs.nixos-hardware.nixosModules.common-gpu-amd inputs.nixos-hardware.nixosModules.common-pc-ssd - ./modules/nixos/server + ./nixos/server ./instances/heimdall/hardware-configuration.nix ./instances/heimdall/configuration.nix - ./modules/nixos/users/tiziano.nix + ./nixos/users/tiziano.nix - ./modules/nixos/ip_forwarding.nix - ./modules/nixos/torrentbox.nix - ./modules/nixos/minio_server.nix - ./modules/nixos/nextcloud.nix - ./modules/nixos/immich.nix + ./nixos/ip_forwarding.nix + ./nixos/torrentbox.nix + ./nixos/minio_server.nix + ./nixos/nextcloud.nix + ./nixos/immich.nix inputs.cute-api.nixosModules.default { services.cute-api = { enable = true; host = "0.0.0.0"; }; } - # ./modules/nixos/garage.nix - # ./modules/nixos/ntfy.nix + # ./nixos/garage.nix + # ./nixos/ntfy.nix # S3 cache read - # ./modules/nixos/s3_cache_read.nix + # ./nixos/s3_cache_read.nix ] ++ homeManagerUModules ++ [{ age.secrets = { minio_bertof = { file = ./secrets/minio_bertof.age; owner = "bertof"; }; @@ -383,17 +383,17 @@ "cifs" ]; }) - ./modules/nixos/server + ./nixos/server ./instances/freya/hardware-configuration.nix ./instances/freya/configuration.nix - ./modules/nixos/torrentbox.nix - ./modules/nixos/minio_server.nix - # ./modules/nixos/nextcloud.nix - ./modules/nixos/ntfy.nix + ./nixos/torrentbox.nix + ./nixos/minio_server.nix + # ./nixos/nextcloud.nix + ./nixos/ntfy.nix # S3 cache read - # ./modules/nixos/s3_cache_read.nix + # ./nixos/s3_cache_read.nix ] ++ homeManagerModules ++ [{ home-manager.users.bertof = import ./instances/freya/hm.nix; }]; @@ -402,14 +402,14 @@ baldur = inputs.nixpkgs-u.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ [ - ./modules/nixos/server + ./nixos/server ./instances/baldur/hardware-configuration.nix ./instances/baldur/configuration.nix - # ./modules/nixos/digitalocean.nix + # ./nixos/digitalocean.nix - # ./modules/nixos/users/tiziano.nix + # ./nixos/users/tiziano.nix # S3 cache read - # ./modules/nixos/s3_cache_read.nix + # ./nixos/s3_cache_read.nix ] ++ homeManagerUModules ++ [{ home-manager.users.bertof = import ./instances/baldur/hm.nix; # home-manager.users.tiziano = import ./instances/baldur/hm_tiziano.nix; @@ -419,16 +419,16 @@ loki = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = commonModules ++ [ - ./modules/nixos/server + ./nixos/server inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-pc-ssd ./instances/loki/hardware-configuration.nix ./instances/loki/configuration.nix - ./modules/nixos/users/tiziano.nix + ./nixos/users/tiziano.nix # S3 cache read - # ./modules/nixos/s3_cache_read.nix + # ./nixos/s3_cache_read.nix ] ++ homeManagerModules ++ [{ home-manager.users.bertof = import ./instances/odin/hm.nix; home-manager.users.tiziano = import ./instances/odin/hm_tiziano.nix; diff --git a/hm/modules/alacritty.nix b/hm/alacritty.nix similarity index 100% rename from hm/modules/alacritty.nix rename to hm/alacritty.nix diff --git a/hm/modules/autorandr.nix b/hm/autorandr.nix similarity index 100% rename from hm/modules/autorandr.nix rename to hm/autorandr.nix diff --git a/hm/modules/bash.nix b/hm/bash.nix similarity index 100% rename from hm/modules/bash.nix rename to hm/bash.nix diff --git a/hm/modules/bat.nix b/hm/bat.nix similarity index 100% rename from hm/modules/bat.nix rename to hm/bat.nix diff --git a/hm/modules/biblio.nix b/hm/biblio.nix similarity index 100% rename from hm/modules/biblio.nix rename to hm/biblio.nix diff --git a/hm/modules/bitwarden.nix b/hm/bitwarden.nix similarity index 100% rename from hm/modules/bitwarden.nix rename to hm/bitwarden.nix diff --git a/hm/modules/blender.nix b/hm/blender.nix similarity index 100% rename from hm/modules/blender.nix rename to hm/blender.nix diff --git a/hm/modules/blender_nvidia.nix b/hm/blender_nvidia.nix similarity index 100% rename from hm/modules/blender_nvidia.nix rename to hm/blender_nvidia.nix diff --git a/hm/modules/bottom.nix b/hm/bottom.nix similarity index 100% rename from hm/modules/bottom.nix rename to hm/bottom.nix diff --git a/hm/modules/broot.nix b/hm/broot.nix similarity index 100% rename from hm/modules/broot.nix rename to hm/broot.nix diff --git a/hm/modules/carapace.nix b/hm/carapace.nix similarity index 100% rename from hm/modules/carapace.nix rename to hm/carapace.nix diff --git a/hm/modules/cava.nix b/hm/cava.nix similarity index 100% rename from hm/modules/cava.nix rename to hm/cava.nix diff --git a/hm/modules/combined/basics.nix b/hm/combined/basics.nix similarity index 100% rename from hm/modules/combined/basics.nix rename to hm/combined/basics.nix diff --git a/hm/modules/combined/minimal.nix b/hm/combined/minimal.nix similarity index 100% rename from hm/modules/combined/minimal.nix rename to hm/combined/minimal.nix diff --git a/hm/modules/configurations.nix b/hm/configurations.nix similarity index 100% rename from hm/modules/configurations.nix rename to hm/configurations.nix diff --git a/hm/modules/development/cpp.nix b/hm/development/cpp.nix similarity index 100% rename from hm/modules/development/cpp.nix rename to hm/development/cpp.nix diff --git a/hm/modules/development/data.nix b/hm/development/data.nix similarity index 100% rename from hm/modules/development/data.nix rename to hm/development/data.nix diff --git a/hm/modules/development/database.nix b/hm/development/database.nix similarity index 100% rename from hm/modules/development/database.nix rename to hm/development/database.nix diff --git a/hm/modules/development/docker.nix b/hm/development/docker.nix similarity index 100% rename from hm/modules/development/docker.nix rename to hm/development/docker.nix diff --git a/hm/modules/development/go.nix b/hm/development/go.nix similarity index 100% rename from hm/modules/development/go.nix rename to hm/development/go.nix diff --git a/hm/modules/development/javascript.nix b/hm/development/javascript.nix similarity index 100% rename from hm/modules/development/javascript.nix rename to hm/development/javascript.nix diff --git a/hm/modules/development/kubernetes.nix b/hm/development/kubernetes.nix similarity index 100% rename from hm/modules/development/kubernetes.nix rename to hm/development/kubernetes.nix diff --git a/hm/modules/development/latex.nix b/hm/development/latex.nix similarity index 100% rename from hm/modules/development/latex.nix rename to hm/development/latex.nix diff --git a/hm/modules/development/markdown.nix b/hm/development/markdown.nix similarity index 100% rename from hm/modules/development/markdown.nix rename to hm/development/markdown.nix diff --git a/hm/modules/development/nix.nix b/hm/development/nix.nix similarity index 100% rename from hm/modules/development/nix.nix rename to hm/development/nix.nix diff --git a/hm/modules/development/python.nix b/hm/development/python.nix similarity index 100% rename from hm/modules/development/python.nix rename to hm/development/python.nix diff --git a/hm/modules/development/rust.nix b/hm/development/rust.nix similarity index 100% rename from hm/modules/development/rust.nix rename to hm/development/rust.nix diff --git a/hm/modules/development/web.nix b/hm/development/web.nix similarity index 100% rename from hm/modules/development/web.nix rename to hm/development/web.nix diff --git a/hm/modules/dircolors.nix b/hm/dircolors.nix similarity index 100% rename from hm/modules/dircolors.nix rename to hm/dircolors.nix diff --git a/hm/modules/direnv.nix b/hm/direnv.nix similarity index 100% rename from hm/modules/direnv.nix rename to hm/direnv.nix diff --git a/hm/modules/dunst.nix b/hm/dunst.nix similarity index 100% rename from hm/modules/dunst.nix rename to hm/dunst.nix diff --git a/hm/modules/dwarf-fortress.nix b/hm/dwarf-fortress.nix similarity index 100% rename from hm/modules/dwarf-fortress.nix rename to hm/dwarf-fortress.nix diff --git a/hm/modules/easyeffects.nix b/hm/easyeffects.nix similarity index 100% rename from hm/modules/easyeffects.nix rename to hm/easyeffects.nix diff --git a/hm/modules/eza.nix b/hm/eza.nix similarity index 100% rename from hm/modules/eza.nix rename to hm/eza.nix diff --git a/hm/modules/firefox.nix b/hm/firefox.nix similarity index 100% rename from hm/modules/firefox.nix rename to hm/firefox.nix diff --git a/hm/modules/fonts.nix b/hm/fonts.nix similarity index 100% rename from hm/modules/fonts.nix rename to hm/fonts.nix diff --git a/hm/modules/foot.nix b/hm/foot.nix similarity index 100% rename from hm/modules/foot.nix rename to hm/foot.nix diff --git a/hm/modules/fzf.nix b/hm/fzf.nix similarity index 100% rename from hm/modules/fzf.nix rename to hm/fzf.nix diff --git a/hm/modules/git.nix b/hm/git.nix similarity index 100% rename from hm/modules/git.nix rename to hm/git.nix diff --git a/hm/modules/gnome_shell.nix b/hm/gnome_shell.nix similarity index 100% rename from hm/modules/gnome_shell.nix rename to hm/gnome_shell.nix diff --git a/hm/modules/gpg.nix b/hm/gpg.nix similarity index 100% rename from hm/modules/gpg.nix rename to hm/gpg.nix diff --git a/hm/modules/grobi.nix b/hm/grobi.nix similarity index 100% rename from hm/modules/grobi.nix rename to hm/grobi.nix diff --git a/hm/modules/gtk_theme.nix b/hm/gtk_theme.nix similarity index 100% rename from hm/modules/gtk_theme.nix rename to hm/gtk_theme.nix diff --git a/hm/modules/heif.nix b/hm/heif.nix similarity index 100% rename from hm/modules/heif.nix rename to hm/heif.nix diff --git a/hm/modules/helix.nix b/hm/helix.nix similarity index 100% rename from hm/modules/helix.nix rename to hm/helix.nix diff --git a/hm/modules/hyprland-bluetooth-keyboard.nix b/hm/hyprland-bluetooth-keyboard.nix similarity index 100% rename from hm/modules/hyprland-bluetooth-keyboard.nix rename to hm/hyprland-bluetooth-keyboard.nix diff --git a/hm/modules/hyprland.nix b/hm/hyprland.nix similarity index 98% rename from hm/modules/hyprland.nix rename to hm/hyprland.nix index b1389ed..5c3fa45 100644 --- a/hm/modules/hyprland.nix +++ b/hm/hyprland.nix @@ -79,8 +79,8 @@ in hyprpaper = { enable = true; settings = { - preload = "${../../wallpapers/n8ca4obsys991.png}"; - wallpaper = [ ",${../../wallpapers/n8ca4obsys991.png}" ]; + preload = "${../wallpapers/n8ca4obsys991.png}"; + wallpaper = [ ",${../wallpapers/n8ca4obsys991.png}" ]; }; }; }; diff --git a/hm/modules/hyprlock.nix b/hm/hyprlock.nix similarity index 100% rename from hm/modules/hyprlock.nix rename to hm/hyprlock.nix diff --git a/hm/modules/info.nix b/hm/info.nix similarity index 100% rename from hm/modules/info.nix rename to hm/info.nix diff --git a/hm/modules/java.nix b/hm/java.nix similarity index 100% rename from hm/modules/java.nix rename to hm/java.nix diff --git a/hm/modules/jellyfin-player.nix b/hm/jellyfin-player.nix similarity index 100% rename from hm/modules/jellyfin-player.nix rename to hm/jellyfin-player.nix diff --git a/hm/modules/joshuto.nix b/hm/joshuto.nix similarity index 100% rename from hm/modules/joshuto.nix rename to hm/joshuto.nix diff --git a/hm/modules/joystickwake.nix b/hm/joystickwake.nix similarity index 100% rename from hm/modules/joystickwake.nix rename to hm/joystickwake.nix diff --git a/hm/modules/jq.nix b/hm/jq.nix similarity index 100% rename from hm/modules/jq.nix rename to hm/jq.nix diff --git a/hm/modules/kakoune.nix b/hm/kakoune.nix similarity index 100% rename from hm/modules/kakoune.nix rename to hm/kakoune.nix diff --git a/hm/modules/kdeconnect.nix b/hm/kdeconnect.nix similarity index 100% rename from hm/modules/kdeconnect.nix rename to hm/kdeconnect.nix diff --git a/hm/modules/keepassxc.nix b/hm/keepassxc.nix similarity index 100% rename from hm/modules/keepassxc.nix rename to hm/keepassxc.nix diff --git a/hm/modules/keychain.nix b/hm/keychain.nix similarity index 100% rename from hm/modules/keychain.nix rename to hm/keychain.nix diff --git a/hm/modules/kicad.nix b/hm/kicad.nix similarity index 100% rename from hm/modules/kicad.nix rename to hm/kicad.nix diff --git a/hm/modules/kitty.nix b/hm/kitty.nix similarity index 100% rename from hm/modules/kitty.nix rename to hm/kitty.nix diff --git a/hm/modules/lf.nix b/hm/lf.nix similarity index 100% rename from hm/modules/lf.nix rename to hm/lf.nix diff --git a/hm/modules/libinput-gestures.nix b/hm/libinput-gestures.nix similarity index 100% rename from hm/modules/libinput-gestures.nix rename to hm/libinput-gestures.nix diff --git a/hm/modules/lorri.nix b/hm/lorri.nix similarity index 100% rename from hm/modules/lorri.nix rename to hm/lorri.nix diff --git a/hm/modules/lsd.nix b/hm/lsd.nix similarity index 100% rename from hm/modules/lsd.nix rename to hm/lsd.nix diff --git a/hm/modules/lutris.nix b/hm/lutris.nix similarity index 100% rename from hm/modules/lutris.nix rename to hm/lutris.nix diff --git a/hm/modules/man.nix b/hm/man.nix similarity index 100% rename from hm/modules/man.nix rename to hm/man.nix diff --git a/hm/modules/mangohud.nix b/hm/mangohud.nix similarity index 100% rename from hm/modules/mangohud.nix rename to hm/mangohud.nix diff --git a/hm/modules/megasync.nix b/hm/megasync.nix similarity index 100% rename from hm/modules/megasync.nix rename to hm/megasync.nix diff --git a/hm/modules/mpv.nix b/hm/mpv.nix similarity index 100% rename from hm/modules/mpv.nix rename to hm/mpv.nix diff --git a/hm/modules/nautilus.nix b/hm/nautilus.nix similarity index 100% rename from hm/modules/nautilus.nix rename to hm/nautilus.nix diff --git a/hm/modules/ncspot.nix b/hm/ncspot.nix similarity index 100% rename from hm/modules/ncspot.nix rename to hm/ncspot.nix diff --git a/hm/modules/nemo.nix b/hm/nemo.nix similarity index 100% rename from hm/modules/nemo.nix rename to hm/nemo.nix diff --git a/hm/modules/nix-index.nix b/hm/nix-index.nix similarity index 100% rename from hm/modules/nix-index.nix rename to hm/nix-index.nix diff --git a/hm/modules/noti.nix b/hm/noti.nix similarity index 100% rename from hm/modules/noti.nix rename to hm/noti.nix diff --git a/hm/modules/ntfy.nix b/hm/ntfy.nix similarity index 100% rename from hm/modules/ntfy.nix rename to hm/ntfy.nix diff --git a/hm/modules/nushell.nix b/hm/nushell.nix similarity index 100% rename from hm/modules/nushell.nix rename to hm/nushell.nix diff --git a/hm/modules/nvim/nvim-cmp-config.lua b/hm/nvim/nvim-cmp-config.lua similarity index 100% rename from hm/modules/nvim/nvim-cmp-config.lua rename to hm/nvim/nvim-cmp-config.lua diff --git a/hm/modules/nvim/nvim-lspconfig-config.lua b/hm/nvim/nvim-lspconfig-config.lua similarity index 100% rename from hm/modules/nvim/nvim-lspconfig-config.lua rename to hm/nvim/nvim-lspconfig-config.lua diff --git a/hm/modules/nvim/snippets/markdown.json b/hm/nvim/snippets/markdown.json similarity index 100% rename from hm/modules/nvim/snippets/markdown.json rename to hm/nvim/snippets/markdown.json diff --git a/hm/modules/nvim/snippets/package.json b/hm/nvim/snippets/package.json similarity index 100% rename from hm/modules/nvim/snippets/package.json rename to hm/nvim/snippets/package.json diff --git a/hm/modules/nvim/telescope-config.lua b/hm/nvim/telescope-config.lua similarity index 100% rename from hm/modules/nvim/telescope-config.lua rename to hm/nvim/telescope-config.lua diff --git a/hm/modules/obs-studio.nix b/hm/obs-studio.nix similarity index 100% rename from hm/modules/obs-studio.nix rename to hm/obs-studio.nix diff --git a/hm/modules/office.nix b/hm/office.nix similarity index 100% rename from hm/modules/office.nix rename to hm/office.nix diff --git a/hm/modules/onedrive.nix b/hm/onedrive.nix similarity index 100% rename from hm/modules/onedrive.nix rename to hm/onedrive.nix diff --git a/hm/modules/pass.nix b/hm/pass.nix similarity index 100% rename from hm/modules/pass.nix rename to hm/pass.nix diff --git a/hm/modules/picom.nix b/hm/picom.nix similarity index 100% rename from hm/modules/picom.nix rename to hm/picom.nix diff --git a/hm/modules/polybar.nix b/hm/polybar.nix similarity index 100% rename from hm/modules/polybar.nix rename to hm/polybar.nix diff --git a/hm/modules/pro_audio.nix b/hm/pro_audio.nix similarity index 100% rename from hm/modules/pro_audio.nix rename to hm/pro_audio.nix diff --git a/hm/modules/pycharm.nix b/hm/pycharm.nix similarity index 100% rename from hm/modules/pycharm.nix rename to hm/pycharm.nix diff --git a/hm/modules/rclone-mount-bertof.nix b/hm/rclone-mount-bertof.nix similarity index 100% rename from hm/modules/rclone-mount-bertof.nix rename to hm/rclone-mount-bertof.nix diff --git a/hm/modules/rclone-mount-tiziano.nix b/hm/rclone-mount-tiziano.nix similarity index 100% rename from hm/modules/rclone-mount-tiziano.nix rename to hm/rclone-mount-tiziano.nix diff --git a/hm/modules/rclone-mount.nix b/hm/rclone-mount.nix similarity index 100% rename from hm/modules/rclone-mount.nix rename to hm/rclone-mount.nix diff --git a/hm/modules/readme.md b/hm/readme.md similarity index 100% rename from hm/modules/readme.md rename to hm/readme.md diff --git a/hm/modules/research.nix b/hm/research.nix similarity index 100% rename from hm/modules/research.nix rename to hm/research.nix diff --git a/hm/modules/rofi.nix b/hm/rofi.nix similarity index 100% rename from hm/modules/rofi.nix rename to hm/rofi.nix diff --git a/hm/modules/screen_locker.nix b/hm/screen_locker.nix similarity index 100% rename from hm/modules/screen_locker.nix rename to hm/screen_locker.nix diff --git a/hm/modules/security.nix b/hm/security.nix similarity index 100% rename from hm/modules/security.nix rename to hm/security.nix diff --git a/hm/modules/shell_aliases.nix b/hm/shell_aliases.nix similarity index 100% rename from hm/modules/shell_aliases.nix rename to hm/shell_aliases.nix diff --git a/hm/modules/spotifyd.nix b/hm/spotifyd.nix similarity index 100% rename from hm/modules/spotifyd.nix rename to hm/spotifyd.nix diff --git a/hm/modules/ssh.nix b/hm/ssh.nix similarity index 100% rename from hm/modules/ssh.nix rename to hm/ssh.nix diff --git a/hm/modules/starship.nix b/hm/starship.nix similarity index 100% rename from hm/modules/starship.nix rename to hm/starship.nix diff --git a/hm/modules/swayidle.nix b/hm/swayidle.nix similarity index 100% rename from hm/modules/swayidle.nix rename to hm/swayidle.nix diff --git a/hm/modules/swaynotificationcenter.nix b/hm/swaynotificationcenter.nix similarity index 100% rename from hm/modules/swaynotificationcenter.nix rename to hm/swaynotificationcenter.nix diff --git a/hm/modules/syncthing.nix b/hm/syncthing.nix similarity index 100% rename from hm/modules/syncthing.nix rename to hm/syncthing.nix diff --git a/hm/modules/syncthing_tiziano.nix b/hm/syncthing_tiziano.nix similarity index 100% rename from hm/modules/syncthing_tiziano.nix rename to hm/syncthing_tiziano.nix diff --git a/hm/modules/terminator.nix b/hm/terminator.nix similarity index 100% rename from hm/modules/terminator.nix rename to hm/terminator.nix diff --git a/hm/modules/thunar.nix b/hm/thunar.nix similarity index 100% rename from hm/modules/thunar.nix rename to hm/thunar.nix diff --git a/hm/modules/tmux.nix b/hm/tmux.nix similarity index 100% rename from hm/modules/tmux.nix rename to hm/tmux.nix diff --git a/hm/modules/twmn.nix b/hm/twmn.nix similarity index 100% rename from hm/modules/twmn.nix rename to hm/twmn.nix diff --git a/hm/modules/update_background.nix b/hm/update_background.nix similarity index 100% rename from hm/modules/update_background.nix rename to hm/update_background.nix diff --git a/hm/modules/vim.nix b/hm/vim.nix similarity index 100% rename from hm/modules/vim.nix rename to hm/vim.nix diff --git a/hm/modules/virtualization.nix b/hm/virtualization.nix similarity index 100% rename from hm/modules/virtualization.nix rename to hm/virtualization.nix diff --git a/hm/modules/vivaldi.nix b/hm/vivaldi.nix similarity index 100% rename from hm/modules/vivaldi.nix rename to hm/vivaldi.nix diff --git a/hm/modules/vscode.nix b/hm/vscode.nix similarity index 100% rename from hm/modules/vscode.nix rename to hm/vscode.nix diff --git a/hm/modules/waybar.nix b/hm/waybar.nix similarity index 100% rename from hm/modules/waybar.nix rename to hm/waybar.nix diff --git a/hm/modules/webapp.nix b/hm/webapp.nix similarity index 100% rename from hm/modules/webapp.nix rename to hm/webapp.nix diff --git a/hm/modules/wl_update_background.nix b/hm/wl_update_background.nix similarity index 100% rename from hm/modules/wl_update_background.nix rename to hm/wl_update_background.nix diff --git a/hm/modules/wlsunset.nix b/hm/wlsunset.nix similarity index 100% rename from hm/modules/wlsunset.nix rename to hm/wlsunset.nix diff --git a/hm/modules/xidlehook.nix b/hm/xidlehook.nix similarity index 100% rename from hm/modules/xidlehook.nix rename to hm/xidlehook.nix diff --git a/hm/modules/xresources.nix b/hm/xresources.nix similarity index 100% rename from hm/modules/xresources.nix rename to hm/xresources.nix diff --git a/hm/modules/yazi.nix b/hm/yazi.nix similarity index 100% rename from hm/modules/yazi.nix rename to hm/yazi.nix diff --git a/hm/modules/yt-dlp.nix b/hm/yt-dlp.nix similarity index 100% rename from hm/modules/yt-dlp.nix rename to hm/yt-dlp.nix diff --git a/hm/modules/zathura.nix b/hm/zathura.nix similarity index 100% rename from hm/modules/zathura.nix rename to hm/zathura.nix diff --git a/hm/modules/zellij.nix b/hm/zellij.nix similarity index 100% rename from hm/modules/zellij.nix rename to hm/zellij.nix diff --git a/hm/modules/zoxide.nix b/hm/zoxide.nix similarity index 100% rename from hm/modules/zoxide.nix rename to hm/zoxide.nix diff --git a/hm/modules/zsh.nix b/hm/zsh.nix similarity index 100% rename from hm/modules/zsh.nix rename to hm/zsh.nix diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix index fdd8767..2afd96a 100644 --- a/instances/baldur/hm.nix +++ b/instances/baldur/hm.nix @@ -14,21 +14,21 @@ }; imports = [ - ../../hm/modules/combined/minimal.nix + ../../hm/combined/minimal.nix - # ../../hm/modules/development/cpp.nix - # ../../hm/modules/development/data.nix - # ../../hm/modules/development/go.nix - # ../../hm/modules/development/javascript.nix - # ../../hm/modules/development/latex.nix - # ../../hm/modules/development/python.nix - # ../../hm/modules/development/rust.nix + # ../../hm/development/cpp.nix + # ../../hm/development/data.nix + # ../../hm/development/go.nix + # ../../hm/development/javascript.nix + # ../../hm/development/latex.nix + # ../../hm/development/python.nix + # ../../hm/development/rust.nix - # ../../hm/modules/fonts.nix - ../../hm/modules/helix.nix - # ../../hm/modules/kitty.nix - # ../../hm/modules/megasync.nix - # ../../hm/modules/noti.nix + # ../../hm/fonts.nix + ../../hm/helix.nix + # ../../hm/kitty.nix + # ../../hm/megasync.nix + # ../../hm/noti.nix ]; home.stateVersion = "23.05"; diff --git a/instances/baldur/hm_tiziano.nix b/instances/baldur/hm_tiziano.nix index 073eb57..8bd3eb2 100644 --- a/instances/baldur/hm_tiziano.nix +++ b/instances/baldur/hm_tiziano.nix @@ -12,9 +12,9 @@ }; imports = [ - ../../hm/modules/combined/minimal.nix + ../../hm/combined/minimal.nix - ../../hm/modules/shell_aliases.nix + ../../hm/shell_aliases.nix ]; home.stateVersion = "23.05"; diff --git a/instances/freya/hm.nix b/instances/freya/hm.nix index 84c2899..3b6f7bf 100644 --- a/instances/freya/hm.nix +++ b/instances/freya/hm.nix @@ -20,11 +20,11 @@ }; imports = [ - ../../hm/modules/combined/minimal.nix + ../../hm/combined/minimal.nix - ../../hm/modules/helix.nix - ../../hm/modules/kitty.nix - ../../hm/modules/syncthing.nix + ../../hm/helix.nix + ../../hm/kitty.nix + ../../hm/syncthing.nix ]; home.stateVersion = "22.11"; diff --git a/instances/heimdall/hm.nix b/instances/heimdall/hm.nix index 13d722f..044f3ff 100644 --- a/instances/heimdall/hm.nix +++ b/instances/heimdall/hm.nix @@ -20,14 +20,14 @@ }; imports = [ - ../../hm/modules/combined/basics.nix + ../../hm/combined/basics.nix - ../../hm/modules/helix.nix - ../../hm/modules/kitty.nix - ../../hm/modules/nushell.nix - ../../hm/modules/rclone-mount-bertof.nix - ../../hm/modules/syncthing.nix - ../../hm/modules/yt-dlp.nix + ../../hm/helix.nix + ../../hm/kitty.nix + ../../hm/nushell.nix + ../../hm/rclone-mount-bertof.nix + ../../hm/syncthing.nix + ../../hm/yt-dlp.nix ]; home.stateVersion = "22.11"; diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix index fa3cf11..0fecef3 100644 --- a/instances/loki/hm.nix +++ b/instances/loki/hm.nix @@ -11,24 +11,24 @@ }; imports = [ - ../../hm/modules/combined/basics.nix + ../../hm/combined/basics.nix - # ../../hm/modules/development/cpp.nix - # ../../hm/modules/development/data.nix - # ../../hm/modules/development/go.nix - # ../../hm/modules/development/javascript.nix - # ../../hm/modules/development/latex.nix - # ../../hm/modules/development/nix.nix - # ../../hm/modules/development/python.nix - # ../../hm/modules/development/rust.nix + # ../../hm/development/cpp.nix + # ../../hm/development/data.nix + # ../../hm/development/go.nix + # ../../hm/development/javascript.nix + # ../../hm/development/latex.nix + # ../../hm/development/nix.nix + # ../../hm/development/python.nix + # ../../hm/development/rust.nix - ../../hm/modules/helix.nix - # ../../hm/modules/kakoune.nix - ../../hm/modules/kitty.nix - ../../hm/modules/megasync.nix - ../../hm/modules/syncthing.nix + ../../hm/helix.nix + # ../../hm/kakoune.nix + ../../hm/kitty.nix + ../../hm/megasync.nix + ../../hm/syncthing.nix - ../../hm/modules/shell_aliases.nix + ../../hm/shell_aliases.nix ]; home.stateVersion = "22.11"; diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix index 5b6310e..08b513f 100644 --- a/instances/odin/hm.nix +++ b/instances/odin/hm.nix @@ -69,78 +69,78 @@ # }; imports = [ - ../../hm/modules/combined/basics.nix + ../../hm/combined/basics.nix - # ../../hm/modules/development/cpp.nix - # ../../hm/modules/development/data.nix - # # ../../hm/modules/development/database.nix - # ../../hm/modules/development/docker.nix - # ../../hm/modules/development/go.nix - # ../../hm/modules/development/javascript.nix - # ../../hm/modules/development/kubernetes.nix - # ../../hm/modules/development/latex.nix - # ../../hm/modules/development/markdown.nix - # ../../hm/modules/development/nix.nix - # ../../hm/modules/development/python.nix - # ../../hm/modules/development/rust.nix - # ../../hm/modules/development/web.nix + # ../../hm/development/cpp.nix + # ../../hm/development/data.nix + # # ../../hm/development/database.nix + # ../../hm/development/docker.nix + # ../../hm/development/go.nix + # ../../hm/development/javascript.nix + # ../../hm/development/kubernetes.nix + # ../../hm/development/latex.nix + # ../../hm/development/markdown.nix + # ../../hm/development/nix.nix + # ../../hm/development/python.nix + # ../../hm/development/rust.nix + # ../../hm/development/web.nix - # # ../../hm/modules/alacritty.nix - # ../../hm/modules/autorandr.nix - # ../../hm/modules/biblio.nix - # # ../../hm/modules/bitwarden.nix - # # ../../hm/modules/blender.nix - # # ../../hm/modules/carapace.nix - # # ../../hm/modules/dwarf-fortress.nix - # ../../hm/modules/easyeffects.nix - # ../../hm/modules/firefox.nix - # # ../../hm/modules/vivaldi.nix - # # ../../hm/modules/fonts.nix - # # ../../hm/modules/gnome_shell.nix - # # ../../hm/modules/grobi.nix - # ../../hm/modules/gtk_theme.nix - # ../../hm/modules/heif.nix - # ../../hm/modules/helix.nix - # ../../hm/modules/jellyfin-player.nix - # # ../../hm/modules/joystickwake.nix - # # ../../hm/modules/kakoune.nix - # ../../hm/modules/kdeconnect.nix - # # ../../hm/modules/keepassxc.nix - # # ../../hm/modules/kicad.nix - # ../../hm/modules/kitty.nix - # ../../hm/modules/libinput-gestures.nix - # # ../../hm/modules/lutris.nix - # ../../hm/modules/mangohud.nix - # ../../hm/modules/megasync.nix - # ../../hm/modules/mpv.nix - # # ../../hm/modules/nautilus.nix - # ../../hm/modules/ncspot.nix - # ../../hm/modules/nix-index.nix - # ../../hm/modules/noti.nix - # ../../hm/modules/nushell.nix - # ../../hm/modules/obs-studio.nix - # ../../hm/modules/office.nix - # ../../hm/modules/pass.nix - # ../../hm/modules/pro_audio.nix - # # ../../hm/modules/pycharm.nix - # ../../hm/modules/rclone-mount.nix - # ../../hm/modules/research.nix - # # ../../hm/modules/rofi.nix - # # ../../hm/modules/screen_locker.nix - # # ../../hm/modules/security.nix - # # ../../hm/modules/spotifyd.nix - # ../../hm/modules/syncthing.nix - # # ../../hm/modules/thunar.nix - # # ../../hm/modules/twmn.nix - # # ../../hm/modules/update_background.nix - # ../../hm/modules/vim.nix - # ../../hm/modules/virtualization.nix - # ../../hm/modules/vscode.nix - # ../../hm/modules/webapp.nix - # ../../hm/modules/xresources.nix - # ../../hm/modules/yazi.nix - # ../../hm/modules/zathura.nix - # ../../hm/modules/zellij.nix + # # ../../hm/alacritty.nix + # ../../hm/autorandr.nix + # ../../hm/biblio.nix + # # ../../hm/bitwarden.nix + # # ../../hm/blender.nix + # # ../../hm/carapace.nix + # # ../../hm/dwarf-fortress.nix + # ../../hm/easyeffects.nix + # ../../hm/firefox.nix + # # ../../hm/vivaldi.nix + # # ../../hm/fonts.nix + # # ../../hm/gnome_shell.nix + # # ../../hm/grobi.nix + # ../../hm/gtk_theme.nix + # ../../hm/heif.nix + # ../../hm/helix.nix + # ../../hm/jellyfin-player.nix + # # ../../hm/joystickwake.nix + # # ../../hm/kakoune.nix + # ../../hm/kdeconnect.nix + # # ../../hm/keepassxc.nix + # # ../../hm/kicad.nix + # ../../hm/kitty.nix + # ../../hm/libinput-gestures.nix + # # ../../hm/lutris.nix + # ../../hm/mangohud.nix + # ../../hm/megasync.nix + # ../../hm/mpv.nix + # # ../../hm/nautilus.nix + # ../../hm/ncspot.nix + # ../../hm/nix-index.nix + # ../../hm/noti.nix + # ../../hm/nushell.nix + # ../../hm/obs-studio.nix + # ../../hm/office.nix + # ../../hm/pass.nix + # ../../hm/pro_audio.nix + # # ../../hm/pycharm.nix + # ../../hm/rclone-mount.nix + # ../../hm/research.nix + # # ../../hm/rofi.nix + # # ../../hm/screen_locker.nix + # # ../../hm/security.nix + # # ../../hm/spotifyd.nix + # ../../hm/syncthing.nix + # # ../../hm/thunar.nix + # # ../../hm/twmn.nix + # # ../../hm/update_background.nix + # ../../hm/vim.nix + # ../../hm/virtualization.nix + # ../../hm/vscode.nix + # ../../hm/webapp.nix + # ../../hm/xresources.nix + # ../../hm/yazi.nix + # ../../hm/zathura.nix + # ../../hm/zellij.nix ]; home.stateVersion = "24.11"; diff --git a/instances/odin/hm_tiziano.nix b/instances/odin/hm_tiziano.nix index 7bf4979..a95bda5 100644 --- a/instances/odin/hm_tiziano.nix +++ b/instances/odin/hm_tiziano.nix @@ -12,12 +12,12 @@ }; imports = [ - ../../hm/modules/combined/basics.nix + ../../hm/combined/basics.nix - ../../hm/modules/syncthing_tiziano.nix + ../../hm/syncthing_tiziano.nix - ../../hm/modules/shell_aliases.nix - ../../hm/modules/rclone-mount-tiziano.nix + ../../hm/shell_aliases.nix + ../../hm/rclone-mount-tiziano.nix ]; home.stateVersion = "23.05"; diff --git a/instances/sif/hm.nix b/instances/sif/hm.nix index 3c6f5a6..09035ec 100644 --- a/instances/sif/hm.nix +++ b/instances/sif/hm.nix @@ -64,81 +64,81 @@ }; imports = [ - ../../hm/modules/combined/basics.nix + ../../hm/combined/basics.nix - # ../../hm/modules/development/cpp.nix - # ../../hm/modules/development/database.nix - ../../hm/modules/development/data.nix - ../../hm/modules/development/docker.nix - # ../../hm/modules/development/go.nix - # ../../hm/modules/development/javascript.nix - ../../hm/modules/development/kubernetes.nix - ../../hm/modules/development/latex.nix - ../../hm/modules/development/markdown.nix - ../../hm/modules/development/nix.nix - ../../hm/modules/development/python.nix - # ../../hm/modules/development/rust.nix - ../../hm/modules/development/web.nix + # ../../hm/development/cpp.nix + # ../../hm/development/database.nix + ../../hm/development/data.nix + ../../hm/development/docker.nix + # ../../hm/development/go.nix + # ../../hm/development/javascript.nix + ../../hm/development/kubernetes.nix + ../../hm/development/latex.nix + ../../hm/development/markdown.nix + ../../hm/development/nix.nix + ../../hm/development/python.nix + # ../../hm/development/rust.nix + ../../hm/development/web.nix - # ../../hm/modules/alacritty.nix - # ../../hm/modules/autorandr.nix - # ../../hm/modules/biblio.nix - # ../../hm/modules/bitwarden.nix - # ../../hm/modules/blender.nix - # ../../hm/modules/carapace.nix - # ../../hm/modules/dwarf-fortress.nix - # ../../hm/modules/fonts.nix - # ../../hm/modules/gnome_shell.nix - # ../../hm/modules/grobi.nix - # ../../hm/modules/jellyfin-player.nix - # ../../hm/modules/joystickwake.nix - # ../../hm/modules/kakoune.nix - # ../../hm/modules/keepassxc.nix - # ../../hm/modules/kicad.nix - # ../../hm/modules/lutris.nix - # ../../hm/modules/mangohud.nix - # ../../hm/modules/megasync.nix - # ../../hm/modules/nautilus.nix - # ../../hm/modules/ncspot.nix - # ../../hm/modules/obs-studio.nix - # ../../hm/modules/pycharm.nix - # ../../hm/modules/rofi.nix - # ../../hm/modules/screen_locker.nix - # ../../hm/modules/security.nix - # ../../hm/modules/spotifyd.nix - # ../../hm/modules/thunar.nix - # ../../hm/modules/twmn.nix - # ../../hm/modules/update_background.nix - # ../../hm/modules/vivaldi.nix - # ../../hm/modules/vscode.nix - ../../hm/modules/cava.nix - ../../hm/modules/easyeffects.nix - ../../hm/modules/firefox.nix - ../../hm/modules/foot.nix - ../../hm/modules/gtk_theme.nix - ../../hm/modules/heif.nix - ../../hm/modules/helix.nix - ../../hm/modules/kdeconnect.nix - ../../hm/modules/kitty.nix - ../../hm/modules/libinput-gestures.nix - ../../hm/modules/mpv.nix - ../../hm/modules/noti.nix - ../../hm/modules/nushell.nix - ../../hm/modules/office.nix - ../../hm/modules/office.nix - ../../hm/modules/pass.nix - ../../hm/modules/pro_audio.nix - ../../hm/modules/rclone-mount-bertof.nix - ../../hm/modules/research.nix - ../../hm/modules/syncthing.nix - ../../hm/modules/vim.nix - ../../hm/modules/virtualization.nix - ../../hm/modules/webapp.nix - ../../hm/modules/xresources.nix - ../../hm/modules/yazi.nix - ../../hm/modules/yt-dlp.nix - ../../hm/modules/zathura.nix - ../../hm/modules/zellij.nix + # ../../hm/alacritty.nix + # ../../hm/autorandr.nix + # ../../hm/biblio.nix + # ../../hm/bitwarden.nix + # ../../hm/blender.nix + # ../../hm/carapace.nix + # ../../hm/dwarf-fortress.nix + # ../../hm/fonts.nix + # ../../hm/gnome_shell.nix + # ../../hm/grobi.nix + # ../../hm/jellyfin-player.nix + # ../../hm/joystickwake.nix + # ../../hm/kakoune.nix + # ../../hm/keepassxc.nix + # ../../hm/kicad.nix + # ../../hm/lutris.nix + # ../../hm/mangohud.nix + # ../../hm/megasync.nix + # ../../hm/nautilus.nix + # ../../hm/ncspot.nix + # ../../hm/obs-studio.nix + # ../../hm/pycharm.nix + # ../../hm/rofi.nix + # ../../hm/screen_locker.nix + # ../../hm/security.nix + # ../../hm/spotifyd.nix + # ../../hm/thunar.nix + # ../../hm/twmn.nix + # ../../hm/update_background.nix + # ../../hm/vivaldi.nix + # ../../hm/vscode.nix + ../../hm/cava.nix + ../../hm/easyeffects.nix + ../../hm/firefox.nix + ../../hm/foot.nix + ../../hm/gtk_theme.nix + ../../hm/heif.nix + ../../hm/helix.nix + ../../hm/kdeconnect.nix + ../../hm/kitty.nix + ../../hm/libinput-gestures.nix + ../../hm/mpv.nix + ../../hm/noti.nix + ../../hm/nushell.nix + ../../hm/office.nix + ../../hm/office.nix + ../../hm/pass.nix + ../../hm/pro_audio.nix + ../../hm/rclone-mount-bertof.nix + ../../hm/research.nix + ../../hm/syncthing.nix + ../../hm/vim.nix + ../../hm/virtualization.nix + ../../hm/webapp.nix + ../../hm/xresources.nix + ../../hm/yazi.nix + ../../hm/yt-dlp.nix + ../../hm/zathura.nix + ../../hm/zellij.nix ]; home.stateVersion = "24.11"; diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index 7f28feb..1b79f12 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -68,79 +68,79 @@ }; imports = [ - ../../hm/modules/combined/basics.nix + ../../hm/combined/basics.nix - # ../../hm/modules/development/cpp.nix - # ../../hm/modules/development/database.nix - # ../../hm/modules/development/go.nix - # ../../hm/modules/development/javascript.nix - # ../../hm/modules/development/rust.nix - ../../hm/modules/development/data.nix - ../../hm/modules/development/docker.nix - ../../hm/modules/development/kubernetes.nix - ../../hm/modules/development/latex.nix - ../../hm/modules/development/markdown.nix - ../../hm/modules/development/nix.nix - ../../hm/modules/development/python.nix - ../../hm/modules/development/web.nix + # ../../hm/development/cpp.nix + # ../../hm/development/database.nix + # ../../hm/development/go.nix + # ../../hm/development/javascript.nix + # ../../hm/development/rust.nix + ../../hm/development/data.nix + ../../hm/development/docker.nix + ../../hm/development/kubernetes.nix + ../../hm/development/latex.nix + ../../hm/development/markdown.nix + ../../hm/development/nix.nix + ../../hm/development/python.nix + ../../hm/development/web.nix - # ../../hm/modules/alacritty.nix - # ../../hm/modules/autorandr.nix - # ../../hm/modules/biblio.nix - # ../../hm/modules/bitwarden.nix - # ../../hm/modules/carapace.nix - # ../../hm/modules/gnome_shell.nix - # ../../hm/modules/grobi.nix - # ../../hm/modules/jellyfin-player.nix - # ../../hm/modules/kakoune.nix - # ../../hm/modules/keepassxc.nix - # ../../hm/modules/kicad.nix - # ../../hm/modules/lutris.nix - # ../../hm/modules/nautilus.nix - ../../hm/modules/obs-studio.nix - # ../../hm/modules/picom.nix - # ../../hm/modules/pycharm.nix - # ../../hm/modules/rofi.nix - # ../../hm/modules/screen_locker.nix - # ../../hm/modules/security.nix - # ../../hm/modules/spotifyd.nix - # ../../hm/modules/thunar.nix - # ../../hm/modules/twmn.nix - # ../../hm/modules/update_background.nix - # ../../hm/modules/vivaldi.nix - # ../../hm/modules/vscode.nix - # ../../hm/modules/blender_nvidia.nix - # ../../hm/modules/dwarf-fortress.nix - ../../hm/modules/easyeffects.nix - ../../hm/modules/firefox.nix - ../../hm/modules/fonts.nix - ../../hm/modules/foot.nix - ../../hm/modules/gtk_theme.nix - ../../hm/modules/heif.nix - ../../hm/modules/helix.nix - ../../hm/modules/joystickwake.nix - ../../hm/modules/kdeconnect.nix - ../../hm/modules/kitty.nix - ../../hm/modules/mangohud.nix - ../../hm/modules/megasync.nix - ../../hm/modules/mpv.nix - # ../../hm/modules/ncspot.nix - ../../hm/modules/noti.nix - ../../hm/modules/nushell.nix - ../../hm/modules/office.nix - ../../hm/modules/pass.nix - ../../hm/modules/pro_audio.nix - ../../hm/modules/rclone-mount-bertof.nix - ../../hm/modules/research.nix - ../../hm/modules/syncthing.nix - ../../hm/modules/vim.nix - ../../hm/modules/virtualization.nix - ../../hm/modules/webapp.nix - ../../hm/modules/xresources.nix - ../../hm/modules/yazi.nix - ../../hm/modules/yt-dlp.nix - ../../hm/modules/zathura.nix - ../../hm/modules/zellij.nix + # ../../hm/alacritty.nix + # ../../hm/autorandr.nix + # ../../hm/biblio.nix + # ../../hm/bitwarden.nix + # ../../hm/carapace.nix + # ../../hm/gnome_shell.nix + # ../../hm/grobi.nix + # ../../hm/jellyfin-player.nix + # ../../hm/kakoune.nix + # ../../hm/keepassxc.nix + # ../../hm/kicad.nix + # ../../hm/lutris.nix + # ../../hm/nautilus.nix + ../../hm/obs-studio.nix + # ../../hm/picom.nix + # ../../hm/pycharm.nix + # ../../hm/rofi.nix + # ../../hm/screen_locker.nix + # ../../hm/security.nix + # ../../hm/spotifyd.nix + # ../../hm/thunar.nix + # ../../hm/twmn.nix + # ../../hm/update_background.nix + # ../../hm/vivaldi.nix + # ../../hm/vscode.nix + # ../../hm/blender_nvidia.nix + # ../../hm/dwarf-fortress.nix + ../../hm/easyeffects.nix + ../../hm/firefox.nix + ../../hm/fonts.nix + ../../hm/foot.nix + ../../hm/gtk_theme.nix + ../../hm/heif.nix + ../../hm/helix.nix + ../../hm/joystickwake.nix + ../../hm/kdeconnect.nix + ../../hm/kitty.nix + ../../hm/mangohud.nix + ../../hm/megasync.nix + ../../hm/mpv.nix + # ../../hm/ncspot.nix + ../../hm/noti.nix + ../../hm/nushell.nix + ../../hm/office.nix + ../../hm/pass.nix + ../../hm/pro_audio.nix + ../../hm/rclone-mount-bertof.nix + ../../hm/research.nix + ../../hm/syncthing.nix + ../../hm/vim.nix + ../../hm/virtualization.nix + ../../hm/webapp.nix + ../../hm/xresources.nix + ../../hm/yazi.nix + ../../hm/yt-dlp.nix + ../../hm/zathura.nix + ../../hm/zellij.nix ]; diff --git a/modules/nixos/basics/automatic-garbage-collection.nix b/nixos/basics/automatic-garbage-collection.nix similarity index 100% rename from modules/nixos/basics/automatic-garbage-collection.nix rename to nixos/basics/automatic-garbage-collection.nix diff --git a/modules/nixos/basics/btrfs-scrub.nix b/nixos/basics/btrfs-scrub.nix similarity index 100% rename from modules/nixos/basics/btrfs-scrub.nix rename to nixos/basics/btrfs-scrub.nix diff --git a/modules/nixos/basics/default.nix b/nixos/basics/default.nix similarity index 100% rename from modules/nixos/basics/default.nix rename to nixos/basics/default.nix diff --git a/modules/nixos/basics/distributed.nix b/nixos/basics/distributed.nix similarity index 100% rename from modules/nixos/basics/distributed.nix rename to nixos/basics/distributed.nix diff --git a/modules/nixos/basics/docker.nix b/nixos/basics/docker.nix similarity index 100% rename from modules/nixos/basics/docker.nix rename to nixos/basics/docker.nix diff --git a/modules/nixos/basics/extended-registry.nix b/nixos/basics/extended-registry.nix similarity index 100% rename from modules/nixos/basics/extended-registry.nix rename to nixos/basics/extended-registry.nix diff --git a/modules/nixos/basics/fstrim.nix b/nixos/basics/fstrim.nix similarity index 100% rename from modules/nixos/basics/fstrim.nix rename to nixos/basics/fstrim.nix diff --git a/modules/nixos/basics/fwupd.nix b/nixos/basics/fwupd.nix similarity index 100% rename from modules/nixos/basics/fwupd.nix rename to nixos/basics/fwupd.nix diff --git a/modules/nixos/basics/git.nix b/nixos/basics/git.nix similarity index 100% rename from modules/nixos/basics/git.nix rename to nixos/basics/git.nix diff --git a/modules/nixos/basics/remote-deploy.nix b/nixos/basics/remote-deploy.nix similarity index 100% rename from modules/nixos/basics/remote-deploy.nix rename to nixos/basics/remote-deploy.nix diff --git a/modules/nixos/basics/resolved.nix b/nixos/basics/resolved.nix similarity index 100% rename from modules/nixos/basics/resolved.nix rename to nixos/basics/resolved.nix diff --git a/modules/nixos/basics/tailscale.nix b/nixos/basics/tailscale.nix similarity index 90% rename from modules/nixos/basics/tailscale.nix rename to nixos/basics/tailscale.nix index b82a214..b664e15 100644 --- a/modules/nixos/basics/tailscale.nix +++ b/nixos/basics/tailscale.nix @@ -1,6 +1,6 @@ { lib, ... }: let - hosts = import ../../../hosts.nix; + hosts = import ../../hosts.nix; tailscale_hosts = lib.attrsets.mapAttrs' ( k: v: lib.attrsets.nameValuePair v [ k ] diff --git a/modules/nixos/basics/zerotier.nix b/nixos/basics/zerotier.nix similarity index 87% rename from modules/nixos/basics/zerotier.nix rename to nixos/basics/zerotier.nix index d1082b2..6d6ce29 100644 --- a/modules/nixos/basics/zerotier.nix +++ b/nixos/basics/zerotier.nix @@ -1,5 +1,5 @@ # let -# hosts = import ../../../hosts.nix; +# hosts = import ../../hosts.nix; # zerotier_hosts = lib.attrsets.mapAttrs' # ( # k: v: lib.attrsets.nameValuePair v [ k ] diff --git a/modules/nixos/big_data.nix b/nixos/big_data.nix similarity index 100% rename from modules/nixos/big_data.nix rename to nixos/big_data.nix diff --git a/modules/nixos/cuda_support.nix b/nixos/cuda_support.nix similarity index 100% rename from modules/nixos/cuda_support.nix rename to nixos/cuda_support.nix diff --git a/modules/nixos/defcon.nix b/nixos/defcon.nix similarity index 100% rename from modules/nixos/defcon.nix rename to nixos/defcon.nix diff --git a/modules/nixos/digitalocean.nix b/nixos/digitalocean.nix similarity index 100% rename from modules/nixos/digitalocean.nix rename to nixos/digitalocean.nix diff --git a/modules/nixos/dnsmasq.nix b/nixos/dnsmasq.nix similarity index 100% rename from modules/nixos/dnsmasq.nix rename to nixos/dnsmasq.nix diff --git a/modules/nixos/garage.nix b/nixos/garage.nix similarity index 96% rename from modules/nixos/garage.nix rename to nixos/garage.nix index 80cab97..d4f58d6 100644 --- a/modules/nixos/garage.nix +++ b/nixos/garage.nix @@ -2,7 +2,7 @@ users.groups.garage = { }; users.users.garage = { isSystemUser = true; group = "garage"; }; age.secrets.garage_rpc_secret = { - file = ../../secrets/garage_rpc_secret.age; + file = ../secrets/garage_rpc_secret.age; owner = "garage"; }; diff --git a/modules/nixos/hyprland.nix b/nixos/hyprland.nix similarity index 100% rename from modules/nixos/hyprland.nix rename to nixos/hyprland.nix diff --git a/modules/nixos/immich.nix b/nixos/immich.nix similarity index 100% rename from modules/nixos/immich.nix rename to nixos/immich.nix diff --git a/modules/nixos/installer.nix b/nixos/installer.nix similarity index 100% rename from modules/nixos/installer.nix rename to nixos/installer.nix diff --git a/modules/nixos/ip_forwarding.nix b/nixos/ip_forwarding.nix similarity index 100% rename from modules/nixos/ip_forwarding.nix rename to nixos/ip_forwarding.nix diff --git a/modules/nixos/k3s.nix b/nixos/k3s.nix similarity index 100% rename from modules/nixos/k3s.nix rename to nixos/k3s.nix diff --git a/modules/nixos/kavita.nix b/nixos/kavita.nix similarity index 87% rename from modules/nixos/kavita.nix rename to nixos/kavita.nix index 454072c..d40ceb7 100644 --- a/modules/nixos/kavita.nix +++ b/nixos/kavita.nix @@ -2,7 +2,7 @@ { age.secrets.kavita_token = { - file = ../../secrets/kavita_token.age; + file = ../secrets/kavita_token.age; owner = "kavita"; }; diff --git a/modules/nixos/kdeconnect.nix b/nixos/kdeconnect.nix similarity index 100% rename from modules/nixos/kdeconnect.nix rename to nixos/kdeconnect.nix diff --git a/modules/nixos/mind.nix b/nixos/mind.nix similarity index 100% rename from modules/nixos/mind.nix rename to nixos/mind.nix diff --git a/modules/nixos/minio_local.nix b/nixos/minio_local.nix similarity index 82% rename from modules/nixos/minio_local.nix rename to nixos/minio_local.nix index 78e19ce..47e1e4e 100644 --- a/modules/nixos/minio_local.nix +++ b/nixos/minio_local.nix @@ -1,7 +1,7 @@ { config, ... }: { age.secrets.minio = { - file = ../../secrets/minio.age; + file = ../secrets/minio.age; owner = "minio"; }; diff --git a/modules/nixos/minio_server.nix b/nixos/minio_server.nix similarity index 87% rename from modules/nixos/minio_server.nix rename to nixos/minio_server.nix index 6382fbb..221e580 100644 --- a/modules/nixos/minio_server.nix +++ b/nixos/minio_server.nix @@ -1,7 +1,7 @@ { config, ... }: { age.secrets.minio = { - file = ../../secrets/minio.age; + file = ../secrets/minio.age; owner = "minio"; }; diff --git a/modules/nixos/musa.nix b/nixos/musa.nix similarity index 100% rename from modules/nixos/musa.nix rename to nixos/musa.nix diff --git a/modules/nixos/nextcloud.nix b/nixos/nextcloud.nix similarity index 93% rename from modules/nixos/nextcloud.nix rename to nixos/nextcloud.nix index 69bc488..6391812 100644 --- a/modules/nixos/nextcloud.nix +++ b/nixos/nextcloud.nix @@ -1,17 +1,17 @@ { pkgs, config, ... }: let - hosts = import ../../hosts.nix; + hosts = import ../hosts.nix; in { age.secrets = { nextcloud_admin_secret = { - file = ../../secrets/nextcloud_admin_secret.age; + file = ../secrets/nextcloud_admin_secret.age; owner = "nextcloud"; group = "nextcloud"; }; nextcloud_bucket_secret = { - file = ../../secrets/nextcloud_bucket_secret.age; + file = ../secrets/nextcloud_bucket_secret.age; owner = "nextcloud"; group = "nextcloud"; }; diff --git a/modules/nixos/ntfy.nix b/nixos/ntfy.nix similarity index 100% rename from modules/nixos/ntfy.nix rename to nixos/ntfy.nix diff --git a/modules/nixos/ollama.nix b/nixos/ollama.nix similarity index 100% rename from modules/nixos/ollama.nix rename to nixos/ollama.nix diff --git a/modules/nixos/pentablet.nix b/nixos/pentablet.nix similarity index 100% rename from modules/nixos/pentablet.nix rename to nixos/pentablet.nix diff --git a/modules/nixos/plasma6.nix b/nixos/plasma6.nix similarity index 100% rename from modules/nixos/plasma6.nix rename to nixos/plasma6.nix diff --git a/modules/nixos/plymouth.nix b/nixos/plymouth.nix similarity index 100% rename from modules/nixos/plymouth.nix rename to nixos/plymouth.nix diff --git a/modules/nixos/pro_audio.nix b/nixos/pro_audio.nix similarity index 100% rename from modules/nixos/pro_audio.nix rename to nixos/pro_audio.nix diff --git a/modules/nixos/rice.nix b/nixos/rice.nix similarity index 100% rename from modules/nixos/rice.nix rename to nixos/rice.nix diff --git a/modules/nixos/s3_cache_read.nix b/nixos/s3_cache_read.nix similarity index 64% rename from modules/nixos/s3_cache_read.nix rename to nixos/s3_cache_read.nix index 44cd48d..e164a2c 100644 --- a/modules/nixos/s3_cache_read.nix +++ b/nixos/s3_cache_read.nix @@ -1,4 +1,4 @@ { config, ... }: { - age.secrets.s3_cache_read.file = ../../secrets/s3_cache_read.age; + age.secrets.s3_cache_read.file = ../secrets/s3_cache_read.age; systemd.services.nix-daemon.serviceConfig.EnvironmentFile = config.age.secrets.s3_cache_read.path; } diff --git a/modules/nixos/s3_cache_write.nix b/nixos/s3_cache_write.nix similarity index 66% rename from modules/nixos/s3_cache_write.nix rename to nixos/s3_cache_write.nix index 9e8ad8a..0521061 100644 --- a/modules/nixos/s3_cache_write.nix +++ b/nixos/s3_cache_write.nix @@ -1,5 +1,5 @@ { config, lib, ... }: { - age.secrets.s3_cache_write.file = ../../secrets/s3_cache_write.age; + age.secrets.s3_cache_write.file = ../secrets/s3_cache_write.age; systemd.services.nix-daemon.serviceConfig.EnvironmentFile = lib.mkForce config.age.secrets.s3_cache_write.path; } diff --git a/modules/nixos/server/automatic-upgrade.nix b/nixos/server/automatic-upgrade.nix similarity index 100% rename from modules/nixos/server/automatic-upgrade.nix rename to nixos/server/automatic-upgrade.nix diff --git a/modules/nixos/server/default.nix b/nixos/server/default.nix similarity index 100% rename from modules/nixos/server/default.nix rename to nixos/server/default.nix diff --git a/modules/nixos/steam.nix b/nixos/steam.nix similarity index 100% rename from modules/nixos/steam.nix rename to nixos/steam.nix diff --git a/modules/nixos/torrentbox.nix b/nixos/torrentbox.nix similarity index 100% rename from modules/nixos/torrentbox.nix rename to nixos/torrentbox.nix diff --git a/modules/nixos/users/bertof.nix b/nixos/users/bertof.nix similarity index 100% rename from modules/nixos/users/bertof.nix rename to nixos/users/bertof.nix diff --git a/modules/nixos/users/tiziano.nix b/nixos/users/tiziano.nix similarity index 100% rename from modules/nixos/users/tiziano.nix rename to nixos/users/tiziano.nix diff --git a/pkgs/wl-lockscreen/default.nix b/pkgs/wl-lockscreen/default.nix index 6f657ac..425e568 100644 --- a/pkgs/wl-lockscreen/default.nix +++ b/pkgs/wl-lockscreen/default.nix @@ -1,7 +1,7 @@ { roboto , swaylock , writeShellScriptBin -, wallpaper ? ../../wallpapers/n8ca4obsys991.png +, wallpaper ? ../wallpapers/n8ca4obsys991.png , font ? { package = roboto; name = "Roboto"; size = 10; } , strPalette ? { primary.background = "000000ff";