aboutsummaryrefslogtreecommitdiffstats
path: root/modules/tools
diff options
context:
space:
mode:
Diffstat (limited to 'modules/tools')
-rw-r--r--modules/tools/editor/neovim/config/default.nix4
-rw-r--r--modules/tools/editor/neovim/config/keybindings.lua (renamed from modules/tools/editor/neovim/keybindings.lua)0
-rw-r--r--modules/tools/editor/neovim/config/options.lua (renamed from modules/tools/editor/neovim/options.lua)0
-rw-r--r--modules/tools/editor/neovim/default.nix11
-rw-r--r--modules/tools/editor/neovim/plugins/default.nix9
-rw-r--r--modules/tools/editor/neovim/plugins/treesitter.nix2
-rw-r--r--modules/tools/file-manager/default.nix10
-rw-r--r--modules/tools/file-manager/lf/default.nix10
-rw-r--r--modules/tools/file-manager/lf/scripts/previewer.sh3
-rw-r--r--modules/tools/file-manager/lsd/default.nix6
-rw-r--r--modules/tools/file-manager/nnn/default.nix15
-rw-r--r--modules/tools/git/default.nix5
-rw-r--r--modules/tools/viewer/bat/default.nix12
-rw-r--r--modules/tools/viewer/bat/theme.tmTheme.mustache (renamed from modules/tools/viewer/bat/theme.nix)36
14 files changed, 77 insertions, 46 deletions
diff --git a/modules/tools/editor/neovim/config/default.nix b/modules/tools/editor/neovim/config/default.nix
new file mode 100644
index 0000000..4514d2f
--- /dev/null
+++ b/modules/tools/editor/neovim/config/default.nix
@@ -0,0 +1,4 @@
+''
+${builtins.readFile ./options.lua}
+${builtins.readFile ./keybindings.lua}
+''
diff --git a/modules/tools/editor/neovim/keybindings.lua b/modules/tools/editor/neovim/config/keybindings.lua
index 3e8e0fa..3e8e0fa 100644
--- a/modules/tools/editor/neovim/keybindings.lua
+++ b/modules/tools/editor/neovim/config/keybindings.lua
diff --git a/modules/tools/editor/neovim/options.lua b/modules/tools/editor/neovim/config/options.lua
index b1fe9cb..b1fe9cb 100644
--- a/modules/tools/editor/neovim/options.lua
+++ b/modules/tools/editor/neovim/config/options.lua
diff --git a/modules/tools/editor/neovim/default.nix b/modules/tools/editor/neovim/default.nix
index 6cf3b50..87fad55 100644
--- a/modules/tools/editor/neovim/default.nix
+++ b/modules/tools/editor/neovim/default.nix
@@ -18,15 +18,8 @@
programs.neovim.extraLuaConfig =
''
- ${builtins.readFile ./options.lua}
- ${builtins.readFile ./keybindings.lua}
-
- -- Plugins configuration
- ${builtins.readFile ./plugins/comment.lua}
- ${builtins.readFile ./plugins/lualine.lua}
- ${import ./plugins/treesitter.nix config}
- ${builtins.readFile ./plugins/base16.lua}
- ${builtins.readFile ./plugins/nvim-tree.lua}
+${import ./config}
+${import ./plugins { inherit config; }}
'';
programs.neovim.plugins = with pkgs.vimPlugins; [
diff --git a/modules/tools/editor/neovim/plugins/default.nix b/modules/tools/editor/neovim/plugins/default.nix
new file mode 100644
index 0000000..2df4e4a
--- /dev/null
+++ b/modules/tools/editor/neovim/plugins/default.nix
@@ -0,0 +1,9 @@
+{ config }:
+
+''
+${builtins.readFile ./comment.lua}
+${builtins.readFile ./lualine.lua}
+${import ./treesitter.nix { inherit config; }}
+${builtins.readFile ./base16.lua}
+${builtins.readFile ./nvim-tree.lua}
+''
diff --git a/modules/tools/editor/neovim/plugins/treesitter.nix b/modules/tools/editor/neovim/plugins/treesitter.nix
index 05f1f2a..be0bdb6 100644
--- a/modules/tools/editor/neovim/plugins/treesitter.nix
+++ b/modules/tools/editor/neovim/plugins/treesitter.nix
@@ -1,4 +1,4 @@
-config:
+{ config }:
''
require("nvim-treesitter.configs").setup {
diff --git a/modules/tools/file-manager/default.nix b/modules/tools/file-manager/default.nix
index fc5eb46..760584a 100644
--- a/modules/tools/file-manager/default.nix
+++ b/modules/tools/file-manager/default.nix
@@ -1,8 +1,16 @@
-{ ... }:
+{ lib, ... }:
{
imports = [
./lf
./lsd
+ ./nnn
];
+
+ options.tools.file-manager = {
+ default = lib.mkOption {
+ type = lib.types.str;
+ description = "Path to the default file manager program.";
+ };
+ };
}
diff --git a/modules/tools/file-manager/lf/default.nix b/modules/tools/file-manager/lf/default.nix
index 30ed421..4cfbba2 100644
--- a/modules/tools/file-manager/lf/default.nix
+++ b/modules/tools/file-manager/lf/default.nix
@@ -6,14 +6,20 @@
};
config = lib.mkIf config.tools.file-manager.lf.enable {
+ tools.file-manager.default = "${pkgs.nnn}/bin/lf";
programs.lf.enable = true;
programs.lf.settings = {
hidden = true;
};
programs.lf.previewer.source = pkgs.writeShellScript
"previewer.sh"
- (builtins.readFile ./scripts/previewer.sh);
-
+ ''
+#!/bin/sh
+unset COLORTERM
+${if config.tools.viewer.bat.enable then
+ "bat -pp --line-range=:500 --color=always '$1'"
+else "cat"}
+ '';
programs.lf.extraConfig = "set icons";
xdg.configFile."lf/icons".source = ./icons;
diff --git a/modules/tools/file-manager/lf/scripts/previewer.sh b/modules/tools/file-manager/lf/scripts/previewer.sh
deleted file mode 100644
index 407e0a0..0000000
--- a/modules/tools/file-manager/lf/scripts/previewer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-unset COLORTERM
-bat -pp --line-range=:500 --color=always "$1"
diff --git a/modules/tools/file-manager/lsd/default.nix b/modules/tools/file-manager/lsd/default.nix
index 5b940ab..d99413d 100644
--- a/modules/tools/file-manager/lsd/default.nix
+++ b/modules/tools/file-manager/lsd/default.nix
@@ -8,10 +8,6 @@
config = lib.mkIf config.tools.file-manager.lsd.enable {
programs.lsd.enable = true;
programs.lsd.enableAliases = true;
- shell.alias."tree" = "${pkgs.lsd}/bin/lsd -a --tree";
-
- programs.lsd.settings = {
- icons.separator = " ";
- };
+ programs.lsd.settings.icons.separator = " ";
};
}
diff --git a/modules/tools/file-manager/nnn/default.nix b/modules/tools/file-manager/nnn/default.nix
new file mode 100644
index 0000000..6244d04
--- /dev/null
+++ b/modules/tools/file-manager/nnn/default.nix
@@ -0,0 +1,15 @@
+{ config, pkgs, lib, ... }:
+
+{
+ options.tools.file-manager.nnn = {
+ enable = lib.mkEnableOption "Enables nnn.";
+ };
+
+ config = lib.mkIf config.tools.file-manager.nnn.enable {
+ tools.file-manager.default = "${pkgs.nnn}/bin/nnn -H -d";
+ programs.nnn.enable = true;
+ programs.nnn.package = pkgs.nnn.override ({ withNerdIcons = true; });
+ programs.nnn.plugins.src = "${pkgs.nnn}/share/plugins";
+ shell.alias."nnn" = "nnn -H -d";
+ };
+}
diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix
index 1dadacf..135cbc6 100644
--- a/modules/tools/git/default.nix
+++ b/modules/tools/git/default.nix
@@ -15,6 +15,9 @@
};
# The base directory of the credential file must exist
- home.activation.createGitCacheDirectory = lib.hm.dag.entryAfter [ "writeBoundary" ] "mkdir -p ${config.xdg.cacheHome}/git";
+ home.activation.createGitCacheDirectory
+ = lib.hm.dag.entryAfter
+ [ "writeBoundary" ]
+ "mkdir -p ${config.xdg.cacheHome}/git";
};
}
diff --git a/modules/tools/viewer/bat/default.nix b/modules/tools/viewer/bat/default.nix
index 915b4b2..73bdefd 100644
--- a/modules/tools/viewer/bat/default.nix
+++ b/modules/tools/viewer/bat/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
{
options.tools.viewer.bat = {
@@ -7,8 +7,12 @@
config = lib.mkIf config.tools.viewer.bat.enable {
programs.bat.enable = true;
- programs.bat.config.theme = "customTheme";
- xdg.configFile."bat/themes/customTheme.tmTheme".text
- = import ./theme.nix config;
+ programs.bat.config.theme = "custom-theme";
+ shell.alias."cbat" = "${pkgs.bat}/bin/bat -pp";
+ home.sessionVariables."PAGER" = "${pkgs.bat}/bin/bat --paging always";
+ xdg.configFile."bat/themes/custom-theme.tmTheme".source
+ = config.scheme {
+ template = builtins.readFile ./theme.tmTheme.mustache;
+ };
};
}
diff --git a/modules/tools/viewer/bat/theme.nix b/modules/tools/viewer/bat/theme.tmTheme.mustache
index dc22ceb..844b80d 100644
--- a/modules/tools/viewer/bat/theme.nix
+++ b/modules/tools/viewer/bat/theme.tmTheme.mustache
@@ -1,7 +1,3 @@
-config:
-
-with config.scheme.withHashtag;
-''
<?xml version="1.0" encoding="UTF-8"?>
<plist version="1.0">
<dict>
@@ -14,17 +10,17 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>background</key>
- <string>${base00}</string>
+ <string>#{{base00-hex}}</string>
<key>foreground</key>
- <string>${base05}</string>
+ <string>#{{base05-hex}}</string>
<key>caret</key>
- <string>${base07}</string>
+ <string>#{{base07-hex}}</string>
<key>invisibles</key>
- <string>${base03}</string>
+ <string>#{{base03-hex}}</string>
<key>lineHighlight</key>
- <string>${base02}</string>
+ <string>#{{base02-hex}}</string>
<key>selection</key>
- <string>${base03}</string>
+ <string>#{{base03-hex}}</string>
</dict>
</dict>
@@ -35,7 +31,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base04}</string>
+ <string>#{{base04-hex}}</string>
</dict>
</dict>
@@ -45,7 +41,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base0A}</string>
+ <string>#{{base0A-hex}}</string>
</dict>
</dict>
@@ -55,7 +51,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base09}</string>
+ <string>#{{base09-hex}}</string>
</dict>
</dict>
@@ -65,7 +61,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base08}</string>
+ <string>#{{base08-hex}}</string>
</dict>
</dict>
@@ -75,7 +71,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base0D}</string>
+ <string>#{{base0D-hex}}</string>
</dict>
</dict>
@@ -85,7 +81,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base0E}</string>
+ <string>#{{base0E-hex}}</string>
</dict>
</dict>
@@ -95,7 +91,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base0B}</string>
+ <string>#{{base0B-hex}}</string>
</dict>
</dict>
@@ -105,7 +101,7 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base0C}</string>
+ <string>#{{base0C-hex}}</string>
</dict>
</dict>
@@ -115,10 +111,10 @@ with config.scheme.withHashtag;
<key>settings</key>
<dict>
<key>foreground</key>
- <string>${base0F}</string>
+ <string>#{{base0F-hex}}</string>
</dict>
</dict>
</array>
</dict>
</plist>
-''
+
generated by cgit v1.2.3 (git 2.39.1) at 2026-10-11 03:25:55 +0000