cleanup flake, fix nixpkgs config, and add cosmic flake

This commit is contained in:
cswimr 2025-01-28 07:18:19 -06:00
parent b23ceaa5b0
commit 0721f6edfa
Signed by: cswimr
GPG key ID: 0EC431A8DA8F8087
3 changed files with 107 additions and 38 deletions

View file

@ -4,6 +4,7 @@
stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
staging-next.url = "github:NixOS/nixpkgs/staging-next";
cosmic.url = "github:lilyinstarlight/nixos-cosmic";
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
@ -55,23 +56,10 @@
let
user = "cswimr";
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [
inputs.catppuccin-vsc.overlays.default
inputs.nur.overlays.default
inputs.gauntlet.overlays.default
];
config.allowUnfree = true;
};
stablePkgs = import inputs.stable {
inherit system;
config.allowUnfree = true;
};
stagingNextPkgs = import inputs.staging-next {
inherit system;
config.allowUnfree = true;
};
in
{
nixosConfigurations = {
@ -79,9 +67,7 @@
system = system;
specialArgs = {
inherit inputs;
inherit pkgs;
inherit stablePkgs;
inherit stagingNextPkgs;
system = system;
hostname = "eclipse";
user = user;
@ -96,7 +82,7 @@
./nixos/flatpak.nix
./nixos/gaming.nix
./nixos/gui-pkgs.nix
./nixos/nvidia.nix
#./nixos/nvidia.nix
./nixos/nvim.nix
./nixos/pkg.nix
./nixos/shell.nix
@ -111,8 +97,6 @@
hardware.bluetooth.enable = true;
}
# nixpkgs.nixosModules.readOnlyPkgs
# { nixpkgs.pkgs = pkgs; }
inputs.sops-nix.nixosModules.sops
inputs.nixvim.nixosModules.nixvim
inputs.nur.modules.nixos.default
@ -146,9 +130,7 @@
backupFileExtension = "bak";
extraSpecialArgs = {
inherit inputs;
inherit pkgs;
inherit stablePkgs;
inherit stagingNextPkgs;
system = system;
hostname = "eclipse";
user = user;
@ -176,7 +158,6 @@
system = system;
specialArgs = {
inherit inputs;
inherit pkgs;
system = system;
hostname = "nebula";
};
@ -214,7 +195,6 @@
backupFileExtension = "bak";
extraSpecialArgs = {
inherit inputs;
inherit pkgs;
system = system;
hostname = "nebula";
user = user;