From e1899769ff1fd34b85f0dc17f0407b33b067c08e Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 23 Sep 2024 20:31:12 -0500 Subject: [PATCH] moved gnome to a host choice, not a profile choice. Added cosmic flake to check it out. --- flake.lock | 149 +++++++++++++++++++++++++++- flake.nix | 17 ++-- nixos/hosts/telchar/default.nix | 3 + nixos/profiles/global/nix.nix | 2 + nixos/profiles/role-workstation.nix | 1 - 5 files changed, 160 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4cf63d3..6216564 100644 --- a/flake.lock +++ b/flake.lock @@ -77,7 +77,45 @@ "type": "github" } }, + "flake-compat_2": { + "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-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -360,6 +398,29 @@ "type": "github" } }, + "nix-update": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1726651036, + "narHash": "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=", + "owner": "Mic92", + "repo": "nix-update", + "rev": "7dd0e4467c571ebb7e53d9e3d40c49f75473efdf", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-update", + "type": "github" + } + }, "nix-vscode-extensions": { "inputs": { "flake-compat": "flake-compat", @@ -382,6 +443,30 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_2", + "nix-update": "nix-update", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1727138676, + "narHash": "sha256-py+c+r8dP3BmiGv44OIEHRZx6EFncpRJGlYzfVNINa8=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "ffd6b5ce3de69631f4eae17e13ba17650b126471", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1726650330, @@ -443,6 +528,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1725762081, "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", @@ -619,6 +720,7 @@ "nix-index-database": "nix-index-database", "nix-inspect": "nix-inspect", "nix-vscode-extensions": "nix-vscode-extensions", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -645,6 +747,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726972233, + "narHash": "sha256-FlL/bNESOtDQoczRhmPfReNAmLqVg+dAX4HectPOOf0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "36d73192555e569d27579f6c486fea3ab768823c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "slimlock": { "inputs": { "nixpkgs": [ @@ -674,7 +797,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1726524647, @@ -752,7 +875,7 @@ }, "talhelper": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs-unstable" ] @@ -793,6 +916,28 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": "flake-utils_4", diff --git a/flake.nix b/flake.nix index 8644fea..1c133b2 100644 --- a/flake.nix +++ b/flake.nix @@ -71,7 +71,6 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - # NixVirt for qemu & libvirt # https://github.com/AshleyYakeley/NixVirt nixvirt-git = { @@ -79,13 +78,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # ghostty - 👻 - # ghostty = { - # url = "git+ssh://git@github.com/ghostty-org/ghostty"; - # }; - # just manually installing it, private repo gives me a lot of headaches.disko - # nix profile install git+ssh://git@github.com/ghostty-org/ghostty - vscode-server.url = "github:nix-community/nixos-vscode-server"; # krewfile - Declarative krew plugin management @@ -95,10 +87,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # NixOS Cosmic + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = - { self, nixpkgs, sops-nix, home-manager, nix-vscode-extensions, impermanence, disko, talhelper, lix-module, vscode-server, krewfile, ... } @ inputs: + { self, nixpkgs, sops-nix, home-manager, nix-vscode-extensions, impermanence, disko, talhelper, lix-module, vscode-server, krewfile, nixos-cosmic, ... } @ inputs: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" @@ -175,6 +173,7 @@ system = "x86_64-linux"; hardwareModules = [ inputs.nixos-hardware.nixosModules.framework-16-7040-amd + # nixos-cosmic.nixosModules.default ./nixos/profiles/hw-framework-16-7840hs.nix disko.nixosModules.disko (import ./nixos/profiles/disko-telchar.nix) diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix index 3184ff6..55701b7 100644 --- a/nixos/hosts/telchar/default.nix +++ b/nixos/hosts/telchar/default.nix @@ -28,6 +28,9 @@ mySystem = { purpose = "Development"; + # Desktop Environment + de.gnome.enable = true; + # System config system = { motd.networkInterfaces = [ "wlp1s0" ]; diff --git a/nixos/profiles/global/nix.nix b/nixos/profiles/global/nix.nix index a8f2521..c56c89d 100644 --- a/nixos/profiles/global/nix.nix +++ b/nixos/profiles/global/nix.nix @@ -26,12 +26,14 @@ "https://hsndev.cachix.org" "https://nix-community.cachix.org" "https://numtide.cachix.org" + "https://cosmic.cachix.org/" ]; trusted-public-keys = [ "hsndev.cachix.org-1:vN1/XGBZtMLnTFYDmTLDrullgZHSUYY3Kqt+Yg/C+tE=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; # Fallback quickly if substituters are not available. diff --git a/nixos/profiles/role-workstation.nix b/nixos/profiles/role-workstation.nix index 4bfee67..1578d43 100644 --- a/nixos/profiles/role-workstation.nix +++ b/nixos/profiles/role-workstation.nix @@ -6,7 +6,6 @@ with config; { mySystem = { - de.gnome.enable = true; shell.fish.enable = true; editor.vscode.enable = true;