From d0a9186a624819811a786239e72db951b631b4a9 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 18 May 2023 09:53:51 -0500 Subject: [PATCH] trying to add nixified-ai --- flake.lock | 265 +++++++++++++++++++++++++++++++++++++- flake.nix | 6 +- pkgs/desktop-packages.nix | 1 + scripts/filesearch | 2 +- 4 files changed, 269 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index eeb7031..f0ef916 100644 --- a/flake.lock +++ b/flake.lock @@ -120,6 +120,67 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixified-ai", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1677714448, + "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1673362319, + "narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixified-ai", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1666885127, + "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -186,6 +247,64 @@ "type": "github" } }, + "flake-utils_5": { + "locked": { + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hercules-ci-agent": { + "inputs": { + "flake-parts": "flake-parts_3", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_5", + "pre-commit-hooks-nix": "pre-commit-hooks-nix" + }, + "locked": { + "lastModified": 1673183923, + "narHash": "sha256-vb+AEQJAW4Xn4oHsfsx8H12XQU0aK8VYLtWYJm/ol28=", + "owner": "hercules-ci", + "repo": "hercules-ci-agent", + "rev": "b3f8aa8e4a8b22dbbe92cc5a89e6881090b933b3", + "type": "github" + }, + "original": { + "id": "hercules-ci-agent", + "type": "indirect" + } + }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "hercules-ci-agent": "hercules-ci-agent", + "nixpkgs": [ + "nixified-ai", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1676558019, + "narHash": "sha256-obUHCMMWbffb3k0b9YIChsJ2Z281BcDYnTPTbJRP6vs=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "fdbc15b55db8d037504934d3af52f788e0593380", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -249,6 +368,40 @@ "type": "github" } }, + "invokeai-src": { + "flake": false, + "locked": { + "lastModified": 1677475057, + "narHash": "sha256-REtyVcyRgspn1yYvB4vIHdOrPRZRNSSraepHik9MfgE=", + "owner": "invoke-ai", + "repo": "InvokeAI", + "rev": "650f4bb58ceca458bff1410f35cd6d6caad399c6", + "type": "github" + }, + "original": { + "owner": "invoke-ai", + "ref": "v2.3.1.post2", + "repo": "InvokeAI", + "type": "github" + } + }, + "koboldai-src": { + "flake": false, + "locked": { + "lastModified": 1668957963, + "narHash": "sha256-fKQ/6LiMmrfSWczC5kcf6M9cpuF9dDYl2gJ4+6ZLSdY=", + "owner": "koboldai", + "repo": "koboldai-client", + "rev": "f2077b8e58db6bd47a62bf9ed2649bb0711f9678", + "type": "github" + }, + "original": { + "owner": "koboldai", + "ref": "1.19.2", + "repo": "koboldai-client", + "type": "github" + } + }, "libre-presenter": { "inputs": { "flake-utils": "flake-utils_3", @@ -309,6 +462,53 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixified-ai", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667419884, + "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, + "nixified-ai": { + "inputs": { + "flake-parts": "flake-parts", + "hercules-ci-effects": "hercules-ci-effects", + "invokeai-src": "invokeai-src", + "koboldai-src": "koboldai-src", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1681331676, + "narHash": "sha256-zOzkx39AALckaAtW175ueBOUpy/xPtrC8nnp9lHYVt0=", + "owner": "nixified-ai", + "repo": "flake", + "rev": "422bf5503375cfc5bd526862ae0b67c55f1c8705", + "type": "github" + }, + "original": { + "owner": "nixified-ai", + "repo": "flake", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1682836095, @@ -356,6 +556,24 @@ "type": "indirect" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1672350804, + "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1682669017, @@ -435,6 +653,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1672262501, + "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1682692304, "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", @@ -450,7 +684,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1669542132, "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", @@ -465,6 +699,30 @@ "type": "indirect" } }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "nixified-ai", + "hercules-ci-effects", + "hercules-ci-agent", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667760143, + "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "anyrun": "anyrun", @@ -474,8 +732,9 @@ "hyprland": "hyprland", "libre-presenter": "libre-presenter", "nix-bitcoin": "nix-bitcoin", + "nixified-ai": "nixified-ai", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", "simple-nixos-mailserver": "simple-nixos-mailserver" } @@ -505,7 +764,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-22_11": "nixpkgs-22_11", "utils": "utils" }, diff --git a/flake.nix b/flake.nix index 968dee8..54ca78c 100644 --- a/flake.nix +++ b/flake.nix @@ -33,9 +33,13 @@ libre-presenter = { url = "gitlab:chriscochrun/church-presenter"; }; + nixified-ai = { + url = "github:nixified-ai/flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, nixos-hardware, emacs, nix-bitcoin, libre-presenter, anyrun, ... }: + outputs = { nixpkgs, nixpkgs-stable, home-manager, hyprland, nixos-hardware, emacs, nix-bitcoin, libre-presenter, nixified-ai, anyrun, ... }: let system = "x86_64-linux"; username = "chris"; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index c1cd753..d33bc8c 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -34,6 +34,7 @@ with lib; plasma5Packages.kwallet sierra-breeze-enhanced libimobiledevice + # textgen-amd # bottles # jitsi-meet-electron imv diff --git a/scripts/filesearch b/scripts/filesearch index 886dda7..835610a 100755 --- a/scripts/filesearch +++ b/scripts/filesearch @@ -13,7 +13,7 @@ fi cd ~/ -cat db | wofi --dmenu -i -M multi-contains | xargs -r0 xdg-open +cat db | rofi -dmenu -i -sync -p="search..." -theme ~/.config/rofi/launchers-git/$style.rasi -M multi-contains | xargs -r0 xdg-open # $@ &