Merge remote-tracking branch 'refs/remotes/origin/main'

hosts/de-lacadie/home.nix

@@ -6,6 +6,7 @@ let
   terminal = pkgs.alacritty;
 in {
   imports = [
+<<<<<<< HEAD
       ../../programs/gammastep.nix
       ../../programs/kdeconnect.nix
       ../../programs/ssh.nix
@@ -13,6 +14,11 @@ in {
       ../../programs/taskwarrior.nix
       ../../programs/clifm.nix
       ../../programs/git.nix
+=======
+      ../../snippets/kdeconnect.nix
+      ../../snippets/ssh.nix
+      ../../snippets/zsh.nix
+>>>>>>> refs/remotes/origin/main
   ];
   home.username = "alice";
   home.homeDirectory = "/home/alice";
@@ -174,11 +180,11 @@ in {
   # terminal emulator
   programs.alacritty.enable = true;
 
-  # programs.neovim = import ./programs/neovim.nix;
+  # programs.neovim = import ./snippets/neovim.nix;
 
-  programs.kakoune = import ../../programs/kakoune.nix pkgs;
+  programs.kakoune = import ../../snippets/kakoune.nix pkgs;
   xdg.configFile."kak-lsp/kak-lsp.toml".source =
-    ../../programs/kakoune/kak-lsp.toml;
+    ../../snippets/kakoune/kak-lsp.toml;
   xdg.desktopEntries.kakoune = {
     name = "Kakoune";
     genericName = "Text Editor";
@@ -225,7 +231,7 @@ in {
     };
   };
 
-  programs.firefox = import ../../programs/firefox.nix { inherit pkgs; };
+  programs.firefox = import ../../snippets/firefox.nix { inherit pkgs; };
 
-  programs.thunderbird = import ../../programs/thunderbird.nix;
+  programs.thunderbird = import ../../snippets/thunderbird.nix;
 }

hosts/randolph/home.nix

@@ -6,13 +6,13 @@ let
   terminal = pkgs.alacritty;
 in {
   imports = [
-      ../../programs/gammastep.nix
-      ../../programs/kdeconnect.nix
-      ../../programs/ssh.nix
-      ../../programs/zsh.nix
-      ../../programs/taskwarrior.nix
-      ../../programs/clifm.nix
-      ../../programs/git.nix
+      ../../snippets/gammastep.nix
+      ../../snippets/kdeconnect.nix
+      ../../snippets/ssh.nix
+      ../../snippets/zsh.nix
+      ../../snippets/taskwarrior.nix
+      ../../snippets/clifm.nix
+      ../../snippets/git.nix
   ];
   home.username = "alice";
   home.homeDirectory = "/home/alice";
@@ -116,6 +116,7 @@ in {
       merriweather-sans
       paratype-pt-serif
       libertinus
+      roboto
       font-awesome
     ] ++ # Fonts
     # [ papirus-icon-theme ] ++ # Icons
@@ -135,12 +136,12 @@ in {
   #   };
   # };
 
-  wayland.windowManager.sway = import ../../programs/sway.nix {
+  wayland.windowManager.sway = import ../../snippets/sway.nix {
     inherit scripts extra config lib pkgs terminal;
   };
 
   programs.waybar =
-    import ../../programs/waybar.nix { inherit scripts config lib pkgs terminal; };
+    import ../../snippets/waybar.nix { inherit scripts config lib pkgs terminal; };
 
   programs.swaylock = {
     enable = true;
@@ -168,9 +169,9 @@ in {
   # terminal emulator
   programs.alacritty.enable = true;
 
-  programs.kakoune = import ../../programs/kakoune.nix pkgs;
+  programs.kakoune = import ../../snippets/kakoune.nix pkgs;
   xdg.configFile."kak-lsp/kak-lsp.toml".source =
-    ../../programs/kakoune/kak-lsp.toml;
+    ../../snippets/kakoune/kak-lsp.toml;
   xdg.desktopEntries.kakoune = {
     name = "Kakoune";
     genericName = "Text Editor";
@@ -226,7 +227,7 @@ in {
       ];
   };
 
-  programs.firefox = import ../../programs/firefox.nix { inherit pkgs; };
+  programs.firefox = import ../../snippets/firefox.nix { inherit pkgs; };
 
-  programs.thunderbird = import ../../programs/thunderbird.nix;
+  programs.thunderbird = import ../../snippets/thunderbird.nix;
 }

snippets/clifm.nix

@@ -13,7 +13,7 @@ let
   });
 in
 {
-  home.packages = with pkgs.extend overlay; [ clifm ];
+  home.packages = with pkgs.extend overlay; [ atool unzip zip clifm ];
   xdg.configFile."clifm/profiles/default/clifmrc".source = ./clifm/clifmrc;
   xdg.configFile."clifm/profiles/default/mimelist.clifm".source = ./clifm/mimelist.clifm;
 }

snippets/clifm/clifmrc

@@ -366,7 +366,7 @@ TrashAsRm=true
 # Only used when opening a directory via a new Clifm instance (with the
 # 'x' command), this option specifies the command to be used to launch a
 # terminal emulator to run Clifm on it.
-TerminalCmd="$TERM -e"
+TerminalCmd="alacritty -e"
 
 # Set the file mode creation mask. Defaults to the value inherited from
 # the shell (though 077 is recommended).

snippets/clifm/mimelist.clifm

@@ -124,7 +124,7 @@ X:N:.*\.abw$=abiword %x;libreoffice %x;soffice %x;ooffice %x
 # Only for the open-with command (ow) and the --open command line switch.
 # In graphical environments directories will be opened in a new window.
 
-X:inode/directory=xterm -e clifm %x;xterm -e vifm %x;pcmanfm %x;thunar %x;xterm -e ncdu %x
+X:inode/directory=$TERM -e clifm %x;xterm -e vifm %x;pcmanfm %x;thunar %x;xterm -e ncdu %x
 !X:inode/directory=vifm;ranger;nnn;ncdu
 
 #-----------------------------
@@ -140,7 +140,7 @@ X:^text/html$=$BROWSER;surf %x;vimprobable %x;vimprobable2 %x;qutebrowser %x;dwb
 
 X:^text/rtf$=libreoffice %x;soffice %x;ooffice %x
 X:(^text/.*|application/(json|javascript)|inode/x-empty)=$TERM -e $EDITOR %x;$TERM -e $VISUAL $x;kak;micro;dte;nvim;vim;vi;mg;emacs;nano;mili;leafpad %x;mousepad %x;featherpad %x;nedit %x;kate %x;gedit %x;pluma %x;io.elementary.code %x;liri-text %x;xed %x;atom %x;nota %x;gobby %x;kwrite %x;xedit %x
-!X:(^text/.*|application/(json|javascript)|inode/x-empty)=$EDITOR;$VISUAL;kak;micro;dte;nvim;vim;vi;mg;emacs;nano
+!X:(^text/.*|application/(json|javascript)|inode/x-empty)=$TERM -e $EDITOR %x;$EDITOR;$VISUAL;kak;micro;dte;nvim;vim;vi;mg;emacs;nano
 
 #-----------------------------
 # Office documents
@@ -170,7 +170,7 @@ X:.*/pdf$=mupdf %x;sioyek %x;llpp %x;lpdf %x;zathura %x;mupdf-x11 %x;apvlv %x;xp
 
 X:^image/gif$=animate %x;pqiv %x;sxiv -a %x;nsxiv -a %x;feh %x
 X:^image/svg=display;inkscape %x
-X:^image/.*=sxiv %x;nsxiv %x;pqiv %x;gpicview %x;qview %x;qimgv %x;mirage %x;ristretto %x;loupe %x;eog %x;eom %x;xviewer %x;viewnior %x;nomacs %x;geeqie %x;gwenview %x;gthumb %x;gimp %x
+X:^image/.*=imv %x;sxiv %x;nsxiv %x;pqiv %x;gpicview %x;qview %x;qimgv %x;mirage %x;ristretto %x;loupe %x;eog %x;eom %x;xviewer %x;viewnior %x;nomacs %x;geeqie %x;gwenview %x;gthumb %x;gimp %x
 !X:^image/.*=fim;img2txt;cacaview;fbi;fbv
 
 #-----------------------------