From fced475e86cf1957a2f7d7f2c7e9690366aa0101 Mon Sep 17 00:00:00 2001 From: oqyude Date: Fri, 10 Oct 2025 20:08:23 +0300 Subject: [PATCH] some clean --- configurations/default.nix | 12 ++ .../disko/mini-pc.nix | 0 .../disko/pub-vds.nix | 0 .../hosts => configurations}/disko/server.nix | 0 .../hosts => configurations}/disko/vds.nix | 0 .../hardware/logitech.nix | 0 .../hardware/mini-pc.nix | 0 .../hardware/pub-vds.nix | 0 .../hardware/server.nix | 4 +- .../hosts => configurations}/hardware/vds.nix | 0 .../hosts => configurations}/mini-laptop.nix | 0 .../hosts => configurations}/mini-pc.nix | 0 .../hosts => configurations}/server.nix | 0 .../hosts => configurations}/vds.nix | 0 .../hosts => configurations}/wsl.nix | 0 flake.nix | 6 +- .../wsl-apps => home/apps}/default.nix | 1 - .../wsl-apps => home/apps}/gramps.nix | 0 .../wsl-apps => home/apps}/streamrip.nix | 0 .../wsl-apps => home/apps}/yt-dlp.nix | 0 {homeConfigurations => home}/default.nix | 0 .../example of symlinking.nix | 0 {homeConfigurations => home}/home.nix | 0 {homeConfigurations => home}/minimal.nix | 0 .../modules/dconf.nix | 0 .../modules/external.nix | 0 .../modules/packages.nix | 0 .../modules/plasma-manager.nix | 0 {homeConfigurations => home}/primary.nix | 0 {homeConfigurations => home}/server.nix | 0 {homeConfigurations => home}/vds.nix | 0 {homeConfigurations => home}/wsl.nix | 2 +- homeConfigurations/pub-vds.nix | 27 --- homeConfigurations/wsl-apps/gimp.nix | 12 -- {nixosModules => modules}/default.nix | 0 {nixosModules => modules}/desktop/default.nix | 0 .../desktop/environment/bspwm.nix | 0 .../desktop/environment/deepin.nix | 0 .../desktop/environment/default.nix | 0 .../desktop/environment/gnome.nix | 0 .../desktop/environment/kde.nix | 0 .../desktop/environment/xfce.nix | 0 {nixosModules => modules}/desktop/theming.nix | 0 .../essentials/default.nix | 0 .../essentials/packages.nix | 0 .../essentials/services.nix | 0 .../essentials/settings.nix | 0 .../essentials/systemd-routine.nix | 0 {nixosModules => modules}/essentials/tty.nix | 0 .../extra/gaming/aagl.nix | 0 .../extra/gaming/nix-gaming.nix | 0 {nixosModules => modules}/extra/musnix.nix | 0 .../extra/self/fingerprint.nix | 0 .../extra/self/zapret.nix | 0 {nixosModules => modules}/options.nix | 0 {nixosModules => modules}/primary/default.nix | 0 .../server/calibre-web.nix | 0 {nixosModules => modules}/server/default.nix | 0 {nixosModules => modules}/server/immich.nix | 0 {nixosModules => modules}/server/mealie.nix | 0 {nixosModules => modules}/server/memos.nix | 0 {nixosModules => modules}/server/miniflux.nix | 0 .../server/nextcloud.nix | 0 {nixosModules => modules}/server/nginx.nix | 0 {nixosModules => modules}/server/node-red.nix | 0 .../server/open-webui.nix | 0 {nixosModules => modules}/server/samba.nix | 0 .../server/secrets/miniflux.env | 0 .../server/stirling-pdf.nix | 0 .../server/syncthing.nix | 0 {nixosModules => modules}/server/systemd.nix | 0 .../server/transmission.nix | 0 {nixosModules => modules}/server/trilium.nix | 0 .../server/uptime-kuma.nix | 0 {nixosModules => modules}/server/zerotier.nix | 0 {nixosModules => modules}/services/tts.nix | 0 .../services/zapret-old.nix | 0 {nixosModules => modules}/services/zapret.nix | 0 {nixosModules => modules}/software/ai.nix | 0 {nixosModules => modules}/software/aichat.nix | 0 .../software/beets/default.nix | 0 .../software/beets/dependencies.nix | 0 .../software/beets/other/default.nix | 0 .../beets/other/dependencies-back.nix | 0 .../software/beets/other/dependencies-cut.nix | 0 {nixosModules => modules}/software/daw.nix | 0 .../software/virtual.nix | 0 .../software/whisper.nix | 0 {nixosModules => modules}/software/wine.nix | 0 {nixosModules => modules}/users.nix | 0 {nixosModules => modules}/vds/3x-ui.nix | 0 {nixosModules => modules}/vds/default.nix | 0 {nixosModules => modules}/vds/docker.nix | 0 {nixosModules => modules}/vds/netbird.nix | 0 {nixosModules => modules}/vds/nginx.nix | 0 .../vds/secrets/xray.yaml | 0 {nixosModules => modules}/vds/xray.nix | 0 {nixosModules => modules}/wsl/default.nix | 0 nixosConfigurations/default.nix | 12 -- nixosConfigurations/hosts/hardware/laptop.nix | 59 ------ nixosConfigurations/hosts/laptop.nix | 170 ------------------ 101 files changed, 19 insertions(+), 286 deletions(-) create mode 100644 configurations/default.nix rename {nixosConfigurations/hosts => configurations}/disko/mini-pc.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/disko/pub-vds.nix (100%) rename {nixosConfigurations/hosts => configurations}/disko/server.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/disko/vds.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/hardware/logitech.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/hardware/mini-pc.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/hardware/pub-vds.nix (100%) rename {nixosConfigurations/hosts => configurations}/hardware/server.nix (95%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/hardware/vds.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/mini-laptop.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/mini-pc.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/server.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/vds.nix (100%) mode change 100755 => 100644 rename {nixosConfigurations/hosts => configurations}/wsl.nix (100%) mode change 100755 => 100644 rename {homeConfigurations/wsl-apps => home/apps}/default.nix (83%) mode change 100755 => 100644 rename {homeConfigurations/wsl-apps => home/apps}/gramps.nix (100%) mode change 100755 => 100644 rename {homeConfigurations/wsl-apps => home/apps}/streamrip.nix (100%) mode change 100755 => 100644 rename {homeConfigurations/wsl-apps => home/apps}/yt-dlp.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/default.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/example of symlinking.nix (100%) rename {homeConfigurations => home}/home.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/minimal.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/modules/dconf.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/modules/external.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/modules/packages.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/modules/plasma-manager.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/primary.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/server.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/vds.nix (100%) mode change 100755 => 100644 rename {homeConfigurations => home}/wsl.nix (98%) mode change 100755 => 100644 delete mode 100644 homeConfigurations/pub-vds.nix delete mode 100644 homeConfigurations/wsl-apps/gimp.nix rename {nixosModules => modules}/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/environment/bspwm.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/environment/deepin.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/environment/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/environment/gnome.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/environment/kde.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/environment/xfce.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/desktop/theming.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/essentials/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/essentials/packages.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/essentials/services.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/essentials/settings.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/essentials/systemd-routine.nix (100%) rename {nixosModules => modules}/essentials/tty.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/extra/gaming/aagl.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/extra/gaming/nix-gaming.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/extra/musnix.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/extra/self/fingerprint.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/extra/self/zapret.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/options.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/primary/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/calibre-web.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/immich.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/mealie.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/memos.nix (100%) rename {nixosModules => modules}/server/miniflux.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/nextcloud.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/nginx.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/node-red.nix (100%) rename {nixosModules => modules}/server/open-webui.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/samba.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/secrets/miniflux.env (100%) rename {nixosModules => modules}/server/stirling-pdf.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/syncthing.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/systemd.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/transmission.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/server/trilium.nix (100%) rename {nixosModules => modules}/server/uptime-kuma.nix (100%) rename {nixosModules => modules}/server/zerotier.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/services/tts.nix (100%) rename {nixosModules => modules}/services/zapret-old.nix (100%) rename {nixosModules => modules}/services/zapret.nix (100%) rename {nixosModules => modules}/software/ai.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/aichat.nix (100%) rename {nixosModules => modules}/software/beets/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/beets/dependencies.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/beets/other/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/beets/other/dependencies-back.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/beets/other/dependencies-cut.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/daw.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/virtual.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/whisper.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/software/wine.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/users.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/vds/3x-ui.nix (100%) rename {nixosModules => modules}/vds/default.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/vds/docker.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/vds/netbird.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/vds/nginx.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/vds/secrets/xray.yaml (100%) rename {nixosModules => modules}/vds/xray.nix (100%) mode change 100755 => 100644 rename {nixosModules => modules}/wsl/default.nix (100%) mode change 100755 => 100644 delete mode 100755 nixosConfigurations/default.nix delete mode 100755 nixosConfigurations/hosts/hardware/laptop.nix delete mode 100755 nixosConfigurations/hosts/laptop.nix diff --git a/configurations/default.nix b/configurations/default.nix new file mode 100644 index 0000000..8612837 --- /dev/null +++ b/configurations/default.nix @@ -0,0 +1,12 @@ +{ ... }@flakeContext: +{ + nixosConfigurations = { + atoridu = import ./mini-pc.nix flakeContext; # atoridu + lamet = import ./mini-laptop.nix flakeContext; # lamet + otreca = import ./vds.nix flakeContext; # vds + sapphira = import ./server.nix flakeContext; # sapphira + wsl = import ./wsl.nix flakeContext; # wsl + + pub-vds = import ./pub-vds.nix flakeContext; + }; +} diff --git a/nixosConfigurations/hosts/disko/mini-pc.nix b/configurations/disko/mini-pc.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/disko/mini-pc.nix rename to configurations/disko/mini-pc.nix diff --git a/nixosConfigurations/hosts/disko/pub-vds.nix b/configurations/disko/pub-vds.nix similarity index 100% rename from nixosConfigurations/hosts/disko/pub-vds.nix rename to configurations/disko/pub-vds.nix diff --git a/nixosConfigurations/hosts/disko/server.nix b/configurations/disko/server.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/disko/server.nix rename to configurations/disko/server.nix diff --git a/nixosConfigurations/hosts/disko/vds.nix b/configurations/disko/vds.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/disko/vds.nix rename to configurations/disko/vds.nix diff --git a/nixosConfigurations/hosts/hardware/logitech.nix b/configurations/hardware/logitech.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/hardware/logitech.nix rename to configurations/hardware/logitech.nix diff --git a/nixosConfigurations/hosts/hardware/mini-pc.nix b/configurations/hardware/mini-pc.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/hardware/mini-pc.nix rename to configurations/hardware/mini-pc.nix diff --git a/nixosConfigurations/hosts/hardware/pub-vds.nix b/configurations/hardware/pub-vds.nix similarity index 100% rename from nixosConfigurations/hosts/hardware/pub-vds.nix rename to configurations/hardware/pub-vds.nix diff --git a/nixosConfigurations/hosts/hardware/server.nix b/configurations/hardware/server.nix old mode 100755 new mode 100644 similarity index 95% rename from nixosConfigurations/hosts/hardware/server.nix rename to configurations/hardware/server.nix index fabb010..a279695 --- a/nixosConfigurations/hosts/hardware/server.nix +++ b/configurations/hardware/server.nix @@ -47,7 +47,9 @@ }; }; - swapDevices = [ ]; + swapDevices = [ + { device = "/dev/disk/by-partlabel/disk-main-swap"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nixosConfigurations/hosts/hardware/vds.nix b/configurations/hardware/vds.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/hardware/vds.nix rename to configurations/hardware/vds.nix diff --git a/nixosConfigurations/hosts/mini-laptop.nix b/configurations/mini-laptop.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/mini-laptop.nix rename to configurations/mini-laptop.nix diff --git a/nixosConfigurations/hosts/mini-pc.nix b/configurations/mini-pc.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/mini-pc.nix rename to configurations/mini-pc.nix diff --git a/nixosConfigurations/hosts/server.nix b/configurations/server.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/server.nix rename to configurations/server.nix diff --git a/nixosConfigurations/hosts/vds.nix b/configurations/vds.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/vds.nix rename to configurations/vds.nix diff --git a/nixosConfigurations/hosts/wsl.nix b/configurations/wsl.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosConfigurations/hosts/wsl.nix rename to configurations/wsl.nix diff --git a/flake.nix b/flake.nix index 0c061dc..c35c2e7 100755 --- a/flake.nix +++ b/flake.nix @@ -98,8 +98,8 @@ flakeContext = { inherit inputs; }; in { } - // (import ./homeConfigurations flakeContext) - // (import ./nixosConfigurations flakeContext) - // (import ./nixosModules flakeContext) + // (import ./home flakeContext) + // (import ./configurations flakeContext) + // (import ./modules flakeContext) // (import ./pkgs flakeContext); } diff --git a/homeConfigurations/wsl-apps/default.nix b/home/apps/default.nix old mode 100755 new mode 100644 similarity index 83% rename from homeConfigurations/wsl-apps/default.nix rename to home/apps/default.nix index 071a8e2..085760f --- a/homeConfigurations/wsl-apps/default.nix +++ b/home/apps/default.nix @@ -3,7 +3,6 @@ }: { imports = [ - # ./gimp.nix ./gramps.nix ./streamrip.nix ./yt-dlp.nix diff --git a/homeConfigurations/wsl-apps/gramps.nix b/home/apps/gramps.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/wsl-apps/gramps.nix rename to home/apps/gramps.nix diff --git a/homeConfigurations/wsl-apps/streamrip.nix b/home/apps/streamrip.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/wsl-apps/streamrip.nix rename to home/apps/streamrip.nix diff --git a/homeConfigurations/wsl-apps/yt-dlp.nix b/home/apps/yt-dlp.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/wsl-apps/yt-dlp.nix rename to home/apps/yt-dlp.nix diff --git a/homeConfigurations/default.nix b/home/default.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/default.nix rename to home/default.nix diff --git a/homeConfigurations/example of symlinking.nix b/home/example of symlinking.nix similarity index 100% rename from homeConfigurations/example of symlinking.nix rename to home/example of symlinking.nix diff --git a/homeConfigurations/home.nix b/home/home.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/home.nix rename to home/home.nix diff --git a/homeConfigurations/minimal.nix b/home/minimal.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/minimal.nix rename to home/minimal.nix diff --git a/homeConfigurations/modules/dconf.nix b/home/modules/dconf.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/modules/dconf.nix rename to home/modules/dconf.nix diff --git a/homeConfigurations/modules/external.nix b/home/modules/external.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/modules/external.nix rename to home/modules/external.nix diff --git a/homeConfigurations/modules/packages.nix b/home/modules/packages.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/modules/packages.nix rename to home/modules/packages.nix diff --git a/homeConfigurations/modules/plasma-manager.nix b/home/modules/plasma-manager.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/modules/plasma-manager.nix rename to home/modules/plasma-manager.nix diff --git a/homeConfigurations/primary.nix b/home/primary.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/primary.nix rename to home/primary.nix diff --git a/homeConfigurations/server.nix b/home/server.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/server.nix rename to home/server.nix diff --git a/homeConfigurations/vds.nix b/home/vds.nix old mode 100755 new mode 100644 similarity index 100% rename from homeConfigurations/vds.nix rename to home/vds.nix diff --git a/homeConfigurations/wsl.nix b/home/wsl.nix old mode 100755 new mode 100644 similarity index 98% rename from homeConfigurations/wsl.nix rename to home/wsl.nix index 2511a27..93120b5 --- a/homeConfigurations/wsl.nix +++ b/home/wsl.nix @@ -13,7 +13,7 @@ let in { imports = [ - ./wsl-apps + ./apps ./minimal.nix ]; xdg = { diff --git a/homeConfigurations/pub-vds.nix b/homeConfigurations/pub-vds.nix deleted file mode 100644 index 15d68db..0000000 --- a/homeConfigurations/pub-vds.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - config, - pkgs, - xlib, - ... -}: -{ - imports = [ - ./minimal.nix - ]; - xdg = { - enable = true; - autostart.enable = true; - userDirs = { - enable = true; - createDirectories = false; - desktop = null; - documents = null; - download = null; - music = null; - pictures = null; - publicShare = null; - templates = null; - videos = null; - }; - }; -} diff --git a/homeConfigurations/wsl-apps/gimp.nix b/homeConfigurations/wsl-apps/gimp.nix deleted file mode 100644 index 15447bc..0000000 --- a/homeConfigurations/wsl-apps/gimp.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - pkgs, - xlib, - inputs, - ... -}: -{ - home.packages = [ - pkgs.gimp - ]; -} diff --git a/nixosModules/default.nix b/modules/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/default.nix rename to modules/default.nix diff --git a/nixosModules/desktop/default.nix b/modules/desktop/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/default.nix rename to modules/desktop/default.nix diff --git a/nixosModules/desktop/environment/bspwm.nix b/modules/desktop/environment/bspwm.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/environment/bspwm.nix rename to modules/desktop/environment/bspwm.nix diff --git a/nixosModules/desktop/environment/deepin.nix b/modules/desktop/environment/deepin.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/environment/deepin.nix rename to modules/desktop/environment/deepin.nix diff --git a/nixosModules/desktop/environment/default.nix b/modules/desktop/environment/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/environment/default.nix rename to modules/desktop/environment/default.nix diff --git a/nixosModules/desktop/environment/gnome.nix b/modules/desktop/environment/gnome.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/environment/gnome.nix rename to modules/desktop/environment/gnome.nix diff --git a/nixosModules/desktop/environment/kde.nix b/modules/desktop/environment/kde.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/environment/kde.nix rename to modules/desktop/environment/kde.nix diff --git a/nixosModules/desktop/environment/xfce.nix b/modules/desktop/environment/xfce.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/environment/xfce.nix rename to modules/desktop/environment/xfce.nix diff --git a/nixosModules/desktop/theming.nix b/modules/desktop/theming.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/desktop/theming.nix rename to modules/desktop/theming.nix diff --git a/nixosModules/essentials/default.nix b/modules/essentials/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/essentials/default.nix rename to modules/essentials/default.nix diff --git a/nixosModules/essentials/packages.nix b/modules/essentials/packages.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/essentials/packages.nix rename to modules/essentials/packages.nix diff --git a/nixosModules/essentials/services.nix b/modules/essentials/services.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/essentials/services.nix rename to modules/essentials/services.nix diff --git a/nixosModules/essentials/settings.nix b/modules/essentials/settings.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/essentials/settings.nix rename to modules/essentials/settings.nix diff --git a/nixosModules/essentials/systemd-routine.nix b/modules/essentials/systemd-routine.nix similarity index 100% rename from nixosModules/essentials/systemd-routine.nix rename to modules/essentials/systemd-routine.nix diff --git a/nixosModules/essentials/tty.nix b/modules/essentials/tty.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/essentials/tty.nix rename to modules/essentials/tty.nix diff --git a/nixosModules/extra/gaming/aagl.nix b/modules/extra/gaming/aagl.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/extra/gaming/aagl.nix rename to modules/extra/gaming/aagl.nix diff --git a/nixosModules/extra/gaming/nix-gaming.nix b/modules/extra/gaming/nix-gaming.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/extra/gaming/nix-gaming.nix rename to modules/extra/gaming/nix-gaming.nix diff --git a/nixosModules/extra/musnix.nix b/modules/extra/musnix.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/extra/musnix.nix rename to modules/extra/musnix.nix diff --git a/nixosModules/extra/self/fingerprint.nix b/modules/extra/self/fingerprint.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/extra/self/fingerprint.nix rename to modules/extra/self/fingerprint.nix diff --git a/nixosModules/extra/self/zapret.nix b/modules/extra/self/zapret.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/extra/self/zapret.nix rename to modules/extra/self/zapret.nix diff --git a/nixosModules/options.nix b/modules/options.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/options.nix rename to modules/options.nix diff --git a/nixosModules/primary/default.nix b/modules/primary/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/primary/default.nix rename to modules/primary/default.nix diff --git a/nixosModules/server/calibre-web.nix b/modules/server/calibre-web.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/calibre-web.nix rename to modules/server/calibre-web.nix diff --git a/nixosModules/server/default.nix b/modules/server/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/default.nix rename to modules/server/default.nix diff --git a/nixosModules/server/immich.nix b/modules/server/immich.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/immich.nix rename to modules/server/immich.nix diff --git a/nixosModules/server/mealie.nix b/modules/server/mealie.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/mealie.nix rename to modules/server/mealie.nix diff --git a/nixosModules/server/memos.nix b/modules/server/memos.nix similarity index 100% rename from nixosModules/server/memos.nix rename to modules/server/memos.nix diff --git a/nixosModules/server/miniflux.nix b/modules/server/miniflux.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/miniflux.nix rename to modules/server/miniflux.nix diff --git a/nixosModules/server/nextcloud.nix b/modules/server/nextcloud.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/nextcloud.nix rename to modules/server/nextcloud.nix diff --git a/nixosModules/server/nginx.nix b/modules/server/nginx.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/nginx.nix rename to modules/server/nginx.nix diff --git a/nixosModules/server/node-red.nix b/modules/server/node-red.nix similarity index 100% rename from nixosModules/server/node-red.nix rename to modules/server/node-red.nix diff --git a/nixosModules/server/open-webui.nix b/modules/server/open-webui.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/open-webui.nix rename to modules/server/open-webui.nix diff --git a/nixosModules/server/samba.nix b/modules/server/samba.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/samba.nix rename to modules/server/samba.nix diff --git a/nixosModules/server/secrets/miniflux.env b/modules/server/secrets/miniflux.env similarity index 100% rename from nixosModules/server/secrets/miniflux.env rename to modules/server/secrets/miniflux.env diff --git a/nixosModules/server/stirling-pdf.nix b/modules/server/stirling-pdf.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/stirling-pdf.nix rename to modules/server/stirling-pdf.nix diff --git a/nixosModules/server/syncthing.nix b/modules/server/syncthing.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/syncthing.nix rename to modules/server/syncthing.nix diff --git a/nixosModules/server/systemd.nix b/modules/server/systemd.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/systemd.nix rename to modules/server/systemd.nix diff --git a/nixosModules/server/transmission.nix b/modules/server/transmission.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/transmission.nix rename to modules/server/transmission.nix diff --git a/nixosModules/server/trilium.nix b/modules/server/trilium.nix similarity index 100% rename from nixosModules/server/trilium.nix rename to modules/server/trilium.nix diff --git a/nixosModules/server/uptime-kuma.nix b/modules/server/uptime-kuma.nix similarity index 100% rename from nixosModules/server/uptime-kuma.nix rename to modules/server/uptime-kuma.nix diff --git a/nixosModules/server/zerotier.nix b/modules/server/zerotier.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/server/zerotier.nix rename to modules/server/zerotier.nix diff --git a/nixosModules/services/tts.nix b/modules/services/tts.nix similarity index 100% rename from nixosModules/services/tts.nix rename to modules/services/tts.nix diff --git a/nixosModules/services/zapret-old.nix b/modules/services/zapret-old.nix similarity index 100% rename from nixosModules/services/zapret-old.nix rename to modules/services/zapret-old.nix diff --git a/nixosModules/services/zapret.nix b/modules/services/zapret.nix similarity index 100% rename from nixosModules/services/zapret.nix rename to modules/services/zapret.nix diff --git a/nixosModules/software/ai.nix b/modules/software/ai.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/ai.nix rename to modules/software/ai.nix diff --git a/nixosModules/software/aichat.nix b/modules/software/aichat.nix similarity index 100% rename from nixosModules/software/aichat.nix rename to modules/software/aichat.nix diff --git a/nixosModules/software/beets/default.nix b/modules/software/beets/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/beets/default.nix rename to modules/software/beets/default.nix diff --git a/nixosModules/software/beets/dependencies.nix b/modules/software/beets/dependencies.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/beets/dependencies.nix rename to modules/software/beets/dependencies.nix diff --git a/nixosModules/software/beets/other/default.nix b/modules/software/beets/other/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/beets/other/default.nix rename to modules/software/beets/other/default.nix diff --git a/nixosModules/software/beets/other/dependencies-back.nix b/modules/software/beets/other/dependencies-back.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/beets/other/dependencies-back.nix rename to modules/software/beets/other/dependencies-back.nix diff --git a/nixosModules/software/beets/other/dependencies-cut.nix b/modules/software/beets/other/dependencies-cut.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/beets/other/dependencies-cut.nix rename to modules/software/beets/other/dependencies-cut.nix diff --git a/nixosModules/software/daw.nix b/modules/software/daw.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/daw.nix rename to modules/software/daw.nix diff --git a/nixosModules/software/virtual.nix b/modules/software/virtual.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/virtual.nix rename to modules/software/virtual.nix diff --git a/nixosModules/software/whisper.nix b/modules/software/whisper.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/whisper.nix rename to modules/software/whisper.nix diff --git a/nixosModules/software/wine.nix b/modules/software/wine.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/software/wine.nix rename to modules/software/wine.nix diff --git a/nixosModules/users.nix b/modules/users.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/users.nix rename to modules/users.nix diff --git a/nixosModules/vds/3x-ui.nix b/modules/vds/3x-ui.nix similarity index 100% rename from nixosModules/vds/3x-ui.nix rename to modules/vds/3x-ui.nix diff --git a/nixosModules/vds/default.nix b/modules/vds/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/vds/default.nix rename to modules/vds/default.nix diff --git a/nixosModules/vds/docker.nix b/modules/vds/docker.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/vds/docker.nix rename to modules/vds/docker.nix diff --git a/nixosModules/vds/netbird.nix b/modules/vds/netbird.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/vds/netbird.nix rename to modules/vds/netbird.nix diff --git a/nixosModules/vds/nginx.nix b/modules/vds/nginx.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/vds/nginx.nix rename to modules/vds/nginx.nix diff --git a/nixosModules/vds/secrets/xray.yaml b/modules/vds/secrets/xray.yaml similarity index 100% rename from nixosModules/vds/secrets/xray.yaml rename to modules/vds/secrets/xray.yaml diff --git a/nixosModules/vds/xray.nix b/modules/vds/xray.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/vds/xray.nix rename to modules/vds/xray.nix diff --git a/nixosModules/wsl/default.nix b/modules/wsl/default.nix old mode 100755 new mode 100644 similarity index 100% rename from nixosModules/wsl/default.nix rename to modules/wsl/default.nix diff --git a/nixosConfigurations/default.nix b/nixosConfigurations/default.nix deleted file mode 100755 index 4df4f65..0000000 --- a/nixosConfigurations/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ... }@flakeContext: -{ - nixosConfigurations = { - atoridu = import ./hosts/mini-pc.nix flakeContext; # atoridu - lamet = import ./hosts/mini-laptop.nix flakeContext; # lamet - otreca = import ./hosts/vds.nix flakeContext; # vds - sapphira = import ./hosts/server.nix flakeContext; # sapphira - wsl = import ./hosts/wsl.nix flakeContext; # wsl - - pub-vds = import ./hosts/pub-vds.nix flakeContext; - }; -} diff --git a/nixosConfigurations/hosts/hardware/laptop.nix b/nixosConfigurations/hosts/hardware/laptop.nix deleted file mode 100755 index 601a4d9..0000000 --- a/nixosConfigurations/hosts/hardware/laptop.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - initrd = { - availableKernelModules = [ - "nvme" - "xhci_pci" - "usbhid" - "usb_storage" - "uas" - "sd_mod" - ]; - kernelModules = [ ]; - }; - kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ ]; - }; - - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/5938c796-6ff5-49d9-a3a6-022b4c32beeb"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/61BF-3342"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/d89bccd2-0672-4855-9d87-40e2688cdec4"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/nixosConfigurations/hosts/laptop.nix b/nixosConfigurations/hosts/laptop.nix deleted file mode 100755 index cdc8f0b..0000000 --- a/nixosConfigurations/hosts/laptop.nix +++ /dev/null @@ -1,170 +0,0 @@ -{ - inputs, - ... -}@flakeContext: -let - nixosModule = - { - config, - lib, - pkgs, - xlib, - ... - }: - { - xlib.device = { - type = "primary"; - }; - - imports = [ - ./hardware/laptop.nix - ./hardware/logitech.nix - ]; - fileSystems = { - "${xlib.dirs.therima-drive}" = { - device = "/dev/disk/by-uuid/C0A2DDEFA2DDEA44"; - fsType = "ntfs3"; - options = [ - "defaults" - "uid=1000" - "gid=1000" - "fmask=0007" - "dmask=0007" - "nofail" - #"x-systemd.device-timeout=0" - ]; - }; - "${xlib.dirs.vetymae-drive}" = { - device = "/dev/disk/by-uuid/6E04EA7F04EA49A3"; - fsType = "ntfs3"; - options = [ - "defaults" - "uid=1000" - "gid=1000" - "fmask=0007" - "dmask=0007" - "nofail" - #"x-systemd.device-timeout=0" - ]; - }; - }; - - boot = { - kernelPackages = lib.mkDefault pkgs.linuxPackages_xanmod_stable; - kernelParams = [ "usbcore.autosuspend=-1" ]; - loader = { - systemd-boot.enable = lib.mkDefault true; - efi.canTouchEfiVariables = lib.mkDefault true; - }; - }; - - hardware = { - bluetooth.enable = true; - # nvidia = { - # open = true; - # dynamicBoost.enable = true; - # nvidiaSettings = true; - # powerManagement = { - # enable = false; - # finegrained = false; # maybe comment this out idk what it does - # }; - # #package = config.boot.kernelPackages.nvidiaPackages.stable; - # nvidiaPersistenced = true; - # modesetting.enable = true; - # prime = { - # offload = { - # enable = true; - # enableOffloadCmd = true; - # }; - # sync.enable = false; - # amdgpuBusId = "PCI:6:0:0"; - # nvidiaBusId = "PCI:1:0:0"; - # }; - # }; - }; - - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - networking = { - hostName = "${xlib.device.hostname}"; - networkmanager.enable = true; - firewall.enable = false; - }; - - i18n = { - extraLocaleSettings = { - LC_ADDRESS = "ru_RU.UTF-8"; - LC_IDENTIFICATION = "ru_RU.UTF-8"; - LC_MEASUREMENT = "ru_RU.UTF-8"; - LC_MONETARY = "ru_RU.UTF-8"; - LC_NAME = "ru_RU.UTF-8"; - LC_NUMERIC = "ru_RU.UTF-8"; - LC_PAPER = "ru_RU.UTF-8"; - LC_TELEPHONE = "ru_RU.UTF-8"; - LC_TIME = "ru_RU.UTF-8"; - }; - }; - - services = { - xserver = { - videoDrivers = [ - "amdgpu" - "nvidia" - ]; - }; - syncthing = { - enable = true; - systemService = true; - configDir = "${xlib.dirs.user-storage}/Syncthing/${config.system.name}"; - dataDir = "${xlib.dirs.user-home}"; - group = "users"; - user = "${xlib.device.username}"; - }; - pipewire = { - enable = lib.mkDefault true; - systemWide = true; - alsa.enable = false; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - extraConfig.pipewire = { - "99-default.conf" = { - "context.properties" = { - "default.clock.rate" = 96000; - "default.clock.allowed-rates" = [ - 44100 - 48000 - 96000 - ]; - "default.clock.quantum" = 1024; - "default.clock.min-quantum" = 256; - "default.clock.max-quantum" = 2048; - }; - }; - }; - }; - thermald.enable = true; - earlyoom.enable = true; - preload.enable = true; - }; - nixpkgs.config.pulseaudio = true; - - #services.power-profiles-daemon.enable = false; - - security = { - rtkit.enable = true; - }; - - system.stateVersion = "25.11"; - }; -in -inputs.nixpkgs.lib.nixosSystem { - modules = [ - nixosModule - inputs.self.nixosModules.default - ]; - system = "x86_64-linux"; - specialArgs = { - deviceType = "primary"; - }; -}