diff --git a/flake.nix b/flake.nix index a809ca6..e34d30f 100644 --- a/flake.nix +++ b/flake.nix @@ -22,24 +22,47 @@ utils.lib.mkFlake { inherit self inputs; - # Channel definitions. - # Channels are automatically generated from nixpkgs inputs - # e.g the inputs which contain `legacyPackages` attribute are used. + + channels.nixpkgs.overlaysBuilder = channels: [ + 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; - - nix.package = nixpkgs.nixFlakes; - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; + nixosModules = utils.lib.exportModules [ + ./modules/default.nix + ]; + # nix.package = nixpkgs.nixFlakes; + # nix.extraOptions = '' + # experimental-features = nix-command flakes + # ''; hostDefaults.modules = [ - home-manager.nixosModules.home-manager + home-manager.nixosModule { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { inherit inputs self; }; + }; } - ./modules + self.nixosModules.default ]; hosts.nixos-laptop.modules = [ diff --git a/modules/picom.nix b/modules/picom.nix index 21edda4..cdd6f88 100644 --- a/modules/picom.nix +++ b/modules/picom.nix @@ -4,13 +4,13 @@ let base = { services.picom = { enable = true; - inactiveOpacity = "0.95"; + inactiveOpacity = "0.90"; opacityRule = [ "100:fullscreen" "80 :class_g = 'Polybar'" ]; blur = true; - inactiveDim = "0.1"; + # inactiveDim = "0.1"; experimentalBackends = true; extraOptions = '' corner-radius = 10; @@ -29,8 +29,8 @@ let # dual kawase blur blur-background-fixed = false; - # blur-method = "dual_kawase"; - blur-strength = 10; + blur-method = "dual_kawase"; + blur-strength = 5; use-ewmh-active-win = true; detect-rounded-corners = true; diff --git a/overlays/default.nix b/overlays/default.nix index 068142f..08804fa 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,6 @@ final: prev: { picom = prev.picom.overrideAttrs (old: { - version = "unstable-2021-08-04"; src = inputs.picom; }); }