From 38046556b49a49af02e8056cd379be6e36d37500 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Mon, 12 Aug 2024 15:52:34 -0400 Subject: [PATCH] Cosmic and fixing terraform --- flake.lock | 170 +++++++++++++----- flake.nix | 15 +- .../hosts/nixos/rainbow-planet/default.nix | 2 + modules/system/common/all-nixos.nix | 12 +- 4 files changed, 152 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 2c55e09..4f6a96c 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "onchg": "onchg" }, "locked": { - "lastModified": 1720429515, - "narHash": "sha256-r73eyaZzaNgysusdaFmanOHcYMVnRxdAYzD4BvkBjmU=", + "lastModified": 1723077491, + "narHash": "sha256-Zdv5L9Uhh84HTppHszAFvTAUzZfvHY+MTEcQwHc6dIk=", "owner": "aksiksi", "repo": "compose2nix", - "rev": "a55aea08f1eb34cc1681c9ea2d7b42b58730df5d", + "rev": "e5f35685dd09435f648ec827335ab307b7c4574d", "type": "github" }, "original": { @@ -57,11 +57,11 @@ "config": { "locked": { "dir": "templates/config", - "lastModified": 1715288913, - "narHash": "sha256-NQhxnFCAUj4x5t878Gpzb6xlRpr1V7bm5AEoqCVaJbk=", + "lastModified": 1719931926, + "narHash": "sha256-B8j9lHX0LqWlZkm8JxZRN6919RQjJEu/1J1SR8pU/ww=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "4f09d5af5c1782414ff27caab6f3abd84e516ded", + "rev": "034287ee462c87dadc14a94d4b53a48ed66c7b3d", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1721735625, - "narHash": "sha256-4T0FK0b3Q7Dd7oj79M7GhA9+YqKxxGT0iN+h8yqdP7s=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "4698b1ef375e9c904037e0b2049aa73d39ac1b2d", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -92,6 +92,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -112,11 +128,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -202,11 +218,11 @@ ] }, "locked": { - "lastModified": 1721719500, - "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", + "lastModified": 1722924007, + "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", + "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", "type": "github" }, "original": { @@ -292,13 +308,36 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1723258277, + "narHash": "sha256-2yB/905PCCFwFI20mRU7aAZdp1h7cYmsvlKk+t8+W20=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "7f032a71bf9cb77df5610796c70f45e1f69a9a3a", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1721754224, - "narHash": "sha256-JEVfxzZRo+/zdWKBjHpAUG905SDZL9fmoLJxf9b5CGU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "405b654893aba16c8014de6a17e84439d3fb8e46", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -321,6 +360,22 @@ "type": "indirect" } }, + "nixpkgs-1_0": { + "locked": { + "lastModified": 1699291058, + "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "type": "github" + } + }, "nixpkgs-24_05": { "locked": { "lastModified": 1717144377, @@ -338,23 +393,33 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { - "dir": "lib", "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1721524707, "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", @@ -374,20 +439,21 @@ "inputs": { "config": "config", "flake-parts": "flake-parts", - "nixpkgs": [ + "nixpkgs-1_0": "nixpkgs-1_0", + "nixpkgs-1_6": [ "nixpkgs" ], - "nixpkgs-unstable": [ + "nixpkgs-1_9": [ "nixpkgs-unstable" ], "systems": "systems_2" }, "locked": { - "lastModified": 1719931926, - "narHash": "sha256-B8j9lHX0LqWlZkm8JxZRN6919RQjJEu/1J1SR8pU/ww=", + "lastModified": 1723144319, + "narHash": "sha256-yvGkbgDRhm+BVO2ivARcHjzNw/FiYQNL5QbbTCahr0E=", "owner": "stackbuilders", "repo": "nixpkgs-terraform", - "rev": "034287ee462c87dadc14a94d4b53a48ed66c7b3d", + "rev": "6b5daf242e5dea86e9ae9c04971f08bedaaac440", "type": "github" }, "original": { @@ -398,11 +464,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1721622093, - "narHash": "sha256-iQ+quy3A1EKeFyLyAtjhgSvZHH7r+xybXZkxMhasN4I=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "453402b94f39f968a7c27df28e060f69e4a50c3b", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -430,11 +496,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1721548954, - "narHash": "sha256-7cCC8+Tdq1+3OPyc3+gVo9dzUNkNIQfwSDJ2HSi2u3o=", + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63d37ccd2d178d54e7fb691d7ec76000740ea24a", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { @@ -490,6 +556,7 @@ "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-homebrew": "nix-homebrew", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-terraform": "nixpkgs-terraform", @@ -498,10 +565,31 @@ "sops-nix": "sops-nix" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723170066, + "narHash": "sha256-SFkQfOA+8AIYJsPlQtxNP+z5jRLfz91z/aOrV94pPmw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "fecfe4d7c96fea2982c7907997b387a6b52c1093", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_4", "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils" @@ -526,14 +614,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1722897572, + "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", "owner": "mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 438022d..904de79 100644 --- a/flake.nix +++ b/flake.nix @@ -41,12 +41,17 @@ # Manage Homebrew itself nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs-terraform = { url = "github:stackbuilders/nixpkgs-terraform"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-unstable.follows = "nixpkgs-unstable"; + inputs.nixpkgs-1_6.follows = "nixpkgs"; + inputs.nixpkgs-1_9.follows = "nixpkgs-unstable"; }; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; @@ -60,8 +65,9 @@ }; # end inputs outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, compose2nix, disko, genebean-omp-themes, - home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-hardware, nixpkgs-terraform, - simple-nixos-mailserver, sops-nix, ... }: let + home-manager, nix-darwin, nix-flatpak, nix-homebrew, nixos-cosmic, + nixos-hardware, nixpkgs-terraform, simple-nixos-mailserver, sops-nix, ... + }: let # creates a macOS system config darwinHostConfig = { system, hostname, username, additionalModules, additionalSpecialArgs }: nix-darwin.lib.darwinSystem { @@ -217,6 +223,7 @@ hostname = "rainbow-planet"; username = "gene"; additionalModules = [ + nixos-cosmic.nixosModules.default nixos-hardware.nixosModules.dell-xps-13-9360 ]; additionalSpecialArgs = {}; diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix index 12981e2..f493676 100644 --- a/modules/hosts/nixos/rainbow-planet/default.nix +++ b/modules/hosts/nixos/rainbow-planet/default.nix @@ -86,6 +86,7 @@ services = { boinc.enable = true; + desktopManager.cosmic.enable = true; desktopManager.plasma6.enable = true; displayManager.sddm = { enable = true; @@ -165,6 +166,7 @@ tailscale-systray ]; }; + virtualisation = { containers.enable = true; libvirtd = { diff --git a/modules/system/common/all-nixos.nix b/modules/system/common/all-nixos.nix index 971f938..bf91912 100644 --- a/modules/system/common/all-nixos.nix +++ b/modules/system/common/all-nixos.nix @@ -43,10 +43,18 @@ "flakes" "nix-command" ]; - extra-substituters = [ + # extra-substituters = [ + # ]; + # extra-trusted-public-keys = [ + # ]; + substituters = [ + "https://cache.nixos.org" # default one + "https://cosmic.cachix.org/" "https://nixpkgs-terraform.cachix.org" ]; - extra-trusted-public-keys = [ + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" # default one + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "nixpkgs-terraform.cachix.org-1:8Sit092rIdAVENA3ZVeH9hzSiqI/jng6JiCrQ1Dmusw=" ]; trusted-users = [ "${username}" ];