diff --git a/nixos/flake.nix b/nixos/flake.nix index f0a833c..88eb525 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -47,8 +47,8 @@ }; modules = [ ./universal.nix - ./configuration.nix - ./services.nix + ./hosts/nixos/configuration.nix + ./hosts/nixos/services.nix ]; }; @@ -69,7 +69,6 @@ }; modules = [ ./universal.nix - ./services.nix ]; }; diff --git a/nixos/configuration.nix b/nixos/hosts/nixos/configuration.nix similarity index 100% rename from nixos/configuration.nix rename to nixos/hosts/nixos/configuration.nix diff --git a/nixos/hardware-configuration.nix b/nixos/hosts/nixos/hardware-configuration.nix similarity index 100% rename from nixos/hardware-configuration.nix rename to nixos/hosts/nixos/hardware-configuration.nix diff --git a/nixos/services.nix b/nixos/hosts/nixos/services.nix similarity index 100% rename from nixos/services.nix rename to nixos/hosts/nixos/services.nix diff --git a/nixos/packages/berkeley-mono-typeface.nix b/nixos/packages/berkeley-mono-typeface.nix deleted file mode 100644 index ce462e0..0000000 --- a/nixos/packages/berkeley-mono-typeface.nix +++ /dev/null @@ -1,24 +0,0 @@ -# make a derivation for berkeley-mono font installation -{ pkgs }: - -pkgs.stdenv.mkDerivation { - pname = "berkeley-mono-typeface"; - version = "2.002"; - - src = "../assets/TX-02 2.002.zip"; - - unpackPhase = '' - runHook preUnpack - ${pkgs.unzip}/bin/unzip $src - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 "TX-02 2.002/*.ttf" -t $out/share/fonts/truetype - - runHook postInstall - ''; -} \ No newline at end of file