Compare commits

..

No commits in common. "5eb1eee3d274d851a8c61ff1d2999efe0017e37f" and "977c3160490474f244518754eaa5f5c10764dfe3" have entirely different histories.

6 changed files with 40 additions and 47 deletions

View file

@ -312,11 +312,11 @@
"vimwiki-cli": "vimwiki-cli" "vimwiki-cli": "vimwiki-cli"
}, },
"locked": { "locked": {
"lastModified": 1671858011, "lastModified": 1671357603,
"narHash": "sha256-H1y+8HuPDv2DQxD80/HU/ifT/q/Qn3SB3B56MMgM9Ro=", "narHash": "sha256-LIathTJK9ElWdjlT+zI+CJFB5adORTM9kYeWqEbKwiU=",
"ref": "main", "ref": "main",
"rev": "6e83e0cf52e84c9abc1bb95e9c90eac3da8b3c53", "rev": "ea3d0f9a8146f1985dec0b0348a79e3a3038d9b7",
"revCount": 468, "revCount": 465,
"type": "git", "type": "git",
"url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab"
}, },

View file

@ -251,7 +251,6 @@
}; };
helix = { helix = {
hostname = "git.sealight.xyz"; hostname = "git.sealight.xyz";
# autoRollback = false;
profiles.system = { profiles.system = {
user = "root"; user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.helix; path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.helix;

View file

@ -51,6 +51,7 @@
gdb gdb
xxd xxd
taskwarrior taskwarrior
yt-dlp
gnupg gnupg
syncthing syncthing
dijo dijo
@ -59,7 +60,7 @@
pandoc pandoc
(pkgs.writeScriptBin "jq-repl" '' (pkgs.writeScriptBin "jq-repl" ''
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ -z $1 ]] || [[ $1 == "-" ]]; then if [[ -z $1 ]] || [[ $1 == "-" ]] then
input=$(mktemp) input=$(mktemp)
trap "rm -f $input" EXIT trap "rm -f $input" EXIT
cat /dev/stdin > $input cat /dev/stdin > $input
@ -69,29 +70,27 @@
echo "" \ | fzf --phony --preview-window="up:90%" --print-query --preview "jq --color-output -r {q} $input" echo "" \ | fzf --phony --preview-window="up:90%" --print-query --preview "jq --color-output -r {q} $input"
'') '')
(pkgs.writeScriptBin "flakify" ''
#!/usr/bin/env zsh
if [ ! -e flake.nix ]; then
nix flake new -t github:nix-community/nix-direnv .
elif [ ! -e .envrc ]; then
echo "use flake" > .envrc
direnv allow
fi
vim flake.nix
'')
(pkgs.writeScriptBin "mx" ''
#!/usr/bin/env bash
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix
'')
]; ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = false; enableAutosuggestions = true;
initExtra = '' initExtra = ''
bindkey -v bindkey -v
flakify() {
if [ ! -e flake.nix ]; then
nix flake new -t github:nix-community/nix-direnv .
elif [ ! -e .envrc ]; then
echo "use flake" > .envrc
direnv allow
fi
vim flake.nix
}
mx() {
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | fzf --preview="manix '{}'" | xargs manix
}
autopair-init autopair-init
''; '';
sessionVariables = { sessionVariables = {
@ -138,16 +137,16 @@
}; };
file = "zsh-autoquoter.zsh"; file = "zsh-autoquoter.zsh";
} }
# { {
# name = "zsh-nix-shell"; name = "zsh-nix-shell";
# file = "nix-shell.plugin.zsh"; file = "nix-shell.plugin.zsh";
# src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
# owner = "chisui"; owner = "chisui";
# repo = "zsh-nix-shell"; repo = "zsh-nix-shell";
# rev = "v0.5.0"; rev = "v0.5.0";
# sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91"; sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91";
# }; };
# } }
]; ];
}; };
@ -165,6 +164,7 @@
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
nix-direnv.enable = true; nix-direnv.enable = true;
# nix-direnv.enableFlakes = true; always enabled
}; };
programs.zoxide = { programs.zoxide = {
@ -182,9 +182,7 @@
"....." = "cd ../../../.."; "....." = "cd ../../../..";
# kitaab recents # kitaab recents
kr = "cd /home/anish/kitaab/vimwiki; exa --sort=modified --reverse | fzf --preview 'bat --style=numbers --color=always --terminal-width -1 ./{}'"; kr = "cd /home/anish/kitaab/vimwiki; ls --sort=modified --reverse | fzf --preview 'bat --style=numbers --color=always --terminal-width -1 {}'";
icat = "kitty +kitten icat";
yt = "ytfzf -T kitty -t ";
# modern cli tools # modern cli tools
ls = "exa --icons"; ls = "exa --icons";
@ -237,7 +235,7 @@
nf = "n flake"; nf = "n flake";
nfl = "nf lock"; nfl = "nf lock";
nepl = "n repl '<nixpkgs>'"; nepl = "n repl '<nixpkgs>'";
srch = "ns nixpkgs"; srch = "ns nixos";
orch = "ns override"; orch = "ns override";
nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/etc/nixos/#curve'; cd $OLDPWD"; nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/etc/nixos/#curve'; cd $OLDPWD";
nrt = "cd /tmp; sudo nixos-rebuild test --flake '/etc/nixos/#curve'; cd $OLDPWD"; nrt = "cd /tmp; sudo nixos-rebuild test --flake '/etc/nixos/#curve'; cd $OLDPWD";

View file

@ -7,5 +7,5 @@ open_url_with default
mouse_map left click ungrabbed mouse_click_url_or_select mouse_map left click ungrabbed mouse_click_url_or_select
confirm_os_window_close 0 confirm_os_window_close 0
-- Allows zen-mode.nvim to increase font size -- Allows zen-mode.nvim to increase font size
-- allow_remote_control socket-only allow_remote_control socket-only
-- listen_on unix:/tmp/kitty listen_on unix:/tmp/kitty

View file

@ -95,8 +95,6 @@ in
wyrd wyrd
tex tex
tic-80 tic-80
ytfzf
yt-dlp
]; ];

View file

@ -10,7 +10,6 @@
users.groups.woodpecker-runner = { }; users.groups.woodpecker-runner = { };
# Allow the exec runner to write to build with nix # Allow the exec runner to write to build with nix
nix.settings.allowed-users = [ "woodpecker-runner" ]; nix.settings.allowed-users = [ "woodpecker-runner" ];
virtualisation.docker.enable = true;
age.secrets.woodpecker-agent-secret.owner = "woodpecker-runner"; age.secrets.woodpecker-agent-secret.owner = "woodpecker-runner";
age.secrets.woodpecker-agent-secret.file = "${self}/secrets/woodpecker-agent-secret.age"; age.secrets.woodpecker-agent-secret.file = "${self}/secrets/woodpecker-agent-secret.age";
@ -38,13 +37,12 @@
Type = "simple"; Type = "simple";
Environment = [ Environment = [
"WOODPECKER_RUNNER_CAPACITY=6" "WOODPECKER_RUNNER_CAPACITY=6"
"WOODPECKER_RUNNER_NAME=woodpecker-agent" # "WOODPECKER_RUNNER_NAME=woodpecker-agent"
"WOODPECKER_SERVER=ci.sealight.xyz:9000" "WOODPECKER_SERVER=https://ci.sealight.xyz/"
"WOODPECKER_HOSTNAME=mossnet" # "WOODPECKER_HOSTNAME=mossnet"
"WOODPECKER_BACKEND=docker" # "WOODPECKER_BACKEND=local"
"NIX_REMOTE=daemon" # "NIX_REMOTE=daemon"
"PAGER=cat" # "PAGER=cat"
# "WOODPECKER_PROTO=https"
# "WOODPECKER_LOG_LEVEL=debug" # "WOODPECKER_LOG_LEVEL=debug"
]; ];
WorkingDirectory = "/var/lib/woodpecker"; WorkingDirectory = "/var/lib/woodpecker";