diff --git a/nixos/configs/sterni/packages.nix b/nixos/configs/sterni/packages.nix index 41d4b53..394f41e 100644 --- a/nixos/configs/sterni/packages.nix +++ b/nixos/configs/sterni/packages.nix @@ -14,7 +14,6 @@ let in { - environment.systemPackages = with pkgs; [ ((ganttproject-bin.override { @@ -27,7 +26,6 @@ in }; })) - (nextcloudSync "InstantUpload") (nextcloudSync "Pictures") (nextcloudSync "Unterlagen") diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix index 95fb308..c1a58d8 100644 --- a/nixos/system/desktop/packages.nix +++ b/nixos/system/desktop/packages.nix @@ -16,25 +16,15 @@ let (lib.concatStringsSep "\n" licenses); #joplin = pkgs.joplin-desktop; - #joplin = pkgs.joplin-desktop; - joplin = pkgs.writers.writeBashBin "joplin" '' - if [[ ! -x "$HOME/programs/Joplin.AppImage" ]] - then - echo "$HOME/programs/Joplin.AppImage does not exist or is not executable"; - exit 1 - fi - exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Joplin.AppImage" - ''; - - zettlr = pkgs.writers.writeBashBin "zettlr" '' - if [[ ! -x "$HOME/programs/Zettlr.AppImage" ]] - then - echo "$HOME/programs/Zettlr.AppImage does not exist or is not executable"; - exit 1 - fi - exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Zettlr.AppImage" - ''; - #zettlr = unstablePkgs.zettlr; + joplin = pkgs.unstable.joplin-desktop; + #joplin = pkgs.writers.writeBashBin "joplin" '' + # if [[ ! -x "$HOME/programs/Joplin.AppImage" ]] + # then + # echo "$HOME/programs/Joplin.AppImage does not exist or is not executable"; + # exit 1 + # fi + # exec ${pkgs.appimage-run}/bin/appimage-run "$HOME/programs/Joplin.AppImage" + #''; parseUrl = pkgs.writers.writeBashBin "parseUrl" '' echo "$@" | \ @@ -136,25 +126,6 @@ let ${pkgs.copyq}/bin/copyq read 0 | ${pkgs.xdotool}/bin/xdotool type -f - ''; - weight = pkgs.writeShellScriptBin "weight" '' - if [[ $# -eq 1 ]] - then - weight=$1 - echo "weight : $weight" - else - echo - echo -n " weight : " - read weight - fi - - echo - - ${pkgs.curl}/bin/curl \ - -H "Content-Type: application/json" \ - -XPOST "http://workout.private:9200/health/weight" \ - -d '{ "weight" : '$weight', "date": "'$( ${pkgs.coreutils}/bin/date -Iseconds )'" }' - ''; - isoToUtf8 = pkgs.writers.writeBashBin "iso-to-utf8" '' input="$1" TMP=$(mktemp) @@ -175,34 +146,13 @@ in programs.gnupg.agent.enableExtraSocket = true; environment.systemPackages = with pkgs; - let - connectToMyPortable = connectToSpeaker "my-portable" "37:F0:17:2F:B6:84"; - disconnectToMyPortable = - disconnectToSpeaker "my-portable" "37:F0:17:2F:B6:84"; - connectToBrullrohre = connectToSpeaker "brullrohre" "FC:A8:9A:ED:B8:FA"; - disconnectToBrullrohre = - disconnectToSpeaker "brullrohre" "FC:A8:9A:ED:B8:FA"; - in [ uget - #zettlr - #(library.desktopFile zettlr { longName = "Zettlr"; }) joplin (library.desktopFile joplin { longName = "Joplin"; }) zim - weight - - connectToMyPortable - (library.desktopFile connectToMyPortable { longName = "Bluetooth"; }) - disconnectToMyPortable - (library.desktopFile disconnectToMyPortable { longName = "Bluetooth"; }) - connectToBrullrohre - (library.desktopFile connectToBrullrohre { longName = "Bluetooth"; }) - disconnectToBrullrohre - (library.desktopFile disconnectToBrullrohre { longName = "Bluetooth"; }) - #antimony #(library.desktopFile antimony { longName = "CAD Software"; command = "antimony"; }) parted @@ -285,18 +235,7 @@ in # cantata ncmpcpp - #(pkgs.dragon-drop.overrideAttrs (old: rec { - # pname = "dragon-drop"; - # version = "1.1.1"; - # src = fetchFromGitHub { - # owner = "mwh"; - # repo = "dragon"; - # rev = "v${version}"; - # sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; - # }; - #})) - - dino # jabber client + # dino # jabber client nixos-generators shellcheck @@ -346,7 +285,6 @@ in nethogs netsniff-ng iftop - #wireguard ffmpeg (writeShellScriptBin "shrink-exports" @@ -357,12 +295,11 @@ in replaceLinks youtube-dl - #image-generator - cairo + #cairo - w3m - links2 - lynx + #w3m + #links2 + #lynx # temperature s-tui @@ -393,17 +330,8 @@ in pkgconf cairo - # etc-info stuff - (pkgs.writers.writeDashBin "etc-info-sync" (lib.concatStringsSep "\n" - (map (host: "rsync -avLz ${host}.private:/etc/info/ ~/.etc_info") - (attrNames config.module.cluster.services.tinc."private".hosts)))) - ] ++ (map pandocScript (lib.cartesianProductOfSets { inputFormat = [ "man" "markdown" "mediawiki" ]; outputFormat = [ "mediawiki" "docbook5" "html5" "man" ]; - })) # ++ (map (search: - #pkgs.writers.writeDashBin "reddit-${search}" '' - # ${unstablePkgs.tuir}/bin/tuir -s ${search} "$@" - #'') [ "nixos" "systemdUltras" "terraform" ]) - ; + })); }