From cebccc01f69cb5944db4201e424606e37aa50104 Mon Sep 17 00:00:00 2001 From: traxys Date: Thu, 8 Aug 2024 21:57:06 +0200 Subject: [PATCH] de: Create new module for COSMIC --- de/nixos.nix | 8 +++ flake.lock | 89 +++++++++++++++++++++++++++-- flake.nix | 6 ++ hostconfig/ZeNixComputa/default.nix | 1 + 4 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 de/nixos.nix diff --git a/de/nixos.nix b/de/nixos.nix new file mode 100644 index 0000000..a01f10a --- /dev/null +++ b/de/nixos.nix @@ -0,0 +1,8 @@ +nixos-cosmic: { + imports = [ nixos-cosmic.nixosModules.default ]; + + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; +} diff --git a/flake.lock b/flake.lock index 50b45e5..9e3cd85 100644 --- a/flake.lock +++ b/flake.lock @@ -213,6 +213,22 @@ } }, "flake-compat_5": { + "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_6": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -945,6 +961,29 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2", + "rust-overlay": "rust-overlay_5" + }, + "locked": { + "lastModified": 1723080973, + "narHash": "sha256-p7kQ4yxruANLz0FLnqYdSvqyYGwBaT9nWs2J/nrVKA4=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "d8b2b9aee034c10ca67848653171f576f87434a8", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1711401922, @@ -1016,6 +1055,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-traxys": { "locked": { "lastModified": 1692884435, @@ -1253,7 +1308,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -1341,7 +1396,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_5" + "rust-overlay": "rust-overlay_6" }, "locked": { "lastModified": 1721768087, @@ -1366,7 +1421,7 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay_6" + "rust-overlay": "rust-overlay_7" }, "locked": { "lastModified": 1715634745, @@ -1401,6 +1456,7 @@ "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", + "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_12", "nixpkgs-master": "nixpkgs-master", "nixpkgs-traxys": "nixpkgs-traxys", @@ -1409,7 +1465,7 @@ "powerlevel10k": "powerlevel10k", "raclette": "raclette", "roaming_proxy": "roaming_proxy", - "rust-overlay": "rust-overlay_7", + "rust-overlay": "rust-overlay_8", "simulationcraft": "simulationcraft", "treefmt-nix": "treefmt-nix_2", "vim-headerguard": "vim-headerguard", @@ -1502,6 +1558,27 @@ } }, "rust-overlay_5": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_6": { "inputs": { "flake-utils": "flake-utils_13", "nixpkgs": "nixpkgs_13" @@ -1520,7 +1597,7 @@ "type": "github" } }, - "rust-overlay_6": { + "rust-overlay_7": { "inputs": { "flake-utils": "flake-utils_15", "nixpkgs": "nixpkgs_14" @@ -1539,7 +1616,7 @@ "type": "github" } }, - "rust-overlay_7": { + "rust-overlay_8": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 56e2cbb..353c3b6 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,11 @@ nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Extra Package Sources meson-syntax = { url = "github:Monochrome-Sauce/sublime-meson"; @@ -191,6 +196,7 @@ personal-cli = import ./personal-cli/nixos.nix; gui = import ./gui/nixos.nix; wm = import ./wm/nixos.nix; + de = import ./de/nixos.nix inputs.nixos-cosmic; personal-gui = import ./personal-gui/nixos.nix; roaming = import ./roaming/nixos.nix; gaming = import ./gaming/nixos.nix; diff --git a/hostconfig/ZeNixComputa/default.nix b/hostconfig/ZeNixComputa/default.nix index f09fa54..0ef3bf4 100644 --- a/hostconfig/ZeNixComputa/default.nix +++ b/hostconfig/ZeNixComputa/default.nix @@ -13,6 +13,7 @@ personal-gui gaming wm + de ]; hmModules = with self.hmModules; [ ./extra_info.nix