mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tmp gnome46

Browse Source
This commit is contained in:
mjallen18
2024-04-15 15:06:35 -05:00
parent eb456b934f
commit 620fad6d22
5 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
flake.lock generated
View File

@@ -53,11 +53,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1712410564, "lastModified": 1713178514,
"narHash": "sha256-SaieRX6F81W84WA973bA8NGAybjomH01y79FLLj5l6c=", "narHash": "sha256-WbG/7YWAT0n37LS7unI6gJjYQERkORsRXRovBCXAYqw=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "658cc876186c56526ebacaa5954e3c88fb7e3577", "rev": "546bfa46a80292e800d2767db90170d64d92c200",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712369716, "lastModified": 1712765734,
"narHash": "sha256-9zs+0GTfSyGHdpiA6dPJXnDKAHmfr01OE9FxDE9KvPI=", "narHash": "sha256-HakehmZVdhbXHNaTzoSwIHdvy1A3A7XXEIUHV2cC7d8=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "2516d44cb178547194a66fa9c44930ab9bddd910", "rev": "7d92cad55f58ef55d5c95ecf3753e0fa75ab11e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -341,6 +341,22 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -368,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712390667, "lastModified": 1713166971,
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b787726a8413e11b074cde42704b4af32d95545c", "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -388,11 +404,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712390667, "lastModified": 1713166971,
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b787726a8413e11b074cde42704b4af32d95545c", "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -425,11 +441,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712296875, "lastModified": 1712909442,
"narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=", "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad", "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -451,11 +467,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1712361380, "lastModified": 1712983637,
"narHash": "sha256-1cEiFtUvjBlp4J4kCvlsEobrTEsAzRBhRNvG8N1XH9w=", "narHash": "sha256-PSoOKfevRvoVZdMqijl9VcaB5OqgCoAgQ8UpsEAdEDQ=",
"owner": "martinvonz", "owner": "martinvonz",
"repo": "jj", "repo": "jj",
"rev": "93cebcd0c0e910b8b7de606982efa8430a94676e", "rev": "82c85ba7542b0a5c938f53d71f9a481fc37eda1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -515,11 +531,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712150496, "lastModified": 1712992043,
"narHash": "sha256-24MK9P+3OIBeaVsyy6r/W77/9TVLCQGDF8RVOCkK4Uk=", "narHash": "sha256-xUbqDxGiDab1et16JupBHpliGNpRSUcKfm++7t0UgBo=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "8be938197486acb2af4ba91aae0fac57619a46c8", "rev": "71be19b234d58f4ec447e921633506beb81a52c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -621,11 +637,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1712324865, "lastModified": 1712909959,
"narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -637,12 +653,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712163089, "lastModified": 1712963716,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"revCount": 606852, "revCount": 611350,
"type": "tarball", "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": { "original": {
"type": "tarball", "type": "tarball",
@@ -683,11 +699,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1712310679, "lastModified": 1713013257,
"narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=", "narHash": "sha256-ZEfGB3YCBVggvk0BQIqVY7J8XF/9jxQ68fCca6nib+8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72da83d9515b43550436891f538ff41d68eecc7f", "rev": "90055d5e616bd943795d38808c94dbf0dd35abe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -728,11 +744,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1712163089, "lastModified": 1712963716,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -776,6 +792,7 @@
"root": { "root": {
"inputs": { "inputs": {
"chaotic": "chaotic", "chaotic": "chaotic",
"gnome46": "gnome46",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"home-manager-stable": "home-manager-stable", "home-manager-stable": "home-manager-stable",
"impermanence": "impermanence", "impermanence": "impermanence",

6
flake.nix
View File

@@ -15,6 +15,8 @@
url = "github:nix-community/lanzaboote/v0.3.0"; url = "github:nix-community/lanzaboote/v0.3.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
gnome46.url = "github:NixOS/nixpkgs/gnome-46";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
home-manager-stable.url = "github:nix-community/home-manager"; 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 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 = { nixosConfigurations = {
# Desktop # Desktop
"matt-nixos" = nixpkgs.lib.nixosSystem { "matt-nixos" = gnome46.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence

20
hosts/desktop/configuration.nix
View File

@@ -10,6 +10,8 @@ let
hostname = "matt-nixos"; hostname = "matt-nixos";
gnome = true; gnome = true;
plasma = false; plasma = false;
# gnome46 = import (builtins.fetchTarball https://github.com/nixos/nixpgs/tarball/gnome-46) { config = config.nixpgs.config; };
in { in {
imports = [ # Include the results of the hardware scan. imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
@@ -26,12 +28,12 @@ in {
apps.discover-wrapped.enable = plasma; apps.discover-wrapped.enable = plasma;
chaotic = { # chaotic = {
nyx.cache.enable = true; # nyx.cache.enable = true;
nyx.overlay.enable = true; # nyx.overlay.enable = true;
mesa-git.enable = true; # mesa-git.enable = true;
hdr.enable = false; # hdr.enable = false;
}; # };
# Configure bootloader with lanzaboot and secureboot # Configure bootloader with lanzaboot and secureboot
boot = { boot = {
@@ -66,6 +68,9 @@ in {
bootspec.enable = true; bootspec.enable = true;
}; };
# gnome46.services.desktopManager.gnome.enable = true;
# gnome46.services.displayManager.gdm.enable = true;
# Services configs # Services configs
services = { services = {
# Enable the X11 windowing system. # Enable the X11 windowing system.
@@ -81,7 +86,8 @@ in {
desktopManager.gnome.enable = gnome; desktopManager.gnome.enable = gnome;
}; };
# displayManager.gdm.enable = gnome;
# desktopManager.gnome.enable = gnome;
desktopManager.plasma6.enable = plasma; desktopManager.plasma6.enable = plasma;
# enable auto discovery of printers # enable auto discovery of printers

1
hosts/desktop/hardware-configuration.nix
View File

@@ -15,6 +15,7 @@
fileSystems."/" = { fileSystems."/" = {
device = "none"; device = "none";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ "defaults" "size=32G" "mode=755" ];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {

1
hosts/nas/hardware-configuration.nix
View File

@@ -15,6 +15,7 @@
fileSystems."/" = { fileSystems."/" = {
device = "none"; device = "none";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ "defaults" "size=32G" "mode=755" ];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {