From 212823586cedd0d5d9fea03941785f37a01a6cfe Mon Sep 17 00:00:00 2001 From: stuebinm Date: Wed, 22 Mar 2023 21:36:28 +0100 Subject: get rid of crane & naersk the only thing this makes more complicated is typst; most of the other benefits I don't use in any case. --- home/packages.nix | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) (limited to 'home') diff --git a/home/packages.nix b/home/packages.nix index 840e138..78c6b4c 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,35 +1,7 @@ -{ config, lib, pkgs, inputs, system, ... }: +{ config, lib, pkgs, inputs, system, craneLib, ... }: let - naersk = pkgs.callPackage inputs.naersk {}; - extras = { - almanac = naersk.buildPackage inputs.almanac; - kijetesantakaluotokieni = naersk.buildPackage (pkgs.fetchgit { - url = "https://git.2ki.xyz/spiders/kijetesantakaluotokieni"; - rev = "7d9ea828f42ffd9fb6826ea4cbf7677b08222064"; - sha256 = "sha256-PEp+K5mRNUR6yWLrpGpiX8qvaPQIibA17NQwXUiC2lk="; - }); - showrt = naersk.buildPackage { - src = inputs.showrt; - buildInputs = [ pkgs.protobuf ]; - }; - }; isabelle = import "${inputs.playground.outPath}/isabelle-nix-fhsenv" { inherit pkgs; }; - emacs29 = pkgs.callPackage - (import "${inputs.nixpkgs.outPath}/pkgs/applications/editors/emacs/generic.nix" { - version = "29"; - sha256 = "sha256-AI4eNgzRLnM1s4hQa0YWJxZR3WZoIuKy7BYosT06K1c="; - }) { - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz - QuartzCore WebKit ImageCaptureCore GSS ImageIO; - gconf = null; - alsa-lib = null; - gpm = null; - libXaw = pkgs.xorg.libXaw; - inherit (pkgs.darwin) sigtool; - withPgtk = true; - withX = false; - }; in { home.packages = with pkgs; [ @@ -48,8 +20,8 @@ in texlive.combined.scheme-full xournal pandoc zathura pdfpc poppler_utils typst # general cli utils - extras.almanac libnotify grim slurp wl-clipboard extras.showrt - extras.kijetesantakaluotokieni mpc_cli duf dufs progress hledger + almanac libnotify grim slurp wl-clipboard showrt + kijetesantakaluotokieni mpc_cli duf dufs progress hledger wineWowPackages.full # graphical utils kitty baobab @@ -83,7 +55,7 @@ in mercurial # isabelle isabelle.isabelle2022 (isabelle.mkEnv "isabelle-env" "fish") - (import inputs.isabelle-utils {inherit pkgs naersk; }).isabat + isabat (import inputs.traveltext { inherit pkgs; }) ]; -- cgit v1.2.3