Upgrade syden peertube to flake

[perso/Immae/Config/Nix.git] / environments / immae-eu.nix

diff --git a/environments/immae-eu.nix b/environments/immae-eu.nix
index a7dfda192a496e597b35ef0fc8cf3bd2473907f3..147926b48b88e03bff706fb957d9f30ef184ec27 100644 (file)
--- a/environments/immae-eu.nix
+++ b/environments/immae-eu.nix
@@ -4,21 +4,21 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
   paths = [
     # archives
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
   paths = [
     # archives

-    lzo unzip bzip2 p7zip xz
+    lzo unzip bzip2 xz

     # unrar is unfree
 
     # backups
     duply
 
     # calendar/contacts
     # unrar is unfree
 
     # backups
     duply
 
     # calendar/contacts

-    abook khard khal cadaver vdirsyncer pal
+    abook khard khal cadaver vdirsyncerStable pal

 
     # computing
     boinctui
 
     # cryptocurrencies
     cardano cardano-cli sia monero
 
     # computing
     boinctui
 
     # cryptocurrencies
     cardano cardano-cli sia monero

-    xmr-stak
+    # failing xmr-stak

     solc
     iota-cli-app
 
     solc
     iota-cli-app
 


@@ -54,11 +54,12 @@ let
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire
     # monitoring
     cnagios mtop pg_activity nagios-cli mtr
     iftop htop iotop iperf bonfire

-    goaccess tcpdump tshark tcpflow mitmproxy
+    goaccess tcpdump tshark tcpflow
+    mitmproxy

     # nagnu
 
     # messaging/forums/news
     # nagnu
 
     # messaging/forums/news

-    #flrn slrn
+    flrn slrn

     telegram-cli telegram-history-dump telegramircd
     weechat profanity
     newsboat irssi
     telegram-cli telegram-history-dump telegramircd
     weechat profanity
     newsboat irssi


@@ -66,7 +67,7 @@ let
     # nix
     yarn2nix-moretea.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan
     # nix
     yarn2nix-moretea.yarn2nix nix
     nixops nix-prefetch-scripts nix-generate-from-cpan

-    bundix nodePackages.bower2nix
+    bundix nodePackages.bower2nix nix-diff

     nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install
     nodePackages.node2nix niv
     # (nixos {}).nixos-generate-config
     # (nixos {}).nixos-install


@@ -74,7 +75,7 @@ let
     # (nixos {}).manual.manpages
 
     # note taking
     # (nixos {}).manual.manpages
 
     # note taking

-    note terminal-velocity jrnl doing
+    note terminal-velocity jrnl doing nb

 
     # office
     sc-im ranger
 
     # office
     sc-im ranger


@@ -88,6 +89,7 @@ let
     vimPlugins.vim-plug
     (vim_configurable.override { python = python3; })
     mailcap
     vimPlugins.vim-plug
     (vim_configurable.override { python = python3; })
     mailcap

+    webapps.surfer

 
     # password management
     (pass.withExtensions (exts: [ exts.pass-otp ])) apg pwgen
 
     # password management
     (pass.withExtensions (exts: [ exts.pass-otp ])) apg pwgen


@@ -104,6 +106,7 @@ let
 
     # todolist/time management
     taskwarrior vit timewarrior
 
     # todolist/time management
     taskwarrior vit timewarrior

+    bugwarrior

 
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg
 
     # video/music
     youtube-dl ncmpc ncmpcpp ffmpeg


@@ -116,13 +119,14 @@ let
     telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc
     wget patchelf rename tmux (lib.meta.hiPrio nettools)
     vlock mosh manpages openssl openssl.doc openssl.man
     telnet bind.dnsutils httpie ngrep nmap p0f socat lsof psmisc
     wget patchelf rename tmux (lib.meta.hiPrio nettools)
     vlock mosh manpages openssl openssl.doc openssl.man

+    sshfs ncdu

 
     # other tools
     pgloader s3cmd lftp jq cpulimit libxslt gandi-cli
 
     # Terraform + AWS
     terraform_0_12 awscli
 
     # other tools
     pgloader s3cmd lftp jq cpulimit libxslt gandi-cli
 
     # Terraform + AWS
     terraform_0_12 awscli

-    (ansible.override { python2 = python3; }) python3Packages.boto
+    ansible python3Packages.boto

     openvpn
 
     zsh-completions
     openvpn
 
     zsh-completions