mirror of
https://github.com/kmein/niveum
synced 2026-03-22 12:51:08 +01:00
Compare commits
27 Commits
e3f4c34ac3
...
18603a5682
| Author | SHA1 | Date | |
|---|---|---|---|
| 18603a5682 | |||
| 53578ac92b | |||
| 14118b6a63 | |||
| 0813d2e37c | |||
| 8d5743119f | |||
| 5105ef0b1e | |||
| d67c8a6298 | |||
| 64ac86b32b | |||
| ed5c8815ce | |||
| 5e41f04f72 | |||
| e8e5bb6211 | |||
| e910bf6f6a | |||
| bd47cef7e5 | |||
| ad3249077b | |||
| 367acd05e5 | |||
| bae1d0b0cc | |||
| f58e111ce1 | |||
| b647b9f901 | |||
| 883655dc58 | |||
| 21960a2c95 | |||
| 254195b331 | |||
| ce032525d2 | |||
| f9b992cce3 | |||
| 3f6e4755a6 | |||
| cc4c5b79c1 | |||
| 673edbb8b3 | |||
| 89f9e09c3d |
@@ -135,7 +135,6 @@ in
|
||||
};
|
||||
};
|
||||
}
|
||||
{ programs.command-not-found.enable = true; }
|
||||
{
|
||||
programs.gnupg = {
|
||||
agent = {
|
||||
|
||||
@@ -17,7 +17,6 @@ in {
|
||||
pkgs.gitstats
|
||||
pkgs.patch
|
||||
pkgs.patchutils
|
||||
inputs.self.packages.${pkgs.system}.git-preview
|
||||
];
|
||||
|
||||
environment.shellAliases = {
|
||||
|
||||
@@ -37,7 +37,7 @@ in {
|
||||
};
|
||||
scripts = [
|
||||
pkgs.mpvScripts.quality-menu
|
||||
niveumPackages.mpv-visualizer
|
||||
pkgs.mpvScripts.visualizer
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -52,8 +52,8 @@
|
||||
pkgs.nodePackages.typescript-language-server
|
||||
pkgs.lua-language-server
|
||||
pkgs.nodePackages.vscode-langservers-extracted
|
||||
pkgs.lemminx
|
||||
niveumPackages.jq-lsp
|
||||
pkgs.lemminx # XML LSP
|
||||
pkgs.jq-lsp
|
||||
pkgs.dhall-lsp-server
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
{ pkgs, niveumPackages, config, ... }: {
|
||||
environment.variables.EDITOR = pkgs.lib.mkForce "nvim";
|
||||
environment.shellAliases.vi = "nvim";
|
||||
environment.shellAliases.vim = "nvim";
|
||||
environment.shellAliases.view = "nvim -R";
|
||||
|
||||
home-manager.users.me = {
|
||||
editorconfig = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"*" = {
|
||||
charset = "utf-8";
|
||||
end_of_line = "lf";
|
||||
trim_trailing_whitespace = true;
|
||||
insert_final_newline = true;
|
||||
indent_style = "space";
|
||||
indent_size = 2;
|
||||
};
|
||||
"*.py" = { indent_size = 4; };
|
||||
Makefile = { indent_style = "tab"; };
|
||||
"*.md" = { trim_trailing_whitespace = false; };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
||||
(niveumPackages.vim.override {
|
||||
stylixColors = config.lib.stylix.colors;
|
||||
# colorscheme = "base16-gruvbox-dark-medium";
|
||||
})
|
||||
|
||||
# language servers
|
||||
pkgs.pyright
|
||||
pkgs.haskellPackages.haskell-language-server
|
||||
pkgs.texlab
|
||||
pkgs.nil
|
||||
pkgs.rust-analyzer
|
||||
pkgs.nodePackages.typescript-language-server
|
||||
pkgs.lua-language-server
|
||||
pkgs.nodePackages.vscode-langservers-extracted
|
||||
pkgs.lemminx
|
||||
niveumPackages.jq-lsp
|
||||
pkgs.dhall-lsp-server
|
||||
];
|
||||
}
|
||||
@@ -153,15 +153,12 @@ in {
|
||||
niveumPackages.mpv-iptv
|
||||
niveumPackages.devanagari
|
||||
niveumPackages.betacode # ancient greek betacode to unicode converter
|
||||
niveumPackages.meteo
|
||||
niveumPackages.jq-lsp
|
||||
pkgs.jq-lsp
|
||||
niveumPackages.swallow # window swallowing
|
||||
niveumPackages.literature-quote
|
||||
niveumPackages.booksplit
|
||||
niveumPackages.dmenu-randr
|
||||
niveumPackages.dmenu-bluetooth
|
||||
niveumPackages.manual-sort
|
||||
niveumPackages.dns-sledgehammer
|
||||
niveumPackages.wttr
|
||||
niveumPackages.unicodmenu
|
||||
niveumPackages.emailmenu
|
||||
@@ -209,11 +206,7 @@ in {
|
||||
ncspot
|
||||
playerctl
|
||||
|
||||
nix-index
|
||||
niveumPackages.nix-index-update
|
||||
|
||||
#krebs
|
||||
niveumPackages.dic
|
||||
pkgs.nur.repos.mic92.ircsink
|
||||
|
||||
(haskellPackages.ghcWithHoogle (hs: [
|
||||
|
||||
252
flake.lock
generated
252
flake.lock
generated
@@ -53,43 +53,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"almanac": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1640984494,
|
||||
"narHash": "sha256-xxbrGJtRK6wzOR09vGPqoUvnY5f0h6hn6Uecy331Zhw=",
|
||||
"owner": "lfborjas",
|
||||
"repo": "almanac",
|
||||
"rev": "72931bd9accefccd2df59d9d64a6cbb91f2d5f17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lfborjas",
|
||||
"repo": "almanac",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"astro-calendar": {
|
||||
"inputs": {
|
||||
"almanac": "almanac",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"swiss-ephemeris": "swiss-ephemeris",
|
||||
"swisseph": "swisseph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759827606,
|
||||
"narHash": "sha256-JunaXkzalZtQYjGxJrMGYDEgOwullKLnpAFj/SaJaKI=",
|
||||
"owner": "kmein",
|
||||
"repo": "astro-calendar",
|
||||
"rev": "f1579f087ee49e4c6a3bcf130b20738123f8616a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kmein",
|
||||
"repo": "astro-calendar",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"autorenkalender": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -345,7 +308,7 @@
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
@@ -648,25 +611,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ical-ephemeris": {
|
||||
"inputs": {
|
||||
"astro-calendar": "astro-calendar",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761309163,
|
||||
"narHash": "sha256-x5BdTIoG/ANMhJJw+IMWLbdXJ7vTh3dou8zN4LCnTeU=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "949682c2ec4da9a23c414a8ca8c039652cbbef0c",
|
||||
"revCount": 22,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris"
|
||||
}
|
||||
},
|
||||
"kellia-dictionary": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -734,7 +678,7 @@
|
||||
"menstruation-backend_2": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765657254,
|
||||
@@ -990,7 +934,7 @@
|
||||
},
|
||||
"nixinate_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742737607,
|
||||
@@ -1119,22 +1063,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1765186076,
|
||||
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1760878510,
|
||||
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
|
||||
@@ -1150,7 +1078,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1659446231,
|
||||
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
||||
@@ -1166,6 +1094,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1615532953,
|
||||
@@ -1210,11 +1154,11 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1758035966,
|
||||
"narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
|
||||
"lastModified": 1701436327,
|
||||
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
|
||||
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1226,11 +1170,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1759381078,
|
||||
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
|
||||
"lastModified": 1701436327,
|
||||
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
|
||||
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1241,38 +1185,6 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1701436327,
|
||||
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1701436327,
|
||||
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1653060744,
|
||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||
@@ -1288,7 +1200,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1764983851,
|
||||
"narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
|
||||
@@ -1304,6 +1216,38 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1765186076,
|
||||
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nmd": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -1418,7 +1362,7 @@
|
||||
"nur_2": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765367248,
|
||||
@@ -1545,18 +1489,16 @@
|
||||
"coptic-dictionary": "coptic-dictionary",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"home-manager": "home-manager_2",
|
||||
"ical-ephemeris": "ical-ephemeris",
|
||||
"menstruation-backend": "menstruation-backend_2",
|
||||
"menstruation-telegram": "menstruation-telegram_2",
|
||||
"nix-on-droid": "nix-on-droid_2",
|
||||
"nixinate": "nixinate_2",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs-old": "nixpkgs-old_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable_2",
|
||||
"nur": "nur_2",
|
||||
"recht": "recht_2",
|
||||
"retiolum": "retiolum_2",
|
||||
"rust-overlay": "rust-overlay_2",
|
||||
"scripts": "scripts_2",
|
||||
"stockholm": "stockholm",
|
||||
"stylix": "stylix_2",
|
||||
@@ -1613,16 +1555,32 @@
|
||||
},
|
||||
"rust-overlay_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765334520,
|
||||
"narHash": "sha256-jTof2+ir9UPmv4lWksYO6WbaXCC0nsDExrB9KZj7Dz4=",
|
||||
"lastModified": 1765593578,
|
||||
"narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "db61f666aea93b28f644861fbddd37f235cc5983",
|
||||
"rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765593578,
|
||||
"narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1668,9 +1626,7 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
"rust-overlay": "rust-overlay_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765657698,
|
||||
@@ -1690,7 +1646,7 @@
|
||||
"inputs": {
|
||||
"buildbot-nix": "buildbot-nix",
|
||||
"nix-writers": "nix-writers",
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763891069,
|
||||
@@ -1771,38 +1727,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"swiss-ephemeris": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1638583659,
|
||||
"narHash": "sha256-EEgKk5DDkmICteFzFzXdvdGke7aPoJa6aQ228nAYieQ=",
|
||||
"owner": "lfborjas",
|
||||
"repo": "swiss-ephemeris",
|
||||
"rev": "3094368f5f963e8756e89e3b3dd24b96796b8682",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lfborjas",
|
||||
"repo": "swiss-ephemeris",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"swisseph": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1757697308,
|
||||
"narHash": "sha256-m2Qgzhsgrv0KyJin8UfNFJ8KL/HFfoN8AmCTlcirHXE=",
|
||||
"owner": "aloistr",
|
||||
"repo": "swisseph",
|
||||
"rev": "3084917b5d2384af6fb928583552e0a299fb6d83",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aloistr",
|
||||
"repo": "swisseph",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
@@ -1899,7 +1823,7 @@
|
||||
},
|
||||
"telebots_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765657917,
|
||||
@@ -1952,9 +1876,7 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
"rust-overlay": "rust-overlay_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765658153,
|
||||
|
||||
186
flake.nix
186
flake.nix
@@ -10,7 +10,7 @@
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||
menstruation-backend.url = "github:kmein/menstruation.rs";
|
||||
menstruation-telegram.url = "github:kmein/menstruation-telegram";
|
||||
nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
nixinate.url = "github:matthewcroughan/nixinate";
|
||||
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
||||
@@ -18,7 +18,6 @@
|
||||
nur.url = "github:nix-community/NUR";
|
||||
recht.url = "github:kmein/recht";
|
||||
retiolum.url = "github:krebs/retiolum";
|
||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||
scripts.url = "github:kmein/scripts";
|
||||
stockholm.url = "github:krebs/stockholm";
|
||||
stylix.url = "github:danth/stylix/release-25.11";
|
||||
@@ -27,27 +26,19 @@
|
||||
voidrice.url = "github:Lukesmithxyz/voidrice";
|
||||
wallpaper-generator.url = "github:pinpox/wallpaper-generator/v1.1";
|
||||
wallpapers.url = "github:kmein/wallpapers";
|
||||
ical-ephemeris.url = "git+ssh://gitea@code.kmein.de:22022/kfm/ical-ephemeris";
|
||||
|
||||
autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
|
||||
agenix.inputs.home-manager.follows = "home-manager";
|
||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
autorenkalender.inputs.nixpkgs.follows = "nixpkgs";
|
||||
coptic-dictionary.inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# menstruation-backend.inputs.flake-utils.follows = "flake-utils";
|
||||
# menstruation-backend.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# menstruation-backend.inputs.rust-overlay.follows = "rust-overlay";
|
||||
menstruation-telegram.inputs.menstruation-backend.follows = "menstruation-backend";
|
||||
menstruation-telegram.inputs.nixpkgs.follows = "nixpkgs-old";
|
||||
nix-on-droid.inputs.home-manager.follows = "home-manager";
|
||||
nix-on-droid.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||
recht.inputs.nixpkgs.follows = "nixpkgs";
|
||||
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
|
||||
scripts.inputs.nixpkgs.follows = "nixpkgs";
|
||||
scripts.inputs.rust-overlay.follows = "rust-overlay";
|
||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
tinc-graph.inputs.nixpkgs.follows = "nixpkgs";
|
||||
tinc-graph.inputs.rust-overlay.follows = "rust-overlay";
|
||||
voidrice.flake = false;
|
||||
wallpapers.flake = false;
|
||||
};
|
||||
@@ -63,7 +54,7 @@
|
||||
retiolum,
|
||||
nixinate,
|
||||
flake-utils,
|
||||
nix-on-droid,
|
||||
nix-index-database,
|
||||
stylix,
|
||||
...
|
||||
}:
|
||||
@@ -73,20 +64,6 @@
|
||||
in
|
||||
{
|
||||
apps = {
|
||||
x86_64-darwin =
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-darwin;
|
||||
in
|
||||
{
|
||||
deploy-maakaron = {
|
||||
type = "app";
|
||||
program = toString (
|
||||
pkgs.writers.writeDash "deploy-maakaron" ''
|
||||
exec $(nix build .#homeConfigurations.maakaron.activationPackage --no-link --print-out-paths)/activate
|
||||
''
|
||||
);
|
||||
};
|
||||
};
|
||||
x86_64-linux =
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
@@ -108,7 +85,6 @@
|
||||
map (
|
||||
hostname:
|
||||
let
|
||||
externalNetwork = import ./lib/external-network.nix;
|
||||
targets = {
|
||||
ful = "root@ful";
|
||||
zaatar = "root@zaatar";
|
||||
@@ -169,38 +145,6 @@
|
||||
panoptikon = import lib/panoptikon.nix;
|
||||
};
|
||||
|
||||
nixOnDroidConfigurations = {
|
||||
moto = nix-on-droid.lib.nixOnDroidConfiguration {
|
||||
modules = [ systems/moto/configuration.nix ];
|
||||
pkgs = import nixpkgs {
|
||||
system = "aarch64-linux";
|
||||
overlays = [ nix-on-droid.overlays.default ];
|
||||
};
|
||||
extraSpecialArgs = {
|
||||
niveumPackages = inputs.self.packages.aarch64-linux;
|
||||
niveumLib = inputs.self.lib;
|
||||
inherit inputs;
|
||||
};
|
||||
home-manager-path = home-manager.outPath;
|
||||
};
|
||||
};
|
||||
|
||||
homeConfigurations = {
|
||||
maakaron =
|
||||
let
|
||||
system = "x86_64-darwin";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = [ ./systems/maakaron/home.nix ];
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
niveumPackages = inputs.self.packages.${system};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nixosConfigurations = let
|
||||
niveumSpecialArgs = system: {
|
||||
unstablePackages = import nixpkgs-unstable {
|
||||
@@ -224,7 +168,6 @@
|
||||
systems/ful/configuration.nix
|
||||
agenix.nixosModules.default
|
||||
inputs.self.nixosModules.passport
|
||||
inputs.ical-ephemeris.nixosModules.default
|
||||
inputs.self.nixosModules.panoptikon
|
||||
inputs.self.nixosModules.go-webring
|
||||
inputs.self.nixosModules.htgen
|
||||
@@ -302,6 +245,7 @@
|
||||
agenix.nixosModules.default
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
nix-index-database.nixosModules.default
|
||||
nur.modules.nixos.default
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
@@ -315,6 +259,7 @@
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
nur.modules.nixos.default
|
||||
nix-index-database.nixosModules.default
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
};
|
||||
@@ -327,6 +272,7 @@
|
||||
retiolum.nixosModules.retiolum
|
||||
home-manager.nixosModules.home-manager
|
||||
nur.modules.nixos.default
|
||||
nix-index-database.nixosModules.default
|
||||
stylix.nixosModules.stylix
|
||||
];
|
||||
};
|
||||
@@ -339,14 +285,11 @@
|
||||
overlays = [
|
||||
nur.overlays.default
|
||||
(self: super: {
|
||||
mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
|
||||
mpv = super.mpv.override {scripts = [super.mpvScripts.visualizer super.mpvScripts.mpris];};
|
||||
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
||||
})
|
||||
];
|
||||
};
|
||||
unstablePackages = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
};
|
||||
wrapScript = {
|
||||
packages ? [],
|
||||
name,
|
||||
@@ -354,112 +297,105 @@
|
||||
}:
|
||||
pkgs.writers.writeDashBin name ''PATH=$PATH:${nixpkgs.lib.makeBinPath (packages ++ [pkgs.findutils pkgs.coreutils pkgs.gnused pkgs.gnugrep])} ${script} "$@"'';
|
||||
in {
|
||||
# linguistics and ancient world
|
||||
auc = pkgs.callPackage packages/auc.nix {};
|
||||
betacode = pkgs.callPackage packages/betacode.nix {};
|
||||
brainmelter = pkgs.callPackage packages/brainmelter.nix {};
|
||||
brassica = pkgs.callPackage packages/brassica.nix {};
|
||||
cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
|
||||
brassica = pkgs.callPackage packages/brassica.nix {}; # TODO upstream
|
||||
devanagari = pkgs.callPackage packages/devanagari {};
|
||||
stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
|
||||
heuretes = pkgs.callPackage packages/heuretes.nix {};
|
||||
ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
|
||||
jsesh = pkgs.callPackage packages/jsesh.nix {}; # TODO upstream
|
||||
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
|
||||
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
||||
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
||||
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
|
||||
closest = pkgs.callPackage packages/closest {};
|
||||
cro = pkgs.callPackage packages/cro.nix {};
|
||||
|
||||
# lit
|
||||
random-zeno = pkgs.callPackage packages/random-zeno.nix {};
|
||||
literature-quote = pkgs.callPackage packages/literature-quote.nix {};
|
||||
|
||||
# krebs
|
||||
brainmelter = pkgs.callPackage packages/brainmelter.nix {};
|
||||
cyberlocker-tools = pkgs.callPackage packages/cyberlocker-tools.nix {};
|
||||
htgen = pkgs.callPackage packages/htgen.nix {};
|
||||
hc = pkgs.callPackage packages/hc.nix {};
|
||||
kpaste = pkgs.callPackage packages/kpaste.nix {};
|
||||
pls = pkgs.callPackage packages/pls.nix {};
|
||||
untilport = pkgs.callPackage packages/untilport.nix {};
|
||||
radio-news = pkgs.callPackage packages/radio-news.nix {};
|
||||
|
||||
# window manager
|
||||
swallow = pkgs.callPackage packages/swallow.nix {};
|
||||
devour = pkgs.callPackage packages/devour.nix {};
|
||||
|
||||
cheat-sh = pkgs.callPackage packages/cheat-sh.nix {};
|
||||
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {}; # TODO upstream
|
||||
cro = pkgs.callPackage packages/cro.nix {};
|
||||
default-gateway = pkgs.callPackage packages/default-gateway.nix {};
|
||||
depp = pkgs.callPackage packages/depp.nix {};
|
||||
dashboard = pkgs.callPackage packages/dashboard {};
|
||||
devanagari = pkgs.callPackage packages/devanagari {};
|
||||
devour = pkgs.callPackage packages/devour.nix {};
|
||||
dic = pkgs.callPackage packages/dic.nix {};
|
||||
dirmir = pkgs.callPackage packages/dirmir.nix {};
|
||||
dmenu-bluetooth = pkgs.callPackage packages/dmenu-bluetooth.nix {};
|
||||
dmenu-scrot = pkgs.callPackage packages/dmenu-scrot.nix {};
|
||||
dns-sledgehammer = pkgs.callPackage packages/dns-sledgehammer.nix {};
|
||||
fkill = pkgs.callPackage packages/fkill.nix {};
|
||||
fzfmenu = pkgs.callPackage packages/fzfmenu.nix {};
|
||||
genius = pkgs.callPackage packages/genius.nix {};
|
||||
gfs-fonts = pkgs.callPackage packages/gfs-fonts.nix {};
|
||||
git-preview = pkgs.callPackage packages/git-preview.nix {};
|
||||
gpt35 = pkgs.callPackage packages/gpt.nix {model = "gpt-3.5-turbo";};
|
||||
gpt4 = pkgs.callPackage packages/gpt.nix {model = "gpt-4";};
|
||||
hc = pkgs.callPackage packages/hc.nix {};
|
||||
jq-lsp = pkgs.callPackage packages/jq-lsp.nix {};
|
||||
stardict-tools = pkgs.callPackage packages/stardict-tools.nix {};
|
||||
heuretes = pkgs.callPackage packages/heuretes.nix {};
|
||||
htgen = pkgs.callPackage packages/htgen.nix {};
|
||||
image-convert-favicon = pkgs.callPackage packages/image-convert-favicon.nix {};
|
||||
image-convert-tolino = pkgs.callPackage packages/image-convert-tolino.nix {};
|
||||
infschmv = pkgs.callPackage packages/infschmv.nix {};
|
||||
iolanguage = pkgs.callPackage packages/iolanguage.nix {};
|
||||
ipa = pkgs.writers.writePython3Bin "ipa" {flakeIgnore = ["E501"];} (builtins.readFile packages/ipa.py);
|
||||
ix = pkgs.callPackage packages/ix.nix {};
|
||||
jsesh = pkgs.callPackage packages/jsesh.nix {};
|
||||
k-lock = pkgs.callPackage packages/k-lock.nix {};
|
||||
kirciuoklis = pkgs.callPackage packages/kirciuoklis.nix {};
|
||||
klem = pkgs.callPackage packages/klem.nix {};
|
||||
kpaste = pkgs.callPackage packages/kpaste.nix {};
|
||||
literature-quote = pkgs.callPackage packages/literature-quote.nix {};
|
||||
mahlzeit = pkgs.haskellPackages.callPackage packages/mahlzeit.nix {};
|
||||
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {};
|
||||
man-pandoc = pkgs.callPackage packages/man/pandoc.nix {}; # TODO upstream
|
||||
man-pdf = pkgs.callPackage packages/man-pdf.nix {};
|
||||
mansplain = pkgs.callPackage packages/mansplain.nix {};
|
||||
manual-sort = pkgs.callPackage packages/manual-sort.nix {};
|
||||
menu-calc = pkgs.callPackage packages/menu-calc.nix {};
|
||||
meteo = pkgs.callPackage packages/meteo.nix {};
|
||||
noise-waves = pkgs.callPackage packages/noise-waves.nix {};
|
||||
mpv-radio = pkgs.callPackage packages/mpv-radio.nix {di-fm-key-file = "/dev/null";};
|
||||
mpv-tuner = pkgs.callPackage packages/mpv-tuner.nix {di-fm-key-file = "/dev/null";};
|
||||
mpv-tv = pkgs.callPackage packages/mpv-tv.nix {};
|
||||
mpv-iptv = pkgs.callPackage packages/mpv-iptv.nix {};
|
||||
mpv-visualizer = unstablePackages.mpvScripts.visualizer;
|
||||
new-mac = pkgs.callPackage packages/new-mac.nix {};
|
||||
nix-git = pkgs.callPackage packages/nix-git.nix {};
|
||||
nix-index-update = pkgs.callPackage packages/nix-index-update.nix {inherit system;};
|
||||
notemenu = pkgs.callPackage packages/notemenu.nix {niveumPackages = self.packages.${system};};
|
||||
opustags = pkgs.callPackage packages/opustags.nix {};
|
||||
pls = pkgs.callPackage packages/pls.nix {};
|
||||
polyglot = pkgs.callPackage packages/polyglot.nix {};
|
||||
opustags = pkgs.callPackage packages/opustags.nix {}; # TODO upstream
|
||||
q = pkgs.callPackage packages/q.nix {};
|
||||
qrpaste = pkgs.callPackage packages/qrpaste.nix {};
|
||||
random-zeno = pkgs.callPackage packages/random-zeno.nix {};
|
||||
go-webring = pkgs.callPackage packages/go-webring.nix {};
|
||||
go-webring = pkgs.callPackage packages/go-webring.nix {}; # TODO upstream
|
||||
rfc = pkgs.callPackage packages/rfc.nix {};
|
||||
gimp = pkgs.callPackage packages/gimp.nix {};
|
||||
scanned = pkgs.callPackage packages/scanned.nix {};
|
||||
swallow = pkgs.callPackage packages/swallow.nix {};
|
||||
text2pdf = pkgs.callPackage packages/text2pdf.nix {};
|
||||
text2pdf = pkgs.callPackage packages/text2pdf.nix {}; # TODO upstream
|
||||
timer = pkgs.callPackage packages/timer.nix {};
|
||||
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
||||
trans = pkgs.callPackage packages/trans.nix {};
|
||||
trans = pkgs.callPackage packages/trans.nix {}; # TODO upstream
|
||||
ttspaste = pkgs.callPackage packages/ttspaste.nix {};
|
||||
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
|
||||
emailmenu = pkgs.callPackage packages/emailmenu.nix {};
|
||||
stag = pkgs.callPackage packages/stag.nix {};
|
||||
untilport = pkgs.callPackage packages/untilport.nix {};
|
||||
stag = pkgs.callPackage packages/stag.nix {}; # TODO upstream
|
||||
vg = pkgs.callPackage packages/vg.nix {};
|
||||
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
|
||||
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
|
||||
radio-news = pkgs.callPackage packages/radio-news.nix {};
|
||||
vimPlugins-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
|
||||
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
|
||||
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
|
||||
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {};
|
||||
vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {};
|
||||
vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {};
|
||||
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {};
|
||||
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {};
|
||||
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {};
|
||||
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {};
|
||||
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {};
|
||||
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {};
|
||||
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {}; # TODO upstream
|
||||
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {}; # TODO upstream
|
||||
vimPlugins-typst-vim = pkgs.callPackage packages/vimPlugins/typst-vim.nix {}; # TODO upstream
|
||||
vimPlugins-mdwa-nvim = pkgs.callPackage packages/vimPlugins/mdwa-nvim.nix {}; # TODO upstream
|
||||
vimPlugins-vim-ernest = pkgs.callPackage packages/vimPlugins/vim-ernest.nix {}; # TODO upstream
|
||||
vimPlugins-vim-256noir = pkgs.callPackage packages/vimPlugins/vim-256noir.nix {}; # TODO upstream
|
||||
vimPlugins-vim-colors-paramount = pkgs.callPackage packages/vimPlugins/vim-colors-paramount.nix {}; # TODO upstream
|
||||
vimPlugins-vim-fetch = pkgs.callPackage packages/vimPlugins/vim-fetch.nix {}; # TODO upstream
|
||||
vimPlugins-vim-fsharp = pkgs.callPackage packages/vimPlugins/vim-fsharp.nix {}; # TODO upstream
|
||||
vimPlugins-vim-mail = pkgs.callPackage packages/vimPlugins/vim-mail.nix {}; # TODO upstream
|
||||
vimPlugins-vim-reason-plus = pkgs.callPackage packages/vimPlugins/vim-reason-plus.nix {}; # TODO upstream
|
||||
vimv = pkgs.callPackage packages/vimv.nix {};
|
||||
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {};
|
||||
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {};
|
||||
wttr = pkgs.callPackage packages/wttr.nix {};
|
||||
weechat-declarative = pkgs.callPackage packages/weechat-declarative.nix {}; # TODO upstream
|
||||
weechatScripts-hotlist2extern = pkgs.callPackage packages/weechatScripts/hotlist2extern.nix {}; # TODO upstream
|
||||
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
|
||||
wttr = pkgs.callPackage packages/wttr.nix {}; # TODO upstream
|
||||
|
||||
booksplit = wrapScript {
|
||||
script = inputs.voidrice.outPath + "/.local/bin/booksplit";
|
||||
name = "booksplit";
|
||||
packages = [pkgs.ffmpeg pkgs.glibc.bin];
|
||||
};
|
||||
dmenu-randr = pkgs.callPackage packages/dmenu-randr.nix {};
|
||||
tag = wrapScript {
|
||||
script = inputs.voidrice.outPath + "/.local/bin/tag";
|
||||
name = "tag";
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
default = "daily";
|
||||
};
|
||||
loadCredential = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.string;
|
||||
type = lib.types.listOf lib.types.str;
|
||||
description = ''
|
||||
This can be used to pass secrets to the systemd service without adding them to the nix store.
|
||||
'';
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
writers,
|
||||
curl,
|
||||
}:
|
||||
writers.writeDashBin "so" ''
|
||||
writers.writeDashBin "cht.sh" ''
|
||||
IFS=+
|
||||
${curl}/bin/curl -sSL http://cht.sh/"$*"
|
||||
''
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
fetchgit,
|
||||
lib,
|
||||
stdenv,
|
||||
coreutils,
|
||||
curl,
|
||||
gnugrep,
|
||||
gnused,
|
||||
util-linux,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "dic";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://cgit.ni.krebsco.de/dic;
|
||||
rev = "refs/tags/v1.1.1";
|
||||
sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag";
|
||||
};
|
||||
|
||||
phases = [
|
||||
"unpackPhase"
|
||||
"installPhase"
|
||||
];
|
||||
|
||||
installPhase = let
|
||||
path = lib.makeBinPath [
|
||||
coreutils
|
||||
curl
|
||||
gnused
|
||||
gnugrep
|
||||
util-linux
|
||||
];
|
||||
in ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
sed \
|
||||
's,^main() {$,&\n PATH=${path}; export PATH,' \
|
||||
< ./dic \
|
||||
> $out/bin/dic
|
||||
|
||||
chmod +x $out/bin/dic
|
||||
'';
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
{writers}:
|
||||
writers.writeDashBin "dirmir" ''
|
||||
SOURCE="$1"
|
||||
TARGET="$2"
|
||||
|
||||
if [ ! -d "$SOURCE" ] || [ $# -ne 2 ]; then
|
||||
echo >/dev/stderr "Usage: dirmir SOURCE TARGET"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -e "$TARGET" ]; then
|
||||
echo >/dev/stderr "$TARGET" already exists. Please use a different name.
|
||||
exit 1
|
||||
fi
|
||||
|
||||
find "$SOURCE" | while read -r entry; do
|
||||
if [ -d "$entry" ]; then
|
||||
mkdir -p "$TARGET/$entry"
|
||||
else
|
||||
# create a file with the same permissions as $entry
|
||||
install -m "$(stat -c %a "$entry")" /dev/null "$TARGET/$entry"
|
||||
fi
|
||||
done
|
||||
''
|
||||
@@ -1,64 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
libnotify,
|
||||
dmenu,
|
||||
bluez5,
|
||||
lib,
|
||||
}:
|
||||
writers.writeDashBin "dmenu-bluetooth" ''
|
||||
# UI for connecting to bluetooth devices
|
||||
set -efu
|
||||
PATH=$PATH=${lib.makeBinPath [libnotify dmenu bluez5]}
|
||||
|
||||
bluetooth_notify() {
|
||||
notify-send --app-name=" Bluetooth" "$@"
|
||||
}
|
||||
|
||||
chose_device() {
|
||||
# the output from `bluetoothctl {paired-,}devices` has a first column which always contains `Device` followed by a MAC address and the device name
|
||||
cut -d ' ' -f2- | dmenu -i -l 5 -p "Bluetooth device"
|
||||
}
|
||||
|
||||
bluetoothctl scan on &
|
||||
|
||||
case "$(printf "pair\nconnect\ndisconnect" | dmenu -i)" in
|
||||
pair)
|
||||
chosen="$(bluetoothctl devices | chose_device)"
|
||||
chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
|
||||
|
||||
bluetooth_notify "$chosen_name" "Pairing ..."
|
||||
|
||||
if bluetoothctl pair "$(echo "$chosen" | cut -d ' ' -f1)"; then
|
||||
bluetooth_notify "✔ $chosen_name" "Paired with device."
|
||||
else
|
||||
test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to pair with device."
|
||||
fi
|
||||
;;
|
||||
|
||||
connect)
|
||||
chosen="$(bluetoothctl paired-devices | chose_device)"
|
||||
chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
|
||||
|
||||
bluetooth_notify "$chosen_name" "Trying to connect ..."
|
||||
|
||||
if bluetoothctl connect "$(echo "$chosen" | cut -d ' ' -f1)"; then
|
||||
bluetooth_notify "✔ $chosen_name" "Connected to device."
|
||||
else # something was selected but it didn't work
|
||||
test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to connect to device."
|
||||
fi
|
||||
;;
|
||||
|
||||
disconnect)
|
||||
chosen="$(bluetoothctl paired-devices | chose_device)"
|
||||
chosen_name="$(echo "$chosen" | cut -d ' ' -f2-)"
|
||||
|
||||
bluetooth_notify "$chosen_name" "Disconnecting ..."
|
||||
|
||||
if bluetoothctl disconnect "$(echo "$chosen" | cut -d ' ' -f1)"; then
|
||||
bluetooth_notify "✔ $chosen_name" "Disconnected from device."
|
||||
else # something was selected but it didn't work
|
||||
test "$chosen" && bluetooth_notify "❌ $chosen_name" "Failed to disconnect from device."
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
''
|
||||
@@ -1,42 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
lib,
|
||||
dmenu,
|
||||
scrot,
|
||||
libnotify,
|
||||
xclip,
|
||||
screenshotsDirectory ? "/tmp",
|
||||
}:
|
||||
writers.writeDashBin "dmenu-scrot" ''
|
||||
# ref https://gitlab.com/dwt1/dotfiles/-/blob/master/.dmenu/dmenu-scrot.sh
|
||||
PATH=$PATH:${lib.makeBinPath [dmenu scrot libnotify xclip]}
|
||||
|
||||
APP_NAME="📸 Scrot"
|
||||
IMG_PATH="${screenshotsDirectory}"
|
||||
TIME=3000 #Miliseconds notification should remain visible
|
||||
|
||||
cmd=$(printf "fullscreen\nsection\nupload_fullscreen\nupload_section\n" | dmenu -p 'Screenshot')
|
||||
|
||||
cd "$IMG_PATH" || exit
|
||||
case ''${cmd%% *} in
|
||||
fullscreen)
|
||||
scrot -d 1 \
|
||||
&& notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (full screen) saved.'
|
||||
;;
|
||||
|
||||
section)
|
||||
scrot -s \
|
||||
&& notify-send -u low -t $TIME -a "$APP_NAME" 'Screenshot (section) saved.'
|
||||
;;
|
||||
|
||||
upload_fullscreen)
|
||||
scrot -d 1 -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
|
||||
&& notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (full screen) uploaded: $(xclip -selection clipboard -out)"
|
||||
;;
|
||||
|
||||
upload_section)
|
||||
scrot -s -e "kpaste < \$f" | tail --lines=1 | xclip -selection clipboard -in \
|
||||
&& notify-send -u low -t $TIME -a "$APP_NAME" "Screenshot (section) uploaded: $(xclip -selection clipboard -out)"
|
||||
;;
|
||||
esac
|
||||
''
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
coreutils,
|
||||
}:
|
||||
writers.writeDashBin "dns-sledgehammer" ''
|
||||
${coreutils}/bin/printf '%s\n' 'nameserver 1.1.1.1' 'options edns0' > /etc/resolv.conf
|
||||
''
|
||||
@@ -1,28 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
curl,
|
||||
coreutils,
|
||||
gnused,
|
||||
pandoc,
|
||||
}:
|
||||
writers.writeDashBin "genius" ''
|
||||
${coreutils}/bin/test "$#" -eq 2 || (
|
||||
echo "usage: $0 <artist> <song>"
|
||||
exit 1
|
||||
)
|
||||
|
||||
normalize() {
|
||||
${coreutils}/bin/tr -d -c '0-9A-Za-z ' | ${coreutils}/bin/tr ' ' - | ${coreutils}/bin/tr '[:upper:]' '[:lower:]'
|
||||
}
|
||||
|
||||
ARTIST=$(echo "$1" | normalize | ${gnused}/bin/sed 's/./\U&/')
|
||||
TITLE=$(echo "$2" | normalize)
|
||||
GENIUS_URL="https://genius.com/$ARTIST-$TITLE-lyrics"
|
||||
|
||||
${curl}/bin/curl -s "$GENIUS_URL" \
|
||||
| ${gnused}/bin/sed -ne '/class="lyrics"/,/<\/p>/p' \
|
||||
| ${pandoc}/bin/pandoc -f html -s -t plain \
|
||||
| ${gnused}/bin/sed 's/^_/\x1b[3m/g;s/_$/\x1b[0m/g;s/^\[/\n\x1b\[1m\[/g;s/\]$/\]\x1b[0m/g'
|
||||
|
||||
printf "\n%s\n" "$GENIUS_URL" >/dev/stderr
|
||||
''
|
||||
@@ -1,23 +0,0 @@
|
||||
{
|
||||
coreutils,
|
||||
git,
|
||||
writers,
|
||||
}:
|
||||
writers.writeDashBin "git-preview" ''
|
||||
set -efu
|
||||
head_commit=$(${git}/bin/git log -1 --format=%H)
|
||||
merge_commit=$1; shift
|
||||
merge_message='Merge for git-preview'
|
||||
preview_dir=$(${coreutils}/bin/mktemp --tmpdir -d git-preview.XXXXXXXX)
|
||||
preview_name=$(${coreutils}/bin/basename "$preview_dir")
|
||||
${git}/bin/git worktree add --detach -f "$preview_dir" 2>/dev/null
|
||||
${git}/bin/git -C "$preview_dir" checkout -q "$head_commit"
|
||||
${git}/bin/git -C "$preview_dir" merge \
|
||||
''${GIT_PREVIEW_MERGE_STRATEGY+-s "$GIT_PREVIEW_MERGE_STRATEGY"} \
|
||||
-m "$merge_message" \
|
||||
-q \
|
||||
"$merge_commit"
|
||||
${git}/bin/git -C "$preview_dir" diff "$head_commit.." "$@"
|
||||
${coreutils}/bin/rm -fR "$preview_dir"
|
||||
${coreutils}/bin/rm -R .git/worktrees/"$preview_name"
|
||||
''
|
||||
@@ -2,6 +2,7 @@
|
||||
writers,
|
||||
fetchurl,
|
||||
xan,
|
||||
util-linux,
|
||||
}: let
|
||||
database = fetchurl {
|
||||
url = "http://c.krebsco.de/greek.csv";
|
||||
@@ -9,5 +10,5 @@
|
||||
};
|
||||
in
|
||||
writers.writeDashBin "heuretes" ''
|
||||
${xan}/bin/xan search -s simple "^$*$" ${database} | ${xan}/bin/xan table
|
||||
${xan}/bin/xan search -s simple "$*" ${database} | ${util-linux}/bin/column -s, -t
|
||||
''
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
pup,
|
||||
curl,
|
||||
pandoc,
|
||||
man,
|
||||
}:
|
||||
writers.writeDashBin "InfSchMV" ''
|
||||
${curl}/bin/curl -sSL https://www.berlin.de/corona/massnahmen/verordnung/ \
|
||||
| ${pup}/bin/pup .textile \
|
||||
| ${pandoc}/bin/pandoc -f html -t man -s \
|
||||
| ${man}/bin/man -l -
|
||||
''
|
||||
@@ -1,29 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cmake,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017.09.06";
|
||||
name = "iolanguage-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "IoLanguage";
|
||||
repo = "io";
|
||||
rev = "${version}";
|
||||
sha256 = "07rg1zrz6i6ghp11cm14w7bbaaa1s8sb0y5i7gr2sds0ijlpq223";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
buildInputs = [cmake python3];
|
||||
preBuild = "mkdir -p build && cd build";
|
||||
buildPhase = ''
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$out/ ..
|
||||
make all
|
||||
'';
|
||||
meta = with lib; {
|
||||
homepage = "https://iolanguage.org/";
|
||||
description = "Io programming language. Inspired by Self, Smalltalk and LISP.";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
fetchurl,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "ix";
|
||||
src = fetchurl {
|
||||
url = "https://ix.io/client";
|
||||
sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57";
|
||||
};
|
||||
phases = ["installPhase"];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install $src $out/bin/ix
|
||||
'';
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
}:
|
||||
buildGoModule {
|
||||
name = "jq-lsp";
|
||||
version = "unstable-2023-09-08";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wader";
|
||||
repo = "jq-lsp";
|
||||
rev = "85edf1adbe5e6c91b37c67b6a4bf85eda1e49f2f";
|
||||
hash = "sha256-ItLKRSbGZ8UqFEHCoh96KwhSpuKZ3l+2ZXnBkHEZL0M=";
|
||||
};
|
||||
vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw=";
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkDerivation,
|
||||
ansi-terminal,
|
||||
base,
|
||||
directory,
|
||||
doctest,
|
||||
filepath,
|
||||
megaparsec,
|
||||
optparse-applicative,
|
||||
prettyprinter,
|
||||
process,
|
||||
raw-strings-qq,
|
||||
stdenv,
|
||||
tasty,
|
||||
tasty-hunit,
|
||||
text,
|
||||
yaml,
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "mahlzeit";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kmein";
|
||||
repo = "mahlzeit";
|
||||
rev = "954c0fb3f45815999bc65d003794af6a850b069c";
|
||||
sha256 = "046yrr40hjmxkjmwzcvmwb39fxx2v2i6hgdxrjfiwilzvhikarrg";
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
ansi-terminal
|
||||
base
|
||||
directory
|
||||
filepath
|
||||
megaparsec
|
||||
prettyprinter
|
||||
text
|
||||
yaml
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
ansi-terminal
|
||||
base
|
||||
directory
|
||||
filepath
|
||||
optparse-applicative
|
||||
process
|
||||
text
|
||||
yaml
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base
|
||||
doctest
|
||||
megaparsec
|
||||
raw-strings-qq
|
||||
tasty
|
||||
tasty-hunit
|
||||
];
|
||||
homepage = "https://github.com/kmein/mahlzeit";
|
||||
description = "Recipe toolkit";
|
||||
license = lib.licenses.mit;
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
lib,
|
||||
jq,
|
||||
curl,
|
||||
xdotool,
|
||||
nsxiv,
|
||||
gnused,
|
||||
defaultStation ? 103840,
|
||||
}:
|
||||
writers.writeDashBin "meteo" ''
|
||||
# usage: meteo --list
|
||||
# usage: meteo --update
|
||||
# usage: meteo STATION
|
||||
set -efu
|
||||
|
||||
PATH=$PATH:${lib.makeBinPath [jq curl xdotool nsxiv gnused]}
|
||||
|
||||
# TODO XDG
|
||||
CONFIG_DIR=$HOME/.config/wetter
|
||||
STATIONS_FILE=$CONFIG_DIR/stations.json
|
||||
|
||||
case ''${1-} in
|
||||
--list)
|
||||
sed -n 's/^\s*\(--[^)]\+\))$/\1/p' "$0"
|
||||
jq -r -n \
|
||||
--slurpfile stations_file "$STATIONS_FILE" \
|
||||
'
|
||||
$stations_file[0] as $known_stations |
|
||||
|
||||
$known_stations | keys[]
|
||||
'
|
||||
exit
|
||||
;;
|
||||
--update)
|
||||
mkdir -p "$(dirname "$STATIONS_FILE")"
|
||||
exec >"$STATIONS_FILE"
|
||||
|
||||
curl -fsSL http://wetterstationen.meteomedia.de/ |
|
||||
jq -Rrs '
|
||||
def decodeHTML:
|
||||
gsub("ä";"ä") |
|
||||
gsub("ö";"ö") |
|
||||
gsub("ü";"ü") |
|
||||
gsub("Ä";"Ä") |
|
||||
gsub("Ö";"Ö") |
|
||||
gsub("Ü";"Ü") |
|
||||
gsub("ß";"ß")
|
||||
;
|
||||
[
|
||||
match(".*<option value=\"/\\?map=Deutschland&station=(?<station>[0-9]+)\">(?<name>[^<]+)</option>";"g")
|
||||
.captures |
|
||||
map({"\(.name)":(.string)}) |
|
||||
add |
|
||||
{"\(.name|decodeHTML)":(.station|tonumber)}
|
||||
] |
|
||||
add
|
||||
'
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
|
||||
# set -x
|
||||
|
||||
station=''${1-${toString defaultStation}}
|
||||
station=$(jq -e -n \
|
||||
--arg station "$station" \
|
||||
--slurpfile stations_file "$STATIONS_FILE" \
|
||||
'
|
||||
$stations_file[0] as $known_stations |
|
||||
|
||||
$station |
|
||||
if test("^[0-9]+$") then
|
||||
tonumber
|
||||
else
|
||||
$known_stations[.]
|
||||
end
|
||||
')
|
||||
cache="/tmp/''${LOGNAME}_wetter_$station.png"
|
||||
curl -sSL \
|
||||
"http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
|
||||
-o "$cache"
|
||||
|
||||
if window_id=$(xdotool search --name "^nsxiv - $cache$"); then
|
||||
xdotool key --window "$window_id" r
|
||||
else
|
||||
nsxiv "$cache" &
|
||||
fi
|
||||
''
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
writers,
|
||||
wget,
|
||||
system,
|
||||
}:
|
||||
writers.writeDashBin "nix-index-update" ''
|
||||
filename="index-${system}"
|
||||
mkdir -p ~/.cache/nix-index
|
||||
cd ~/.cache/nix-index
|
||||
# -N will only download a new version if there is an update.
|
||||
${wget}/bin/wget -q -N https://github.com/Mic92/nix-index-database/releases/latest/download/$filename
|
||||
ln -f $filename files
|
||||
''
|
||||
@@ -1,10 +1,8 @@
|
||||
{
|
||||
writers,
|
||||
curl,
|
||||
pup,
|
||||
gawk,
|
||||
gnused,
|
||||
gnugrep,
|
||||
less,
|
||||
fzf,
|
||||
}:
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../lib) kieran retiolumAddresses restic;
|
||||
@@ -15,7 +14,6 @@ in {
|
||||
./hledger.nix
|
||||
./go-webring.nix
|
||||
./gemini.nix
|
||||
./ical-ephemeris.nix
|
||||
./wallabag.nix
|
||||
../../configs/monitoring.nix
|
||||
../../configs/mycelium.nix
|
||||
@@ -72,64 +70,6 @@ in {
|
||||
];
|
||||
};
|
||||
|
||||
users.users.servant = {
|
||||
isSystemUser = true;
|
||||
group = "servant";
|
||||
};
|
||||
users.groups.servant = {};
|
||||
systemd.services.servant = {
|
||||
enable = true;
|
||||
environment.PORT = toString 18987;
|
||||
environment.VIRTUAL_HOST = "https://openapiaiapi.kmein.de";
|
||||
serviceConfig.ExecStart = pkgs.writers.writeHaskell "server" {
|
||||
libraries = with pkgs.haskellPackages; [
|
||||
servant
|
||||
servant-server
|
||||
servant-openapi3
|
||||
servant-swagger-ui
|
||||
servant-client
|
||||
aeson
|
||||
text
|
||||
warp
|
||||
uuid
|
||||
lens
|
||||
];
|
||||
ghcArgs = ["-O3" "-threaded"];
|
||||
} ./servant-openapi.hs;
|
||||
serviceConfig.User = "servant";
|
||||
serviceConfig.Group = "servant";
|
||||
};
|
||||
|
||||
services.htgen.openapi-conversion = {
|
||||
port = 18988;
|
||||
script = ''. ${pkgs.writers.writeDash "openapi-conversion" ''
|
||||
case "$Method $Request_URI" in
|
||||
"GET /openapi-3.1.json")
|
||||
schema=$(mktemp -d)
|
||||
trap 'rm -rf $schema' EXIT
|
||||
${pkgs.wget}/bin/wget http://127.0.0.1:${toString 18987}/openapi.json -O "$schema"/openapi.json
|
||||
cat "$schema"/openapi.json >&2
|
||||
PATH=${lib.makeBinPath [pkgs.bashInteractive pkgs.nodejs]} ${pkgs.nodejs}/bin/npx --yes openapi-format "$schema"/openapi.json --convertTo "3.1" -o "$schema"/openapi-new.json
|
||||
printf 'HTTP/1.1 200 OK\r\n'
|
||||
printf 'Content-Type: %s\r\n' "$(${pkgs.file}/bin/file -ib "$schema"/openapi-new.json)"
|
||||
printf 'Server: %s\r\n' "$Server"
|
||||
printf 'Connection: close\r\n'
|
||||
printf 'Content-Length: %d\r\n' $(${pkgs.coreutils}/bin/wc -c < "$schema"/openapi-new.json)
|
||||
printf '\r\n'
|
||||
cat "$schema"/openapi-new.json
|
||||
exit
|
||||
;;
|
||||
esac
|
||||
''}'';
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."openapiaiapi.kmein.de" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/openapi-3.1.json".proxyPass = "http://127.0.0.1:${toString 18988}";
|
||||
locations."/".proxyPass = "http://127.0.0.1:${toString 18987}";
|
||||
};
|
||||
|
||||
networking = {
|
||||
firewall.allowedTCPPorts = [80 443];
|
||||
hostName = "ful";
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
{ config, ... }:
|
||||
let
|
||||
port = 9090;
|
||||
in
|
||||
{
|
||||
services.nginx.virtualHosts."ical-ephemeris.kmein.de" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString port}/";
|
||||
};
|
||||
};
|
||||
|
||||
services.ical-ephemeris = {
|
||||
enable = true;
|
||||
inherit port;
|
||||
brevoApiKeyFile = config.age.secrets.brevo-key.path;
|
||||
copecartIpnKeyFile = config.age.secrets.copecart-ipn.path;
|
||||
baseUrl = "https://ical-ephemeris.kmein.de";
|
||||
};
|
||||
|
||||
age.secrets.copecart-ipn = {
|
||||
file = ../../secrets/copecart-ipn.age;
|
||||
};
|
||||
|
||||
age.secrets.brevo-key = {
|
||||
file = ../../secrets/brevo-key.age;
|
||||
};
|
||||
}
|
||||
@@ -21,7 +21,7 @@ in {
|
||||
nginx = {
|
||||
serverName = "matomo.kmein.de";
|
||||
};
|
||||
package = pkgs.matomo_5;
|
||||
package = pkgs.matomo;
|
||||
};
|
||||
|
||||
services.mysql = {
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
|
||||
{-# LANGUAGE DataKinds #-}
|
||||
{-# LANGUAGE TypeFamilies #-}
|
||||
{-# LANGUAGE TypeOperators #-}
|
||||
{-# LANGUAGE DeriveGeneric #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
module Main where
|
||||
|
||||
import Data.Aeson (ToJSON, FromJSON)
|
||||
import GHC.Generics (Generic)
|
||||
import Data.String (IsString(..))
|
||||
import Network.Wai (Application)
|
||||
import Network.Wai.Handler.Warp (run)
|
||||
import Servant
|
||||
import Servant.Client (HasClient (..))
|
||||
import Servant.OpenApi (HasOpenApi(..), toOpenApi)
|
||||
import qualified Data.Version as Version
|
||||
import Servant.Swagger.UI (SwaggerSchemaUI, swaggerSchemaUIServer)
|
||||
import Data.OpenApi (ToSchema, servers, license, info, description, version, title)
|
||||
import qualified Data.OpenApi as OpenApi
|
||||
import Control.Concurrent.MVar (MVar, newMVar, modifyMVar, readMVar)
|
||||
import System.Environment (getEnv)
|
||||
import Control.Monad.IO.Class (liftIO)
|
||||
import Control.Lens
|
||||
import qualified Data.Text as T
|
||||
import GHC.Generics
|
||||
import GHC.TypeLits
|
||||
import Data.UUID (UUID)
|
||||
import Data.UUID.V4 (nextRandom)
|
||||
import qualified Data.UUID as UUID
|
||||
|
||||
-- Define a simple data type
|
||||
data User = User
|
||||
{ userId :: UUID
|
||||
, name :: String
|
||||
, age :: Int
|
||||
} deriving (Generic, Show)
|
||||
|
||||
instance ToJSON User
|
||||
instance FromJSON User
|
||||
instance ToSchema User
|
||||
|
||||
-- Define the API type
|
||||
type API = "users" :> OperationId "getUsers" :> Get '[JSON] [User]
|
||||
:<|> "users" :> OperationId "insertUser" :> ReqBody '[JSON] User :> Post '[JSON] User
|
||||
:<|> "users" :> OperationId "updateUser" :> Capture "id" UUID :> ReqBody '[JSON] User :> Put '[JSON] User
|
||||
:<|> "users" :> OperationId "deleteUser" :> Capture "id" UUID :> Delete '[JSON] NoContent
|
||||
|
||||
-- Define the API with Swagger endpoints
|
||||
type APIWithSwagger = API
|
||||
:<|> SwaggerSchemaUI "swagger-ui" "openapi.json"
|
||||
|
||||
|
||||
data OperationId (name :: Symbol)
|
||||
|
||||
instance HasServer subApi ctx => HasServer (OperationId name :> subApi) ctx where
|
||||
type ServerT (OperationId name :> subApi) m = ServerT subApi m
|
||||
route _ = route (Proxy @subApi)
|
||||
hoistServerWithContext _ = hoistServerWithContext (Proxy @subApi)
|
||||
|
||||
instance (HasOpenApi subApi, KnownSymbol name) => HasOpenApi (OperationId name :> subApi) where
|
||||
toOpenApi _ = toOpenApi (Proxy @subApi) & OpenApi.allOperations . OpenApi.operationId ?~ apiName
|
||||
where
|
||||
apiName = T.pack $ symbolVal (Proxy @name)
|
||||
|
||||
instance HasClient m api => HasClient m (OperationId name :> api) where
|
||||
type Client m (OperationId name :> api) = Client m api
|
||||
clientWithRoute pm Proxy = clientWithRoute pm (Proxy :: Proxy api)
|
||||
hoistClientMonad pm _ = hoistClientMonad pm (Proxy :: Proxy api)
|
||||
|
||||
-- Handlers for the API
|
||||
getUsers :: MVar [User] -> Handler [User]
|
||||
getUsers usersVar = liftIO $ readMVar usersVar
|
||||
|
||||
addUser :: MVar [User] -> User -> Handler User
|
||||
addUser usersVar newUser = liftIO $ do
|
||||
newId <- nextRandom
|
||||
let userWithId = newUser { userId = newId }
|
||||
modifyMVar usersVar $ \users -> return (userWithId : users, userWithId)
|
||||
|
||||
updateUser :: MVar [User] -> UUID -> User -> Handler User
|
||||
updateUser usersVar uid updatedUser = liftIO $ do
|
||||
modifyMVar usersVar $ \users ->
|
||||
let newUsers = map (\user -> if userId user == uid then updatedUser { userId = uid } else user) users
|
||||
in return (newUsers, updatedUser { userId = uid })
|
||||
|
||||
deleteUser :: MVar [User] -> UUID -> Handler NoContent
|
||||
deleteUser usersVar uid = liftIO $ do
|
||||
modifyMVar usersVar $ \users ->
|
||||
let newUsers = filter (\user -> userId user /= uid) users
|
||||
in return (newUsers, NoContent)
|
||||
|
||||
-- Implement the server
|
||||
server :: OpenApi.Server -> MVar [User] -> Server APIWithSwagger
|
||||
server virtualHost usersVar = (getUsers usersVar
|
||||
:<|> addUser usersVar
|
||||
:<|> updateUser usersVar
|
||||
:<|> deleteUser usersVar)
|
||||
:<|> swaggerSchemaUIServer (toOpenApi (Proxy :: Proxy API)
|
||||
& info.title .~ "OpenAPI AI API"
|
||||
& info.version .~ "1.0"
|
||||
& info.description ?~ "This is an API for AI with OpenAPI"
|
||||
& info.license ?~ "MIT"
|
||||
& servers .~ [virtualHost])
|
||||
|
||||
-- Create the application
|
||||
app :: OpenApi.Server -> MVar [User] -> Application
|
||||
app virtualHost usersVar = serve (Proxy :: Proxy APIWithSwagger) (server virtualHost usersVar)
|
||||
|
||||
-- Main entry point
|
||||
main :: IO ()
|
||||
main = do
|
||||
initialUsers <- mapM (\(name, age) -> nextRandom >>= \uid -> return (User uid name age)) [("Alice", 30), ("Bob", 25)]
|
||||
usersVar <- newMVar initialUsers
|
||||
virtualHost <- getEnv "VIRTUAL_HOST"
|
||||
port <- read <$> getEnv "PORT" -- Assuming PORT is a number
|
||||
run port (app (fromString virtualHost) usersVar)
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
../../configs/sound.nix
|
||||
../../configs/printing.nix
|
||||
../../configs/nix.nix
|
||||
../../configs/flix.nix
|
||||
../../configs/fonts.nix
|
||||
../../configs/mycelium.nix
|
||||
../../configs/retiolum.nix
|
||||
@@ -80,7 +79,6 @@
|
||||
niveumPackages.mpv-tv
|
||||
telegram-desktop
|
||||
(niveumPackages.mpv-radio.override { di-fm-key-file = config.age.secrets.di-fm-key.path; })
|
||||
niveumPackages.meteo
|
||||
spotify
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
niveumPackages,
|
||||
...
|
||||
}: let
|
||||
system = "x86_64-darwin";
|
||||
|
||||
nextcloud = "${config.home.homeDirectory}/Nextcloud/ZODIAC";
|
||||
|
||||
hora = pkgs.callPackage ../../packages/hora.nix {
|
||||
timeLedger = "${nextcloud}/hora.timeclock";
|
||||
};
|
||||
|
||||
adminEssentials = import ../../configs/admin-essentials.nix {
|
||||
inherit pkgs niveumPackages lib system;
|
||||
};
|
||||
|
||||
stardict = import ../../configs/stardict.nix {
|
||||
inherit pkgs lib inputs;
|
||||
};
|
||||
|
||||
git = import ../../configs/git.nix {
|
||||
inherit pkgs lib inputs system;
|
||||
};
|
||||
in {
|
||||
home.packages =
|
||||
[
|
||||
hora
|
||||
niveumPackages.vim
|
||||
pkgs.ghc
|
||||
pkgs.python3
|
||||
]
|
||||
++ adminEssentials.environment.systemPackages
|
||||
++ git.environment.systemPackages;
|
||||
#++ stardict.environment.systemPackages;
|
||||
|
||||
home.shellAliases =
|
||||
adminEssentials.environment.shellAliases
|
||||
// git.environment.shellAliases;
|
||||
|
||||
programs.git = git.home-manager.users.me.programs.git;
|
||||
|
||||
programs.zsh = let
|
||||
promptColours = {
|
||||
success = "green";
|
||||
failure = "red";
|
||||
};
|
||||
in {
|
||||
autocd = true;
|
||||
defaultKeymap = "viins";
|
||||
enableAutosuggestions = true;
|
||||
enableCompletion = true;
|
||||
enable = true;
|
||||
historySubstringSearch.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
syntaxHighlighting.highlighters = ["main" "brackets" "pattern" "line"];
|
||||
initExtra = ''
|
||||
# ref https://gist.github.com/meeech/0b97a86f235d10bc4e2a1116eec38e7e
|
||||
if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ];
|
||||
then
|
||||
. '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
|
||||
fi
|
||||
|
||||
precmd () {
|
||||
if [[ -n $IN_NIX_SHELL ]]; then
|
||||
PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})λ%f '
|
||||
else
|
||||
PROMPT='%B%~%b %(?.%F{${promptColours.success}}.%F{${promptColours.failure}})%#%f '
|
||||
fi
|
||||
print -Pn "\e]2;%n@%M:%~\a" # title bar prompt
|
||||
}
|
||||
zle-keymap-select zle-line-init () {
|
||||
case $KEYMAP in
|
||||
vicmd) print -n '\e]12;green\a';;
|
||||
viins|main) print -n '\e]12;gray\a';;
|
||||
esac
|
||||
}
|
||||
zle -N zle-line-init
|
||||
zle -N zle-keymap-select
|
||||
'';
|
||||
};
|
||||
|
||||
home.sessionVariables.EDITOR = "${niveumPackages.vim}/bin/nvim";
|
||||
home.file."Local Applications".source = pkgs.symlinkJoin {
|
||||
name = "local-applications";
|
||||
paths = [pkgs.anki-bin pkgs.dbeaver pkgs.vscode pkgs.stellarium];
|
||||
};
|
||||
home.stateVersion = "23.11";
|
||||
home.username = "xm7234fu";
|
||||
home.homeDirectory = "/Users/${config.home.username}";
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.package = pkgs.nixVersions.stable;
|
||||
nix.extraOptions = "experimental-features = nix-command flakes";
|
||||
}
|
||||
|
||||
/*
|
||||
hora register -p weekly --depth 1 --empty
|
||||
|
||||
|
||||
*/
|
||||
@@ -1,71 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
niveumPackages,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
sshPort = 8022;
|
||||
in {
|
||||
environment.packages = with pkgs; [
|
||||
nil
|
||||
bzip2
|
||||
coreutils
|
||||
curl
|
||||
diffutils
|
||||
findutils
|
||||
git
|
||||
gnugrep
|
||||
gnupg
|
||||
gnused
|
||||
gnutar
|
||||
gzip
|
||||
hostname
|
||||
iproute2
|
||||
man
|
||||
openssh
|
||||
procps
|
||||
tzdata
|
||||
unzip
|
||||
util-linux
|
||||
vim
|
||||
which
|
||||
xz
|
||||
zip
|
||||
hledger
|
||||
hledger-ui
|
||||
niveumPackages.vim
|
||||
gitAndTools.gh
|
||||
ripgrep
|
||||
(pkgs.writers.writeDashBin "start-ssh" ''
|
||||
${pkgs.openssh}/bin/sshd -f ${pkgs.writeText "sshd_config" ''
|
||||
HostKey /data/data/com.termux.nix/files/home/.ssh/ssh_host_rsa_key
|
||||
Port ${toString sshPort}
|
||||
''}
|
||||
'')
|
||||
];
|
||||
|
||||
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "hm-bak";
|
||||
config = {pkgs, ...}: {
|
||||
home.stateVersion = "23.05";
|
||||
programs.tmux.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
environment.sessionVariables = {
|
||||
LEDGER_FILE = "/data/data/com.termux.nix/files/home/src/ledger/privat.journal";
|
||||
};
|
||||
|
||||
user.shell = "${pkgs.fish}/bin/fish";
|
||||
|
||||
environment.etcBackupExtension = ".bak";
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
|
||||
nix.extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
}
|
||||
Reference in New Issue
Block a user