forked from pub-solar/os
Compare commits
No commits in common. "5e62cca796c0d4d8c73f86d30084a0cb51d6016e" and "99c4efb479672d02bdc59b638e7215375e143e43" have entirely different histories.
5e62cca796
...
99c4efb479
80
flake.lock
80
flake.lock
|
|
@ -262,11 +262,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724561770,
|
||||
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
|
||||
"lastModified": 1723859949,
|
||||
"narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
|
||||
"rev": "076b9a905af8a52b866c8db068d6da475839d97b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -276,30 +276,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-direnv": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724328508,
|
||||
"narHash": "sha256-apY9HpJVXitcnX2s3dJi6rCAMQBI5y0QIebWfzTQ2d4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-direnv",
|
||||
"rev": "7272fa949e26457146663cdb2cec4d57c7a1f296",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-direnv",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-22-05": {
|
||||
"locked": {
|
||||
"lastModified": 1685573264,
|
||||
|
|
@ -333,11 +309,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1724575805,
|
||||
"narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=",
|
||||
"lastModified": 1723310128,
|
||||
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895",
|
||||
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -348,11 +324,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1724316499,
|
||||
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
|
||||
"lastModified": 1723938990,
|
||||
"narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
|
||||
"rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -384,7 +360,6 @@
|
|||
"invoiceplane-template": "invoiceplane-template",
|
||||
"lix-module": "lix-module",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-direnv": "nix-direnv",
|
||||
"nixos-22-05": "nixos-22-05",
|
||||
"nixos-flake": "nixos-flake",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
|
|
@ -456,27 +431,6 @@
|
|||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-direnv",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723808491,
|
||||
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wayland-pipewire-idle-inhibit",
|
||||
|
|
@ -530,11 +484,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724149317,
|
||||
"narHash": "sha256-c3eJQ+9zqU0XrfGrBWB5zUuPkCLQg3w04iNHfO8CBWU=",
|
||||
"lastModified": 1707219270,
|
||||
"narHash": "sha256-I02sXCEVJbVRaRv8IZM+wyn2D6FAjNa8fv/n66s5FJ4=",
|
||||
"ref": "main",
|
||||
"rev": "c829fa6f6f1e03ebf8d64f83fc27623beaae7bbb",
|
||||
"revCount": 69,
|
||||
"rev": "d75b98bccc34a9b1a27d3d19623af4dbb446b9e7",
|
||||
"revCount": 66,
|
||||
"type": "git",
|
||||
"url": "https://git.pub.solar/teutat3s/tritonshell"
|
||||
},
|
||||
|
|
@ -546,11 +500,11 @@
|
|||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1724479785,
|
||||
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
|
||||
"lastModified": 1723637854,
|
||||
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
|
||||
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -586,7 +540,7 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724040047,
|
||||
|
|
|
|||
|
|
@ -30,10 +30,6 @@
|
|||
agenix.inputs.darwin.follows = "nix-darwin";
|
||||
agenix.inputs.home-manager.follows = "home-manager";
|
||||
|
||||
nix-direnv.url = "github:nix-community/nix-direnv";
|
||||
nix-direnv.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-direnv.inputs.flake-parts.follows = "flake-parts";
|
||||
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||
|
||||
lix-module = {
|
||||
|
|
|
|||
|
|
@ -213,39 +213,6 @@
|
|||
endpoint = "[2001:4d88:1ffa:26::5]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# trinkgenossin.pub.solar
|
||||
publicKey = "QWgHovHxtqiQhnHLouSWiT6GIoQDmuvnThYL5c/rvU4=";
|
||||
allowedIPs = [
|
||||
"10.7.6.5/32"
|
||||
"fd00:fae:fae:fae:fae:5::/96"
|
||||
];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2a01:239:35d:f500::1]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# delite.pub.solar
|
||||
publicKey = "ZT2qGWgMPwHRUOZmTQHWCRX4m14YwOsiszjsA5bpc2k=";
|
||||
allowedIPs = [
|
||||
"10.7.6.6/32"
|
||||
"fd00:fae:fae:fae:fae:6::/96"
|
||||
];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2a04:52c0:124:9d8c::2]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# blue-shell.pub.solar
|
||||
publicKey = "bcrIpWrKc1M+Hq4ds3aN1lTaKE26f2rvXhd+93QrzR8=";
|
||||
allowedIPs = [
|
||||
"10.7.6.7/32"
|
||||
"fd00:fae:fae:fae:fae:7::/96"
|
||||
];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2a03:4000:43:24e::1]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
];
|
||||
};
|
||||
# mozillavpn
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ in
|
|||
inherit pkgs;
|
||||
};
|
||||
|
||||
programs.direnv = import ./direnv { inherit pkgs flake; };
|
||||
programs.direnv = import ./direnv { };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ pkgs, flake, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
enable = true;
|
||||
nix-direnv = {
|
||||
enable = true;
|
||||
package = flake.inputs.nix-direnv.packages.${pkgs.system}.nix-direnv;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
au! BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml
|
||||
autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
|
||||
|
||||
au BufRead,BufNewFile *.age set filetype=age
|
||||
autocmd FileType age setlocal noeol nofixeol
|
||||
|
||||
function AddTemplate(tmpl_file)
|
||||
exe "0read " . a:tmpl_file
|
||||
set nomodified
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
self: with self; ''
|
||||
#
|
||||
# rg recursively through notes
|
||||
# ack recursively through notes
|
||||
#
|
||||
# uses ripgrep: https://github.com/BurntSushi/ripgrep
|
||||
# uses ack: https://beyondgrep.com
|
||||
|
||||
NOTESDIR=~/pub.solar-nc/Notes
|
||||
ACK_PREFIX="${rg}/bin/rg --files-with-matches"
|
||||
ACK_PREFIX="ack --files-with-matches"
|
||||
cd $NOTESDIR || exit
|
||||
file="$(
|
||||
FZF_DEFAULT_COMMAND="$ACK_PREFIX '$1'" \
|
||||
${fzf}/bin/fzf --sort --preview="[[ ! -z {} ]] && ack --colour --context 5 {q} {}" \
|
||||
fzf --sort --preview="[[ ! -z {} ]] && ack --colour --context 5 {q} {}" \
|
||||
--phony -q "$1" \
|
||||
--bind "change:reload:$ACK_PREFIX {q}" \
|
||||
--preview-window="70%:wrap"
|
||||
)" &&
|
||||
echo "opening $file" &&
|
||||
${bat}/bin/bat --theme=TwoDark "$file"
|
||||
bat --theme=TwoDark "$file"
|
||||
''
|
||||
|
|
|
|||
Loading…
Reference in a new issue