diff --git a/flake.nix b/flake.nix index 89842203..0269457c 100644 --- a/flake.nix +++ b/flake.nix @@ -105,6 +105,7 @@ pubsolaros = [ core base-user users.root ]; anonymous = pubsolaros ++ [ users.nixos ]; teutat3s = pubsolaros ++ [ users.teutat3s ]; + con = teutat3s ++ [ graphical ]; dumpyourvms = teutat3s ++ [ graphical ]; }; }; diff --git a/hosts/con/con.nix b/hosts/con/con.nix new file mode 100644 index 00000000..faa64ee7 --- /dev/null +++ b/hosts/con/con.nix @@ -0,0 +1,33 @@ +{ config, pkgs, lib, ... }: +with lib; +let + psCfg = config.pub-solar; + xdg = config.home-manager.users."${psCfg.user.name}".xdg; +in +{ + imports = [ + ./hardware-configuration.nix + ]; + + config = { + pub-solar.x-os.keyfile = "/etc/nixos/hosts/con/secrets/keyfile.bin"; + pub-solar.nextcloud.enable = mkForce false; + + home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { + home.sessionVariables = { + DOCKER_BUILDKIT = "1"; + }; + # Custom device sway configs + xdg.configFile = mkIf psCfg.sway.enable { + "sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf; + "sway/config.d/autostart.conf".source = ./.config/sway/config.d/autostart.conf; + "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; + "sway/config.d/input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; + "sway/config.d/screens.conf".source = ./.config/sway/config.d/screens.conf; + }; + }; + networking.hosts = { + "127.0.0.1" = [ "virtrex.test" "expo.test" "proxy.test" ]; + }; + }; +} diff --git a/hosts/con/default.nix b/hosts/con/default.nix index 95238b8c..2196635d 100644 --- a/hosts/con/default.nix +++ b/hosts/con/default.nix @@ -1,26 +1,6 @@ -{ config, pkgs, lib, ... }: -with lib; -let - psCfg = config.pub-solar; - xdg = config.home-manager.users."${psCfg.user.name}".xdg; -in +{ suites, ... }: { - config = { - home-manager = pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] { - home.sessionVariables = { - DOCKER_BUILDKIT = "1"; - }; - # Custom device sway configs - xdg.configFile = mkIf psCfg.sway.enable { - "sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf; - "sway/config.d/autostart.conf".source = ./.config/sway/config.d/autostart.conf; - "sway/config.d/10-custom-keybindings.conf".source = ./.config/sway/config.d/custom-keybindings.conf; - "sway/config.d/input-defaults.conf".source = ./.config/sway/config.d/input-defaults.conf; - "sway/config.d/screens.conf".source = ./.config/sway/config.d/screens.conf; - }; - }; - networking.hosts = { - "127.0.0.1" = [ "virtrex.test" "expo.test" "proxy.test" ]; - }; - }; + imports = [ + ./con.nix + ] ++ suites.con; } diff --git a/hosts/con/hardware-configuration.nix b/hosts/con/hardware-configuration.nix new file mode 100644 index 00000000..8adf9afd --- /dev/null +++ b/hosts/con/hardware-configuration.nix @@ -0,0 +1,34 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-uuid/382ae29a-ed0d-4e18-99db-6efb6afaae64"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/fb2f9ace-ce72-4b0d-b8b5-a8792d374f3c"; + + fileSystems."/boot/efi" = + { + device = "/dev/disk/by-uuid/6BD6-50D2"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; +}