update icewm config

7 files changed, 68 insertions, 40 deletions

diff --git a/icewm/preferences b/icewm/preferences
index bc90b14..6c29e5b 100644
--- a/icewm/preferences
+++ b/icewm/preferences
@@ -1,6 +1,9 @@
 TerminalCommand=st
+
 TaskBarGraphHeight=28
 SmallIconSize=24
+
 DesktopBackgroundColor="rgb:00/80/80"
+
 WorkspaceNames=" 1 "," 2 "
 QuickSwitchRaiseCandidate=1
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;
+    };
+  }
diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix
index 305132a..cf8f1c8 100644
--- a/nixpkgs/common.nix
+++ b/nixpkgs/common.nix
@@ -48,6 +48,8 @@
     ".config/sx/sxrc".text = ''
       ${pkgs.xorg.xsetroot}/bin/xsetroot -solid "#008080"
       ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../xkb/symbols/custom-fr} $DISPLAY
+      ${pkgs.xorg.xset}/bin/xset s off
+      ${pkgs.xorg.xset}/bin/xset -dpms
       nm-applet &
       icewm-session
     '';
@@ -55,14 +57,6 @@
     ".config/icewm/keys".source = ../icewm/keys;
     ".config/icewm/menu".source = ../icewm/menu;
     ".config/icewm/theme".source = ../icewm/theme;
-    ".config/icewm/toolbar".text = ''
-      prog "Terminal" xterm st
-      prog "Qutebrowser" ${pkgs.qutebrowser}/share/icons/hicolor/32x32/apps/qutebrowser.png qutebrowser
-      prog "Firefox" ${pkgs.firefox}/share/icons/hicolor/32x32/apps/firefox.png ${pkgs.firefox}/bin/firefox
-      prog "Midori" ${pkgs.midori}/share/icons/hicolor/22x22/apps/org.midori_browser.Midori.png midori
-      prog "Thunderbird" ${pkgs.thunderbird}/share/icons/hicolor/32x32/apps/thunderbird.png thunderbird
-      prog "Spotify" ${pkgs.spotify}/share/icons/hicolor/32x32/apps/spotify-client.png spotify
-    '';
   };
 
   services.syncthing.enable = true;
diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index 2c97fce..473e411 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -24,10 +24,32 @@ in {
 
   programs.bash.shellAliases.z = "cd /Z/lx";
 
+  home.file = {
+    ".config/icewm/toolbar".text = ''
+      prog "Terminal" xterm st
+      prog "File manager" ${pkgs.xfce.thunar}/share/icons/hicolor/48x48/apps/org.xfce.thunar.png thunar /Z/lx
+      prog "Qutebrowser" ${pkgs.qutebrowser}/share/icons/hicolor/32x32/apps/qutebrowser.png qutebrowser
+      prog "Firefox" ${pkgs.firefox}/share/icons/hicolor/32x32/apps/firefox.png ${pkgs.firefox}/bin/firefox
+      prog "Thunderbird" ${pkgs.thunderbird}/share/icons/hicolor/32x32/apps/thunderbird.png thunderbird
+      prog "Spotify" ${pkgs.spotify}/share/icons/hicolor/32x32/apps/spotify-client.png spotify
+    '';
+    ".gtkrc-2.0".text = ''
+      gtk-theme-name = "Chicago95"
+      gtk-icon-theme-name = "Chicago95"
+    '';
+    ".config/gtk-3.0/settings.ini".text = ''
+      [Settings]
+      gtk-icon-theme-name = Chicago95
+      gtk-theme-name = Chicago95
+    '';
+  };
+
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import nurSrc { inherit pkgs; };
   };
 
+  home.packages = [ (import ../nixos/pkg_chicago95.nix { inherit pkgs; }) ];
+
   home.file.".config/qutebrowser/quickmarks".source = ../qutebrowser/quickmarks;
 
   programs.firefox.enable = true;
@@ -55,12 +77,16 @@ in {
   };
   xdg.mimeApps.enable = true;
   xdg.mimeApps.defaultApplications = {
-    "application/pdf" = [ "llpp.desktop" ];
+    "application/pdf" = [ "epdfview.desktop" ];
+    "image/jpeg" = [ "feh.desktop" ];
+    "image/png" = [ "feh.desktop" ];
   };
 
   home.homeDirectory = "/home/lx";
   xdg.userDirs.download = "/home/lx/Downloads";
 
+  gtk.gtk3.bookmarks = [ "file:///Z/lx" ];
+
   services.gpg-agent.enable = true;
   services.gpg-agent.enableSshSupport = false;
   services.gpg-agent.pinentryFlavor = "qt";