diff --git a/hosts/PubSolarOS.nix b/hosts/PubSolarOS.nix deleted file mode 100644 index da0375cd..00000000 --- a/hosts/PubSolarOS.nix +++ /dev/null @@ -1,21 +0,0 @@ -{suites, ...}: { - ### root password is empty by default ### - ### default password: pub-solar, optional: add your SSH keys - imports = - suites.iso; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - networking.networkmanager.enable = true; - - fileSystems."/" = {device = "/dev/disk/by-label/nixos";}; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.05"; # Did you read the comment? -} diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix deleted file mode 100644 index c71f03cc..00000000 --- a/hosts/bootstrap.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - config, - lib, - pkgs, - profiles, - ... -}: -with lib; let - # Gets hostname of host to be bundled inside iso - # Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11 - getFqdn = config: let - net = config.networking; - fqdn = - if (net ? domain) && (net.domain != null) - then "${net.hostName}.${net.domain}" - else net.hostName; - in - fqdn; -in { - # build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"` - imports = [ - # profiles.networking - profiles.users.root # make sure to configure ssh keys - profiles.users.pub-solar - profiles.base-user - profiles.graphical - profiles.pub-solar-iso - ]; - - config = { - boot.loader.systemd-boot.enable = true; - - # will be overridden by the bootstrapIso instrumentation - fileSystems."/" = {device = "/dev/disk/by-label/nixos";}; - - system.nixos.label = "PubSolarOS-" + config.system.nixos.version; - - # mkForce because a similar transformation gets double applied otherwise - # https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L17 - # https://github.com/NixOS/nixpkgs/blob/aecd4d8349b94f9bd5718c74a5b789f233f67326/nixos/modules/installer/cd-dvd/installation-cd-base.nix#L21-L22 - isoImage = { - isoBaseName = mkForce (getFqdn config); - isoName = mkForce "${config.system.nixos.label}-${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso"; - }; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? - }; -} diff --git a/hosts/chonk/chonk.nix b/hosts/chonk/chonk.nix deleted file mode 100644 index bca7d463..00000000 --- a/hosts/chonk/chonk.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; -with pkgs; let - psCfg = config.pub-solar; -in { - imports = [ - ./configuration.nix - ]; -} diff --git a/hosts/chonk/default.nix b/hosts/chonk/default.nix index bf9899fb..3c4d411a 100644 --- a/hosts/chonk/default.nix +++ b/hosts/chonk/default.nix @@ -1,7 +1,6 @@ -{suites, ...}: { - imports = - [ - ./chonk.nix - ] - ++ suites.chonk; +{ ... }: { + imports = [ + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/companion/companion.nix b/hosts/companion/companion.nix deleted file mode 100644 index bb0b2561..00000000 --- a/hosts/companion/companion.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in { - imports = [ - ./configuration.nix - ]; - - config = { - nixpkgs.crossSystem.system = "aarch64-linux"; - }; -} diff --git a/hosts/companion/default.nix b/hosts/companion/default.nix index 3fc65c9f..3c4d411a 100644 --- a/hosts/companion/default.nix +++ b/hosts/companion/default.nix @@ -1,7 +1,6 @@ -{suites, ...}: { - imports = - [ - ./companion.nix - ] - ++ suites.companion; +{ ... }: { + imports = [ + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/cox/configuration.nix b/hosts/cox/configuration.nix index 3019dbe6..7bd9c212 100644 --- a/hosts/cox/configuration.nix +++ b/hosts/cox/configuration.nix @@ -16,6 +16,9 @@ time.timeZone = "Europe/Berlin"; + boot.plymouth.enable = lib.mkForce false; + pub-solar.nextcloud.enable = lib.mkForce false; + networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; networking.interfaces.wlan0.useDHCP = false; diff --git a/hosts/cox/cox.nix b/hosts/cox/cox.nix deleted file mode 100644 index ca873721..00000000 --- a/hosts/cox/cox.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in -{ - imports = [ - ./configuration.nix - ]; - - config = { - boot.plymouth.enable = lib.mkForce false; - pub-solar.nextcloud.enable = lib.mkForce false; - }; -} diff --git a/hosts/cox/default.nix b/hosts/cox/default.nix index aa29e195..3c4d411a 100644 --- a/hosts/cox/default.nix +++ b/hosts/cox/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./cox.nix - ] ++ suites.cox; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/cube/configuration.nix b/hosts/cube/configuration.nix index 8813aa9b..95f8b9ca 100644 --- a/hosts/cube/configuration.nix +++ b/hosts/cube/configuration.nix @@ -10,6 +10,10 @@ ./home-controller.nix ]; + pub-solar.core.disk-encryption-active = false; + + networking.networkmanager.enable = lib.mkForce false; + # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; diff --git a/hosts/cube/cube.nix b/hosts/cube/cube.nix deleted file mode 100644 index 2274383f..00000000 --- a/hosts/cube/cube.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -with pkgs; -let - psCfg = config.pub-solar; -in -{ - imports = [ - ./configuration.nix - ]; - - pub-solar.core.disk-encryption-active = false; - - networking.networkmanager.enable = lib.mkForce false; -} diff --git a/hosts/cube/default.nix b/hosts/cube/default.nix index 7834ef54..3c4d411a 100644 --- a/hosts/cube/default.nix +++ b/hosts/cube/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./cube.nix - ] ++ suites.cube; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/falcone/configuration.nix b/hosts/falcone/configuration.nix index b877e8fe..002e1599 100644 --- a/hosts/falcone/configuration.nix +++ b/hosts/falcone/configuration.nix @@ -10,6 +10,8 @@ ./hardware-configuration.nix ]; + boot.plymouth.enable = lib.mkForce false; + pub-solar.nextcloud.enable = lib.mkForce false; pub-solar.core.disk-encryption-active = false; boot.loader.grub.enable = lib.mkForce false; diff --git a/hosts/falcone/default.nix b/hosts/falcone/default.nix index 86de5233..3c4d411a 100644 --- a/hosts/falcone/default.nix +++ b/hosts/falcone/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./falcone.nix - ] ++ suites.falcone; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/falcone/falcone.nix b/hosts/falcone/falcone.nix deleted file mode 100644 index ca873721..00000000 --- a/hosts/falcone/falcone.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in -{ - imports = [ - ./configuration.nix - ]; - - config = { - boot.plymouth.enable = lib.mkForce false; - pub-solar.nextcloud.enable = lib.mkForce false; - }; -} diff --git a/hosts/giggles/configuration.nix b/hosts/giggles/configuration.nix index 56df1bd9..767968a0 100644 --- a/hosts/giggles/configuration.nix +++ b/hosts/giggles/configuration.nix @@ -29,6 +29,9 @@ device = "nodev"; }; + boot.plymouth.enable = lib.mkForce false; + pub-solar.nextcloud.enable = lib.mkForce false; + time.timeZone = "Europe/Berlin"; system.stateVersion = "22.11"; # Did you read the comment? diff --git a/hosts/giggles/default.nix b/hosts/giggles/default.nix index a4aaa0e4..3c4d411a 100644 --- a/hosts/giggles/default.nix +++ b/hosts/giggles/default.nix @@ -1,7 +1,6 @@ -{suites, ...}: { - imports = - [ - ./giggles.nix - ] - ++ suites.giggles; +{ ... }: { + imports = [ + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/giggles/giggles.nix b/hosts/giggles/giggles.nix deleted file mode 100644 index 2b07e284..00000000 --- a/hosts/giggles/giggles.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in { - imports = [ - ./configuration.nix - ]; - - config = { - boot.plymouth.enable = lib.mkForce false; - pub-solar.nextcloud.enable = lib.mkForce false; - }; -} diff --git a/hosts/harrison/configuration.nix b/hosts/harrison/configuration.nix index c0d7e06c..24d8c436 100644 --- a/hosts/harrison/configuration.nix +++ b/hosts/harrison/configuration.nix @@ -4,6 +4,9 @@ { config, pkgs, lib, ... }: +let + psCfg = config.pub-solar; +in { imports = [ @@ -11,6 +14,21 @@ ./hardware-configuration.nix ]; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + + home-manager.users."${psCfg.user.name}".xdg.configFile = lib.mkIf psCfg.sway.enable { + "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; + }; + + pub-solar.paranoia.enable = true; + pub-solar.nextcloud.enable = true; + + programs.ausweisapp.enable = true; + services.pcscd = { + enable = true; + plugins = [ pkgs.pcsc-cyberjack ]; + }; + # Set your time zone. time.timeZone = "Europe/Berlin"; time.hardwareClockInLocalTime = true; # easiest quirk for windows time offset feature diff --git a/hosts/norman/configuration.nix b/hosts/norman/configuration.nix index 86a4947d..68936f30 100644 --- a/hosts/norman/configuration.nix +++ b/hosts/norman/configuration.nix @@ -4,8 +4,13 @@ { config, pkgs, + lib, ... -}: { +}: +let + psCfg = config.pub-solar; +in +{ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -13,6 +18,17 @@ ./builder.nix ]; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; + + environment.systemPackages = [pkgs.factorio-experimental]; + + pub-solar.audio.bluetooth.enable = false; + + home-manager.users."${psCfg.user.name}".xdg.configFile = lib.mkIf psCfg.sway.enable { + "sway/config.d/10-inputs.conf".source = ./.config/sway/config.d/inputs.conf; + "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; + "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; + }; # Set your time zone. time.timeZone = "Europe/Berlin"; diff --git a/hosts/norman/default.nix b/hosts/norman/default.nix index 20216667..3c4d411a 100644 --- a/hosts/norman/default.nix +++ b/hosts/norman/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./norman.nix - ] ++ suites.norman; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/norman/norman.nix b/hosts/norman/norman.nix deleted file mode 100644 index d5734e32..00000000 --- a/hosts/norman/norman.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in { - imports = [ - ./configuration.nix - ]; - - config = { - boot.binfmt.emulatedSystems = ["aarch64-linux"]; - - environment.systemPackages = [pkgs.factorio-experimental]; - - pub-solar.audio.bluetooth.enable = false; - - home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable { - "sway/config.d/10-inputs.conf".source = ./.config/sway/config.d/inputs.conf; - "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; - "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; - }; - }; -} diff --git a/hosts/redpanda/configuration.nix b/hosts/redpanda/configuration.nix index c2b2b653..70365b99 100644 --- a/hosts/redpanda/configuration.nix +++ b/hosts/redpanda/configuration.nix @@ -11,6 +11,7 @@ ./hardware-configuration.nix ]; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.loader.systemd-boot.enable = lib.mkForce false; # Use the GRUB 2 boot loader. diff --git a/hosts/redpanda/default.nix b/hosts/redpanda/default.nix index 3772077f..3c4d411a 100644 --- a/hosts/redpanda/default.nix +++ b/hosts/redpanda/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./redpanda.nix - ] ++ suites.redpanda; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/redpanda/redpanda.nix b/hosts/redpanda/redpanda.nix deleted file mode 100644 index 2f02a9af..00000000 --- a/hosts/redpanda/redpanda.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in -{ - imports = [ - ./configuration.nix - ]; - - #pub-solar.nextcloud.enable = lib.mkForce false; - - config = { - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - }; -} diff --git a/hosts/ringo/configuration.nix b/hosts/ringo/configuration.nix index 5a57fe2d..ce5e41cf 100644 --- a/hosts/ringo/configuration.nix +++ b/hosts/ringo/configuration.nix @@ -11,6 +11,8 @@ ./home-controller.nix ]; + pub-solar.core.lite = true; + # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/hosts/ringo/default.nix b/hosts/ringo/default.nix index ff5a8251..3c4d411a 100644 --- a/hosts/ringo/default.nix +++ b/hosts/ringo/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./ringo.nix - ] ++ suites.ringo; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/ringo/ringo.nix b/hosts/ringo/ringo.nix deleted file mode 100644 index 00fea36d..00000000 --- a/hosts/ringo/ringo.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in -{ - imports = [ - ./configuration.nix - ]; - - config.pub-solar.core.lite = true; -} diff --git a/hosts/surfplace/default.nix b/hosts/surfplace/default.nix index 9bb6c4af..3c4d411a 100644 --- a/hosts/surfplace/default.nix +++ b/hosts/surfplace/default.nix @@ -1,6 +1,6 @@ -{ suites, ... }: -{ +{ ... }: { imports = [ - ./surfplace.nix - ] ++ suites.surfplace; + ./configuration.nix + ./hardware-configuration.nix + ]; } diff --git a/hosts/surfplace/surfplace.nix b/hosts/surfplace/surfplace.nix deleted file mode 100644 index 517c4c9a..00000000 --- a/hosts/surfplace/surfplace.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in -{ - imports = [ - ./configuration.nix - ]; -}