diff --git a/configs/default.nix b/configs/default.nix index 5f20948..3041f75 100644 --- a/configs/default.nix +++ b/configs/default.nix @@ -70,21 +70,32 @@ nixpkgs.config = { allowUnfree = true; packageOverrides = pkgs: { + python3Packages = pkgs.python3Packages.override { + overrides = new: old: { + spotify-cli-linux = new.callPackage {}; + instaloader = new.callPackage {}; + sncli = new.callPackage {}; + }; + }; + haskellPackages = pkgs.haskellPackages.override { + overrides = new: old: { + quote-db = new.callPackage {}; + blessings = new.callPackage {}; + scanner = new.callPackage {}; + }; + }; + autorenkalender = pkgs.callPackage {}; - quote-db = pkgs.haskellPackages.callPackage {}; bvg = pkgs.callPackage {}; daybook = pkgs.callPackage {}; font-size = pkgs.callPackage { font = config.niveum.fonts.terminal; }; genius = pkgs.callPackage {}; instaget = pkgs.callPackage {}; - instaloader = pkgs.python3Packages.callPackage {}; iolanguage = pkgs.callPackage {}; literature-quote = pkgs.callPackage {}; n = pkgs.callPackage {}; nix-git = pkgs.callPackage {}; odyssey = pkgs.callPackage {}; - sncli = pkgs.python3Packages.callPackage {}; - spotify-cli-linux = pkgs.python3Packages.callPackage {}; wttr = pkgs.callPackage {}; dic = pkgs.callPackage {}; @@ -153,7 +164,7 @@ ]; } { - environment.interactiveShellInit = "export PATH=$PATH:$HOME/.local/bin:$HOME/.cargo/bin"; + environment.interactiveShellInit = "export PATH=$PATH:$HOME/.cargo/bin"; environment.shellAliases = { clipboard = "${pkgs.xclip}/bin/xclip -se c"; o = "${pkgs.xdg_utils}/bin/xdg-open"; @@ -251,7 +262,7 @@ httpie whois ddgr - instaloader + python3Packages.instaloader ] ++ [ # media ffmpeg imagemagick @@ -322,7 +333,7 @@ pdfgrep pdftk spotify - spotify-cli-linux + python3Packages.spotify-cli-linux youtubeDL ] ++ [ # math bc @@ -332,7 +343,7 @@ autorenkalender font-size odyssey - # quote-db + haskellPackages.quote-db literature-quote dic yt-next diff --git a/configs/haskell/packages.nix b/configs/haskell/packages.nix index cf18c43..500864b 100644 --- a/configs/haskell/packages.nix +++ b/configs/haskell/packages.nix @@ -1,6 +1,7 @@ haskellPackages: with haskellPackages; [ - (callPackage {}) + blessings + scanner HTTP HUnit MissingH diff --git a/configs/sncli.nix b/configs/sncli.nix index d0cba7d..5c291ce 100644 --- a/configs/sncli.nix +++ b/configs/sncli.nix @@ -1,7 +1,7 @@ { pkgs, ... }: let secrets = import ; in { - environment.systemPackages = [ pkgs.sncli ]; + environment.systemPackages = [ pkgs.python3Packages.sncli ]; home-manager.users.me = { home.file.".snclirc".text = '' diff --git a/packages/quote-db.nix b/packages/quote-db.nix index 479e7fb..b158ea3 100644 --- a/packages/quote-db.nix +++ b/packages/quote-db.nix @@ -1,11 +1,17 @@ { mkDerivation, base, bytestring, cassava, hasmin, HaTeX, lucid , megaparsec, optparse-applicative, prettyprinter, raw-strings-qq , stdenv, text +, fetchFromGitHub }: mkDerivation { pname = "quote-db"; version = "0.1.0.0"; - src = ./.; + src = fetchFromGitHub { + owner = "kmein"; + repo = "quote-db"; + rev = "2a9776293d306cf2777bfd63412d8e30082826d1"; + sha256 = "18nmi6rds1dfwkrnvdbqzl261szg93b6rbx6in2zmpz8v6k6z5f9"; + }; isLibrary = true; isExecutable = true; libraryHaskellDepends = [