mirror of
https://github.com/nmasur/dotfiles
synced 2025-07-08 10:40:13 +00:00
Compare commits
1 Commits
0a98b72784
...
eblume-mol
Author | SHA1 | Date | |
---|---|---|---|
068cdbf5d4 |
17
flake.lock
generated
17
flake.lock
generated
@ -304,22 +304,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"markview-nvim-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1719592662,
|
|
||||||
"narHash": "sha256-E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ=",
|
|
||||||
"owner": "OXY2DEV",
|
|
||||||
"repo": "markview.nvim",
|
|
||||||
"rev": "f60219dce7283192d549f21847fcf8537bf6d260",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "OXY2DEV",
|
|
||||||
"repo": "markview.nvim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nextcloud-cookbook": {
|
"nextcloud-cookbook": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -586,7 +570,6 @@
|
|||||||
"hmts-nvim-src": "hmts-nvim-src",
|
"hmts-nvim-src": "hmts-nvim-src",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"mac-app-util": "mac-app-util",
|
"mac-app-util": "mac-app-util",
|
||||||
"markview-nvim-src": "markview-nvim-src",
|
|
||||||
"nextcloud-cookbook": "nextcloud-cookbook",
|
"nextcloud-cookbook": "nextcloud-cookbook",
|
||||||
"nextcloud-external": "nextcloud-external",
|
"nextcloud-external": "nextcloud-external",
|
||||||
"nextcloud-news": "nextcloud-news",
|
"nextcloud-news": "nextcloud-news",
|
||||||
|
@ -127,10 +127,6 @@
|
|||||||
url = "github:mfussenegger/nvim-lint";
|
url = "github:mfussenegger/nvim-lint";
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
markview-nvim-src = {
|
|
||||||
url = "github:OXY2DEV/markview.nvim";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Tree-Sitter Grammars
|
# Tree-Sitter Grammars
|
||||||
tree-sitter-bash = {
|
tree-sitter-bash = {
|
||||||
|
@ -34,6 +34,7 @@ inputs.darwin.lib.darwinSystem {
|
|||||||
dark = true;
|
dark = true;
|
||||||
};
|
};
|
||||||
mail.user = globals.user;
|
mail.user = globals.user;
|
||||||
|
mole.enable = true;
|
||||||
atuin.enable = true;
|
atuin.enable = true;
|
||||||
charm.enable = true;
|
charm.enable = true;
|
||||||
neovim.enable = true;
|
neovim.enable = true;
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
./firefox.nix
|
./firefox.nix
|
||||||
./kitty.nix
|
./kitty.nix
|
||||||
./media.nix
|
./media.nix
|
||||||
|
./mole.nix
|
||||||
./obsidian.nix
|
./obsidian.nix
|
||||||
./qbittorrent.nix
|
./qbittorrent.nix
|
||||||
./slack.nix
|
./slack.nix
|
||||||
|
@ -34,13 +34,10 @@
|
|||||||
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
|
programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
|
||||||
|
|
||||||
# Display images in the terminal
|
# Display images in the terminal
|
||||||
programs.fish.interactiveShellInit = # fish
|
programs.fish.shellAliases = {
|
||||||
''
|
icat = "kitty +kitten icat";
|
||||||
if test "$TERM" = "xterm-kitty"
|
ssh = "kitty +kitten ssh";
|
||||||
alias icat="kitty +kitten icat"
|
};
|
||||||
alias ssh="kitty +kitten ssh"
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
|
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
110
modules/common/applications/mole.nix
Normal file
110
modules/common/applications/mole.nix
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
# Build kdl-py
|
||||||
|
kdl-py = pkgs.python311.pkgs.buildPythonPackage rec {
|
||||||
|
pname = "kdl-py";
|
||||||
|
version = "1.2.0";
|
||||||
|
pyproject = true;
|
||||||
|
src = pkgs.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM=";
|
||||||
|
};
|
||||||
|
build-system = [ pkgs.python311.pkgs.setuptools ];
|
||||||
|
# has no tests
|
||||||
|
doCheck = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
mole = pkgs.python311.pkgs.buildPythonPackage rec {
|
||||||
|
pname = "mole";
|
||||||
|
version = "0.7.1";
|
||||||
|
pyproject = true;
|
||||||
|
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "eblume";
|
||||||
|
repo = pname;
|
||||||
|
rev = "30bb052a97050b1fa89c287855d834f7952b195a";
|
||||||
|
sha256 = "sha256-DUWsfyICCfFQ2ZQBYSQVoA3eLdKC8djUylKgGdHIyJo=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(builtins.toString (
|
||||||
|
pkgs.writeText "pyproject.toml.patch" ''
|
||||||
|
diff --git a/pyproject.toml b/pyproject.toml
|
||||||
|
index 12ce0f5..787e978 100644
|
||||||
|
--- a/pyproject.toml
|
||||||
|
+++ b/pyproject.toml
|
||||||
|
@@ -12,11 +12,11 @@ packages = [
|
||||||
|
[tool.poetry.dependencies]
|
||||||
|
python = "^3.11"
|
||||||
|
# Now back to the regular dependencies
|
||||||
|
-typer = {extras = ["all"], version = "^0.9"}
|
||||||
|
+typer = {extras = ["all"], version = "^0.12"}
|
||||||
|
todoist-api-python = "^2.1.3"
|
||||||
|
openai = "^1.2.4"
|
||||||
|
rich = "^13.4.2"
|
||||||
|
-watchdog = "^3.0.0"
|
||||||
|
+watchdog = "^4.0.0"
|
||||||
|
pydub = "^0.25.1"
|
||||||
|
requests = "^2.31.0"
|
||||||
|
pyyaml = "^6.0.1"
|
||||||
|
''
|
||||||
|
))
|
||||||
|
];
|
||||||
|
|
||||||
|
# Used during build time
|
||||||
|
nativeBuildInputs = [ pkgs.python311Packages.poetry-core ];
|
||||||
|
|
||||||
|
# Used during run time
|
||||||
|
buildInputs = [
|
||||||
|
pkgs._1password
|
||||||
|
pkgs.nb-cli
|
||||||
|
];
|
||||||
|
|
||||||
|
# Both build and run time
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
pkgs.python311Packages.typer
|
||||||
|
pkgs.python311Packages.todoist-api-python
|
||||||
|
pkgs.python311Packages.openai
|
||||||
|
pkgs.python311Packages.rich
|
||||||
|
pkgs.python311Packages.watchdog
|
||||||
|
pkgs.python311Packages.pydub
|
||||||
|
pkgs.python311Packages.requests
|
||||||
|
pkgs.python311Packages.pyyaml
|
||||||
|
pkgs.python311Packages.pydantic
|
||||||
|
pkgs.python311Packages.pendulum
|
||||||
|
kdl-py
|
||||||
|
pkgs.ffmpeg
|
||||||
|
];
|
||||||
|
|
||||||
|
build-system = [ pkgs.python311.pkgs.setuptools ];
|
||||||
|
|
||||||
|
# has no tests
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
|
options = {
|
||||||
|
mole = {
|
||||||
|
enable = lib.mkEnableOption {
|
||||||
|
description = "Enable Mole.";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf config.mole.enable {
|
||||||
|
home-manager.users.${config.user} = {
|
||||||
|
home.packages = [ mole ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -10,7 +10,7 @@
|
|||||||
pkgs.vimPlugins.vim-eunuch # File manipulation commands
|
pkgs.vimPlugins.vim-eunuch # File manipulation commands
|
||||||
pkgs.vimPlugins.vim-fugitive # Git commands
|
pkgs.vimPlugins.vim-fugitive # Git commands
|
||||||
pkgs.vimPlugins.vim-repeat # Better repeat using .
|
pkgs.vimPlugins.vim-repeat # Better repeat using .
|
||||||
pkgs.vimPlugins.markview-nvim # Markdown preview
|
pkgs.vimPlugins.glow-nvim # Markdown preview popup
|
||||||
pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
|
pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
|
||||||
pkgs.vimPlugins.which-key-nvim # Keybind helper
|
pkgs.vimPlugins.which-key-nvim # Keybind helper
|
||||||
];
|
];
|
||||||
@ -21,7 +21,7 @@
|
|||||||
names = false;
|
names = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
setup.markview = { };
|
setup.glow = { };
|
||||||
setup.which-key = { };
|
setup.which-key = { };
|
||||||
|
|
||||||
vim.o = {
|
vim.o = {
|
||||||
|
@ -14,6 +14,11 @@
|
|||||||
open_mapping = dsl.rawLua "[[<c-\\>]]";
|
open_mapping = dsl.rawLua "[[<c-\\>]]";
|
||||||
hide_numbers = true;
|
hide_numbers = true;
|
||||||
direction = "float";
|
direction = "float";
|
||||||
|
float_opts = {
|
||||||
|
width = dsl.rawLua "vim.o.columns - 4";
|
||||||
|
height = dsl.rawLua "vim.o.lines - 4";
|
||||||
|
row = 0;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
lua = ''
|
lua = ''
|
||||||
|
@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
|
|||||||
key("n", "cq", ":cclose<CR>")
|
key("n", "cq", ":cclose<CR>")
|
||||||
|
|
||||||
-- Other
|
-- Other
|
||||||
key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
|
key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
|
||||||
key("n", "Y", "y$") --- Copy to end of line
|
key("n", "Y", "y$") --- Copy to end of line
|
||||||
key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
|
key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
|
||||||
key("v", "D", "y'>gp") --- Duplicate selected
|
key("v", "D", "y'>gp") --- Duplicate selected
|
||||||
key("x", "<Leader>p", '"_dP') --- Paste but keep register
|
key("x", "<Leader>p", '"_dP') --- Paste but keep register
|
||||||
|
@ -2321,7 +2321,7 @@ in
|
|||||||
datasourceUid = promUid;
|
datasourceUid = promUid;
|
||||||
model = {
|
model = {
|
||||||
editorMode = "code";
|
editorMode = "code";
|
||||||
expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
|
expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
|
||||||
hide = false;
|
hide = false;
|
||||||
instant = true;
|
instant = true;
|
||||||
intervalMs = 1000;
|
intervalMs = 1000;
|
||||||
|
@ -38,10 +38,6 @@ in
|
|||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
|
||||||
services.victoriametrics.extraOptions = [
|
|
||||||
"-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
|
systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
|
||||||
description = "VictoriaMetrics basic auth proxy";
|
description = "VictoriaMetrics basic auth proxy";
|
||||||
after = [ "network.target" ];
|
after = [ "network.target" ];
|
||||||
|
@ -38,6 +38,5 @@ in
|
|||||||
base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
|
base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
|
||||||
baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
|
baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
|
||||||
hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
|
hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
|
||||||
markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user