From b7261af069912c3aa2a04906ee89b8fc0cc64493 Mon Sep 17 00:00:00 2001 From: vorboyvo Date: Fri, 29 Nov 2024 16:31:36 -0500 Subject: [PATCH] Moved programs/ to snippets/ and made necessary modifications in config. Edited clifmrc to make 'x' command work somewhat. --- hosts/de-lacadie/home.nix | 20 ++++++++-------- hosts/randolph/home.nix | 26 ++++++++++----------- {programs => snippets}/clifm.nix | 0 {programs => snippets}/clifm/clifmrc | 2 +- {programs => snippets}/clifm/mimelist.clifm | 6 ++--- {programs => snippets}/firefox.nix | 0 {programs => snippets}/gammastep.nix | 0 {programs => snippets}/git.nix | 0 {programs => snippets}/kakoune.nix | 0 {programs => snippets}/kakoune/divider.kak | 0 {programs => snippets}/kakoune/kak-lsp.toml | 0 {programs => snippets}/kdeconnect.nix | 0 {programs => snippets}/neovim.nix | 0 {programs => snippets}/neovim/init.lua | 0 {programs => snippets}/ssh.nix | 0 {programs => snippets}/sway.nix | 0 {programs => snippets}/taskwarrior.nix | 0 {programs => snippets}/thunderbird.nix | 0 {programs => snippets}/waybar.nix | 0 {programs => snippets}/zsh.nix | 0 20 files changed, 27 insertions(+), 27 deletions(-) rename {programs => snippets}/clifm.nix (100%) rename {programs => snippets}/clifm/clifmrc (99%) rename {programs => snippets}/clifm/mimelist.clifm (95%) rename {programs => snippets}/firefox.nix (100%) rename {programs => snippets}/gammastep.nix (100%) rename {programs => snippets}/git.nix (100%) rename {programs => snippets}/kakoune.nix (100%) rename {programs => snippets}/kakoune/divider.kak (100%) rename {programs => snippets}/kakoune/kak-lsp.toml (100%) rename {programs => snippets}/kdeconnect.nix (100%) rename {programs => snippets}/neovim.nix (100%) rename {programs => snippets}/neovim/init.lua (100%) rename {programs => snippets}/ssh.nix (100%) rename {programs => snippets}/sway.nix (100%) rename {programs => snippets}/taskwarrior.nix (100%) rename {programs => snippets}/thunderbird.nix (100%) rename {programs => snippets}/waybar.nix (100%) rename {programs => snippets}/zsh.nix (100%) diff --git a/hosts/de-lacadie/home.nix b/hosts/de-lacadie/home.nix index 9efb8db..206fb9b 100644 --- a/hosts/de-lacadie/home.nix +++ b/hosts/de-lacadie/home.nix @@ -6,9 +6,9 @@ let terminal = pkgs.alacritty; in { imports = [ - ../../programs/kdeconnect.nix - ../../programs/ssh.nix - ../../programs/zsh.nix + ../../snippets/kdeconnect.nix + ../../snippets/ssh.nix + ../../snippets/zsh.nix ]; home.username = "alice"; home.homeDirectory = "/home/alice"; @@ -139,12 +139,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; @@ -204,11 +204,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"; @@ -255,7 +255,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; } diff --git a/hosts/randolph/home.nix b/hosts/randolph/home.nix index fba3818..90b3589 100644 --- a/hosts/randolph/home.nix +++ b/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"; @@ -136,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; @@ -169,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"; @@ -227,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; } diff --git a/programs/clifm.nix b/snippets/clifm.nix similarity index 100% rename from programs/clifm.nix rename to snippets/clifm.nix diff --git a/programs/clifm/clifmrc b/snippets/clifm/clifmrc similarity index 99% rename from programs/clifm/clifmrc rename to snippets/clifm/clifmrc index 3d0b6c1..aebdd14 100644 --- a/programs/clifm/clifmrc +++ b/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). diff --git a/programs/clifm/mimelist.clifm b/snippets/clifm/mimelist.clifm similarity index 95% rename from programs/clifm/mimelist.clifm rename to snippets/clifm/mimelist.clifm index f43cbe5..a405a11 100644 --- a/programs/clifm/mimelist.clifm +++ b/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 #----------------------------- diff --git a/programs/firefox.nix b/snippets/firefox.nix similarity index 100% rename from programs/firefox.nix rename to snippets/firefox.nix diff --git a/programs/gammastep.nix b/snippets/gammastep.nix similarity index 100% rename from programs/gammastep.nix rename to snippets/gammastep.nix diff --git a/programs/git.nix b/snippets/git.nix similarity index 100% rename from programs/git.nix rename to snippets/git.nix diff --git a/programs/kakoune.nix b/snippets/kakoune.nix similarity index 100% rename from programs/kakoune.nix rename to snippets/kakoune.nix diff --git a/programs/kakoune/divider.kak b/snippets/kakoune/divider.kak similarity index 100% rename from programs/kakoune/divider.kak rename to snippets/kakoune/divider.kak diff --git a/programs/kakoune/kak-lsp.toml b/snippets/kakoune/kak-lsp.toml similarity index 100% rename from programs/kakoune/kak-lsp.toml rename to snippets/kakoune/kak-lsp.toml diff --git a/programs/kdeconnect.nix b/snippets/kdeconnect.nix similarity index 100% rename from programs/kdeconnect.nix rename to snippets/kdeconnect.nix diff --git a/programs/neovim.nix b/snippets/neovim.nix similarity index 100% rename from programs/neovim.nix rename to snippets/neovim.nix diff --git a/programs/neovim/init.lua b/snippets/neovim/init.lua similarity index 100% rename from programs/neovim/init.lua rename to snippets/neovim/init.lua diff --git a/programs/ssh.nix b/snippets/ssh.nix similarity index 100% rename from programs/ssh.nix rename to snippets/ssh.nix diff --git a/programs/sway.nix b/snippets/sway.nix similarity index 100% rename from programs/sway.nix rename to snippets/sway.nix diff --git a/programs/taskwarrior.nix b/snippets/taskwarrior.nix similarity index 100% rename from programs/taskwarrior.nix rename to snippets/taskwarrior.nix diff --git a/programs/thunderbird.nix b/snippets/thunderbird.nix similarity index 100% rename from programs/thunderbird.nix rename to snippets/thunderbird.nix diff --git a/programs/waybar.nix b/snippets/waybar.nix similarity index 100% rename from programs/waybar.nix rename to snippets/waybar.nix diff --git a/programs/zsh.nix b/snippets/zsh.nix similarity index 100% rename from programs/zsh.nix rename to snippets/zsh.nix