refactor: use inputs
in flake, switch to caarlos0 NUR for pkgs
This commit is contained in:
parent
5c22fa220a
commit
e243ec44a0
3 changed files with 121 additions and 110 deletions
159
flake.lock
159
flake.lock
|
@ -1,10 +1,28 @@
|
|||
{
|
||||
"nodes": {
|
||||
"caarlos0-nur": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684929416,
|
||||
"narHash": "sha256-HRaq5cZPZbAlv1gkZeaOXjxWFu26lh+Dq0mCnRSbpMI=",
|
||||
"owner": "caarlos0",
|
||||
"repo": "nur",
|
||||
"rev": "c4a25faa5bc55ba49b0f1dc037615d104d471e8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "caarlos0",
|
||||
"repo": "nur",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
|
@ -29,11 +47,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684343812,
|
||||
"narHash": "sha256-ZTEjiC8PDKeP8JRchuwcFXUNlMcyQ4U+DpyVZ3pB6Q4=",
|
||||
"lastModified": 1684774948,
|
||||
"narHash": "sha256-hJTaw4dYzcB+lsasKejnafq0CxPsVetn9RLXrcL+4jE=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "dfbdabbb3e797334172094d4f6c0ffca8c791281",
|
||||
"rev": "b8c286c82c6b47826a6c0377e7017052ad91353c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -109,15 +127,12 @@
|
|||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"lastModified": 1676283394,
|
||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -169,11 +184,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684484967,
|
||||
"narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=",
|
||||
"lastModified": 1684824189,
|
||||
"narHash": "sha256-k3nCkn5Qy67rCguuw6YkGuL6hOUNRKxQoKOjnapk5sU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715",
|
||||
"rev": "58eb968c21d309a6c2b020ea8d64e25c38ceebba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -185,15 +200,15 @@
|
|||
"nekowinston-nur": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"wezterm-src": "wezterm-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684686200,
|
||||
"narHash": "sha256-qXN0d304LwALJKokFNlkRtLIGCfkmmrm5NN9IdTF5HE=",
|
||||
"lastModified": 1684953042,
|
||||
"narHash": "sha256-Qgrvc9GniZpMctOwde9cUCVlV5CIZUdsm1iLEZt3qDk=",
|
||||
"owner": "nekowinston",
|
||||
"repo": "nur",
|
||||
"rev": "7d19401388642c6a1a160da6eb71e6fe1d2377c9",
|
||||
"rev": "7fa43456e8079d7624224b98c3077c3a27d11c21",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -224,11 +239,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1683020768,
|
||||
"narHash": "sha256-ZyZl6k9NWS5QPwD3NoAVz/eSgodQDvl+y+fu8MVbrHc=",
|
||||
"lastModified": 1624561540,
|
||||
"narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "44f30edf5661d86fb3a95841c35127f3d0ea8b0f",
|
||||
"rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -256,11 +271,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1684025543,
|
||||
"narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
|
||||
"lastModified": 1684632198,
|
||||
"narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
|
||||
"rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -272,11 +287,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1684525479,
|
||||
"narHash": "sha256-Cq4jQE5OpB13nuEV3Ahm0UlpzeJBkb3PUz5pox4ih2E=",
|
||||
"lastModified": 1676426280,
|
||||
"narHash": "sha256-7DltKPrvCP0A9Iemv2ts1vnBYn5xQKScK/sb1VALlao=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4a22f6f0a4b4354778f786425babce9a56f6b5d8",
|
||||
"rev": "6d33e5e14fd12f99ba621683ae90cebadda753ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -288,11 +303,27 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1684464849,
|
||||
"narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=",
|
||||
"lastModified": 1684849778,
|
||||
"narHash": "sha256-MofuVcgMZY8lVWv4uEC5Eo3fbZsBZJDscUpLeYMDoJo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "30b82a186bc585872624a298a5169d1d237ce6a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1684911969,
|
||||
"narHash": "sha256-j2tz1P2rA3d1WYHk8+1WbYDIJO33BqW1EfQSvi+/O8s=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b969a89c3e84a121c9b3af2e4ef277cd822b988a",
|
||||
"rev": "87f9156865ab09e3bde39aadb4131ae364ae704e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -302,7 +333,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
|
@ -318,13 +349,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1683777345,
|
||||
"narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=",
|
||||
"lastModified": 1684585791,
|
||||
"narHash": "sha256-lYPboblKrchmbkGMoAcAivomiOscZCjtGxxTSCY51SM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed",
|
||||
"rev": "eea79d584eff53bf7a76aeb63f8845da6d386129",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -336,11 +367,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1684555660,
|
||||
"narHash": "sha256-z5TvFQ5oqQm+d0RBHi8AEGVKRqOgRV6bnVBAIeDM06E=",
|
||||
"lastModified": 1684959207,
|
||||
"narHash": "sha256-lROs3YxWZDGeEPrcv0AYEfyps+gSW01E/VoTkmHU768=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "99d629e44e1229f35e1291e69d597d449bddc1df",
|
||||
"rev": "c4e46e935ba827acf70979c5e02a8431cf14cc5a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -354,15 +385,15 @@
|
|||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684195081,
|
||||
"narHash": "sha256-IKnQUSBhQTChFERxW2AzuauVpY1HRgeVzAjNMAA4B6I=",
|
||||
"lastModified": 1684842236,
|
||||
"narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "96eabec58248ed8f4b0ad59e7ce9398018684fdc",
|
||||
"rev": "61e567d6497bc9556f391faebe5e410e6623217f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -373,12 +404,13 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"caarlos0-nur": "caarlos0-nur",
|
||||
"darwin": "darwin",
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"nekowinston-nur": "nekowinston-nur",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nur": "nur",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"sops": "sops",
|
||||
|
@ -399,11 +431,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1683080331,
|
||||
"narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=",
|
||||
"lastModified": 1676437770,
|
||||
"narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56",
|
||||
"rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -414,15 +446,15 @@
|
|||
},
|
||||
"sops": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684032930,
|
||||
"narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
|
||||
"lastModified": 1684637723,
|
||||
"narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
|
||||
"rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -439,11 +471,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1684677874,
|
||||
"narHash": "sha256-d+KHaeOxr81rb+otnYKHhqHur6u4bBzPs21+nQ0FRms=",
|
||||
"lastModified": 1684894900,
|
||||
"narHash": "sha256-Lt/Ux6gTd6d0qA49WVGUn/czM3LGBd0SmRG1O5lESaM=",
|
||||
"owner": "willpower3309",
|
||||
"repo": "swayfx",
|
||||
"rev": "60e24c9cf4c9c729513c8103326e51c983414118",
|
||||
"rev": "8e6667ddadb4646e7d43ad5a004c77458ef88fcb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -467,29 +499,14 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wezterm-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1684511858,
|
||||
"narHash": "sha256-xQPnLRmJfLuMuTGyPa897TF0Zw0frRk3EfL359zvK68=",
|
||||
"lastModified": 1684781995,
|
||||
"narHash": "sha256-O/r0bG1okOYMnxh+c0IDakqOPHlH1JNL+UrRD6/BeyE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "4ae176dd8a019eeaf955cc947e3789995edbed07",
|
||||
"revCount": 7215,
|
||||
"rev": "bb23d0463c1d2e055d380f9112676422a8901a59",
|
||||
"revCount": 7226,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/wez/wezterm"
|
||||
|
|
68
flake.nix
68
flake.nix
|
@ -12,8 +12,11 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# NUR
|
||||
nur.url = "github:nix-community/nur";
|
||||
nekowinston-nur.url = "github:nekowinston/nur";
|
||||
caarlos0-nur.url = "github:caarlos0/nur";
|
||||
|
||||
sops.url = "github:Mic92/sops-nix";
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -28,26 +31,20 @@
|
|||
outputs = {
|
||||
self,
|
||||
darwin,
|
||||
flake-utils,
|
||||
home-manager,
|
||||
nekowinston-nur,
|
||||
nix-index-database,
|
||||
nixpkgs,
|
||||
nur,
|
||||
pre-commit-hooks,
|
||||
sops,
|
||||
swayfx,
|
||||
...
|
||||
}: let
|
||||
} @ inputs: let
|
||||
overlays = final: prev: {
|
||||
nur = import nur {
|
||||
nur = import inputs.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
repoOverrides = {
|
||||
nekowinston = nekowinston-nur.packages.${prev.system};
|
||||
caarlos0 = inputs.caarlos0-nur.packages.${prev.system};
|
||||
nekowinston = inputs.nekowinston-nur.packages.${prev.system};
|
||||
};
|
||||
};
|
||||
sway-unwrapped = swayfx.packages.${prev.system}.default;
|
||||
sway-unwrapped = inputs.swayfx.packages.${prev.system}.default;
|
||||
};
|
||||
commonHMConfig = {username}: ({
|
||||
config,
|
||||
|
@ -61,8 +58,8 @@
|
|||
backupFileExtension = "backup";
|
||||
sharedModules = [
|
||||
./modules
|
||||
nix-index-database.hmModules.nix-index
|
||||
sops.homeManagerModules.sops
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
inputs.sops.homeManagerModules.sops
|
||||
];
|
||||
users.${username}.imports = [./home];
|
||||
extraSpecialArgs = {
|
||||
|
@ -132,8 +129,8 @@
|
|||
}
|
||||
./modules
|
||||
./home
|
||||
nix-index-database.hmModules.nix-index
|
||||
sops.homeManagerModules.sops
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
inputs.sops.homeManagerModules.sops
|
||||
];
|
||||
extraSpecialArgs = {
|
||||
flakePath =
|
||||
|
@ -143,29 +140,26 @@
|
|||
};
|
||||
};
|
||||
}
|
||||
// flake-utils.lib.eachDefaultSystem (system: {
|
||||
checks = {
|
||||
pre-commit-check = pre-commit-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
alejandra.enable = true;
|
||||
commitizen.enable = true;
|
||||
editorconfig-checker.enable = true;
|
||||
luacheck.enable = true;
|
||||
nil.enable = true;
|
||||
shellcheck.enable = true;
|
||||
stylua.enable = true;
|
||||
};
|
||||
// inputs.flake-utils.lib.eachDefaultSystem (system: let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in {
|
||||
checks.pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
alejandra.enable = true;
|
||||
commitizen.enable = true;
|
||||
editorconfig-checker.enable = true;
|
||||
luacheck.enable = true;
|
||||
nil.enable = true;
|
||||
shellcheck.enable = true;
|
||||
stylua.enable = true;
|
||||
};
|
||||
};
|
||||
devShells.default = let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
pkgs.mkShell {
|
||||
name = "nixpkgs";
|
||||
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
||||
packages = [pkgs.just pkgs.git-crypt pkgs.sops];
|
||||
};
|
||||
formatter = nixpkgs.legacyPackages.${system}.alejandra;
|
||||
devShells.default = pkgs.mkShell {
|
||||
name = "nixpkgs";
|
||||
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
||||
nativeBuildInputs = [pkgs.just pkgs.git-crypt pkgs.sops];
|
||||
};
|
||||
formatter = pkgs.alejandra;
|
||||
});
|
||||
}
|
||||
|
|
|
@ -85,9 +85,9 @@ in {
|
|||
};
|
||||
|
||||
launchd.agents.discord-applemusic-rich-presence = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
config = {
|
||||
ProgramArguments = ["${lib.getExe pkgs.nur.repos.nekowinston.discord-applemusic-rich-presence}"];
|
||||
ProgramArguments = ["${lib.getExe pkgs.nur.repos.caarlos0.discord-applemusic-rich-presence}"];
|
||||
KeepAlive = true;
|
||||
RunAtLoad = true;
|
||||
StandardErrorPath = "${config.xdg.cacheHome}/discord-applemusic-rich-presence.log";
|
||||
|
|
Loading…
Reference in a new issue