From 8b2e1e20294a89bdb2f40b8654fbe6a548230012 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 13 Apr 2026 22:47:29 +0700 Subject: [PATCH] idk --- devices/home-server/configuration.nix | 4 ---- home/asakiyuki/configuration.nix | 6 +++--- home/asakiyuki/{modules => }/env.nix | 0 home/asakiyuki/{modules => }/files.nix | 0 home/asakiyuki/{modules => }/programs.nix | 0 host/server/default.nix | 5 ++++- host/server/device.nix | 11 +++++++++++ host/server/programs.nix | 7 ++++++- 8 files changed, 24 insertions(+), 9 deletions(-) rename home/asakiyuki/{modules => }/env.nix (100%) rename home/asakiyuki/{modules => }/files.nix (100%) rename home/asakiyuki/{modules => }/programs.nix (100%) create mode 100644 host/server/device.nix diff --git a/devices/home-server/configuration.nix b/devices/home-server/configuration.nix index 4307f9f..5cbd3e5 100644 --- a/devices/home-server/configuration.nix +++ b/devices/home-server/configuration.nix @@ -10,10 +10,6 @@ "flakes" ]; - device = { - flake-name = "home-server"; - }; - nixpkgs.config.allowUnfree = true; boot.loader.systemd-boot.enable = true; diff --git a/home/asakiyuki/configuration.nix b/home/asakiyuki/configuration.nix index f9150b1..4b87595 100644 --- a/home/asakiyuki/configuration.nix +++ b/home/asakiyuki/configuration.nix @@ -26,9 +26,9 @@ in ; }; imports = [ - ./modules/programs.nix - ./modules/files.nix - ./modules/env.nix + ./programs.nix + ./files.nix + ./env.nix ../../modules/features/home/theme.nix ../../options/home/default.nix diff --git a/home/asakiyuki/modules/env.nix b/home/asakiyuki/env.nix similarity index 100% rename from home/asakiyuki/modules/env.nix rename to home/asakiyuki/env.nix diff --git a/home/asakiyuki/modules/files.nix b/home/asakiyuki/files.nix similarity index 100% rename from home/asakiyuki/modules/files.nix rename to home/asakiyuki/files.nix diff --git a/home/asakiyuki/modules/programs.nix b/home/asakiyuki/programs.nix similarity index 100% rename from home/asakiyuki/modules/programs.nix rename to home/asakiyuki/programs.nix diff --git a/host/server/default.nix b/host/server/default.nix index 9d77f6b..916a646 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -1,16 +1,19 @@ -{ libs, pkgs, ... }: +{ libs, ... }: { imports = [ ./programs.nix ./services.nix ./networking.nix + ./default.nix (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/packages.nix") + (libs.root "/modules/features/system/nix-dl.nix") (libs.root "/home/asakiyuki/configuration.nix") (libs.root "/home/junko/configuration.nix") (libs.root "/options/system/default.nix") + (libs.root "/overlays/nixpkgs.nix") ]; } diff --git a/host/server/device.nix b/host/server/device.nix new file mode 100644 index 0000000..20d4809 --- /dev/null +++ b/host/server/device.nix @@ -0,0 +1,11 @@ +{ ... }: +{ + device = { + flake-name = "home-server"; + + programs = { + fastfetch.enable = true; + starship.enable = true; + }; + }; +} diff --git a/host/server/programs.nix b/host/server/programs.nix index 38219b4..5af6b25 100644 --- a/host/server/programs.nix +++ b/host/server/programs.nix @@ -1,6 +1,11 @@ { ... }: { programs = { - + ffmpeg.enable = true; + nodejs.enable = true; + bun.enable = true; + ntfs3g.enable = true; + python.enable = true; + jdk.enable = true; }; }