chore: fix update script and update flake.lock
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
31c3cd5f7d
commit
b869da9668
13 changed files with 318 additions and 131 deletions
|
|
@ -2,9 +2,9 @@
|
|||
config,
|
||||
home-manager,
|
||||
lib,
|
||||
mozilla-addons-to-nix,
|
||||
nh,
|
||||
nix-melt,
|
||||
nur,
|
||||
nurl,
|
||||
pkgs,
|
||||
...
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
|
||||
./modules
|
||||
|
||||
nur.nixosModules.nur
|
||||
home-manager.nixosModules.home-manager
|
||||
|
||||
../modules/arion
|
||||
|
|
@ -96,23 +95,18 @@
|
|||
};
|
||||
}
|
||||
|
||||
nur.hmModules.nur
|
||||
|
||||
./home
|
||||
./home/trash-d
|
||||
];
|
||||
|
||||
home.packages =
|
||||
[
|
||||
nix-melt.packages.${pkgs.system}.default
|
||||
home.packages = [
|
||||
nix-melt.packages.${pkgs.system}.default
|
||||
|
||||
(nurl.packages.${pkgs.system}.default.override {
|
||||
nix = config.nix.package;
|
||||
})
|
||||
]
|
||||
++ (with config.nur.repos.rycee; [
|
||||
mozilla-addons-to-nix
|
||||
]);
|
||||
(nurl.packages.${pkgs.system}.default.override {
|
||||
nix = config.nix.package;
|
||||
})
|
||||
mozilla-addons-to-nix.packages.${pkgs.system}.default
|
||||
];
|
||||
};
|
||||
in {
|
||||
users = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
nur,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./vars
|
||||
./modules/global.nix
|
||||
nur.nixosModules.nur
|
||||
];
|
||||
|
||||
nix = {
|
||||
|
|
@ -41,8 +39,6 @@
|
|||
};
|
||||
}
|
||||
|
||||
nur.hmModules.nur
|
||||
|
||||
./home
|
||||
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,53 +1,16 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
gpu-screen-recorder-src,
|
||||
pkgs,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
inherit (config.vars) mainUser mainMonitor;
|
||||
inherit (lib) concatStringsSep removePrefix;
|
||||
|
||||
inherit (config.vars) mainUser mainMonitor;
|
||||
|
||||
gsr = self.packages.${pkgs.system}.gpu-screen-recorder;
|
||||
hyprPkgs = config.home-manager.users.${mainUser}.wayland.windowManager.hyprland.finalPackage;
|
||||
|
||||
gsr = pkgs.stdenv.mkDerivation {
|
||||
name = "gpu-screen-recorder";
|
||||
version = gpu-screen-recorder-src.shortRev;
|
||||
|
||||
src = gpu-screen-recorder-src;
|
||||
|
||||
nativeBuildInputs = with pkgs; [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
libpulseaudio
|
||||
ffmpeg
|
||||
wayland
|
||||
libdrm
|
||||
libva
|
||||
xorg.libXcomposite
|
||||
xorg.libXrandr
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
./build.sh
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
strip gsr-kms-server
|
||||
strip gpu-screen-recorder
|
||||
|
||||
install -Dm755 "gsr-kms-server" "$out/bin/gsr-kms-server"
|
||||
install -Dm755 "gpu-screen-recorder" "$out/bin/gpu-screen-recorder"
|
||||
#install -Dm644 "extra/gpu-screen-recorder.service" "$out/lib/systemd/user/gpu-screen-recorder.service"
|
||||
|
||||
wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
|
||||
pkgs.addOpenGLRunpath.driverLink
|
||||
pkgs.libglvnd
|
||||
]}"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
security.wrappers = {
|
||||
gpu-screen-recorder = {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "rssbridge/rss-bridge";
|
||||
imageDigest = "sha256:6509181cfc551464580ced84d7bbe87e88435d49dfe2259169080130c889bca8";
|
||||
sha256 = "0i5gwgzd2pbfckxnvzcgyn2s7jw24s23fd20a4h30z7kqx06nw68";
|
||||
imageDigest = "sha256:f4beaf19862378b16bea1555bee0faf87b93d1d1da433527c2e70acf618c1ffc";
|
||||
sha256 = "1addixf0wwh7fl012c278qr16sbhfzcd6zk7pn20735bpibpf4b5";
|
||||
finalImageName = "rssbridge/rss-bridge";
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "ghcr.io/immich-app/immich-machine-learning";
|
||||
imageDigest = "sha256:9577a58ef2c1b61f6f7d7e8c2d86d2e94facc04d901fb27710cbf92fc5e47bfc";
|
||||
sha256 = "04wa6gsazy0qdfalgp0v9danap9pbj8b0mlgz1j9scyh60azql33";
|
||||
imageDigest = "sha256:3aecde307deb0c881a1b4cbaf51db965e5ba1c085b8b4abb1a88c0225812cb05";
|
||||
sha256 = "1zwmzl5cd73zja039q9g3f57dmpdzsavl6im9s3m0g46pwnk44nz";
|
||||
finalImageName = "ghcr.io/immich-app/immich-machine-learning";
|
||||
finalImageTag = "v1.106.1";
|
||||
finalImageTag = "v1.106.2";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "ghcr.io/immich-app/immich-server";
|
||||
imageDigest = "sha256:b29d17de30931f22719f0ee39dd7bd24e2f6be08e61c13bd881e41ed426087f2";
|
||||
sha256 = "05yl9js445cdz31p5rp2clvvwpks7rpabpk9n4sg5d7ijqrnbi3p";
|
||||
imageDigest = "sha256:7c853eee0f9a6f742dafe71db64486a34067f24d253cba3ddc7b7eaa7420f00c";
|
||||
sha256 = "0h8zzdqap3rciibgv2cg6nfcc3493vflwl6vrl936dgvi6ldjq9b";
|
||||
finalImageName = "ghcr.io/immich-app/immich-server";
|
||||
finalImageTag = "v1.106.1";
|
||||
finalImageTag = "v1.106.2";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
pkgs:
|
||||
pkgs.dockerTools.pullImage {
|
||||
imageName = "ghcr.io/fallenbagel/jellyseerr";
|
||||
imageDigest = "sha256:155cec4b7b6726dec1c5721fa1a7e76888768dc464c6f05f9257ae709267377e";
|
||||
sha256 = "1fk46v2vg1qz5sz30c9h2j44c4hk2bljl9z8wl121v4gs28lcvah";
|
||||
imageDigest = "sha256:0bb9f0c6e110ed2d621972054ae221b8a46364ea69922781ccf0821722c6831a";
|
||||
sha256 = "132i3dy8r97yamdgfnj8hbrjp121r9pxgs71khsjs2jd2l4kh0yi";
|
||||
finalImageName = "ghcr.io/fallenbagel/jellyseerr";
|
||||
finalImageTag = "develop";
|
||||
}
|
||||
|
|
|
|||
253
flake.lock
generated
253
flake.lock
generated
|
|
@ -237,6 +237,22 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"locked": {
|
||||
"lastModified": 1717312683,
|
||||
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
|
||||
|
|
@ -483,6 +499,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flakegen": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
|
|
@ -503,8 +537,8 @@
|
|||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"gitignore": "gitignore",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"gitignore": "gitignore_2",
|
||||
"nixpkgs": [
|
||||
"neovim-nightly",
|
||||
"nixpkgs"
|
||||
|
|
@ -545,6 +579,28 @@
|
|||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"mozilla-addons-to-nix",
|
||||
"pre-commit-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"neovim-nightly",
|
||||
|
|
@ -569,11 +625,11 @@
|
|||
"gpu-screen-recorder-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1718037665,
|
||||
"narHash": "sha256-D6S6wOowFTT19fW3Z5MzZ+5bdQbRLpemMD1tvix83mk=",
|
||||
"lastModified": 1718137260,
|
||||
"narHash": "sha256-Gj1N7ruOc+doq+BGJriZ/D/cljjyImp0GdPdLOHLa8o=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "e43934e2d2219bdd9a99c78463aa47cfc0404dcd",
|
||||
"revCount": 613,
|
||||
"rev": "5f24cd6de6be57da2f36aa047c50285625213b47",
|
||||
"revCount": 617,
|
||||
"type": "git",
|
||||
"url": "https://repo.dec05eba.com/gpu-screen-recorder"
|
||||
},
|
||||
|
|
@ -767,6 +823,11 @@
|
|||
"hyprland": [
|
||||
"hyprland"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hypr-official-plugins",
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hypr-official-plugins",
|
||||
"hyprland",
|
||||
|
|
@ -774,11 +835,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718051739,
|
||||
"narHash": "sha256-Z1rJTE0DKd2YZK4uG6gX0zpL3r5iXELILsMDC+N+DCA=",
|
||||
"lastModified": 1718111105,
|
||||
"narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-plugins",
|
||||
"rev": "69073371f4091a08fdf1b4f1cc9ec8435fb1120f",
|
||||
"rev": "151102b7d7c4f61ff42f275e72008d28318dac96",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -820,6 +881,7 @@
|
|||
"inputs": {
|
||||
"hyprcursor": "hyprcursor",
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -828,11 +890,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718051463,
|
||||
"narHash": "sha256-ZB7Ov9pbyOUl6Up8o3Kvb/4bghhcbBk0JILLS/L7LUM=",
|
||||
"lastModified": 1718128194,
|
||||
"narHash": "sha256-ElvRwujUvoycMCNBsi8AVGuVQedFosMW+6CHYgjidaE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "811429bfd4a46f33c7788580f72038b0c3c1c2b1",
|
||||
"revCount": 4795,
|
||||
"rev": "e1b05f8eafd8cd3e7e9197fa1db92391174b9206",
|
||||
"revCount": 4803,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
|
|
@ -872,6 +934,10 @@
|
|||
},
|
||||
"hyprlang": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
|
|
@ -882,11 +948,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716473782,
|
||||
"narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
|
||||
"lastModified": 1717881852,
|
||||
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "87d5d984109c839482b88b4795db073eb9ed446f",
|
||||
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -895,6 +961,31 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprutils": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717881334,
|
||||
"narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprwayland-scanner": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -958,7 +1049,7 @@
|
|||
},
|
||||
"lib-aggregate": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs-lib": "nixpkgs-lib_4"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -1007,6 +1098,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mozilla-addons-to-nix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713544430,
|
||||
"narHash": "sha256-+3IaEnhhefaj5zoNPkvAx8MM95O930d7sooAmtVuIME=",
|
||||
"owner": "~rycee",
|
||||
"repo": "mozilla-addons-to-nix",
|
||||
"rev": "ed843cef648718519cf9fb89afcb33d7c53411d5",
|
||||
"type": "sourcehut"
|
||||
},
|
||||
"original": {
|
||||
"owner": "~rycee",
|
||||
"repo": "mozilla-addons-to-nix",
|
||||
"type": "sourcehut"
|
||||
}
|
||||
},
|
||||
"mpv-persist-properties-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1057,7 +1170,7 @@
|
|||
},
|
||||
"neovim-nightly": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"git-hooks": "git-hooks",
|
||||
"hercules-ci-effects": "hercules-ci-effects_2",
|
||||
|
|
@ -1359,11 +1472,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1718083092,
|
||||
"narHash": "sha256-EQsPXycAbmby4meQUNLYfFaGOiqz2J9AlwFRV4UiHnY=",
|
||||
"lastModified": 1718123384,
|
||||
"narHash": "sha256-YdNUQyqTVL6vQByCPEI8684yL1JruidnaAt+ZxVCHv0=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "aa1ebdaf49a606e21c06e0f6ed7aece9a41831c3",
|
||||
"rev": "55666187a1d040436155930dba5ad59b41745c30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1463,6 +1576,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1710695816,
|
||||
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1715458492,
|
||||
"narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
|
||||
|
|
@ -1478,7 +1607,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1717880976,
|
||||
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
|
||||
|
|
@ -1496,7 +1625,7 @@
|
|||
},
|
||||
"nixpkgs-wayland": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"nix-eval-jobs": "nix-eval-jobs_2",
|
||||
"nixpkgs": [
|
||||
|
|
@ -1504,11 +1633,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718104560,
|
||||
"narHash": "sha256-i9HERcCAce56YLRbxgwkOEInTY8p7R2+PaXrVrAgGMQ=",
|
||||
"lastModified": 1718119126,
|
||||
"narHash": "sha256-2is5Cdtj7nAxpEBSYanQpM1124Sm02FN6DSd6H7FJ9k=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "37cedde30fa2294841c9bb518fbf1dbbd24e915a",
|
||||
"rev": "51055d904b57f175d223887c192d12b4b1be8d30",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1607,21 +1736,6 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1718102237,
|
||||
"narHash": "sha256-5cUm1abWTdXdkP5jWGyUY6IgihpIpbSqem4M/2xwtzc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "b2adfc00254cf5bca52f1951955e801534130d63",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nurl": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -1812,6 +1926,34 @@
|
|||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": [
|
||||
"mozilla-addons-to-nix",
|
||||
"flake-utils"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"mozilla-addons-to-nix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712897695,
|
||||
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pyagentx-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1856,6 +1998,7 @@
|
|||
"jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
|
||||
"libratbag-src": "libratbag-src",
|
||||
"modernx-src": "modernx-src",
|
||||
"mozilla-addons-to-nix": "mozilla-addons-to-nix",
|
||||
"mpv-persist-properties-src": "mpv-persist-properties-src",
|
||||
"mpv-pointer-event-src": "mpv-pointer-event-src",
|
||||
"mpv-touch-gestures-src": "mpv-touch-gestures-src",
|
||||
|
|
@ -1871,7 +2014,6 @@
|
|||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"nms": "nms",
|
||||
"nur": "nur",
|
||||
"nurl": "nurl",
|
||||
"nvim-theme-src": "nvim-theme-src",
|
||||
"pam-fprint-grosshack-src": "pam-fprint-grosshack-src",
|
||||
|
|
@ -1948,7 +2090,7 @@
|
|||
"secrets",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715482972,
|
||||
|
|
@ -1969,7 +2111,7 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718058322,
|
||||
|
|
@ -2121,6 +2263,21 @@
|
|||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_7": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
|
|
@ -2252,7 +2409,7 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_6"
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717623141,
|
||||
|
|
@ -2285,11 +2442,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716290197,
|
||||
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
|
||||
"lastModified": 1717918856,
|
||||
"narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
|
||||
"rev": "72907822c19afc0983c69d59d299204381623725",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
11
flake.nix
11
flake.nix
|
|
@ -147,6 +147,12 @@
|
|||
repo = "ModernX";
|
||||
type = "github";
|
||||
};
|
||||
mozilla-addons-to-nix = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
owner = "~rycee";
|
||||
repo = "mozilla-addons-to-nix";
|
||||
type = "sourcehut";
|
||||
};
|
||||
mpv-persist-properties-src = {
|
||||
flake = false;
|
||||
owner = "d87";
|
||||
|
|
@ -238,11 +244,6 @@
|
|||
repo = "nixos-minecraft-servers";
|
||||
type = "github";
|
||||
};
|
||||
nur = {
|
||||
owner = "nix-community";
|
||||
repo = "NUR";
|
||||
type = "github";
|
||||
};
|
||||
nurl = {
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
owner = "matt1432";
|
||||
|
|
|
|||
11
inputs.nix
11
inputs.nix
|
|
@ -28,6 +28,12 @@ let
|
|||
owner = "nix-community";
|
||||
repo = "nix-melt";
|
||||
};
|
||||
|
||||
mozilla-addons-to-nix = mkDep {
|
||||
type = "sourcehut";
|
||||
owner = "~rycee";
|
||||
repo = "mozilla-addons-to-nix";
|
||||
};
|
||||
};
|
||||
|
||||
overlays = {
|
||||
|
|
@ -36,11 +42,6 @@ let
|
|||
repo = "nixpkgs-wayland";
|
||||
};
|
||||
|
||||
nur = mkInput {
|
||||
owner = "nix-community";
|
||||
repo = "NUR";
|
||||
};
|
||||
|
||||
nix-gaming = mkDep {
|
||||
owner = "fufexan";
|
||||
repo = "nix-gaming";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
pkgs,
|
||||
curseforge-server-downloader-src,
|
||||
gpu-screen-recorder-src,
|
||||
pam-fprint-grosshack-src,
|
||||
pokemon-colorscripts-src,
|
||||
...
|
||||
|
|
@ -11,6 +12,10 @@
|
|||
inherit curseforge-server-downloader-src;
|
||||
};
|
||||
|
||||
gpu-screen-recorder = pkgs.callPackage ./gpu-screen-recorder {
|
||||
inherit gpu-screen-recorder-src;
|
||||
};
|
||||
|
||||
pam-fprint-grosshack = pkgs.callPackage ./pam-fprint-grosshack {
|
||||
inherit pam-fprint-grosshack-src;
|
||||
};
|
||||
|
|
|
|||
66
pkgs/gpu-screen-recorder/default.nix
Normal file
66
pkgs/gpu-screen-recorder/default.nix
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
{
|
||||
addOpenGLRunpath,
|
||||
stdenv,
|
||||
ffmpeg,
|
||||
gpu-screen-recorder-src,
|
||||
lib,
|
||||
libdrm,
|
||||
libglvnd,
|
||||
libpulseaudio,
|
||||
libva,
|
||||
makeWrapper,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wayland,
|
||||
xorg,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) makeLibraryPath;
|
||||
inherit (builtins) fromTOML readFile;
|
||||
|
||||
tag =
|
||||
(fromTOML (readFile "${gpu-screen-recorder-src}/project.conf"))
|
||||
.package
|
||||
.version;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "gpu-screen-recorder";
|
||||
version = "${tag}+${gpu-screen-recorder-src.shortRev}";
|
||||
|
||||
src = gpu-screen-recorder-src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
makeWrapper
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpulseaudio
|
||||
ffmpeg
|
||||
wayland
|
||||
libdrm
|
||||
libva
|
||||
xorg.libXcomposite
|
||||
xorg.libXrandr
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# don't try to setcap/suid in a nix builder
|
||||
substituteInPlace ./meson.build --replace \
|
||||
"meson.add_install_script('extra/meson_post_install.sh')" \
|
||||
"# meson.add_install_script('extra/meson_post_install.sh')"
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
wrapProgram $out/bin/gpu-screen-recorder \
|
||||
--prefix LD_LIBRARY_PATH : "${
|
||||
makeLibraryPath [
|
||||
addOpenGLRunpath.driverLink
|
||||
libglvnd
|
||||
]
|
||||
}"
|
||||
'';
|
||||
}
|
||||
|
|
@ -23,7 +23,7 @@ parseFetchurl() {
|
|||
updateDocker() {
|
||||
find "$FLAKE/devices/nos/modules/arion" \
|
||||
-name "*compose.nix" \
|
||||
-exec sh -c 'updateImages $(dirname "{}")' \;
|
||||
-exec sh -c 'i="$1"; updateImages $(dirname "$i")' shell {} \;
|
||||
}
|
||||
|
||||
updateFFZ() {
|
||||
|
|
@ -45,7 +45,11 @@ updateFirefoxAddons() {
|
|||
awk '{ gsub(/"/, ""); gsub(/;/, ""); print $3 }' |
|
||||
awk 'NR%2{printf $0" version ";next;}1' | paste -sd'\n' -)"
|
||||
|
||||
readarray -t NEW_VERS <<< "$(sed 's/Fetched //' <(mozilla-addons-to-nix addons.json generated-firefox-addons.nix) |
|
||||
readarray -t NEW_VERS <<< "$(sed 's/Fetched //' \
|
||||
<(mozilla-addons-to-nix addons.json generated-firefox-addons.nix) |
|
||||
sed 's/bitwarden-password-manager/bitwarden/' |
|
||||
sed 's/600-sound-volume/sound-volume/' |
|
||||
sed 's/styl-us/stylus/' |
|
||||
sort)"
|
||||
|
||||
for (( i=0; i<${#OLD_VERS[@]}; i++ )); do
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue