add geany and refactor icewm user config

4 files changed, 69 insertions, 62 deletions

diff --git a/nixos/icewm.nix b/nixos/icewm.nix
index bc05578..8be5e89 100644
--- a/nixos/icewm.nix
+++ b/nixos/icewm.nix
@@ -25,5 +25,6 @@
     xfce.ristretto
     epdfview
     leafpad
+    geany
   ];
 }
diff --git a/nixpkgs/common.nix b/nixpkgs/common.nix
index 7a3777d..e42e35f 100644
--- a/nixpkgs/common.nix
+++ b/nixpkgs/common.nix
@@ -41,31 +41,14 @@
   programs.git.lfs.enable = true;
 
   home.file = {
-    ".xkb/symbols/lx-custom-fr".source = ../xkb/symbols/custom-fr;
     ".vim/coc-settings.json".source = ../vim/coc-settings.json;
     ".config/tmux/tmux.conf".source = ../tmux/tmux.conf;
     ".config/qutebrowser/config.py".source = ../qutebrowser/config.py;
-    ".config/sx/sxrc".executable = true;
-    ".config/sx/sxrc".text = ''
-      ${pkgs.xorg.xsetroot}/bin/xsetroot -solid "#008080"
-      ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../xkb/symbols/custom-fr} $DISPLAY
-      xset s off
-      xset -dpms
-      pcmanfm -d &
-      pcmanfm --desktop &
-      nm-applet &
-      icewm-session
-    '';
-    ".config/icewm/preferences".source = ../icewm/preferences;
-    ".config/icewm/keys".source = ../icewm/keys;
-    ".config/icewm/menu".source = ../icewm/menu;
-    ".config/icewm/theme".source = ../icewm/theme;
   };
 
   services.syncthing.enable = true;
 
   xsession.enable = true;
-  home.keyboard = null;
 
   xdg.enable = true;
   xdg.userDirs = {
diff --git a/nixpkgs/icewm.nix b/nixpkgs/icewm.nix
new file mode 100644
index 0000000..192aeb0
--- /dev/null
+++ b/nixpkgs/icewm.nix
@@ -0,0 +1,61 @@
+{ pkgs, ... }: {
+  nixpkgs.config.packageOverrides = pkgs: {
+    chicago95 = import ../nixos/pkg_chicago95.nix { inherit pkgs; };
+  };
+
+  home.file = {
+    ".config/sx/sxrc".executable = true;
+    ".config/sx/sxrc".text = ''
+      ${pkgs.xorg.xsetroot}/bin/xsetroot -solid "#008080"
+      xset s off
+      xset -dpms
+      pcmanfm -d &
+      pcmanfm --desktop &
+      nm-applet &
+      icewm-session
+    '';
+    ".config/icewm/preferences".source = ../icewm/preferences;
+    ".config/icewm/keys".source = ../icewm/keys;
+    ".config/icewm/menu".source = ../icewm/menu;
+    ".config/icewm/theme".source = ../icewm/theme;
+    ".config/icewm/toolbar".text = ''
+      prog "Terminal" ${pkgs.chicago95}/share/icons/Chicago95/apps/24/utilities-terminal.png st
+      prog "File manager" ${pkgs.chicago95}/share/icons/Chicago95/apps/24/system-file-manager.png pcmanfm -n /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 "Music" ${pkgs.sonixd}/share/icons/hicolor/32x32/apps/sonixd.png sonixd
+    '';
+    ".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
+    '';
+    ".config/pcmanfm/default/pcmanfm.conf".source = ../pcmanfm/pcmanfm.conf;
+    ".config/pcmanfm/default/desktop-items-0.conf".source =
+      ../pcmanfm/desktop-items-0.conf;
+  };
+
+  home.packages = with pkgs; [ chicago95 xfce.tumbler ];
+
+  xdg.desktopEntries.llpp = {
+    name = "llpp";
+    genericName = "PDF viewer";
+    exec = "llpp %f";
+    terminal = false;
+    categories = [ "Graphics" "Viewer" ];
+    mimeType = [ "application/pdf" "application/x-pdf" ];
+    type = "Application";
+  };
+  xdg.mimeApps.enable = true;
+  xdg.mimeApps.defaultApplications = {
+    "application/pdf" = [ "epdfview.desktop" ];
+    "image/jpeg" = [ "org.xfce.ristretto.desktop" ];
+    "image/png" = [ "org.xfce.ristretto.desktop" ];
+    "text/plain" = [ "leafpad.desktop" ];
+  };
+}
diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index f30f0ed..17b28a7 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -6,7 +6,7 @@ let
     sha256 = "sha256:0pxljc5bzcwb8c43qmm5l49p03snq7piqnshglqday2dw6cfcd6l";
   };
 in {
-  imports = [ ./common.nix ];
+  imports = [ ./common.nix ./icewm.nix ];
 
   programs.bash.profileExtra = ''
     function mklink {
@@ -34,37 +34,16 @@ in {
 
   programs.bash.shellAliases.z = "cd /Z/lx";
 
-  home.file = {
-    ".config/icewm/toolbar".text = ''
-      prog "Terminal" ${pkgs.chicago95}/share/icons/Chicago95/apps/24/utilities-terminal.png st
-      prog "File manager" ${pkgs.chicago95}/share/icons/Chicago95/apps/24/system-file-manager.png pcmanfm -n /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 "Music" ${pkgs.sonixd}/share/icons/hicolor/32x32/apps/sonixd.png sonixd
-    '';
-    ".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
-    '';
-    ".config/pcmanfm/default/pcmanfm.conf".source = ../pcmanfm/pcmanfm.conf;
-    ".config/pcmanfm/default/desktop-items-0.conf".source =
-      ../pcmanfm/desktop-items-0.conf;
-  };
-
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import nurSrc { inherit pkgs; };
-    chicago95 = import ../nixos/pkg_chicago95.nix { inherit pkgs; };
   };
 
-  home.packages = with pkgs; [ chicago95 xfce.tumbler ];
-
-  home.file.".config/qutebrowser/quickmarks".source = ../qutebrowser/quickmarks;
+  home.file = {
+    ".config/qutebrowser/quickmarks".source = ../qutebrowser/quickmarks;
+    ".gtk-bookmarks".text = ''
+      file:///Z/lx lx
+    '';
+  };
 
   programs.firefox.enable = true;
   programs.firefox.profiles.default = {
@@ -80,23 +59,6 @@ in {
     };
   };
 
-  xdg.desktopEntries.llpp = {
-    name = "llpp";
-    genericName = "PDF viewer";
-    exec = "llpp %f";
-    terminal = false;
-    categories = [ "Graphics" "Viewer" ];
-    mimeType = [ "application/pdf" "application/x-pdf" ];
-    type = "Application";
-  };
-  xdg.mimeApps.enable = true;
-  xdg.mimeApps.defaultApplications = {
-    "application/pdf" = [ "epdfview.desktop" ];
-    "image/jpeg" = [ "org.xfce.ristretto.desktop" ];
-    "image/png" = [ "org.xfce.ristretto.desktop" ];
-    "text/plain" = [ "leafpad.desktop" ];
-  };
-
   home.homeDirectory = "/home/lx";
   xdg.userDirs.download = "/home/lx/Downloads";