fix xkb issues, change espanso formatting, noctalia support
This commit is contained in:
parent
a100acda87
commit
4e3922c4a4
6 changed files with 257 additions and 48 deletions
29
flake.nix
29
flake.nix
|
|
@ -20,6 +20,15 @@
|
|||
url = "github:danth/stylix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
noctalia = {
|
||||
url = "github:noctalia-dev/noctalia-shell";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.noctalia-qs.follows = "noctalia-qs";
|
||||
};
|
||||
noctalia-qs = {
|
||||
url = "github:noctalia-dev/noctalia-qs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||
};
|
||||
|
||||
|
|
@ -27,11 +36,6 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
nur,
|
||||
nur-unstable,
|
||||
home-manager,
|
||||
stylix,
|
||||
nix-minecraft,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -46,14 +50,14 @@
|
|||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
flake.setFlakeRegistry = true;
|
||||
overlays = [ nur.overlays.default ];
|
||||
overlays = [ inputs.nur.overlays.default ];
|
||||
};
|
||||
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
flake.setFlakeRegistry = true;
|
||||
overlays = [ nur-unstable.overlays.default ];
|
||||
overlays = [ inputs.nur-unstable.overlays.default ];
|
||||
};
|
||||
|
||||
sharedSpecialArgs = {
|
||||
|
|
@ -63,8 +67,8 @@
|
|||
|
||||
sharedModules = [
|
||||
./nixos/modules/base.nix
|
||||
stylix.nixosModules.stylix
|
||||
home-manager.nixosModules.home-manager
|
||||
inputs.stylix.nixosModules.stylix
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
({ ... }: {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
|
|
@ -93,7 +97,10 @@
|
|||
++ [
|
||||
{
|
||||
home-manager.users.alisceon.imports =
|
||||
[ ./home/profiles/base.nix ]
|
||||
[
|
||||
inputs.noctalia.homeModules.default
|
||||
./home/profiles/base.nix
|
||||
]
|
||||
++ hmModules;
|
||||
home-manager.users.root.imports = [
|
||||
./home/users/root/default.nix
|
||||
|
|
@ -142,7 +149,7 @@
|
|||
nixosModules = serverModules;
|
||||
hmModules = serverHomeModules;
|
||||
extraModules = [
|
||||
nix-minecraft.nixosModules.minecraft-servers
|
||||
inputs.nix-minecraft.nixosModules.minecraft-servers
|
||||
{ nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; }
|
||||
];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue