Compare commits
8 commits
4ff6010696
...
ba8d938f86
| Author | SHA1 | Date | |
|---|---|---|---|
ba8d938f86
|
|||
|
297cb15fba
|
|||
|
414fb8ae48
|
|||
|
aa430b6499
|
|||
|
b0f3c0b713
|
|||
|
a3ff4071a1
|
|||
|
35579f7f93
|
|||
|
a183f5252c
|
11 changed files with 68 additions and 98 deletions
78
flake.lock
78
flake.lock
|
|
@ -109,11 +109,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695864092,
|
||||
"narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
|
||||
"lastModified": 1696266752,
|
||||
"narHash": "sha256-wJnMDFM21+xXdsXSs6pXMElbv4YfqmQslcPApRuaYKs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
|
||||
"rev": "646ee25c25fffee122a66282861f5f56ad3e0fd9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -175,29 +175,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693611461,
|
||||
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
|
||||
"lastModified": 1696203690,
|
||||
"narHash": "sha256-774XMEL7VHSTLDYVkqrbl5GCdmkVKsjMs+KLM4N4t7k=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693611461,
|
||||
"narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
|
||||
"rev": "21928e6758af0a258002647d14363d5ffc85545b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -343,11 +325,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1696149571,
|
||||
"narHash": "sha256-V1tK4LLi5UJ6U3rnw+cZy5uAjZhcNVnZGNIuPkv2+qo=",
|
||||
"lastModified": 1696214733,
|
||||
"narHash": "sha256-2IqDjWfqhy7MbCbFs3GDRYIpfK2usL+CYGfh6uskK/0=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "9b3045103f7d56e5ccd0574dcb93e953b72d5f50",
|
||||
"rev": "09a17f91d0d362c6e58bfdbe3ccdeacffb0b44b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -359,18 +341,20 @@
|
|||
},
|
||||
"nifoc-overlay": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"neovim-flake": "neovim-flake",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696157682,
|
||||
"narHash": "sha256-MXQmuVo+bOhvLzhGtJ95d3CXq4Ey21Mw5kKyzx6vx44=",
|
||||
"lastModified": 1696244541,
|
||||
"narHash": "sha256-KsHBVgAO+OA4PhPcLUKACSIUA9BkXl+nq9pPS0vsbH4=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "4a8400ed11adfd00af4d6f4380fc06dd150b3433",
|
||||
"revCount": 508,
|
||||
"rev": "870bafd0df0c7aa2701c7d7eda60d6206700d6e3",
|
||||
"revCount": 511,
|
||||
"type": "git",
|
||||
"url": "https://git.kempkens.io/daniel/nix-overlay"
|
||||
},
|
||||
|
|
@ -433,11 +417,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1696009558,
|
||||
"narHash": "sha256-/1nNL8lCF0gn38XaFyu2ufpWcBFwCDZyYUxdZkM6GxU=",
|
||||
"lastModified": 1696234590,
|
||||
"narHash": "sha256-mgOzQYTvaTT4bFopVOadlndy2RPwLy60rDjIWOGujwo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c182df2e68bd97deb32c7e4765adfbbbcaf75b60",
|
||||
"rev": "f902cb49892d300ff15cb237e48aa1cad79d68c3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -450,29 +434,11 @@
|
|||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1693471703,
|
||||
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
|
||||
"lastModified": 1696019113,
|
||||
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_2": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1693471703,
|
||||
"narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
|
||||
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,10 @@
|
|||
|
||||
nifoc-overlay = {
|
||||
url = "git+https://git.kempkens.io/daniel/nix-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-parts.follows = "flake-parts";
|
||||
};
|
||||
};
|
||||
|
||||
deploy-rs = {
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
|
||||
lastAppsFile = "${config.xdg.stateHome}/nix/.apps";
|
||||
in
|
||||
lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
lib.hm.dag.entryAfter [ "writeBoundary" ] /* bash */ ''
|
||||
last_apps=$(cat "${lastAppsFile}" 2>/dev/null || echo "")
|
||||
next_apps=$(readlink -f ${apps}/Applications/* | sort)
|
||||
|
||||
|
|
|
|||
|
|
@ -99,11 +99,11 @@ in
|
|||
};
|
||||
|
||||
functions = {
|
||||
base64decode = ''
|
||||
base64decode = /* fish */ ''
|
||||
echo "$argv" | base64 --decode
|
||||
'';
|
||||
|
||||
upn = ''
|
||||
upn = /* fish */ ''
|
||||
set -f os (uname)
|
||||
|
||||
switch $os
|
||||
|
|
@ -117,7 +117,7 @@ in
|
|||
end
|
||||
'';
|
||||
|
||||
upp = ''
|
||||
upp = /* fish */ ''
|
||||
if not test -f ./.envrc; or rg --quiet '^use flake$' ./.envrc
|
||||
nix flake update ./ -v
|
||||
else
|
||||
|
|
@ -125,17 +125,17 @@ in
|
|||
end
|
||||
'';
|
||||
|
||||
wget-browser = ''
|
||||
wget-browser = /* fish */ ''
|
||||
set user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
|
||||
${pkgs.wget}/bin/wget -U "$user_agent" $argv
|
||||
'';
|
||||
|
||||
aria-browser = ''
|
||||
aria-browser = /* fish */ ''
|
||||
set user_agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15"
|
||||
${pkgs.aria2}/bin/aria2c -U "$user_agent" --file-allocation none --async-dns=false -x 2 $argv
|
||||
'';
|
||||
|
||||
mysqld-direnv-init = ''
|
||||
mysqld-direnv-init = /* fish */ ''
|
||||
if type -q mysql_install_db
|
||||
mysql_install_db --user $USER --datadir=$PWD/.direnv/mysql/data --auth-root-authentication-method=normal
|
||||
else
|
||||
|
|
@ -144,7 +144,7 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
shellInit = ''
|
||||
shellInit = /* fish */ ''
|
||||
# Disable greeting
|
||||
set fish_greeting
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
includes = [
|
||||
# Private
|
||||
{
|
||||
condition = "hasconfig:remote.*.url:gitea@git.kempkens.io:*/**";
|
||||
condition = "hasconfig:remote.*.url:forgejo@git.kempkens.io:*/**";
|
||||
contents = {
|
||||
user = {
|
||||
signingKey = "~/.ssh/GitHub.pub";
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ in
|
|||
])).dependencies;
|
||||
};
|
||||
in
|
||||
''
|
||||
/* lua */ ''
|
||||
vim.loader.enable()
|
||||
vim.opt.runtimepath:prepend("${treesitter-parsers}")
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ in
|
|||
|
||||
{
|
||||
plugin = leap-nvim;
|
||||
config = ''
|
||||
config = /* fennel */ ''
|
||||
(let [leap (require :leap)]
|
||||
(leap.set_default_keymaps))
|
||||
'';
|
||||
|
|
@ -273,7 +273,7 @@ in
|
|||
|
||||
{
|
||||
plugin = nvim-ts-autotag;
|
||||
config = ''
|
||||
config = /* fennel */ ''
|
||||
(let [ts-autotag (require :nvim-ts-autotag)]
|
||||
(ts-autotag.setup))
|
||||
'';
|
||||
|
|
@ -310,7 +310,7 @@ in
|
|||
|
||||
{
|
||||
plugin = virt-column-nvim;
|
||||
config = ''
|
||||
config = /* fennel */ ''
|
||||
(let [virt-column (require :virt-column)]
|
||||
(virt-column.setup))
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -118,12 +118,12 @@ in
|
|||
};
|
||||
nvim-treesitter = buildVimPlugin {
|
||||
pname = "nvim-treesitter";
|
||||
version = "2023-10-01";
|
||||
version = "2023-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-treesitter";
|
||||
repo = "nvim-treesitter";
|
||||
rev = "776e4d341b5416c995e74c3abbf75f9cec26aa5e";
|
||||
sha256 = "02pk5di7lxvbwzi2ajq7kj6rfrxd46635jccw6xf5fbxcl84cqsb";
|
||||
rev = "d96c216c54cc2d48d3c66ba7f0fc3c7c5b71b3b1";
|
||||
sha256 = "0cijl6fgb8qi7n3ggcnm1jvv44fzvqfrjjdnrwhy21nvnmv8mhns";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -162,12 +162,12 @@ in
|
|||
};
|
||||
telescope-nvim = buildVimPlugin {
|
||||
pname = "telescope.nvim";
|
||||
version = "2023-09-29";
|
||||
version = "2023-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nvim-telescope";
|
||||
repo = "telescope.nvim";
|
||||
rev = "ffe90fac32122f401429b14d383137bd92a685d0";
|
||||
sha256 = "1wf2kq3pv98fzy12hv19jg80r9phr96j2x5qvzbqfagglc1zb3jf";
|
||||
rev = "8c69f58427f98b2ca39a90a36db830c06e30351c";
|
||||
sha256 = "00hh8v7nlvw800cjvz3j86myb6m4i6irss4kylbg15ypsp5p9yx9";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -242,12 +242,12 @@ in
|
|||
};
|
||||
nvim-lspconfig = buildVimPlugin {
|
||||
pname = "nvim-lspconfig";
|
||||
version = "2023-10-01";
|
||||
version = "2023-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "nvim-lspconfig";
|
||||
rev = "eb1b53162755888ff75e495797071644d983bff7";
|
||||
sha256 = "04kgsf3rhr0wk3vyx6lawlxj5icvaryx925flh72f234vkhigmq2";
|
||||
rev = "ac478757efcde1ac346f7044ab774e7cbb482533";
|
||||
sha256 = "05nladrq3i3flja17pwfy3bqplys17s5ydyfrnd6rpk6fr4pcdjl";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -528,12 +528,12 @@ in
|
|||
};
|
||||
indent-blankline-nvim = buildVimPlugin {
|
||||
pname = "indent-blankline.nvim";
|
||||
version = "2023-10-01";
|
||||
version = "2023-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lukas-reineke";
|
||||
repo = "indent-blankline.nvim";
|
||||
rev = "3d26bc7ab0e8dfddc0f40c840a8f925dddc2fef6";
|
||||
sha256 = "1p3bxdrj2xibyqw37b1247sz5nqx460d3lr4py3fn0cdgrf3420s";
|
||||
rev = "ce2e8e410bc8b46a6938bfa3520bc6b85ca8a743";
|
||||
sha256 = "0sb1cfp8hx3qq3lr89afc60q0qs20yka7jcimdjh81qnqz2ws6i4";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -550,12 +550,12 @@ in
|
|||
};
|
||||
toggleterm-nvim = buildVimPlugin {
|
||||
pname = "toggleterm.nvim";
|
||||
version = "2023-09-25";
|
||||
version = "2023-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "akinsho";
|
||||
repo = "toggleterm.nvim";
|
||||
rev = "61e8ad370d4da5d84c77e31671027bc094ac06ca";
|
||||
sha256 = "0cwqlaqvbnw4ncm717v052mzb943jcynrfpx38c8aspzjqybdcpj";
|
||||
rev = "c80844fd52ba76f48fabf83e2b9f9b93273f418d";
|
||||
sha256 = "19rbq39m7c1v9yrfmlwmfmxgv5d9bwcjbgjdp3cin409fnl4rv6b";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
@ -572,12 +572,12 @@ in
|
|||
};
|
||||
gitsigns-nvim = buildVimPlugin {
|
||||
pname = "gitsigns.nvim";
|
||||
version = "2023-10-01";
|
||||
version = "2023-10-02";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lewis6991";
|
||||
repo = "gitsigns.nvim";
|
||||
rev = "19654d963e4f1d6d6543f38ab9802092393508c2";
|
||||
sha256 = "1w2kjiiz5ac0qkp6q33gk70lghahxm41f0hjf6mkbk0x74aqj7ks";
|
||||
rev = "b14b9fba7d085ed8c11392aa51e575de84822bb1";
|
||||
sha256 = "0mw9fb9mgvh6hfc18n871c3kbdwhyms0jxpj07glxhxb3qrw34yg";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
helper_binaries_dir = ["${config.home.profileDirectory}/bin"]
|
||||
'';
|
||||
|
||||
programs.fish.functions.podman = ''
|
||||
programs.fish.functions.podman = /* fish */ ''
|
||||
fish -c "set -e SSH_AUTH_SOCK; ${config.home.profileDirectory}/bin/podman $argv"
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
"git.kempkens.io" = {
|
||||
port = 22;
|
||||
user = "gitea";
|
||||
user = "forgejo";
|
||||
identityFile = "~/.ssh/GitHub.pub";
|
||||
identitiesOnly = true;
|
||||
compression = true;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ in
|
|||
|
||||
package = wezterm-pkg;
|
||||
|
||||
extraConfig = ''
|
||||
extraConfig = /* lua */ ''
|
||||
_G.shells = {
|
||||
bash = '${pkgs.bash.outPath}/bin/bash',
|
||||
fish = '${pkgs.fish.outPath}/bin/fish',
|
||||
|
|
@ -47,8 +47,8 @@ in
|
|||
# Change PWD to config directory
|
||||
cd "$config_store_path"
|
||||
|
||||
# Init
|
||||
echo "Compiling init.fnl ..."
|
||||
# Config
|
||||
echo "Compiling config.fnl ..."
|
||||
$fennel "$config_store_path/config.fnl" > "$out/config.lua"
|
||||
|
||||
stylua "$out/"
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@ let
|
|||
in
|
||||
{
|
||||
services = {
|
||||
gitea = {
|
||||
forgejo = {
|
||||
enable = true;
|
||||
package = pkgs.forgejo;
|
||||
|
||||
stateDir = "/var/lib/forgejo";
|
||||
|
||||
|
|
@ -17,9 +16,11 @@ in
|
|||
|
||||
lfs.enable = true;
|
||||
|
||||
appName = "kempkens.io Forge";
|
||||
|
||||
settings = {
|
||||
DEFAULT = {
|
||||
APP_NAME = "kempkens.io Forge";
|
||||
};
|
||||
|
||||
server = {
|
||||
PROTOCOL = "http+unix";
|
||||
DOMAIN = fqdn;
|
||||
|
|
@ -67,7 +68,7 @@ in
|
|||
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://unix:/run/gitea/gitea.sock";
|
||||
proxyPass = "http://unix:/run/forgejo/forgejo.sock";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue