refactor: use non-flake inputs instead of fetchers
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
68beb6118f
commit
9f2b537bf7
27 changed files with 61 additions and 222 deletions
|
|
@ -41,7 +41,7 @@
|
|||
themes = {
|
||||
dracula-bat = {
|
||||
src = pkgs.dracula-theme;
|
||||
file = "bat/Dracula.tmTheme";
|
||||
file = "bat";
|
||||
};
|
||||
};
|
||||
extraPackages = with pkgs.bat-extras; [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{pkgs, ...}: let
|
||||
trash = pkgs.callPackage ./trash-d.nix pkgs;
|
||||
{pkgs, ...} @ inputs: let
|
||||
trash = pkgs.callPackage ./trash-d.nix inputs;
|
||||
in {
|
||||
home.packages = [trash];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
trash-d-src,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
dmd,
|
||||
dub,
|
||||
ronn,
|
||||
|
|
@ -8,14 +8,9 @@
|
|||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "trash";
|
||||
version = "unstable";
|
||||
version = trash-d-src.rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rushsteve1";
|
||||
repo = "trash-d";
|
||||
rev = "d88bb672612761c8e299e717857bf9c85a903e99";
|
||||
hash = "sha256-oPxeoEqOYf6DCg5rJxINqAIlMbxqzAJcZDUY/EzADzY=";
|
||||
};
|
||||
src = trash-d-src;
|
||||
|
||||
buildInputs = [dub dmd ronn];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
neovim-flake,
|
||||
nixpkgs-wayland,
|
||||
...
|
||||
}: {
|
||||
} @ inputs: {
|
||||
nixpkgs.overlays = [
|
||||
(import ./dracula-theme)
|
||||
(import ./plymouth)
|
||||
(import ./spotifywm)
|
||||
(import ./dracula-theme inputs)
|
||||
(import ./plymouth inputs)
|
||||
(import ./spotifywm inputs)
|
||||
(import ./squeekboard)
|
||||
|
||||
neovim-flake.overlay
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "dracula-bat";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matt1432";
|
||||
repo = "bat";
|
||||
rev = "270bce892537311ac92494a2a7663e3ecf772092";
|
||||
hash = "sha256-UyZ3WFfrEEBjtdb//5waVItmjKorkOiNGtu9eeB3lOw=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bat
|
||||
cp -a ./Dracula.tmTheme $out/bat
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,17 +1,14 @@
|
|||
(final: prev: {
|
||||
{
|
||||
bat-theme-src,
|
||||
xresources-theme-src,
|
||||
...
|
||||
} @ inputs: (final: prev: {
|
||||
dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: let
|
||||
bat-colors = prev.callPackage ./bat.nix prev;
|
||||
git-colors = prev.callPackage ./git.nix prev;
|
||||
plymouth = prev.callPackage ./plymouth.nix prev;
|
||||
Xresources = prev.callPackage ./xresources.nix prev;
|
||||
git-colors = prev.callPackage ./git.nix inputs;
|
||||
plymouth = prev.callPackage ./plymouth.nix inputs;
|
||||
wallpaper = prev.fetchurl (import ./wallpaper.nix);
|
||||
in {
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "gtk";
|
||||
rev = "80d5a3fedf280e9cc7f2df3b100a1082c3bcd1cc";
|
||||
hash = "sha256-BPL0Msva1/sPQKPeRJHgvU+xXU3m8b2E6aDBLmXbkkA=";
|
||||
};
|
||||
src = inputs.gtk-theme-src;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -19,10 +16,10 @@
|
|||
mkdir -p $out/share/plymouth/themes $out/wallpapers
|
||||
cp -a ${wallpaper} $out/wallpapers/waves.png
|
||||
|
||||
cp -a ${bat-colors}/bat $out/bat
|
||||
cp -a ${bat-theme-src}/Dracula.tmTheme $out/bat
|
||||
cp -a ${git-colors}/git-colors $out/git-colors
|
||||
cp -a ${plymouth}/share/plymouth/themes/dracula $out/share/plymouth/themes/
|
||||
cp -a ${Xresources}/xres $out/xres
|
||||
cp -a ${xresources-theme-src}/Xresources $out/xres
|
||||
|
||||
# -------------------------------------------
|
||||
mkdir -p $out/share/themes/Dracula
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
git-theme-src,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "dracula-git";
|
||||
version = git-theme-src.rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "git";
|
||||
rev = "924d5fc32f7ca15d0dd3a8d2cf1747e81e063c73";
|
||||
hash = "sha256-3tKjKn5IHIByj+xgi2AIL1vZANlb0vlYJsPjH6BHGxM=";
|
||||
};
|
||||
src = git-theme-src;
|
||||
|
||||
installPhase = ''
|
||||
# Git colors
|
||||
|
|
|
|||
|
|
@ -1,17 +1,13 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
plymouth-theme-src,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "dracula-plymouth";
|
||||
version = plymouth-theme-src.rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "plymouth";
|
||||
rev = "37aa09b27ecee4a825b43d2c1d20b502e8f19c96";
|
||||
hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
|
||||
};
|
||||
src = plymouth-theme-src;
|
||||
|
||||
installPhase = let
|
||||
dracula-script = ./dracula-plymouth.patch;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
url = "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true";
|
||||
url = "https://raw.githubusercontent.com/aynp/dracula-wallpapers/main/Art/4k/Waves%201.png";
|
||||
hash = "sha256-f9FwSOSvqTeDj4bOjYUQ6TM+/carCD9o5dhg/MnP/lk=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "dracula-xresources";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "xresources";
|
||||
rev = "539ef24e9b0c5498a82d59bfa2bad9b618d832a3";
|
||||
hash = "sha256-6fltsAluqOqYIh2NX0I/LC3WCWkb9Fn8PH6LNLBQbrY=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/xres
|
||||
cp -a ./Xresources $out/xres/
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,16 +1,6 @@
|
|||
final: prev: {
|
||||
{plymouth-src, ...}: (final: prev: {
|
||||
plymouth = prev.plymouth.overrideAttrs (o: {
|
||||
version = "unstable-2023-12-08";
|
||||
|
||||
src = prev.fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "plymouth";
|
||||
repo = "plymouth";
|
||||
|
||||
# https://gitlab.freedesktop.org/plymouth/plymouth/-/issues/236
|
||||
# Last commit that works
|
||||
rev = "58cc9f84e456ab0510b13d7bdbc13697467ca7be";
|
||||
hash = "sha256-hgQ8nCphR4hc+WTNtS8GgBrC54uYnvTCp7kjgB/u5lE=";
|
||||
};
|
||||
version = plymouth-src.rev;
|
||||
src = plymouth-src;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
(final: prev: {
|
||||
spotifywm = final.callPackage ./spotifywm.nix {};
|
||||
{...} @ inputs: (final: prev: {
|
||||
spotifywm = final.callPackage ./spotifywm.nix inputs;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,26 +2,20 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
spotifywm-src,
|
||||
libX11,
|
||||
makeBinaryWrapper,
|
||||
spotify,
|
||||
symlinkJoin,
|
||||
...
|
||||
}: let
|
||||
spotifywm = stdenv.mkDerivation {
|
||||
pname = "spotifywm";
|
||||
version = "unstable-2022-10-25";
|
||||
version = spotifywm-src.rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dasJ";
|
||||
repo = "spotifywm";
|
||||
rev = "8624f539549973c124ed18753881045968881745";
|
||||
hash = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0=";
|
||||
};
|
||||
src = spotifywm-src;
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
];
|
||||
buildInputs = [libX11];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
@ -35,9 +29,7 @@ in
|
|||
symlinkJoin {
|
||||
inherit (spotifywm) name;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
];
|
||||
nativeBuildInputs = [makeBinaryWrapper];
|
||||
|
||||
paths = [
|
||||
spotify
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{python3Packages}:
|
||||
{python3Packages, ...}:
|
||||
python3Packages.buildPythonPackage {
|
||||
pname = "coloryou";
|
||||
version = "0.0.1";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
with import <nixpkgs> {};
|
||||
with pkgs.python311Packages;
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
name = "coloryou";
|
||||
src = ./.;
|
||||
propagatedBuildInputs = [material-color-utilities utils];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
} @ inputs:
|
||||
with lib; let
|
||||
mkPackage = name: v: {
|
||||
${name} = pkgs.callPackage ./${name} {};
|
||||
${name} = pkgs.callPackage ./${name} inputs;
|
||||
};
|
||||
|
||||
rmNotPackage = name: value:
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
stdenv,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
cmake,
|
||||
bash-completion,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "input-emulator";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tio";
|
||||
repo = pname;
|
||||
rev = "6c35040e6fc4f65ce0519ee76d00d60490bcb987";
|
||||
hash = "sha256-Im0RADqRwlZ/RiZFSVp+HwnWoLdcpRp0Ej6RP0GY0+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
cmake
|
||||
bash-completion
|
||||
];
|
||||
}
|
||||
|
|
@ -10,17 +10,14 @@
|
|||
systemd,
|
||||
pam,
|
||||
libpam-wrapper,
|
||||
fetchFromGitLab,
|
||||
pam-fprint-grosshack-src,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "pam-fprint-grosshack";
|
||||
version = pam-fprint-grosshack-src.rev;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "mishakmak";
|
||||
repo = name;
|
||||
rev = "45b42524fb5783e1e555067743d7e0f70d27888a";
|
||||
hash = "sha256-obczZbf/oH4xGaVvp3y3ZyDdYhZnxlCWvL0irgEYIi0=";
|
||||
};
|
||||
src = pam-fprint-grosshack-src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
|
|
|
|||
|
|
@ -1,22 +1,19 @@
|
|||
{
|
||||
stdenv,
|
||||
python3Packages,
|
||||
fetchFromGitLab,
|
||||
pokemon-colorscripts-src,
|
||||
...
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "pokemon-colorscripts";
|
||||
version = pokemon-colorscripts-src.rev;
|
||||
|
||||
src = pokemon-colorscripts-src;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
python
|
||||
];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "phoneybadger";
|
||||
repo = "pokemon-colorscripts";
|
||||
rev = "0483c85b93362637bdd0632056ff986c07f30868";
|
||||
hash = "sha256-rj0qKYHCu9SyNsj1PZn1g7arjcHuIDGHwubZg/yJt7A=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/pokemon-colorscripts $out/bin
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
coreutils,
|
||||
gnused,
|
||||
writeShellScriptBin,
|
||||
...
|
||||
}: let
|
||||
repl = ./repl.nix;
|
||||
example = command: desc: ''\n\u001b[33m ${command}\u001b[0m - ${desc}'';
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
gpu-screen-recorder-src,
|
||||
...
|
||||
}: let
|
||||
gsr = pkgs.gpu-screen-recorder.overrideAttrs (o: {
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r445.84f9a04.tar.gz";
|
||||
hash = "sha256-YKGLv7QFBxTZDW9HKS6tEeP1pX91idtuy0oUr4mbjjU=";
|
||||
};
|
||||
version = gpu-screen-recorder-src.rev;
|
||||
|
||||
src = gpu-screen-recorder-src;
|
||||
|
||||
postPatch = "";
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
nix-gaming.nixosModules.steamCompat
|
||||
];
|
||||
imports = [nix-gaming.nixosModules.steamCompat];
|
||||
|
||||
programs = {
|
||||
steam = {
|
||||
|
|
|
|||
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
xresources.extraConfig =
|
||||
builtins.readFile
|
||||
"${pkgs.dracula-theme}/xres/Xresources";
|
||||
"${pkgs.dracula-theme}/xres";
|
||||
|
||||
xdg.configFile = let
|
||||
qtconf = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{nix-gaming, ...}: {
|
||||
imports = [
|
||||
nix-gaming.nixosModules.pipewireLowLatency
|
||||
];
|
||||
imports = [nix-gaming.nixosModules.pipewireLowLatency];
|
||||
|
||||
hardware.pulseaudio.enable = false;
|
||||
|
||||
|
|
|
|||
51
updateSha.sh
51
updateSha.sh
|
|
@ -21,29 +21,6 @@ parseFetchurl() {
|
|||
sed -i "s,sha256 = .*,sha256 = \"$HASH\";," "$FILE"
|
||||
}
|
||||
|
||||
|
||||
updateOverlays() {
|
||||
FILE="/home/matt/.nix/common/overlays"
|
||||
parseNurl "https://github.com/dasJ/spotifywm" "$FILE/spotifywm/spotifywm.nix"
|
||||
}
|
||||
|
||||
updateDracula() {
|
||||
FILE="/home/matt/.nix/common/overlays/dracula-theme"
|
||||
parseNurl "https://github.com/matt1432/bat" "$FILE/bat.nix"
|
||||
parseNurl "https://github.com/dracula/gtk" "$FILE/default.nix"
|
||||
parseNurl "https://github.com/dracula/plymouth" "$FILE/plymouth.nix"
|
||||
parseNurl "https://github.com/dracula/git" "$FILE/git.nix"
|
||||
parseNurl "https://github.com/dracula/xresources" "$FILE/xresources.nix"
|
||||
parseFetchurl "https://github.com/aynp/dracula-wallpapers/blob/main/Art/4k/Waves%201.png?raw=true" "$FILE/wallpaper.nix"
|
||||
}
|
||||
|
||||
updateCustomPkgs() {
|
||||
FILE="/home/matt/.nix/common/pkgs"
|
||||
parseNurl "https://github.com/tio/input-emulator" "$FILE/input-emulator/default.nix"
|
||||
parseNurl "https://gitlab.com/mishakmak/pam-fprint-grosshack" "$FILE/pam-fprint-grosshack/default.nix"
|
||||
parseNurl "https://gitlab.com/phoneybadger/pokemon-colorscripts" "$FILE/pokemon-colorscripts/default.nix"
|
||||
}
|
||||
|
||||
updateFFZ() {
|
||||
FILE="/home/matt/.nix/home/firefox/addons/default.nix"
|
||||
URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi"
|
||||
|
|
@ -70,43 +47,15 @@ updateFirefoxAddons() {
|
|||
mozilla-addons-to-nix addons.json generated-firefox-addons.nix)
|
||||
}
|
||||
|
||||
updateGSR() {
|
||||
(
|
||||
cd /tmp || return
|
||||
|
||||
if [[ ! -d "gpu-screen-recorder" ]]; then
|
||||
git clone https://repo.dec05eba.com/gpu-screen-recorder
|
||||
cd gpu-screen-recorder || return
|
||||
else
|
||||
cd gpu-screen-recorder || return
|
||||
git pull
|
||||
fi
|
||||
|
||||
REV=$(printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
|
||||
URL=https://dec05eba.com/snapshot/gpu-screen-recorder.git."$REV".tar.gz
|
||||
FILE="/home/matt/.nix/devices/binto/modules/gpu-replay.nix"
|
||||
|
||||
parseFetchurl "$URL" "$FILE"
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
doAll() {
|
||||
updateFFZ
|
||||
updateCustomPkgs
|
||||
updateOverlays
|
||||
updateDracula
|
||||
updateFirefoxAddons
|
||||
updateGSR
|
||||
}
|
||||
|
||||
|
||||
[[ "$1" == "-a" || "$1" == "--all" ]] && doAll
|
||||
[[ "$1" == "-d" || "$1" == "--dracula" ]] && updateDracula
|
||||
[[ "$1" == "-c" || "$1" == "--custom" ]] && updateCustomPkgs
|
||||
[[ "$1" == "-o" || "$1" == "--overlays" ]] && updateOverlays
|
||||
[[ "$1" == "-f" || "$1" == "--firefox" ]] && updateFirefoxAddons
|
||||
[[ "$1" == "-ffz" || "$1" == "--frankerfacez" ]] && updateFFZ
|
||||
[[ "$1" == "-gsr" || "$1" == "--gpu-screen-recorder" ]] && updateGSR
|
||||
|
||||
alejandra /home/matt/.nix
|
||||
|
|
|
|||
Loading…
Reference in a new issue