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"
|
"wezterm-src": "wezterm-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1687207775,
|
"lastModified": 1687287155,
|
||||||
"narHash": "sha256-JMFfrOEGLMBK0IJ+kXPTq6SsQ0SHSyUdAFXYIjv9VJY=",
|
"narHash": "sha256-mYEuzJImfKtLIx3CdRjR/q56AgRCR8HRHeGVkKwO5WE=",
|
||||||
"owner": "nekowinston",
|
"owner": "nekowinston",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "c4807f1750f48f2b99233eb095c7a45a4f3d7626",
|
"rev": "c9275bb6153bd27d5db2d38a5910646498a6208d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -257,11 +257,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1687103638,
|
"lastModified": 1687130670,
|
||||||
"narHash": "sha256-dwy/TK6Db5W7ivcgmcxUykhFwodIg0jrRzOFt7H5NUc=",
|
"narHash": "sha256-VKTdfsJe7sVTTqxTd3eRGPoUgEeJKD+kwS86B6TY874=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "91430887645a0953568da2f3e9a3a3bb0a0378ac",
|
"rev": "c1bca7fe84c646cfd4ebf3482c0e6317a0b13f22",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -459,11 +459,11 @@
|
||||||
"wezterm-src": {
|
"wezterm-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1686577193,
|
"lastModified": 1687196661,
|
||||||
"narHash": "sha256-9dCCT3Nd6XAZBKIlbqKQZj8ruUudtwcbd3CYJIK9Dl8=",
|
"narHash": "sha256-r99pbeLLJJe7jRlAUmQ3WFXMM87PaF4fSYd4cV9v8Hg=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "baf9d970816e015bee41ed5eb9186ef7f71c454c",
|
"rev": "c1f495099ef544eda78546191c0026e88e1fdd62",
|
||||||
"revCount": 7256,
|
"revCount": 7258,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/wez/wezterm"
|
"url": "https://github.com/wez/wezterm"
|
||||||
|
|
|
@ -75,9 +75,8 @@
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
_module.args.pkgs = import inputs.nixpkgs {
|
_module.args.pkgs = import inputs.nixpkgs {
|
||||||
inherit system;
|
inherit overlays system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = [overlays];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
checks.pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
|
checks.pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
|
||||||
|
|
|
@ -1,27 +1,4 @@
|
||||||
{
|
{lib, ...}: {
|
||||||
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 {
|
|
||||||
# manipulate the global /etc/zshenv for PATH, etc.
|
# manipulate the global /etc/zshenv for PATH, etc.
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
|
@ -38,7 +15,6 @@ in {
|
||||||
services = {
|
services = {
|
||||||
yabai = {
|
yabai = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = yabaiPkg;
|
|
||||||
enableScriptingAddition = true;
|
enableScriptingAddition = true;
|
||||||
logFile = "/var/tmp/yabai.log";
|
logFile = "/var/tmp/yabai.log";
|
||||||
config = {
|
config = {
|
||||||
|
|
|
@ -4,15 +4,6 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: 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" ''
|
greetdConfig = pkgs.writeText "greetd-config" ''
|
||||||
output "*" {
|
output "*" {
|
||||||
scale 2
|
scale 2
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{inputs}: rec {
|
{inputs}: rec {
|
||||||
overlays = final: prev: {
|
overlays = [
|
||||||
|
(final: prev: {
|
||||||
nur = import inputs.nur {
|
nur = import inputs.nur {
|
||||||
nurpkgs = prev;
|
nurpkgs = prev;
|
||||||
pkgs = prev;
|
pkgs = prev;
|
||||||
|
@ -10,7 +11,9 @@
|
||||||
};
|
};
|
||||||
sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
|
sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
|
||||||
vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
|
vscode-extensions = inputs.nix-vscode-extensions.extensions.${prev.system};
|
||||||
};
|
})
|
||||||
|
inputs.nekowinston-nur.overlays.default
|
||||||
|
];
|
||||||
hmCommonConfig = {username}: ({
|
hmCommonConfig = {username}: ({
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
|
@ -19,7 +22,7 @@
|
||||||
homeLib = import ../home/lib.nix {inherit inputs username pkgs;};
|
homeLib = import ../home/lib.nix {inherit inputs username pkgs;};
|
||||||
in {
|
in {
|
||||||
config = {
|
config = {
|
||||||
nixpkgs.overlays = [overlays];
|
nixpkgs.overlays = overlays;
|
||||||
home-manager = {
|
home-manager = {
|
||||||
backupFileExtension = "backup";
|
backupFileExtension = "backup";
|
||||||
extraSpecialArgs = homeLib.extraSpecialArgs;
|
extraSpecialArgs = homeLib.extraSpecialArgs;
|
||||||
|
|
Loading…
Reference in a new issue