Compare commits

...

5 Commits

Author SHA1 Message Date
Noah Masur
7e3ab279af
update neovim plugins 2024-09-25 16:59:40 -04:00
Noah Masur
cdb9da9c50
add gdd to delete git local and remote branch 2024-09-25 16:58:42 -04:00
Noah Masur
46bbd2c967
add darwin stateversion (required by nix-darwin) 2024-09-25 16:58:03 -04:00
Noah Masur
51bee71faf
move hostname to common because services aren't in darwin 2024-09-25 16:57:44 -04:00
Noah Masur
a7adc18463
add = to convert program to full path 2024-09-25 16:43:48 -04:00
7 changed files with 35 additions and 17 deletions

View File

@ -528,16 +528,16 @@
"nvim-treesitter-src": { "nvim-treesitter-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726901409, "lastModified": 1705679158,
"narHash": "sha256-PYZ1/kmhZIdK0mGZP6Hikm4CIysbA88jUkXLUmbQB98=", "narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "929ca9c76ee20bb27cffbde4ee90583b6c54d616", "rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"ref": "master", "ref": "v0.9.2",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"type": "github" "type": "github"
} }
@ -733,16 +733,16 @@
"toggleterm-nvim-src": { "toggleterm-nvim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713792255, "lastModified": 1721232722,
"narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=", "narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
"owner": "akinsho", "owner": "akinsho",
"repo": "toggleterm.nvim", "repo": "toggleterm.nvim",
"rev": "066cccf48a43553a80a210eb3be89a15d789d6e6", "rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "akinsho", "owner": "akinsho",
"ref": "v2.11.0", "ref": "v2.12.0",
"repo": "toggleterm.nvim", "repo": "toggleterm.nvim",
"type": "github" "type": "github"
} }

View File

@ -91,7 +91,7 @@
}; };
nvim-treesitter-src = { nvim-treesitter-src = {
# https://github.com/nvim-treesitter/nvim-treesitter/tags # https://github.com/nvim-treesitter/nvim-treesitter/tags
url = "github:nvim-treesitter/nvim-treesitter/master"; url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
flake = false; flake = false;
}; };
telescope-nvim-src = { telescope-nvim-src = {
@ -105,7 +105,7 @@
}; };
toggleterm-nvim-src = { toggleterm-nvim-src = {
# https://github.com/akinsho/toggleterm.nvim/tags # https://github.com/akinsho/toggleterm.nvim/tags
url = "github:akinsho/toggleterm.nvim/v2.11.0"; url = "github:akinsho/toggleterm.nvim/v2.12.0";
flake = false; flake = false;
}; };
bufferline-nvim-src = { bufferline-nvim-src = {

View File

@ -137,6 +137,10 @@
type = lib.types.str; type = lib.types.str;
description = "Hostname for push notification services (ntfy)."; description = "Hostname for push notification services (ntfy).";
}; };
status = lib.mkOption {
type = lib.types.str;
description = "Hostname for status page (Uptime-Kuma).";
};
transmission = lib.mkOption { transmission = lib.mkOption {
type = lib.types.str; type = lib.types.str;
description = "Hostname for peer2peer downloads (Transmission)."; description = "Hostname for peer2peer downloads (Transmission).";

View File

@ -76,6 +76,10 @@
description = "Full git commit on notes"; description = "Full git commit on notes";
body = builtins.readFile ./functions/syncnotes.fish; body = builtins.readFile ./functions/syncnotes.fish;
}; };
_which = {
description = "Identify the path to a program in the shell";
body = "command --search (string sub --start=2 $argv)";
};
}; };
interactiveShellInit = '' interactiveShellInit = ''
fish_vi_key_bindings fish_vi_key_bindings
@ -101,6 +105,13 @@
"-" = "cd -"; "-" = "cd -";
mkd = "mkdir -pv"; mkd = "mkdir -pv";
# Convert a program into its full path
"=" = {
position = "anywhere";
regex = "=\\w+";
function = "_which";
};
# System # System
s = "sudo"; s = "sudo";
sc = "systemctl"; sc = "systemctl";

View File

@ -113,6 +113,7 @@ in
gpd = "git push origin -d"; gpd = "git push origin -d";
gbd = "git branch -d"; gbd = "git branch -d";
gbD = "git branch -D"; gbD = "git branch -D";
gdd = "git-delete-both";
gr = "git reset"; gr = "git reset";
grh = "git reset --hard"; grh = "git reset --hard";
gm = "git merge"; gm = "git merge";
@ -158,6 +159,13 @@ in
and git branch -D $branch and git branch -D $branch
''; '';
}; };
git-delete-both = {
argumentNames = "branch";
body = ''
git push origin -d $branch
git branch -d $branch
'';
};
git-merge-fuzzy = { git-merge-fuzzy = {
body = '' body = ''
set branch (git-fuzzy-branch "merge from...") set branch (git-fuzzy-branch "merge from...")

View File

@ -23,6 +23,8 @@
system = { system = {
stateVersion = 5;
keyboard = { keyboard = {
remapCapsLockToControl = true; remapCapsLockToControl = true;
enableKeyMapping = true; # Allows for skhd enableKeyMapping = true; # Allows for skhd

View File

@ -1,13 +1,6 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
options = {
hostnames.status = lib.mkOption {
type = lib.types.str;
description = "Hostname for status page (Uptime-Kuma).";
};
};
config = lib.mkIf config.services.uptime-kuma.enable { config = lib.mkIf config.services.uptime-kuma.enable {
services.uptime-kuma = { services.uptime-kuma = {