diff --git a/configuration.nix b/configuration.nix index 301384c..277a44e 100755 --- a/configuration.nix +++ b/configuration.nix @@ -11,7 +11,6 @@ { imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix ./stylix.nix ]; fonts = { diff --git a/flake.nix b/flake.nix index c33adfe..8efe29c 100755 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,10 @@ ... }: { + imports = [ + ./hardware-configuration-cyberia.nix + ./stylix.nix + ]; networking.hostName = "cyberia"; environment.systemPackages = [ @@ -89,6 +93,38 @@ ]; }; + nixosConfigurations.wired = nixpkgs.lib.nixosSystem { + inherit system; + + modules = [ + stylix.nixosModules.stylix + home-manager.nixosModules.home-manager + { + networking.hostName = "wired"; + imports = [ + ./hardware-configuration-wired.nix + ./stylix.nix + ]; + + } + ./configuration.nix + + { + home-manager.useUserPackages = true; + home-manager.useGlobalPkgs = true; + home-manager.users.lucy = { + imports = [ + inputs.ignis.homeManagerModules.default + nixvim.homeModules.nixvim + spicetify-nix.homeManagerModules.spicetify + ./home/home.nix + + ]; + }; + } + + ]; + }; homeConfigurations.lucy = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; diff --git a/hardware-configuration.nix b/hardware-configuration-cyberia.nix similarity index 100% rename from hardware-configuration.nix rename to hardware-configuration-cyberia.nix diff --git a/hardware-configuration-wired.nix b/hardware-configuration-wired.nix new file mode 100644 index 0000000..e386766 --- /dev/null +++ b/hardware-configuration-wired.nix @@ -0,0 +1,33 @@ +# 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" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/fbea1f31-4ad2-42f7-857a-15f7a1250793"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/9B5B-14D1"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/440b6cb1-02bf-4bda-998c-575589ec415a"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/home/hyprland.nix b/home/hyprland.nix index 6853bd5..81605a2 100755 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -6,6 +6,7 @@ monitor = [ "DP-5,highrr,auto-left,1,bitdepth,10" "HDMI-A-3,preffered,auto-right,1" + "eDP-1,preffered,auto,1,bitdepth,10,cm,auto" ]; general = { border_size = 4;