feat: use my NUR overlays
This commit is contained in:
parent
1012e0cfdf
commit
81bd1447a5
5 changed files with 27 additions and 58 deletions
20
flake.lock
20
flake.lock
|
@ -196,11 +196,11 @@
|
|||
"wezterm-src": "wezterm-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687207775,
|
||||
"narHash": "sha256-JMFfrOEGLMBK0IJ+kXPTq6SsQ0SHSyUdAFXYIjv9VJY=",
|
||||
"lastModified": 1687287155,
|
||||
"narHash": "sha256-mYEuzJImfKtLIx3CdRjR/q56AgRCR8HRHeGVkKwO5WE=",
|
||||
"owner": "nekowinston",
|
||||
"repo": "nur",
|
||||
"rev": "c4807f1750f48f2b99233eb095c7a45a4f3d7626",
|
||||
"rev": "c9275bb6153bd27d5db2d38a5910646498a6208d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -257,11 +257,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1687103638,
|
||||
"narHash": "sha256-dwy/TK6Db5W7ivcgmcxUykhFwodIg0jrRzOFt7H5NUc=",
|
||||
"lastModified": 1687130670,
|
||||
"narHash": "sha256-VKTdfsJe7sVTTqxTd3eRGPoUgEeJKD+kwS86B6TY874=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "91430887645a0953568da2f3e9a3a3bb0a0378ac",
|
||||
"rev": "c1bca7fe84c646cfd4ebf3482c0e6317a0b13f22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -459,11 +459,11 @@
|
|||
"wezterm-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1686577193,
|
||||
"narHash": "sha256-9dCCT3Nd6XAZBKIlbqKQZj8ruUudtwcbd3CYJIK9Dl8=",
|
||||
"lastModified": 1687196661,
|
||||
"narHash": "sha256-r99pbeLLJJe7jRlAUmQ3WFXMM87PaF4fSYd4cV9v8Hg=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "baf9d970816e015bee41ed5eb9186ef7f71c454c",
|
||||
"revCount": 7256,
|
||||
"rev": "c1f495099ef544eda78546191c0026e88e1fdd62",
|
||||
"revCount": 7258,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/wez/wezterm"
|
||||
|
|
|
@ -75,9 +75,8 @@
|
|||
...
|
||||
}: {
|
||||
_module.args.pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
inherit overlays system;
|
||||
config.allowUnfree = true;
|
||||
overlays = [overlays];
|
||||
};
|
||||
|
||||
checks.pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
|
||||
|
|
|
@ -1,27 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
yabaiPkg = pkgs.yabai.overrideAttrs (oldAttrs: let
|
||||
version = "5.0.6";
|
||||
srcs = {
|
||||
"aarch64-darwin" = pkgs.fetchzip {
|
||||
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
|
||||
sha256 = "sha256-wpm9VnR4yPk6Ybo/V2DMLgRcSzDl3dWGSKDCjYfz+xQ=";
|
||||
};
|
||||
"x86_64-darwin" = pkgs.fetchFromGitHub {
|
||||
owner = "koekeishiya";
|
||||
repo = "yabai";
|
||||
rev = "v${version}";
|
||||
sha256 = "";
|
||||
};
|
||||
};
|
||||
in {
|
||||
inherit version;
|
||||
src = srcs."${pkgs.stdenv.hostPlatform.system}" or (throw "Unsupported platform");
|
||||
});
|
||||
in {
|
||||
{lib, ...}: {
|
||||
# manipulate the global /etc/zshenv for PATH, etc.
|
||||
programs.zsh.enable = true;
|
||||
|
||||
|
@ -38,7 +15,6 @@ in {
|
|||
services = {
|
||||
yabai = {
|
||||
enable = true;
|
||||
package = yabaiPkg;
|
||||
enableScriptingAddition = true;
|
||||
logFile = "/var/tmp/yabai.log";
|
||||
config = {
|
||||
|
|
|
@ -4,15 +4,6 @@
|
|||
pkgs,
|
||||
...
|
||||
}: let
|
||||
catppuccin-gtk = pkgs.catppuccin-gtk.overrideAttrs (final: rec {
|
||||
version = "0.6.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3HplAmlj8hK9Myy8mgvR88sMa2COmYAU75Fk1JuKtMc=";
|
||||
};
|
||||
});
|
||||
greetdConfig = pkgs.writeText "greetd-config" ''
|
||||
output "*" {
|
||||
scale 2
|
||||
|
|
|
@ -1,16 +1,19 @@
|
|||
{inputs}: rec {
|
||||
overlays = final: prev: {
|
||||
nur = import inputs.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
repoOverrides = {
|
||||
caarlos0 = inputs.caarlos0-nur.packages.${prev.system};
|
||||
nekowinston = inputs.nekowinston-nur.packages.${prev.system};
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
nur = import inputs.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
repoOverrides = {
|
||||
caarlos0 = inputs.caarlos0-nur.packages.${prev.system};
|
||||
nekowinston = inputs.nekowinston-nur.packages.${prev.system};
|
||||
};
|
||||
};
|
||||
};
|
||||
sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
|
||||
vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
|
||||
};
|
||||
sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
|
||||
vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
|
||||
})
|
||||
inputs.nekowinston-nur.overlays.default
|
||||
];
|
||||
hmCommonConfig = {username}: ({
|
||||
config,
|
||||
pkgs,
|
||||
|
@ -19,7 +22,7 @@
|
|||
homeLib = import ../home/lib.nix {inherit inputs username pkgs;};
|
||||
in {
|
||||
config = {
|
||||
nixpkgs.overlays = [overlays];
|
||||
nixpkgs.overlays = overlays;
|
||||
home-manager = {
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = homeLib.extraSpecialArgs;
|
||||
|
|
Loading…
Reference in a new issue