felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(desktop): migrate from cosmic-nix to upstream NixOS module

Browse source
This commit is contained in:
Felix Schröter 2025-05-18 17:18:53 +02:00
parent 418fc173e6
commit e34e0cae22
Signed by: felschr
GPG key ID: 671E39E6744C807D
3 changed files with 3 additions and 89 deletions

6
desktop/cosmic.nix
View file

@ -1,10 +1,8 @@
{ inputs, lib, ... }:
{ pkgs, lib, ... }:
{
imports = [ inputs.nixos-cosmic.nixosModules.default ];
services.desktopManager.cosmic.enable = true;
# TODO at the moment COSMIC cannot be used alongside Gnome
# https://github.com/lilyinstarlight/nixos-cosmic/issues/17
specialisation = {
cosmic.configuration = {
services.xserver.displayManager.gdm.enable = lib.mkForce false;

79
flake.lock generated
View file

@ -155,22 +155,6 @@
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1746162366,
"narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -346,29 +330,6 @@
"type": "github"
}
},
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1747566515,
"narHash": "sha256-mBT3EypUn1HZ5iRGDmZQPtVNYxQxnkIsasggSCndYjw=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "93f3add95306179d15f8a6b1cfc87bfdc1702a33",
"type": "github"
},
"original": {
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1747129300,
@ -400,22 +361,6 @@
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1747335874,
"narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1747327360,
@ -472,7 +417,7 @@
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_3",
"gitignore": "gitignore",
"nixpkgs": [
"nixpkgs"
@ -502,7 +447,6 @@
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"matrix-appservices": "matrix-appservices",
"nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
@ -511,27 +455,6 @@
"pre-commit-hooks": "pre-commit-hooks"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1747535902,
"narHash": "sha256-rKWBtLcqQeu8PpfKIBn1ORXS2udSH/MwnQFwfSpFOLg=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "b7a99615d26b82c39b73ccc9026545c3f3403b71",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,

7
flake.nix
View file

@ -4,12 +4,10 @@ rec {
nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
"https://cosmic.cachix.org/"
"https://felschr.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
"felschr.cachix.org-1:raomy5XA2tsVkBoG6wo70ARIn+V24IXhWaSe3QZo12A="
];
};
@ -69,11 +67,6 @@ rec {
flake = false;
};
nixos-cosmic = {
url = "github:lilyinstarlight/nixos-cosmic";
inputs.nixpkgs.follows = "nixpkgs";
};
openwrt-imagebuilder = {
url = "github:astro/nix-openwrt-imagebuilder";
inputs.nixpkgs.follows = "nixpkgs";