deprecate stylix, fix minor gripes and bugs
This commit is contained in:
parent
6b492bad2f
commit
fb1ad8d919
42 changed files with 951 additions and 688 deletions
31
flake.nix
31
flake.nix
|
|
@ -2,17 +2,14 @@
|
|||
description = "NixOS configuration for all hosts";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nur = {
|
||||
url = "github:nix-community/NUR";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
stylix = {
|
||||
url = "github:nix-community/stylix";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
noctalia = {
|
||||
|
|
@ -30,6 +27,7 @@
|
|||
outputs = inputs @ {
|
||||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -42,13 +40,6 @@
|
|||
|
||||
overlays = [
|
||||
inputs.nur.overlays.default
|
||||
(_final: prev: {
|
||||
# openldap 2.6.13 currently flakes in its test suite when bottles pulls
|
||||
# in the i686 variant for its multi-arch FHS environment.
|
||||
openldap = prev.openldap.overrideAttrs (old: {
|
||||
doCheck = if old.version == "2.6.13" then false else old.doCheck;
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
|
|
@ -58,20 +49,26 @@
|
|||
inherit overlays;
|
||||
};
|
||||
|
||||
pkgs-unstable = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
flake.setFlakeRegistry = true;
|
||||
inherit overlays;
|
||||
};
|
||||
|
||||
sharedSpecialArgs = {
|
||||
inherit repoLocalPath;
|
||||
inherit repoLocalPath pkgs-unstable;
|
||||
repoRoot = self;
|
||||
};
|
||||
|
||||
sharedModules = [
|
||||
./nixos/modules/base.nix
|
||||
inputs.stylix.nixosModules.stylix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
({ ... }: {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit pkgs repoLocalPath;
|
||||
inherit pkgs repoLocalPath pkgs-unstable;
|
||||
repoRoot = self;
|
||||
};
|
||||
home-manager.backupFileExtension = "backup";
|
||||
|
|
@ -110,7 +107,7 @@
|
|||
workstationModules = [
|
||||
./nixos/modules/profiles/workstation.nix
|
||||
./nixos/modules/wm/sway.nix
|
||||
./nixos/modules/theme/stylix.nix
|
||||
./nixos/modules/theme
|
||||
];
|
||||
|
||||
workstationHomeModules = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue