From 9617d1d0c4add9020b6a6ab533c1fd95efc5c5d3 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 25 May 2024 20:51:43 -0600 Subject: [PATCH] moved things where they belong --- hosts/workstation/configuration.nix | 11 +---------- modules/apps/internet.nix | 5 ++++- modules/apps/multimedia.nix | 1 + pkgs/pureref/default.nix | 23 +++++++++++++++++++++++ 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 pkgs/pureref/default.nix diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index feb5c89..6cef629 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -1,11 +1,4 @@ -{ config, lib, pkgs, ... }: -let - unstable = import - (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") { - config = config.nixpkgs.config; - }; - vdhcoapp = pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { }; -in { +{ config, lib, pkgs, ... }: { imports = [ # ./hardware-configuration.nix @@ -103,8 +96,6 @@ in { groups.nixremote.gid = 555; users = { jawz.packages = (with pkgs; [ - fooyin - vdhcoapp gocryptfs # encrypted filesystem! shhh!!! torrenttools # create torrent files from the terminal! vcsi # video thumbnails for torrents, can I replace it with ^? diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix index adaea69..8925328 100644 --- a/modules/apps/internet.nix +++ b/modules/apps/internet.nix @@ -1,4 +1,6 @@ -{ config, lib, pkgs, ... }: { +{ config, lib, pkgs, ... }: +let vdhcoapp = pkgs.callPackage ../../pkgs/vdhcoapp/default.nix { }; +in { options.my.apps.internet.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.apps.internet.enable { programs = { @@ -10,6 +12,7 @@ }; services.psd.enable = true; users.users.jawz.packages = with pkgs; [ + vdhcoapp # video download helper assistant nextcloud-client # self-hosted google-drive alternative fragments # beautiful torrent client protonmail-bridge # bridge for protonmail diff --git a/modules/apps/multimedia.nix b/modules/apps/multimedia.nix index 1f5a841..6c1e9ee 100644 --- a/modules/apps/multimedia.nix +++ b/modules/apps/multimedia.nix @@ -2,6 +2,7 @@ options.my.apps.multimedia.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.apps.multimedia.enable { users.users.jawz.packages = with pkgs; [ + fooyin # foobar inspired music player pitivi # video editor celluloid # video player curtail # image compressor diff --git a/pkgs/pureref/default.nix b/pkgs/pureref/default.nix new file mode 100644 index 0000000..6b34b31 --- /dev/null +++ b/pkgs/pureref/default.nix @@ -0,0 +1,23 @@ +{ lib, appimageTools, runCommand, curl, gnugrep, cacert }: + +appimageTools.wrapType1 rec { + pname = "pureref"; + version = "2.0.0"; + + src = runCommand "PureRef-${version}_x64.Appimage" { + nativeBuildInputs = [ curl gnugrep cacert ]; + outputHash = "sha256-da/dH0ruI562JylpvE9f2zMUSJ56+T7Y0xlP/xr3yhY="; + } '' + key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" + curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out + ''; + + meta = with lib; { + description = "Reference Image Viewer"; + homepage = "https://www.pureref.com"; + license = licenses.unfree; + maintainers = with maintainers; [ elnudev ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}