refactor: move callPackage to overlays
This commit is contained in:
parent
b4a2082428
commit
11fc0dc0b2
13 changed files with 40 additions and 98 deletions
10
flake.nix
10
flake.nix
|
@ -49,11 +49,14 @@
|
|||
modules = [
|
||||
home-manager.darwinModules.home-manager
|
||||
|
||||
./darwin.nix
|
||||
./machines/sashimi/darwin.nix
|
||||
|
||||
({config, ...}: {
|
||||
config = {
|
||||
nixpkgs.overlays = [overlay-unstable];
|
||||
nixpkgs.overlays = [
|
||||
overlay-unstable
|
||||
(import ./packages/default.nix)
|
||||
];
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
|
@ -90,6 +93,9 @@
|
|||
};
|
||||
devShell = nixpkgs.legacyPackages.${system}.mkShell {
|
||||
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
||||
packages = with nixpkgs.legacyPackages.${system}; [
|
||||
just
|
||||
];
|
||||
};
|
||||
});
|
||||
}
|
||||
|
|
7
home.nix
7
home.nix
|
@ -60,11 +60,10 @@ in {
|
|||
rustc
|
||||
gh
|
||||
|
||||
(callPackage ./packages/org-stats {})
|
||||
(callPackage ./packages/python3.catppuccin-catwalk {})
|
||||
org-stats
|
||||
catppuccin-catwalk
|
||||
(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
|
||||
unstable.wezterm
|
||||
(callPackage ./packages/helm-ls {})
|
||||
]
|
||||
++ lib.optionals isDarwin [
|
||||
iina
|
||||
|
@ -75,7 +74,7 @@ in {
|
|||
mattermost-desktop
|
||||
]
|
||||
++ lib.optionals (isLinux && machine.personal) [
|
||||
(callPackage ./packages/python3.discover-overlay {})
|
||||
discover-overlay
|
||||
unstable.discord
|
||||
lutris
|
||||
]);
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
};
|
||||
skhd = {
|
||||
enable = true;
|
||||
skhdConfig = builtins.readFile ./modules/skhd/skhdrc;
|
||||
skhdConfig = builtins.readFile ../../modules/skhd/skhdrc;
|
||||
};
|
||||
yabai = {
|
||||
enable = true;
|
|
@ -15,20 +15,6 @@ in {
|
|||
];
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(self: super: {
|
||||
picom = super.picom.overrideAttrs (old: {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "FT-Labs";
|
||||
repo = "picom";
|
||||
sha256 = "sha256-MRCffxU0X5a368zJGwzcv25P2ZYyAI31EOBhgiyR71A=";
|
||||
rev = "c9aee893d2ab0acc4e997dc4186e7b1ef344ac0f";
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [pkgs.pcre2];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
gtk = lib.mkIf isLinux {
|
||||
enable = true;
|
||||
|
||||
|
@ -37,7 +23,7 @@ in {
|
|||
package = pkgs.catppuccin-cursors.mochaPink;
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.callPackage ../packages/papirus-folders-catppuccin {
|
||||
package = pkgs.papirus-folders-catppuccin.override {
|
||||
flavour = "mocha";
|
||||
accent = "pink";
|
||||
};
|
||||
|
@ -45,7 +31,7 @@ in {
|
|||
};
|
||||
theme = {
|
||||
name = "Catppuccin-Mocha-Standard-Pink-Dark";
|
||||
package = pkgs.callPackage ../packages/catppuccin-gtk {};
|
||||
package = pkgs.unstable.catppuccin-gtk;
|
||||
};
|
||||
|
||||
gtk2.extraConfig = ''
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
}: let
|
||||
inherit (pkgs.stdenv.hostPlatform) isDarwin;
|
||||
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
||||
darp = pkgs.callPackage ../packages/discord-applemusic-rich-presence {};
|
||||
in {
|
||||
programs.ncmpcpp = {
|
||||
enable = isLinux;
|
||||
|
@ -86,14 +85,12 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
home.packages = lib.mkIf isDarwin [
|
||||
darp
|
||||
];
|
||||
home.packages = lib.mkIf isDarwin [pkgs.discord-applemusic-rich-presence];
|
||||
|
||||
launchd.agents.discord-applemusic-rich-presence = {
|
||||
enable = true;
|
||||
config = {
|
||||
ProgramArguments = ["${lib.getExe darp}"];
|
||||
ProgramArguments = ["${lib.getExe pkgs.discord-applemusic-rich-presence}"];
|
||||
KeepAlive = true;
|
||||
RunAtLoad = true;
|
||||
StandardErrorPath = "${config.home.homeDirectory}/.cache/discord-applemusic-rich-presence.log";
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
nodePackages.bash-language-server
|
||||
nodePackages.dockerfile-language-server-nodejs
|
||||
nodePackages.alex
|
||||
# (callPackage ../packages/emmet-ls {})
|
||||
nodePackages.typescript
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vscode-langservers-extracted
|
||||
|
@ -63,9 +62,8 @@
|
|||
shfmt
|
||||
tree-sitter
|
||||
deadnix
|
||||
statix
|
||||
(callPackage ../packages/jq-lsp {})
|
||||
(callPackage ../packages/helm-ls {})
|
||||
jq-lsp
|
||||
helm-ls
|
||||
|
||||
# needed for some plugin build steps
|
||||
cargo
|
||||
|
|
|
@ -317,7 +317,7 @@ null.setup({
|
|||
null.builtins.formatting.shfmt,
|
||||
null.builtins.formatting.stylua,
|
||||
null.builtins.diagnostics.proselint,
|
||||
null.builtins.diagnostics.statix,
|
||||
null.builtins.diagnostics.deadnix,
|
||||
},
|
||||
on_attach = function(client, bufnr)
|
||||
if client.supports_method("textDocument/formatting") then
|
||||
|
|
|
@ -1,28 +0,0 @@
|
|||
{
|
||||
fetchzip,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "AppleMusicDiscordRPC";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jkelol111/AppleMusicDiscordRPC/releases/download/${version}/AppleMusicDiscordRPC-${version}.zip";
|
||||
sha256 = "sha256-uB257AGO7lf9FXMb4Qd02fCl507sIZjuNU0MSnZGJMw=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/Applications"
|
||||
ls -l $src
|
||||
cp -r "Apple Music Discord RPC.app" "$out/Applications/Apple Music Discord RPC.app"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Firefox web browser";
|
||||
homepage = "https://www.mozilla.org/en-GB/firefox";
|
||||
maintainers = [maintainers.nekowinston];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
|
@ -1,37 +0,0 @@
|
|||
{
|
||||
fetchzip,
|
||||
lib,
|
||||
pkgs,
|
||||
stdenv,
|
||||
}: let
|
||||
flavour = "Mocha";
|
||||
accent = "Pink";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "catppuccin-gtk";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/catppuccin/gtk/releases/download/v${version}/Catppuccin-${flavour}-Standard-${accent}-Dark.zip";
|
||||
sha256 = "sha256-84OpiYgzX61HoLjpF2ffQnAuL3tS1DFuDx2dHbBIog8=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = with pkgs; [
|
||||
gnome.gnome-themes-extra
|
||||
gtk-engine-murrine
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/share/themes"
|
||||
cp -r "Catppuccin-${flavour}-Standard-${accent}-Dark" "$out/share/themes"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Soothing pastel theme for GTK3";
|
||||
homepage = "https://github.com/catppuccin/gtk";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [maintainers.nekowinston];
|
||||
};
|
||||
}
|
21
packages/default.nix
Normal file
21
packages/default.nix
Normal file
|
@ -0,0 +1,21 @@
|
|||
final: prev: {
|
||||
cura = prev.callPackage ./cura {};
|
||||
discord-applemusic-rich-presence = prev.callPackage ./discord-applemusic-rich-presence {};
|
||||
emmet-ls = prev.callPackage ./emmet-ls {};
|
||||
helm-ls = prev.callPackage ./helm-ls {};
|
||||
jq-lsp = prev.callPackage ./jq-lsp {};
|
||||
mopidy-podcast-itunes = prev.callPackage ./mopidy-podcast-itunes {};
|
||||
org-stats = prev.callPackage ./org-stats {};
|
||||
papirus-folders-catppuccin = prev.callPackage ./papirus-folders-catppuccin {};
|
||||
catppuccin-catwalk = prev.callPackage ./python3Packages/catppuccin-catwalk {};
|
||||
discover-overlay = prev.callPackage ./python3Packages/discover-overlay {};
|
||||
picom = prev.picom.overrideAttrs (old: {
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "FT-Labs";
|
||||
repo = "picom";
|
||||
sha256 = "sha256-MRCffxU0X5a368zJGwzcv25P2ZYyAI31EOBhgiyR71A=";
|
||||
rev = "c9aee893d2ab0acc4e997dc4186e7b1ef344ac0f";
|
||||
};
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [prev.pcre2];
|
||||
});
|
||||
}
|
Loading…
Reference in a new issue