more coherent set of icewm apps

6 files changed, 40 insertions, 9 deletions

diff --git a/nixos/common.nix b/nixos/common.nix
index 5e802db..b3de0e6 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -208,6 +208,7 @@ in
     vlc
     mpv
     spotify
+    sonixd
     jellyfin-media-player
     nheko
     neochat
diff --git a/nixos/icewm.nix b/nixos/icewm.nix
index 4269baa..9d5e44d 100644
--- a/nixos/icewm.nix
+++ b/nixos/icewm.nix
@@ -10,6 +10,7 @@
     pavucontrol
     networkmanagerapplet
 
+    arandr
     dmenu
     feh
     acpi
@@ -17,10 +18,9 @@
     sylpheed
     xfe
     libreoffice-still
-    xfce.thunar
-    xfce.thunar-volman
-    xfce.thunar-archive-plugin
+    pcmanfm
     xfce.ristretto
     epdfview
+    leafpad
   ];
 }
diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix
index 06bbe7f..1012415 100644
--- a/nixos/kusanagi.nix
+++ b/nixos/kusanagi.nix
@@ -105,6 +105,7 @@ in
     nur = import nurSrc {
       inherit pkgs;
     };
+    chicago95 = import ./pkg_chicago95.nix { inherit pkgs; };
   };
   home-manager.users.lx = import ../nixpkgs/kusanagi.nix { inherit pkgs; };
 
diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix
index cf8f1c8..935b1e8 100644
--- a/nixpkgs/common.nix
+++ b/nixpkgs/common.nix
@@ -57,6 +57,7 @@
     ".config/icewm/keys".source = ../icewm/keys;
     ".config/icewm/menu".source = ../icewm/menu;
     ".config/icewm/theme".source = ../icewm/theme;
+    ".config/pcmanfm/default/pcmanfm.conf".source = ../pcmanfm/pcmanfm.conf;
   };
 
   services.syncthing.enable = true;
diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index 473e411..1ce4be3 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -27,11 +27,11 @@ in {
   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 "File manager" ${pkgs.chicago95}/share/icons/Chicago95/places/24/folder.png pcmanfm /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
+      # prog "Thunderbird" ${pkgs.thunderbird}/share/icons/hicolor/32x32/apps/thunderbird.png thunderbird
+      prog "Music" ${pkgs.sonixd}/share/icons/hicolor/32x32/apps/sonixd.png sonixd
     '';
     ".gtkrc-2.0".text = ''
       gtk-theme-name = "Chicago95"
@@ -46,9 +46,10 @@ in {
 
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import nurSrc { inherit pkgs; };
+    chicago95 = import ../nixos/pkg_chicago95.nix { inherit pkgs; };
   };
 
-  home.packages = [ (import ../nixos/pkg_chicago95.nix { inherit pkgs; }) ];
+  home.packages = with pkgs; [ chicago95 xfce.tumbler ];
 
   home.file.".config/qutebrowser/quickmarks".source = ../qutebrowser/quickmarks;
 
@@ -78,8 +79,9 @@ in {
   xdg.mimeApps.enable = true;
   xdg.mimeApps.defaultApplications = {
     "application/pdf" = [ "epdfview.desktop" ];
-    "image/jpeg" = [ "feh.desktop" ];
-    "image/png" = [ "feh.desktop" ];
+    "image/jpeg" = [ "org.xfce.ristretto.desktop" ];
+    "image/png" = [ "org.xfce.ristretto.desktop" ];
+    "text/plain" = [ "leafpad.desktop" ];
   };
 
   home.homeDirectory = "/home/lx";
diff --git a/pcmanfm/pcmanfm.conf b/pcmanfm/pcmanfm.conf
new file mode 100644
index 0000000..fcc26e3
--- /dev/null
+++ b/pcmanfm/pcmanfm.conf
@@ -0,0 +1,26 @@
+[config]
+bm_open_method=0
+
+[volume]
+mount_on_startup=1
+mount_removable=1
+autorun=1
+
+[ui]
+always_show_tabs=0
+max_tab_chars=32
+win_width=793
+win_height=433
+splitter_pos=150
+media_in_new_tab=0
+desktop_folder_new_win=0
+change_tab_on_drop=1
+close_on_unmount=1
+focus_previous=0
+side_pane_mode=dirtree
+view_mode=list
+show_hidden=0
+sort=name;ascending;
+toolbar=newtab;navigation;home;
+show_statusbar=1
+pathbar_mode_buttons=0