diff --git a/flake.lock b/flake.lock index a1ced9b..f4d3850 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1712410564, - "narHash": "sha256-SaieRX6F81W84WA973bA8NGAybjomH01y79FLLj5l6c=", + "lastModified": 1713178514, + "narHash": "sha256-WbG/7YWAT0n37LS7unI6gJjYQERkORsRXRovBCXAYqw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "658cc876186c56526ebacaa5954e3c88fb7e3577", + "rev": "546bfa46a80292e800d2767db90170d64d92c200", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1712369716, - "narHash": "sha256-9zs+0GTfSyGHdpiA6dPJXnDKAHmfr01OE9FxDE9KvPI=", + "lastModified": 1712765734, + "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "2516d44cb178547194a66fa9c44930ab9bddd910", + "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1", "type": "github" }, "original": { @@ -341,6 +341,22 @@ "type": "github" } }, + "gnome46": { + "locked": { + "lastModified": 1712940244, + "narHash": "sha256-4+4+srH+X4k7rlj8r1fQlQArE55cUUEcUCUGP1xuwJw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "20d23bf9b180bbedd067d685f8f5493a0d3ee3f5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "gnome-46", + "repo": "nixpkgs", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -368,11 +384,11 @@ ] }, "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -388,11 +404,11 @@ ] }, "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -425,11 +441,11 @@ ] }, "locked": { - "lastModified": 1712296875, - "narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=", + "lastModified": 1712909442, + "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad", + "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", "type": "github" }, "original": { @@ -451,11 +467,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1712361380, - "narHash": "sha256-1cEiFtUvjBlp4J4kCvlsEobrTEsAzRBhRNvG8N1XH9w=", + "lastModified": 1712983637, + "narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=", "owner": "martinvonz", "repo": "jj", - "rev": "93cebcd0c0e910b8b7de606982efa8430a94676e", + "rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d", "type": "github" }, "original": { @@ -515,11 +531,11 @@ ] }, "locked": { - "lastModified": 1712150496, - "narHash": "sha256-24MK9P+3OIBeaVsyy6r/W77/9TVLCQGDF8RVOCkK4Uk=", + "lastModified": 1712992043, + "narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8be938197486acb2af4ba91aae0fac57619a46c8", + "rev": "71be19b234d58f4ec447e921633506beb81a52c0", "type": "github" }, "original": { @@ -621,11 +637,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712324865, - "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", + "lastModified": 1712909959, + "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", + "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", "type": "github" }, "original": { @@ -637,12 +653,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", - "revCount": 606852, + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "revCount": 611350, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.606852%2Brev-fd281bd6b7d3e32ddfa399853946f782553163b5/018ea93e-9d24-76a4-810e-9d1f01e82d37/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.611350%2Brev-cfd6b5fc90b15709b780a5a1619695a88505a176/018eddfc-e6d9-74bb-a823-20f2ae60079b/source.tar.gz" }, "original": { "type": "tarball", @@ -683,11 +699,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1712310679, - "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=", + "lastModified": 1713013257, + "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72da83d9515b43550436891f538ff41d68eecc7f", + "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8", "type": "github" }, "original": { @@ -728,11 +744,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -776,6 +792,7 @@ "root": { "inputs": { "chaotic": "chaotic", + "gnome46": "gnome46", "home-manager": "home-manager_2", "home-manager-stable": "home-manager-stable", "impermanence": "impermanence", diff --git a/flake.nix b/flake.nix index 5048451..9fe48da 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ url = "github:nix-community/lanzaboote/v0.3.0"; inputs.nixpkgs.follows = "nixpkgs"; }; + + gnome46.url = "github:NixOS/nixpkgs/gnome-46"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager-stable.url = "github:nix-community/home-manager"; @@ -29,10 +31,10 @@ }; outputs = { self, nixpkgs, nixpkgs-stable, chaotic, lanzaboote, impermanence, nix-flatpak, home-manager - , nixos-hardware, nix-darwin, nixos-apple-silicon, home-manager-stable }@inputs: { + , nixos-hardware, nix-darwin, nixos-apple-silicon, home-manager-stable, gnome46 }@inputs: { nixosConfigurations = { # Desktop - "matt-nixos" = nixpkgs.lib.nixosSystem { + "matt-nixos" = gnome46.lib.nixosSystem { system = "x86_64-linux"; modules = [ impermanence.nixosModules.impermanence diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 190ee2a..83ce8ea 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -10,6 +10,8 @@ let hostname = "matt-nixos"; gnome = true; plasma = false; + + # gnome46 = import (builtins.fetchTarball https://github.com/nixos/nixpgs/tarball/gnome-46) { config = config.nixpgs.config; }; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix @@ -26,12 +28,12 @@ in { apps.discover-wrapped.enable = plasma; - chaotic = { - nyx.cache.enable = true; - nyx.overlay.enable = true; - mesa-git.enable = true; - hdr.enable = false; - }; + # chaotic = { + # nyx.cache.enable = true; + # nyx.overlay.enable = true; + # mesa-git.enable = true; + # hdr.enable = false; + # }; # Configure bootloader with lanzaboot and secureboot boot = { @@ -66,6 +68,9 @@ in { bootspec.enable = true; }; + # gnome46.services.desktopManager.gnome.enable = true; + # gnome46.services.displayManager.gdm.enable = true; + # Services configs services = { # Enable the X11 windowing system. @@ -81,7 +86,8 @@ in { desktopManager.gnome.enable = gnome; }; - + # displayManager.gdm.enable = gnome; + # desktopManager.gnome.enable = gnome; desktopManager.plasma6.enable = plasma; # enable auto discovery of printers diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 52cb212..2355528 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -15,6 +15,7 @@ fileSystems."/" = { device = "none"; fsType = "tmpfs"; + options = [ "defaults" "size=32G" "mode=755" ]; }; fileSystems."/nix" = { diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix index 256cb15..79045c1 100644 --- a/hosts/nas/hardware-configuration.nix +++ b/hosts/nas/hardware-configuration.nix @@ -15,6 +15,7 @@ fileSystems."/" = { device = "none"; fsType = "tmpfs"; + options = [ "defaults" "size=32G" "mode=755" ]; }; fileSystems."/boot" = {