diff --git a/configuration.nix b/configuration.nix index c567820..b1eb369 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,57 +18,14 @@ }; # hyprland -# programs.hyprland = { -# enable = true; -# xwayland.enable = true; -# }; + programs.hyprland = { + enable = true; + xwayland.enable = true; + }; # Bootloader. -# boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; boot.loader.grub.useOSProber = true; - -boot.supportedFilesystems = [ "zfs" ]; -boot.zfs.forceImportRoot = false; -networking.hostId = "8425e349"; - - - -# Boot loader config for configuration.nix: -boot.loader.grub.useOSProber = true; - boot.loader.grub = { - enable = true; - zfsSupport = true; - efiSupport = true; - efiInstallAsRemovable = true; - mirroredBoots = [ - { devices = [ "nodev"]; path = "/boot"; } - ]; - }; - - fileSystems."/" = - { device = "zpool/root"; - fsType = "zfs"; - }; - - fileSystems."/nix" = - { device = "zpool/nix"; - fsType = "zfs"; - }; - - fileSystems."/home" = - { device = "zpool/home"; - fsType = "zfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/49CB-AECA"; - fsType = "vfat"; - }; - - fileSystems."/mnt/win" = - { - device = "/dev/disk/by-uuid/7420123C201205B0"; - fsType = "ntfs"; - }; +boot.loader.systemd-boot.enable = true; +boot.loader.efi.canTouchEfiVariables = true; swapDevices = [ ]; @@ -246,6 +203,6 @@ hardware.amdgpu.opencl.enable = true; # 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 = "24.05"; # Did you read the comment? + system.stateVersion = "24.11"; # Did you read the comment? } diff --git a/flake.lock b/flake.lock index 504f4a0..e84b488 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1742411397, - "narHash": "sha256-qsFtK4H/IxBHoUD7aWDL+emAfh++E42gRMaGskT3irs=", + "lastModified": 1743527271, + "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a72d991305cfd9b15018a6e7eb3db93a32bc60", + "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 1055885..71d1247 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -14,22 +14,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "zpool/root"; - fsType = "zfs"; - }; - - fileSystems."/home" = - { device = "zpool/home"; - fsType = "zfs"; - }; - - fileSystems."/nix" = - { device = "zpool/nix"; - fsType = "zfs"; + { device = "/dev/disk/by-uuid/926a710f-a999-4c59-9040-8045efaa6e28"; + fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/49CB-AECA"; + { device = "/dev/disk/by-uuid/39F5-52FB"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; };