From fbbb68ee069c46639fc55bcf2aae660f596c7f78 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Sun, 21 May 2023 13:50:49 +0200
Subject: [PATCH] package cleanup

---
 flake.lock                        | 24 ++++++++++++------------
 hosts/thinkpad/default.nix        | 19 ++++++-------------
 shared/zsh.nix                    |  2 ++
 users/rouven/fixes.nix            |  4 ++++
 users/rouven/modules/packages.nix | 19 +++++++------------
 5 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/flake.lock b/flake.lock
index a2c1867..a2bf8a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -178,11 +178,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1684025543,
-        "narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=",
+        "lastModified": 1684632198,
+        "narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e",
+        "rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684491027,
-        "narHash": "sha256-tB44RuuhVCq7TOF02D1l9sxexSmX2c9DDl/UUzi+XQY=",
+        "lastModified": 1684646221,
+        "narHash": "sha256-44dDk7sxsHC4Tw7CHagEKPhoP5T1A2AVmailAtKIdhI=",
         "owner": "therealr5",
         "repo": "purge",
-        "rev": "63a0c5b4d9f4f167b5b8a5456ed195fd3340d3ee",
+        "rev": "631c0ff189ed261faf3a79407de07194779dad74",
         "type": "github"
       },
       "original": {
@@ -249,11 +249,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1684571352,
-        "narHash": "sha256-342PCrDSZ70qVX5hwz1M0cYNBdEcIBVzxyjrU/Um3RU=",
+        "lastModified": 1684637723,
+        "narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "df8b52249e78a0ac33680c9e0b7a029ec22cd8f5",
+        "rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684491085,
-        "narHash": "sha256-ce65P0CAKbZ9Xcx3aBHtByynrT0LHlusgyTzdxxuwr4=",
+        "lastModified": 1684646203,
+        "narHash": "sha256-8ngM2YT1x2DhTCcj26ZMh43jbkXaMSLQ6tU8p6IdKQs=",
         "owner": "therealr5",
         "repo": "trucksimulatorbot-images",
-        "rev": "734dbc070778c5671fc23dfc70196e449089e904",
+        "rev": "063568d4657f8368607227e0370ae3bc174560fd",
         "type": "github"
       },
       "original": {
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index fd63195..dd0c7aa 100755
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -156,26 +156,19 @@
   };
 
   environment.systemPackages = with pkgs; [
+    # hardware utilities
+    btdu
+    nvme-cli
+    intel-gpu-tools
+
+    # system essentials
     wget
-    gcc
-    git
     htop-vim
     dig
     traceroute
     killall
-    python3
     zip
     unzip
-    nvme-cli
-    intel-gpu-tools
-
-    # rust
-    cargo
-    rustc
-    rustfmt
-
-    # java stuff
-    javaPackages.junit_4_12
   ];
   programs.java.enable = true;
 
diff --git a/shared/zsh.nix b/shared/zsh.nix
index a2d6456..b7d4aa4 100644
--- a/shared/zsh.nix
+++ b/shared/zsh.nix
@@ -5,7 +5,9 @@
     # fzf
     bat
     exa
+    duf
     trash-cli
+    nix-output-monitor
   ];
   users.defaultUserShell = pkgs.zsh;
   programs.fzf = {
diff --git a/users/rouven/fixes.nix b/users/rouven/fixes.nix
index a23b16f..b347f1a 100644
--- a/users/rouven/fixes.nix
+++ b/users/rouven/fixes.nix
@@ -1,5 +1,9 @@
 { pkgs, ... }:
 {
+  # nodejs 16 is EOL but bitwarden depends on it
+  nixpkgs.config.permittedInsecurePackages = [
+    "nodejs-16.20.0"
+  ];
   # fixes pam entries for swaylock
   security.pam.services.swaylock.text = ''
     # Account management.
diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix
index 88638bb..881654a 100644
--- a/users/rouven/modules/packages.nix
+++ b/users/rouven/modules/packages.nix
@@ -4,17 +4,14 @@
 
     # essentials
     wpa_supplicant_gui # manage wifi
-    # pcmanfm # rock solid file manager
     xfce.thunar
     xdg-utils # used for xdg-open
     snapper-gui
-    kleopatra
 
     # graphics
     evince # pdf viewer
     gimp
     mpv # best video player out there
-    yt-dlp # youtube downloader
     ffmpeg
 
     # sound
@@ -41,20 +38,20 @@
     yubikey-manager
     yubikey-manager-qt
     yubioath-flutter
-    # bitwarden
+    bitwarden
+    pass
 
     # misc
     neofetch # obligatory
     virt-manager
-    ventoy
     jetbrains.idea-community
-    nix-output-monitor
-
-    duf # better df
+    powerline-fonts
     croc # send files anywhere
 
-    powerline-fonts
-    pass
+    # programming languages
+    cargo
+    rustc
+    rustfmt
 
     # libs
     libyubikey
@@ -64,8 +61,6 @@
     # })
   ];
 
-  programs.obs-studio.enable = true;
-
   xdg.mimeApps = {
     enable = true;
     defaultApplications =