cleanup overlay, update package list
This commit is contained in:
parent
a67e4328e6
commit
5a1199a406
@ -4,14 +4,9 @@ with config.deviceSpecific; {
|
|||||||
|
|
||||||
home-manager.users.alukard.home.packages = with pkgs; [
|
home-manager.users.alukard.home.packages = with pkgs; [
|
||||||
# cli
|
# cli
|
||||||
_7zz
|
|
||||||
advance-touch
|
|
||||||
curl
|
curl
|
||||||
ddgr
|
|
||||||
exa
|
exa
|
||||||
exfat-utils
|
|
||||||
fd
|
fd
|
||||||
git-crypt
|
|
||||||
git-filter-repo
|
git-filter-repo
|
||||||
glib.bin # gio
|
glib.bin # gio
|
||||||
gptfdisk
|
gptfdisk
|
||||||
@ -21,8 +16,6 @@ with config.deviceSpecific; {
|
|||||||
manix
|
manix
|
||||||
neofetch
|
neofetch
|
||||||
nix-prefetch-git
|
nix-prefetch-git
|
||||||
nix-prefetch-github
|
|
||||||
nomino
|
|
||||||
p7zip
|
p7zip
|
||||||
# (p7zip.override { enableUnfree = true; })
|
# (p7zip.override { enableUnfree = true; })
|
||||||
pciutils
|
pciutils
|
||||||
@ -43,7 +36,6 @@ with config.deviceSpecific; {
|
|||||||
# tui
|
# tui
|
||||||
bottom
|
bottom
|
||||||
bpytop
|
bpytop
|
||||||
# gdu
|
|
||||||
micro
|
micro
|
||||||
ncdu
|
ncdu
|
||||||
nix-tree
|
nix-tree
|
||||||
@ -53,11 +45,10 @@ with config.deviceSpecific; {
|
|||||||
spotify-tui
|
spotify-tui
|
||||||
|
|
||||||
# gui
|
# gui
|
||||||
audacity # fixit
|
audacity
|
||||||
blueman
|
blueman
|
||||||
bookworm
|
bookworm
|
||||||
discord
|
discord
|
||||||
easyeffects
|
|
||||||
feh
|
feh
|
||||||
gnome.eog
|
gnome.eog
|
||||||
gparted
|
gparted
|
||||||
@ -79,17 +70,20 @@ with config.deviceSpecific; {
|
|||||||
] ++ lib.optionals (!(isVM || isISO)) [
|
] ++ lib.optionals (!(isVM || isISO)) [
|
||||||
libreoffice
|
libreoffice
|
||||||
] ++ lib.optionals isGaming [
|
] ++ lib.optionals isGaming [
|
||||||
|
ceserver
|
||||||
|
ckan
|
||||||
|
multimc
|
||||||
lutris
|
lutris
|
||||||
mangohud
|
|
||||||
obs-studio
|
obs-studio
|
||||||
wine
|
# wine
|
||||||
winetricks
|
# winetricks
|
||||||
] ++ lib.optionals isLaptop [
|
] ++ lib.optionals isLaptop [
|
||||||
acpi
|
acpi
|
||||||
] ++ lib.optionals (config.device == "AMD-Workstation") [
|
] ++ lib.optionals (config.device == "AMD-Workstation") [
|
||||||
multimc
|
|
||||||
] ++ lib.optionals (enableVirtualisation) [
|
] ++ lib.optionals (enableVirtualisation) [
|
||||||
virt-manager
|
virt-manager
|
||||||
|
] ++ lib.optionals (config.virtualisation.docker.enable) [
|
||||||
|
docker-compose
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -13,57 +13,42 @@ in
|
|||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
# (import "${inputs.nixpkgs-mozilla}/lib-overlay.nix")
|
# (import "${inputs.nixpkgs-mozilla}/lib-overlay.nix")
|
||||||
(import "${inputs.nixpkgs-mozilla}/rust-overlay.nix")
|
# (import "${inputs.nixpkgs-mozilla}/rust-overlay.nix")
|
||||||
(self: super:
|
(self: super:
|
||||||
rec {
|
rec {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
|
|
||||||
youtube-to-mpv = pkgs.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
|
youtube-to-mpv = pkgs.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
|
||||||
wg-conf = pkgs.callPackage ./packages/wg-conf.nix { };
|
|
||||||
i3lock-fancy-rapid = pkgs.callPackage ./packages/i3lock-fancy-rapid.nix { };
|
i3lock-fancy-rapid = pkgs.callPackage ./packages/i3lock-fancy-rapid.nix { };
|
||||||
xonar-fp = pkgs.callPackage ./packages/xonar-fp.nix { };
|
xonar-fp = pkgs.callPackage ./packages/xonar-fp.nix { };
|
||||||
advance-touch = pkgs.callPackage ./packages/advance-touch.nix { };
|
|
||||||
nomino = pkgs.callPackage ./packages/nomino.nix { };
|
|
||||||
# bpytop = pkgs.callPackage ./packages/bpytop.nix { };
|
|
||||||
ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
|
ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
|
||||||
bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
|
bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
|
||||||
foliate = pkgs.callPackage ./packages/foliate.nix { };
|
multimc = pkgs.qt5.callPackage ./packages/multimc.nix { multimc-repo = inputs.multimc-cracked; };
|
||||||
|
ceserver = pkgs.callPackage ./packages/ceserver.nix { };
|
||||||
|
mpris-ctl = pkgs.callPackage ./packages/mpris-ctl.nix { };
|
||||||
vscode = master.vscode;
|
vscode = master.vscode;
|
||||||
vscode-fhs = master.vscode-fhs;
|
vscode-fhs = master.vscode-fhs;
|
||||||
vivaldi = master.vivaldi;
|
vivaldi = master.vivaldi;
|
||||||
multimc = pkgs.qt5.callPackage ./packages/multimc.nix { multimc-repo = inputs.multimc-cracked; };
|
|
||||||
nix-direnv = inputs.nix-direnv.defaultPackage.${system};
|
nix-direnv = inputs.nix-direnv.defaultPackage.${system};
|
||||||
steam = super.steam.override {
|
|
||||||
extraLibraries = pkgs: with pkgs; [
|
|
||||||
pipewire
|
|
||||||
];
|
|
||||||
};
|
|
||||||
wine = super.wineWowPackages.staging;
|
wine = super.wineWowPackages.staging;
|
||||||
qbittorrent = super.qbittorrent.overrideAttrs (stable: rec {
|
qbittorrent = super.qbittorrent.overrideAttrs (stable: rec {
|
||||||
version = "enchanced-edition";
|
version = "enchanced-edition";
|
||||||
src = inputs.qbittorrent-ee;
|
src = inputs.qbittorrent-ee;
|
||||||
});
|
});
|
||||||
rust-stable = pkgs.latest.rustChannels.stable.rust.override {
|
# rust-stable = pkgs.latest.rustChannels.stable.rust.override {
|
||||||
extensions = [
|
# extensions = [
|
||||||
"rls-preview"
|
# "rls-preview"
|
||||||
"clippy-preview"
|
# "clippy-preview"
|
||||||
"rustfmt-preview"
|
# "rustfmt-preview"
|
||||||
];
|
|
||||||
};
|
|
||||||
rust-nightly = pkgs.latest.rustChannels.nightly.rust.override {
|
|
||||||
extensions = [
|
|
||||||
"rls-preview"
|
|
||||||
"clippy-preview"
|
|
||||||
"rustfmt-preview"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
# material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { };
|
|
||||||
# wpgtk = super.wpgtk.overrideAttrs (stable: rec {
|
|
||||||
# propagatedBuildInputs = with pkgs; [
|
|
||||||
# python2 python27Packages.pygtk
|
|
||||||
# python3Packages.pygobject3 python3Packages.pillow python3Packages.pywal
|
|
||||||
# ];
|
# ];
|
||||||
# });
|
# };
|
||||||
|
# rust-nightly = pkgs.latest.rustChannels.nightly.rust.override {
|
||||||
|
# extensions = [
|
||||||
|
# "rls-preview"
|
||||||
|
# "clippy-preview"
|
||||||
|
# "rustfmt-preview"
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
{ stdenv, python3Packages, fetchFromGitHub, pkgs }:
|
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
|
||||||
name = "advance-touch";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "tanrax";
|
|
||||||
repo = "terminal-AdvancedNewFile";
|
|
||||||
rev = "38481017b65e764db240c8ec3b4c8ed6faafabf9";
|
|
||||||
sha256 = "1n4wng4jhmib7zpm7vykprf24rckvh3r1b7sr2navy7ndns6vk3q";
|
|
||||||
};
|
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ click ];
|
|
||||||
|
|
||||||
meta = with pkgs.lib; {
|
|
||||||
homepage = "https://github.com/tanrax/terminal-AdvancedNewFile";
|
|
||||||
description = "Add to your terminal the option to quickly create folders and files like a pro";
|
|
||||||
license = licenses.unlicense;
|
|
||||||
maintainers = with maintainers; [ alukardbf ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,30 +0,0 @@
|
|||||||
{ stdenv, fetchFromGitHub, python3Packages, pkgs }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "bpytop";
|
|
||||||
version = "1.0.7";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "aristocratos";
|
|
||||||
repo = "${name}";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = "08hi55wh423j1rfdivnil94sg9admxygzv1diibfygwvknilv9qj";
|
|
||||||
};
|
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [ psutil ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p "$out/bin"
|
|
||||||
cp -p bpytop.py "$out/bin/bpytop"
|
|
||||||
mkdir -p "$out/share/bpytop/doc"
|
|
||||||
cp -p README.md "$out/share/bpytop/doc"
|
|
||||||
cp -pr themes "$out/share/bpytop"
|
|
||||||
chmod 755 "$out/bin/bpytop"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with pkgs.lib; {
|
|
||||||
homepage = "https://github.com/aristocratos/bpytop";
|
|
||||||
description = "Resource monitor that shows usage and stats for processor, memory, disks, network and processes.";
|
|
||||||
license = licenses.asl20;
|
|
||||||
maintainers = with maintainers; [ alukardbf ];
|
|
||||||
};
|
|
||||||
}
|
|
31
profiles/packages/ceserver.nix
Normal file
31
profiles/packages/ceserver.nix
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, zlib }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "ceserver";
|
||||||
|
version = "7.3";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "cheat-engine";
|
||||||
|
repo = "cheat-engine";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1f7v2403k2hq8mx3lwdlssfmbmj3kjnhljk5qfzgqyygwz72zqhl";
|
||||||
|
# fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
cd Cheat\ Engine/ceserver/gcc
|
||||||
|
make
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ceserver $out/bin
|
||||||
|
'';
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
zlib
|
||||||
|
];
|
||||||
|
buildInputs = [
|
||||||
|
|
||||||
|
];
|
||||||
|
}
|
@ -1,23 +0,0 @@
|
|||||||
{ stdenv, fetchurl, pkgs }:
|
|
||||||
let
|
|
||||||
icons = "https://gist.github.com/AlukardBF/e92009045bbfc6f7a84e082c6634b18f/raw/3e6e12c213fba1ec28aaa26430c3606874754c30/MaterialIcons-Regular-for-inline.ttf";
|
|
||||||
in stdenv.mkDerivation {
|
|
||||||
name = "material-icons-inline";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
name = "material-icons-inline";
|
|
||||||
url = icons;
|
|
||||||
sha256 = "sha256-huy/En0YX6bkJmrDazxPltsWZOUPxGuQs12r6L+h+oA=";
|
|
||||||
};
|
|
||||||
|
|
||||||
dontUnpack = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/share/fonts/truetype
|
|
||||||
cp $src $out/share/fonts/truetype/MaterialIcons-Regular-for-inline.ttf
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with pkgs.lib; {
|
|
||||||
description = "Material Icons Font patched for inline";
|
|
||||||
};
|
|
||||||
}
|
|
27
profiles/packages/mpris-ctl.nix
Normal file
27
profiles/packages/mpris-ctl.nix
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, pkg-config, dbus, scdoc, installShellFiles }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "mpris-ctl";
|
||||||
|
version = "0.8.4";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "mariusor";
|
||||||
|
repo = "mpris-ctl";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1j3827yi89wdx3bw0wgwbhalg6r26rngf62g6g5baz2dksgrgagb";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ pkg-config scdoc installShellFiles ];
|
||||||
|
|
||||||
|
buildInputs = [ dbus ];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
make VERSION="0.8.4-2" release
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
scdoc < mpris-ctl.1.scd > mpris-ctl.1
|
||||||
|
installManPage mpris-ctl.1
|
||||||
|
install -D mpris-ctl $out/bin/mpris-ctl
|
||||||
|
'';
|
||||||
|
}
|
@ -1,24 +0,0 @@
|
|||||||
{ stdenv, lib, fetchurl }:
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "nomino";
|
|
||||||
version = "1.1.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://github.com/yaa110/nomino/releases/download/${version}/nomino-linux-64bit";
|
|
||||||
sha256 = "sha256-yVpCIfkWR6HyQusNTtl5QcJ4EsQMsaRE1IpwC+MoVhk=";
|
|
||||||
};
|
|
||||||
|
|
||||||
phases = [ "installPhase" ];
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp $src $out/bin/nomino
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Batch rename utility for developers";
|
|
||||||
homepage = "https://github.com/yaa110/nomino";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ alukardbf ];
|
|
||||||
};
|
|
||||||
}
|
|
@ -1,19 +0,0 @@
|
|||||||
{ stdenv, pkgs }:
|
|
||||||
let
|
|
||||||
myScript = pkgs.writeShellScriptBin "wg-conf" ''
|
|
||||||
if [[ -z "$1" ]]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
systemctl stop wg-quick-wg0.service
|
|
||||||
cp "$1" /root/wg0.conf
|
|
||||||
systemctl start wg-quick-wg0.service
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "wg-conf";
|
|
||||||
src = myScript;
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/bin
|
|
||||||
mv ./bin/wg-conf $out/bin/wg-conf
|
|
||||||
'';
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user