Move NixOS configurations into modules

Changes

6 changed files (+212/-78)

• flake.nix
  • @@ -53,97 +53,81 @@
    plac, }: let - mkHomeConfiguration = - { - # Platform (e.g. x86_64-linux) - system, - # Machine specific module setting - module ? { }, - }: - home-manager.lib.homeManagerConfiguration rec { - pkgs = import nixpkgs { - inherit system; - overlays = [ - (import ./overlays/legit.nix) - (import ./overlays/atkinson-hyperlegible-next.nix) - # Flake packages - (final: prev: { plac = plac.packages."${system}".default; }) - ]; - }; - - modules = [ module ]; - - extraSpecialArgs = { inherit nix-colorizer mac-app-util nixgl; }; - }; - availableSystems = [ "aarch64-darwin" "x86_64-linux" ]; in { - homeConfigurations = { - dev-linux = mkHomeConfiguration { - system = "x86_64-linux"; - module = ./modules/hm/profiles/linux-desktop.nix; - }; + homeConfigurations = + let + mkHomeConfiguration = + { + # Platform (e.g. x86_64-linux) + system, + # Machine specific module setting + module ? { }, + }: + home-manager.lib.homeManagerConfiguration rec { + pkgs = import nixpkgs { + inherit system; + overlays = [ + (import ./overlays/legit.nix) + (import ./overlays/atkinson-hyperlegible-next.nix) + # Flake packages + (final: prev: { plac = plac.packages."${system}".default; }) + ]; + }; + + modules = [ module ]; + + extraSpecialArgs = { inherit nix-colorizer mac-app-util nixgl; }; + }; - git-server = mkHomeConfiguration { - system = "x86_64-linux"; - module = ./modules/hm/profiles/git-server.nix; - }; + in + { + dev-linux = mkHomeConfiguration { + system = "x86_64-linux"; + module = ./modules/hm/profiles/linux-desktop.nix; + }; - mbp-m1 = mkHomeConfiguration { - system = "aarch64-darwin"; - module = ./modules/hm/profiles/macos.nix; - }; + git-server = mkHomeConfiguration { + system = "x86_64-linux"; + module = ./modules/hm/profiles/git-server.nix; + }; - macmini-m1 = mkHomeConfiguration { - system = "aarch64-darwin"; - module = ./modules/hm/profiles/macos.nix; - }; + mbp-m1 = mkHomeConfiguration { + system = "aarch64-darwin"; + module = ./modules/hm/profiles/macos.nix; + }; - workerbee = mkHomeConfiguration { - system = "x86_64-linux"; - module = ./modules/hm/profiles/workerbee.nix; + macmini-m1 = mkHomeConfiguration { + system = "aarch64-darwin"; + module = ./modules/hm/profiles/macos.nix; + }; + + workerbee = mkHomeConfiguration { + system = "x86_64-linux"; + module = ./modules/hm/profiles/workerbee.nix; + }; }; - }; - - nixosConfigurations = { - nixos-workerbee = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" - home-manager.nixosModules.home-manager - ( - { pkgs, ... }: - { - system.stateVersion = "25.11"; - - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - - networking.hostName = "workerhive"; - networking.firewall.enable = false; - - environment.systemPackages = with pkgs; [ neovim ]; - - programs.fish.enable = true; - users.defaultUserShell = pkgs.fish; - - users.users = { - workerbee = { - uid = 1000; - isNormalUser = true; - }; - }; - home-manager.users.workerbee = ./modules/hm/profiles/workerbee.nix; - } - ) - ]; + nixosConfigurations = + let + mkNixosConfiguration = + { system, module }: + nixpkgs.lib.nixosSystem { + inherit system; + modules = [ module ]; + specialArgs = { inherit nixpkgs home-manager; }; + }; + in + { + nixos-workerbee = mkNixosConfiguration { + system = "x86_64-linux"; + module = ./modules/nixos/profiles/workerbee.nix; + }; }; - }; apps = builtins.listToAttrs ( builtins.map (
• modules/nixos/essentials/default.nix (new)
  • @@ -0,0 +1,31 @@
    + # Copyright 2025 Shota FUJI <pockawoooh@gmail.com> + # + # Permission to use, copy, modify, and/or distribute this software for any + # purpose with or without fee is hereby granted. + # + # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + # AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + # INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + # + # SPDX-License-Identifier: 0BSD + # + # Essential softwares for system administration. + + { ... }: + { + config = { + # Primarily used for inspecting generated files. + programs.neovim = { + enable = true; + defaultEditor = true; + + withRuby = false; + withPython3 = false; + withNodeJs = false; + }; + }; + }
• modules/nixos/home-manager/default.nix (new)
  • @@ -0,0 +1,26 @@
    + # Copyright 2025 Shota FUJI <pockawoooh@gmail.com> + # + # Permission to use, copy, modify, and/or distribute this software for any + # purpose with or without fee is hereby granted. + # + # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + # AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + # INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + # + # SPDX-License-Identifier: 0BSD + # + # Configures Home Manager. + + { home-manager, ... }: + { + imports = [ home-manager.nixosModules.home-manager ]; + + config = { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + }; + }
• modules/nixos/nixos/state-version.nix (new)
  • @@ -0,0 +1,24 @@
    + # Copyright 2025 Shota FUJI <pockawoooh@gmail.com> + # + # Permission to use, copy, modify, and/or distribute this software for any + # purpose with or without fee is hereby granted. + # + # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + # AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + # INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + # + # SPDX-License-Identifier: 0BSD + # + # This defines a NixOS version for default state files. Change to the version + # affects every modules inside "modules/nixos". + + { pkgs, ... }: + { + config = { + system.stateVersion = "25.11"; + }; + }
• modules/nixos/profiles/workerbee.nix (new)
  • @@ -0,0 +1,47 @@
    + # Copyright 2025 Shota FUJI <pockawoooh@gmail.com> + # + # Permission to use, copy, modify, and/or distribute this software for any + # purpose with or without fee is hereby granted. + # + # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + # AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + # INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + # + # SPDX-License-Identifier: 0BSD + # + # NixOS module for workerbee, container guest for development works. + # This module is used as Incus system container. + + { + pkgs, + nixpkgs, + home-manager, + ... + }: + { + imports = [ + "${nixpkgs}/nixos/modules/virtualisation/lxc-container.nix" + ../nixos/state-version.nix + ../home-manager + ../essentials + ../shell + ]; + + config = { + networking.hostName = "workerbee"; + networking.firewall.enable = false; + + users.users = { + workerbee = { + uid = 1000; + isNormalUser = true; + }; + }; + + home-manager.users.workerbee = ../../hm/profiles/workerbee.nix; + }; + }
• modules/nixos/shell/default.nix (new)
  • @@ -0,0 +1,22 @@
    + # Copyright 2025 Shota FUJI <pockawoooh@gmail.com> + # + # Permission to use, copy, modify, and/or distribute this software for any + # purpose with or without fee is hereby granted. + # + # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + # AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + # INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + # LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + # PERFORMANCE OF THIS SOFTWARE. + # + # SPDX-License-Identifier: 0BSD + + { pkgs, ... }: + { + config = { + programs.fish.enable = true; + users.defaultUserShell = pkgs.fish; + }; + }