treewide: format using nixfmt-rfc-style
This commit is contained in:
		
							parent
							
								
									dba047b845
								
							
						
					
					
						commit
						399eafe9ed
					
				
					 98 changed files with 1930 additions and 990 deletions
				
			
		| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
{ inputs, packages, ... }: rec {
 | 
			
		||||
{ inputs, packages, ... }:
 | 
			
		||||
rec {
 | 
			
		||||
  all = [
 | 
			
		||||
    scripts
 | 
			
		||||
    sway
 | 
			
		||||
| 
						 | 
				
			
			@ -13,68 +14,87 @@
 | 
			
		|||
 | 
			
		||||
  sway = (import ./sway.nix);
 | 
			
		||||
 | 
			
		||||
  themes = (final: prev: {
 | 
			
		||||
    material-wifi-icons = final.stdenv.mkDerivation rec {
 | 
			
		||||
      name = "material-wifi-icons";
 | 
			
		||||
      src = inputs.material-wifi-icons;
 | 
			
		||||
      installPhase = ''
 | 
			
		||||
        install -D material-wifi.ttf $out/share/fonts/${name}
 | 
			
		||||
      '';
 | 
			
		||||
    };
 | 
			
		||||
    papirus_red = (final.papirus-icon-theme.override { color = "red"; });
 | 
			
		||||
    orchis_theme_compact = (final.orchis-theme.override {
 | 
			
		||||
      border-radius = 0;
 | 
			
		||||
      tweaks = [ "compact" "solid" ];
 | 
			
		||||
    });
 | 
			
		||||
    nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
 | 
			
		||||
  });
 | 
			
		||||
  themes = (
 | 
			
		||||
    final: prev: {
 | 
			
		||||
      material-wifi-icons = final.stdenv.mkDerivation rec {
 | 
			
		||||
        name = "material-wifi-icons";
 | 
			
		||||
        src = inputs.material-wifi-icons;
 | 
			
		||||
        installPhase = ''
 | 
			
		||||
          install -D material-wifi.ttf $out/share/fonts/${name}
 | 
			
		||||
        '';
 | 
			
		||||
      };
 | 
			
		||||
      papirus_red = (final.papirus-icon-theme.override { color = "red"; });
 | 
			
		||||
      orchis_theme_compact = (
 | 
			
		||||
        final.orchis-theme.override {
 | 
			
		||||
          border-radius = 0;
 | 
			
		||||
          tweaks = [
 | 
			
		||||
            "compact"
 | 
			
		||||
            "solid"
 | 
			
		||||
          ];
 | 
			
		||||
        }
 | 
			
		||||
      );
 | 
			
		||||
      nerdfonts_fira_hack = (
 | 
			
		||||
        final.nerdfonts.override {
 | 
			
		||||
          fonts = [
 | 
			
		||||
            "FiraCode"
 | 
			
		||||
            "Hack"
 | 
			
		||||
          ];
 | 
			
		||||
        }
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
  new-packages = (final: prev: packages // {
 | 
			
		||||
    dhist = inputs.dhist.packages.${prev.system}.dhist;
 | 
			
		||||
    demoji = inputs.demoji.packages.${prev.system}.default;
 | 
			
		||||
    tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
 | 
			
		||||
    maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
 | 
			
		||||
    wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
 | 
			
		||||
  });
 | 
			
		||||
  new-packages = (
 | 
			
		||||
    final: prev:
 | 
			
		||||
    packages
 | 
			
		||||
    // {
 | 
			
		||||
      dhist = inputs.dhist.packages.${prev.system}.dhist;
 | 
			
		||||
      demoji = inputs.demoji.packages.${prev.system}.default;
 | 
			
		||||
      tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
 | 
			
		||||
      maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
 | 
			
		||||
      wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
 | 
			
		||||
    }
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
  patches = (final: prev: {
 | 
			
		||||
    bemenu = prev.bemenu.overrideAttrs (o: {
 | 
			
		||||
      postPatch = ''
 | 
			
		||||
        substituteInPlace lib/renderers/wayland/window.c \
 | 
			
		||||
          --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
 | 
			
		||||
      '';
 | 
			
		||||
    });
 | 
			
		||||
    mySway = prev.sway.override {
 | 
			
		||||
      sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
 | 
			
		||||
        patches = old.patches
 | 
			
		||||
          ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
 | 
			
		||||
  patches = (
 | 
			
		||||
    final: prev: {
 | 
			
		||||
      bemenu = prev.bemenu.overrideAttrs (o: {
 | 
			
		||||
        postPatch = ''
 | 
			
		||||
          substituteInPlace lib/renderers/wayland/window.c \
 | 
			
		||||
            --replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
 | 
			
		||||
        '';
 | 
			
		||||
      });
 | 
			
		||||
    };
 | 
			
		||||
    mangohud = prev.mangohud.overrideAttrs (o: {
 | 
			
		||||
      patches = o.patches ++ [
 | 
			
		||||
        (prev.fetchpatch {
 | 
			
		||||
          url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
 | 
			
		||||
          hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
 | 
			
		||||
        })
 | 
			
		||||
      ];
 | 
			
		||||
    });
 | 
			
		||||
  });
 | 
			
		||||
      mySway = prev.sway.override {
 | 
			
		||||
        sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
 | 
			
		||||
          patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
 | 
			
		||||
        });
 | 
			
		||||
      };
 | 
			
		||||
      mangohud = prev.mangohud.overrideAttrs (o: {
 | 
			
		||||
        patches = o.patches ++ [
 | 
			
		||||
          (prev.fetchpatch {
 | 
			
		||||
            url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
 | 
			
		||||
            hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
 | 
			
		||||
          })
 | 
			
		||||
        ];
 | 
			
		||||
      });
 | 
			
		||||
    }
 | 
			
		||||
  );
 | 
			
		||||
 | 
			
		||||
  variables = (final: prev: {
 | 
			
		||||
    uservars = import ../user/variables.nix;
 | 
			
		||||
  });
 | 
			
		||||
  variables = (final: prev: { uservars = import ../user/variables.nix; });
 | 
			
		||||
 | 
			
		||||
  lib_extended = (final: prev: {
 | 
			
		||||
    lib = prev.lib // rec {
 | 
			
		||||
      # Utility function
 | 
			
		||||
      # Input: [{v1=1;} {v2=2;}]
 | 
			
		||||
      # Output: {v1=1;v2=2;}
 | 
			
		||||
      mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { };
 | 
			
		||||
  lib_extended = (
 | 
			
		||||
    final: prev: {
 | 
			
		||||
      lib = prev.lib // rec {
 | 
			
		||||
        # Utility function
 | 
			
		||||
        # Input: [{v1=1;} {v2=2;}]
 | 
			
		||||
        # Output: {v1=1;v2=2;}
 | 
			
		||||
        mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { };
 | 
			
		||||
 | 
			
		||||
      # Easily translate imperative templating code
 | 
			
		||||
      # Input: [ 1 2 ] (num: { "v${num}" = num; })
 | 
			
		||||
      # Output: {v1=1;v2=2;}
 | 
			
		||||
      forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
 | 
			
		||||
    };
 | 
			
		||||
  });
 | 
			
		||||
        # Easily translate imperative templating code
 | 
			
		||||
        # Input: [ 1 2 ] (num: { "v${num}" = num; })
 | 
			
		||||
        # Output: {v1=1;v2=2;}
 | 
			
		||||
        forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
 | 
			
		||||
      };
 | 
			
		||||
    }
 | 
			
		||||
  );
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue