working overlays

This commit is contained in:
Moritz Böhme 2021-09-11 11:15:08 +00:00
parent ea4ddd6dff
commit 9af3b867c6
3 changed files with 39 additions and 17 deletions

View file

@ -22,24 +22,47 @@
utils.lib.mkFlake { utils.lib.mkFlake {
inherit self inputs; inherit self inputs;
# Channel definitions.
# Channels are automatically generated from nixpkgs inputs channels.nixpkgs.overlaysBuilder = channels: [
# e.g the inputs which contain `legacyPackages` attribute are used. self.overlay
inputs.utils.overlay
inputs.emacs-overlay.overlay
];
overlay = import ./overlays { inherit inputs; };
overlays = utils.lib.exportOverlays {
inherit (self) pkgs inputs;
};
outputsBuilder = channels: {
packages = utils.lib.exportPackages self.overlays channels;
devShell = channels.nixpkgs.mkShell {
packages = with channels.nixpkgs; [ nixpkgs-fmt rnix-lsp ];
};
};
channelsConfig.allowUnfree = true; channelsConfig.allowUnfree = true;
nixosModules = utils.lib.exportModules [
nix.package = nixpkgs.nixFlakes; ./modules/default.nix
nix.extraOptions = '' ];
experimental-features = nix-command flakes # nix.package = nixpkgs.nixFlakes;
''; # nix.extraOptions = ''
# experimental-features = nix-command flakes
# '';
hostDefaults.modules = [ hostDefaults.modules = [
home-manager.nixosModules.home-manager home-manager.nixosModule
{ {
home-manager.useGlobalPkgs = true; home-manager = {
home-manager.useUserPackages = true; useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit inputs self; };
};
} }
./modules self.nixosModules.default
]; ];
hosts.nixos-laptop.modules = [ hosts.nixos-laptop.modules = [

View file

@ -4,13 +4,13 @@ let
base = { base = {
services.picom = { services.picom = {
enable = true; enable = true;
inactiveOpacity = "0.95"; inactiveOpacity = "0.90";
opacityRule = [ opacityRule = [
"100:fullscreen" "100:fullscreen"
"80 :class_g = 'Polybar'" "80 :class_g = 'Polybar'"
]; ];
blur = true; blur = true;
inactiveDim = "0.1"; # inactiveDim = "0.1";
experimentalBackends = true; experimentalBackends = true;
extraOptions = '' extraOptions = ''
corner-radius = 10; corner-radius = 10;
@ -29,8 +29,8 @@ let
# dual kawase blur # dual kawase blur
blur-background-fixed = false; blur-background-fixed = false;
# blur-method = "dual_kawase"; blur-method = "dual_kawase";
blur-strength = 10; blur-strength = 5;
use-ewmh-active-win = true; use-ewmh-active-win = true;
detect-rounded-corners = true; detect-rounded-corners = true;

View file

@ -2,7 +2,6 @@
final: prev: { final: prev: {
picom = prev.picom.overrideAttrs (old: { picom = prev.picom.overrideAttrs (old: {
version = "unstable-2021-08-04";
src = inputs.picom; src = inputs.picom;
}); });
} }