update icewm config

4 files changed, 36 insertions, 31 deletions

diff --git a/nixos/95theme.nix b/nixos/95theme.nix
index c17e336..adfcdf1 100644
--- a/nixos/95theme.nix
+++ b/nixos/95theme.nix
@@ -1,33 +1,5 @@
 { config, lib, pkgs, modulesPath, ... }:
-let chicago95 = 
-  pkgs.stdenv.mkDerivation rec {
-    pname = "chicago95";
-    version = "20230216";
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/grassmunk/Chicago95.git";
-      rev = "4c39951284add04941adc6ce5a68a778590b93d1";
-      hash = "sha256-PwNuVAcJ6FZlALdHAvgX8H56bOkZ0llXGd09ETj4enQ=";
-    };
-
-    nativeBuildInputs = with pkgs; [
-      which
-    ];
-
-    installPhase = ''
-      pwd
-      ls -lah
-      for p in cursors fonts gtk_theme icons backgrounds doc; do
-        make install_$p DESTDIR=$out prefix=
-      done
-    '';
-
-    meta = with lib; {
-      description = "A rendition of everyone's favorite 1995 Microsoft operating system for Linux";
-      homepage = "https://github.com/grassmunk/Chicago95";
-      platforms = platforms.all;
-    };
-  };
+let chicago95 = import ./pkg_chicago95.nix { pkgs };
 in
 {
   services.xserver.windowManager.icewm.enable = true;
diff --git a/nixos/common.nix b/nixos/common.nix
index ef1fcff..5e802db 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -167,6 +167,7 @@ in
     smartmontools
     speedtest-cli
     socat
+    mc
     ncdu
     dfc
     wget
diff --git a/nixos/icewm.nix b/nixos/icewm.nix
index d6bc665..4269baa 100644
--- a/nixos/icewm.nix
+++ b/nixos/icewm.nix
@@ -14,10 +14,13 @@
     feh
     acpi
     netsurf.browser
-    midori
     sylpheed
     xfe
-    pcmanfm
     libreoffice-still
+    xfce.thunar
+    xfce.thunar-volman
+    xfce.thunar-archive-plugin
+    xfce.ristretto
+    epdfview
   ];
 }
diff --git a/nixos/pkg_chicago95.nix b/nixos/pkg_chicago95.nix
new file mode 100644
index 0000000..c2a69ee
--- /dev/null
+++ b/nixos/pkg_chicago95.nix
@@ -0,0 +1,29 @@
+{ pkgs }:
+  pkgs.stdenv.mkDerivation rec {
+    pname = "chicago95";
+    version = "20230216";
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/grassmunk/Chicago95.git";
+      rev = "4c39951284add04941adc6ce5a68a778590b93d1";
+      hash = "sha256-PwNuVAcJ6FZlALdHAvgX8H56bOkZ0llXGd09ETj4enQ=";
+    };
+
+    nativeBuildInputs = with pkgs; [
+      which
+    ];
+
+    installPhase = ''
+      pwd
+      ls -lah
+      for p in cursors fonts gtk_theme icons backgrounds doc; do
+        make install_$p DESTDIR=$out prefix=
+      done
+    '';
+
+    meta = with pkgs.lib; {
+      description = "A rendition of everyone's favorite 1995 Microsoft operating system for Linux";
+      homepage = "https://github.com/grassmunk/Chicago95";
+      platforms = platforms.all;
+    };
+  }