From 2949d209b7bef59a790a1ed3bceb22cde1515502 Mon Sep 17 00:00:00 2001
From: Felix Suchert <dev@felixsuchert.de>
Date: Tue, 6 Feb 2024 16:36:05 +0100
Subject: [PATCH] cleanup packages, use programs where possible

---
 entropy/nixos/configuration.nix | 54 +++++++++++++++++++--------------
 entropy/nixos/flake.lock        | 18 +++++------
 entropy/nixos/modules/sway.nix  |  2 +-
 3 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix
index cab03d8..a7363eb 100644
--- a/entropy/nixos/configuration.nix
+++ b/entropy/nixos/configuration.nix
@@ -171,14 +171,39 @@
 
   # ------------ programs -----------------------------------------------------
   programs.fish.enable = true;
-  programs.vim.defaultEditor = true;
+
+  programs.vim.enable = true;
+  # programs.vim.defaultEditor = true;
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   programs.ssh.setXAuthLocation = true;
 
-  # services.emacs = {
-  #   install = true;
-  #   enable = false;
-  # };
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
+  };
+
+  programs.firefox = {
+    enable = true;
+    package = pkgs.firefox-wayland;
+  };
+
+  programs.git = {
+    enable = true;
+    package = pkgs.gitAndTools.gitFull;
+  };
+
+  programs.mosh.enable = true;
+
+  programs.nix-index = {
+    enable = true;
+    enableZshIntegration = true;
+    enableBashIntegration = true;
+    enableFishIntegration = true;
+  };
 
   # List of packages installed in system profile.
   environment.systemPackages = with pkgs; [
@@ -186,6 +211,7 @@
     wget
     w3m
     htop
+    btop
     bat
     lsd
     unstable.eza
@@ -201,7 +227,6 @@
     usbutils
     moreutils
     file
-    mosh
     #tmux
     zellij
     libqalculate
@@ -220,15 +245,13 @@
     neomutt urlview
     notmuch
     aspell # spell checking in mail
-    # personal mailing
-    thunderbirdPackages.thunderbird-115
     ## Rust
     rustup
     cargo-flamegraph
     cargo-watch
 
     unstable.rust-analyzer
-    unstable.helix
+    #unstable.helix
 
     ## other programming languages and compilers
     stack
@@ -246,7 +269,6 @@
     ## nix-community/comma
     comma
     nix-output-monitor
-    nix-index
     nil
 
     # provided by my own overlay
@@ -266,28 +288,17 @@
     ## I heard you like man pages?
     man-pages
     ## git and friends
-    #git
-    #git-doc
-    gitAndTools.gitFull
     gitAndTools.delta
     gitAndTools.gitui
     ## terminal, browsers, text editing, note taking
     alacritty
-    # doesn't support the MLIR tooling from the marketplace :(
-    #unstable.vscodium
     # TODO(feliix42): Fix at some point!
     unstable.vscode.fhs
-    neovim
     tree-sitter # for NVIM completions
     ghostwriter
-    firefox-wayland
     unstable.obsidian
-    ## time tracking
-    # watson
-    hledger hledger-ui hledger-web
     ## file managers
     ranger
-    xfce.thunar
     ## file sharing
     nextcloud-client
     ## document viewers
@@ -315,7 +326,6 @@
     slack
     tdesktop
     signal-desktop
-    weechat
     ## networking
     openconnect
   ];
diff --git a/entropy/nixos/flake.lock b/entropy/nixos/flake.lock
index 1813f9d..32129ec 100644
--- a/entropy/nixos/flake.lock
+++ b/entropy/nixos/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1706182238,
-        "narHash": "sha256-Ti7CerGydU7xyrP/ow85lHsOpf+XMx98kQnPoQCSi1g=",
+        "lastModified": 1707211557,
+        "narHash": "sha256-LTKTzZ6fM5j8XWXf51IMBzDaOaJg9kYWLUZxoIhzRN8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f84eaffc35d1a655e84749228cde19922fcf55f1",
+        "rev": "6e5cc385fc8cf5ca6495d70243074ccdea9f64c7",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706373441,
-        "narHash": "sha256-S1hbgNbVYhuY2L05OANWqmRzj4cElcbLuIkXTb69xkk=",
+        "lastModified": 1707091808,
+        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "56911ef3403a9318b7621ce745f5452fb9ef6867",
+        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706371002,
-        "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=",
+        "lastModified": 1707092692,
+        "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006",
+        "rev": "faf912b086576fd1a15fca610166c98d47bc667e",
         "type": "github"
       },
       "original": {
diff --git a/entropy/nixos/modules/sway.nix b/entropy/nixos/modules/sway.nix
index bda3a1f..0c740fa 100644
--- a/entropy/nixos/modules/sway.nix
+++ b/entropy/nixos/modules/sway.nix
@@ -51,7 +51,6 @@ in
     extraPackages = with pkgs; [
       swaylock-effects
       swayidle
-      xwayland # for legacy apps
       waybar
       wl-clipboard
       mako # notification daemon
@@ -87,6 +86,7 @@ in
   };
 
   programs.waybar.enable = true;
+  programs.xwayland.enable = true; # for legacy apps
 
   services.redshift = {
     enable = true;