From 34ca8aadb9617febd15840cbb24c1c4375858420 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 2 Sep 2021 20:55:17 +0200 Subject: [PATCH] fix biolimo host? --- hosts/biolimo.nix | 6 ------ hosts/biolimo/biolimo.nix | 28 ++++++++++++++++++++++++++++ hosts/biolimo/default.nix | 28 +++------------------------- 3 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 hosts/biolimo.nix create mode 100644 hosts/biolimo/biolimo.nix diff --git a/hosts/biolimo.nix b/hosts/biolimo.nix deleted file mode 100644 index 64fd4b34..00000000 --- a/hosts/biolimo.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ suites, ... }: -{ - imports = [ - ./biolimo - ] ++ suites.biolimo; -} diff --git a/hosts/biolimo/biolimo.nix b/hosts/biolimo/biolimo.nix new file mode 100644 index 00000000..51f2e763 --- /dev/null +++ b/hosts/biolimo/biolimo.nix @@ -0,0 +1,28 @@ +{ 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.x-os.keyfile = "/etc/nixos/hosts/biolimo/secrets/keyfile.bin"; + + hardware.cpu.intel.updateMicrocode = true; + + networking.firewall.allowedTCPPorts = [ + 5000 + ]; + + home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable { + "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; + "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf; + "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; + "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; + }; + }; +} diff --git a/hosts/biolimo/default.nix b/hosts/biolimo/default.nix index 51f2e763..26d7e453 100644 --- a/hosts/biolimo/default.nix +++ b/hosts/biolimo/default.nix @@ -1,28 +1,6 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in +{ suites, ... }: { imports = [ - ./configuration.nix - ]; - - config = { - pub-solar.x-os.keyfile = "/etc/nixos/hosts/biolimo/secrets/keyfile.bin"; - - hardware.cpu.intel.updateMicrocode = true; - - networking.firewall.allowedTCPPorts = [ - 5000 - ]; - - home-manager.users."${psCfg.user.name}".xdg.configFile = mkIf psCfg.sway.enable { - "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf; - "sway/config.d/10-autostart.conf".source = ./.config/sway/config.d/autostart.conf; - "sway/config.d/10-input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; - "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; - }; - }; + ./biolimo.nix + ] ++ suites.biolimo; }