diff --git a/flake.nix b/flake.nix index 4b185c8..5858fda 100644 --- a/flake.nix +++ b/flake.nix @@ -58,13 +58,18 @@ ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ./hosts/desktop - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { inherit inputs nix-colors; }; - home-manager.users.xeovalyte.imports = [ ./hosts/desktop/home.nix ]; - } + ]; + }; + }; + + homeConfigurations = { + "xeovalyte@xv-desktop" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { inherit inputs nix-colors; }; + modules = [ + ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + + ./hosts/desktop/home.nix ]; }; }; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index afbebd9..f920bea 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -46,7 +46,7 @@ extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ]; }; - boot.kernelPackages = pkgs.linuxPackages_latest; + services.openssh.enable = true; system.stateVersion = "24.05"; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index d345c67..e509594 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -8,18 +8,18 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c"; + { device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/9A7D-7464"; + { device = "/dev/disk/by-uuid/029A-9287"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index a72aec8..c50f330 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -38,9 +38,13 @@ headless = false; home.packages = with pkgs; [ - unstable.prismlauncher + unstable.prismlauncher + unstable.vesktop ]; + # Enable home-manager + programs.home-manager.enable = true; + home.stateVersion = "24.05"; }; } diff --git a/modules/system/hardware/nvidia.nix b/modules/system/hardware/nvidia.nix index 9956bb6..b4c05e9 100644 --- a/modules/system/hardware/nvidia.nix +++ b/modules/system/hardware/nvidia.nix @@ -33,14 +33,5 @@ # Currently alpha-quality/buggy, so false is currently the recommended setting. open = false; nvidiaSettings = true; - - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.58.02"; - sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; - sha256_aarch64 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM="; - openSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; - settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8="; - persistencedSha256 = lib.fakeSha256; - }; }; }