mirror of
https://github.com/kmein/niveum
synced 2026-03-19 11:31:09 +01:00
Compare commits
25 Commits
4c84da9404
...
wayland
| Author | SHA1 | Date | |
|---|---|---|---|
| b274a59a50 | |||
| b4de03bb3c | |||
| b0062abbfe | |||
| 0e9a046c5f | |||
| 72ab319e65 | |||
| f08e43067b | |||
| d0ac0af7c3 | |||
| 5febabb7fa | |||
| 44d29f90e9 | |||
| 1aaf0fe5ae | |||
| e8e165ff03 | |||
| 5175bd5f4a | |||
| 874c502094 | |||
| 4490c0a97c | |||
|
|
8e76899b40 | ||
| 8617c8e982 | |||
| 0025d82cd8 | |||
| 03c0e49572 | |||
| 7c3c13abb8 | |||
| f954e867dc | |||
| 67f682aa88 | |||
| 0ceecf4c14 | |||
| 6fdac40832 | |||
| 2ba3c05e4a | |||
| 6ab7e96894 |
2
.github/workflows/niveum.yml
vendored
2
.github/workflows/niveum.yml
vendored
@@ -7,7 +7,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
system: [makanek,manakish,kabsa,zaatar,ful,fatteh,kibbeh]
|
system: [makanek,manakish,kabsa,zaatar,ful,fatteh]
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Install QEMU (ARM)
|
- name: Install QEMU (ARM)
|
||||||
|
|||||||
@@ -1,58 +1,8 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
config,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
alacritty-cfg = theme:
|
|
||||||
(pkgs.formats.yaml {}).generate "alacritty.yml" {
|
|
||||||
bell = {
|
|
||||||
animation = "EaseOut";
|
|
||||||
duration = 100;
|
|
||||||
color = "#ffffff";
|
|
||||||
};
|
|
||||||
font = {
|
|
||||||
normal.family = "Monospace";
|
|
||||||
size = 6;
|
|
||||||
};
|
|
||||||
live_config_reload = true;
|
|
||||||
key_bindings = [
|
|
||||||
{
|
|
||||||
key = "Plus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "IncreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Minus";
|
|
||||||
mods = "Control";
|
|
||||||
action = "DecreaseFontSize";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
key = "Key0";
|
|
||||||
mods = "Control";
|
|
||||||
action = "ResetFontSize";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
colors = let
|
|
||||||
colourNames = ["black" "red" "green" "yellow" "blue" "magenta" "cyan" "white"];
|
|
||||||
colourPairs = lib.getAttrs colourNames theme;
|
|
||||||
in {
|
|
||||||
primary = {inherit (theme) background foreground;};
|
|
||||||
cursor = {inherit (theme) cursor;};
|
|
||||||
normal = lib.mapAttrs (_: colour: colour.dark) colourPairs;
|
|
||||||
bright = lib.mapAttrs (_: colour: colour.bright) colourPairs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
alacritty-pkg = pkgs.symlinkJoin {
|
|
||||||
name = "alacritty";
|
|
||||||
paths = [
|
|
||||||
(pkgs.writers.writeDashBin "alacritty" ''
|
|
||||||
${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
|
|
||||||
${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
|
|
||||||
'')
|
|
||||||
pkgs.alacritty
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
environment.variables.TERMINAL = "alacritty";
|
environment.variables.TERMINAL = "alacritty";
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ in {
|
|||||||
|
|
||||||
transliteration=$(${pkgs.writers.makePythonWriter pkgs.python311 pkgs.python311Packages pkgs.python3Packages "translit.py" {
|
transliteration=$(${pkgs.writers.makePythonWriter pkgs.python311 pkgs.python311Packages pkgs.python3Packages "translit.py" {
|
||||||
# revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
|
# revert to pkgs.writers.writePython3 once https://github.com/NixOS/nixpkgs/pull/353367 is merged
|
||||||
libraries = [ pkgs.python311Packages.cltk ];
|
libraries = [ pkgs.python3Packages.cltk ];
|
||||||
} ''
|
} ''
|
||||||
import sys
|
import sys
|
||||||
from cltk.phonology.grc.transcription import Transcriber
|
from cltk.phonology.grc.transcription import Transcriber
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
niveumPackages.cro
|
niveumPackages.cro
|
||||||
pkgs.tor-browser-bundle-bin
|
pkgs.tor-browser-bundle-bin
|
||||||
pkgs.firefox
|
pkgs.firefox
|
||||||
|
pkgs.brave
|
||||||
];
|
];
|
||||||
|
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ in
|
|||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
packageOverrides = pkgs: {
|
packageOverrides = pkgs: {
|
||||||
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.wofi}/bin/wofi -dmenu "$@"'';
|
||||||
};
|
};
|
||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
"qtwebkit-5.212.0-alpha4"
|
"qtwebkit-5.212.0-alpha4"
|
||||||
@@ -99,8 +99,8 @@ in
|
|||||||
{
|
{
|
||||||
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
o = "${pkgs.xdg-utils}/bin/xdg-open";
|
||||||
ns = "nix-shell --run zsh";
|
ns = "nix-shell --run zsh";
|
||||||
pbcopy = "${pkgs.xclip}/bin/xclip -selection clipboard -in";
|
pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy";
|
||||||
pbpaste = "${pkgs.xclip}/bin/xclip -selection clipboard -out";
|
pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
|
||||||
tmux = "${pkgs.tmux}/bin/tmux -2";
|
tmux = "${pkgs.tmux}/bin/tmux -2";
|
||||||
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
sxiv = swallow "${pkgs.nsxiv}/bin/nsxiv";
|
||||||
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
zathura = swallow "${pkgs.zathura}/bin/zathura";
|
||||||
@@ -223,6 +223,7 @@ in
|
|||||||
./htop.nix
|
./htop.nix
|
||||||
./fu-berlin.nix
|
./fu-berlin.nix
|
||||||
./i3.nix
|
./i3.nix
|
||||||
|
./niri.nix
|
||||||
./i3status-rust.nix
|
./i3status-rust.nix
|
||||||
./keyboard.nix
|
./keyboard.nix
|
||||||
./mycelium.nix
|
./mycelium.nix
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
}: {
|
}: {
|
||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.flameshot = {
|
services.flameshot = {
|
||||||
|
package = pkgs.flameshot.override { enableWlrSupport = true; };
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.General = {
|
settings.General = {
|
||||||
autoCloseIdleDaemon = true;
|
autoCloseIdleDaemon = true;
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
|
config,
|
||||||
niveumPackages,
|
niveumPackages,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
@@ -24,11 +25,6 @@
|
|||||||
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
url = "https://github.com/MKilani/Djehuty/archive/master.zip";
|
||||||
sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
|
sha256 = "sha256-S3vZxdeBj57KJsF+zaZw7sQw8T+z1aVC2CnpnZ0/x2c=";
|
||||||
};
|
};
|
||||||
brill = zip-font "Brill" {
|
|
||||||
url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip";
|
|
||||||
stripRoot = false;
|
|
||||||
hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4=";
|
|
||||||
};
|
|
||||||
antinoou = zip-font "Antinoou" {
|
antinoou = zip-font "Antinoou" {
|
||||||
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
url = "https://www.evertype.com/fonts/coptic/AntinoouFont.zip";
|
||||||
sha256 = "0jwihj08n4yrshcx07dnaml2x9yws6dgyjkvg19jqbz17drbp3sw";
|
sha256 = "0jwihj08n4yrshcx07dnaml2x9yws6dgyjkvg19jqbz17drbp3sw";
|
||||||
@@ -92,7 +88,7 @@ in {
|
|||||||
newGardiner
|
newGardiner
|
||||||
junicode
|
junicode
|
||||||
koineGreek
|
koineGreek
|
||||||
brill
|
# brill
|
||||||
ezra-sil
|
ezra-sil
|
||||||
fira
|
fira
|
||||||
font-awesome
|
font-awesome
|
||||||
@@ -112,6 +108,7 @@ in {
|
|||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-cjk-sans
|
noto-fonts-cjk-sans
|
||||||
noto-fonts-emoji
|
noto-fonts-emoji
|
||||||
|
nerd-fonts.blex-mono
|
||||||
roboto-slab
|
roboto-slab
|
||||||
scheherazade-new
|
scheherazade-new
|
||||||
source-code-pro
|
source-code-pro
|
||||||
@@ -124,10 +121,10 @@ in {
|
|||||||
zilla-slab
|
zilla-slab
|
||||||
]; # google-fonts league-of-moveable-type
|
]; # google-fonts league-of-moveable-type
|
||||||
fontconfig.defaultFonts = rec {
|
fontconfig.defaultFonts = rec {
|
||||||
monospace = ["Noto Sans Mono"] ++ emoji;
|
monospace = [config.stylix.fonts.monospace.name] ++ emoji;
|
||||||
serif = ["Noto Serif" "Noto Naskh Arabic" "Noto Serif Devanagari"];
|
serif = [config.stylix.fonts.serif.name "Scheherazade New" "Ezra SIL" "Antinoou" "Noto Serif Devanagari"];
|
||||||
sansSerif = ["Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic" "Noto Sans Syriac Western"];
|
sansSerif = [config.stylix.fonts.sansSerif.name "Noto Sans Display" "Noto Naskh Arabic" "Noto Sans Hebrew" "Noto Sans Devanagari" "Noto Sans CJK JP" "Noto Sans Coptic" "Noto Sans Syriac Western"];
|
||||||
emoji = ["Noto Color Emoji"];
|
emoji = [config.stylix.fonts.emoji.name];
|
||||||
};
|
};
|
||||||
# xelatex fails with woff files
|
# xelatex fails with woff files
|
||||||
# ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other
|
# ref https://tex.stackexchange.com/questions/392144/xelatex-and-fontspec-crash-trying-to-find-woff-file-for-some-fonts-but-not-other
|
||||||
|
|||||||
@@ -7,19 +7,19 @@
|
|||||||
commaSep = builtins.concatStringsSep ",";
|
commaSep = builtins.concatStringsSep ",";
|
||||||
xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
xkbOptions = ["compose:caps" "terminate:ctrl_alt_bksp" "grp:ctrls_toggle"];
|
||||||
languages = {
|
languages = {
|
||||||
deutsch = { code = "de"; variant = "T3"; };
|
|
||||||
greek = { code = "gr"; variant = "polytonic"; };
|
|
||||||
russian = { code = "ru"; variant = "phonetic"; };
|
|
||||||
arabic = { code = "ara"; variant = "buckwalter"; }; # ../lib/keyboards/arabic;
|
arabic = { code = "ara"; variant = "buckwalter"; }; # ../lib/keyboards/arabic;
|
||||||
coptic = ../lib/keyboards/coptic;
|
|
||||||
avestan = ../lib/keyboards/avestan;
|
avestan = ../lib/keyboards/avestan;
|
||||||
gothic = ../lib/keyboards/gothic;
|
coptic = ../lib/keyboards/coptic;
|
||||||
|
deutsch = { code = "de"; variant = "T3"; };
|
||||||
farsi = { code = "ir"; variant = "qwerty"; };
|
farsi = { code = "ir"; variant = "qwerty"; };
|
||||||
syriac = { code = "sy"; variant = "syc_phonetic"; };
|
gothic = ../lib/keyboards/gothic;
|
||||||
sanskrit = { code = "in"; variant = "san-kagapa"; };
|
greek = { code = "gr"; variant = "polytonic"; };
|
||||||
gujarati = {code = "in"; variant = "guj-kagapa"; };
|
gujarati = {code = "in"; variant = "guj-kagapa"; };
|
||||||
urdu = {code = "in"; variant = "urd-phonetic"; };
|
|
||||||
hebrew = {code = "il"; variant = "phonetic";};
|
hebrew = {code = "il"; variant = "phonetic";};
|
||||||
|
russian = { code = "ru"; variant = "phonetic"; };
|
||||||
|
sanskrit = { code = "in"; variant = "san-kagapa"; };
|
||||||
|
syriac = { code = "sy"; variant = "syc_phonetic"; };
|
||||||
|
urdu = {code = "in"; variant = "urd-phonetic"; };
|
||||||
};
|
};
|
||||||
defaultLanguage = languages.deutsch;
|
defaultLanguage = languages.deutsch;
|
||||||
in {
|
in {
|
||||||
@@ -27,28 +27,33 @@ in {
|
|||||||
|
|
||||||
# man 7 xkeyboard-config
|
# man 7 xkeyboard-config
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
exportConfiguration = true; # link /usr/share/X11 properly
|
# exportConfiguration = true; # link /usr/share/X11 properly
|
||||||
xkb.layout = defaultLanguage.code;
|
xkb.layout = defaultLanguage.code;
|
||||||
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
# T3: https://upload.wikimedia.org/wikipedia/commons/a/a9/German-Keyboard-Layout-T3-Version1-large.png
|
||||||
# buckwalter: http://www.qamus.org/transliteration.htm
|
# buckwalter: http://www.qamus.org/transliteration.htm
|
||||||
xkb.variant = defaultLanguage.variant;
|
xkb.variant = defaultLanguage.variant;
|
||||||
xkb.options = commaSep xkbOptions;
|
xkb.options = commaSep xkbOptions;
|
||||||
xkb.dir = pkgs.symlinkJoin {
|
xkb.extraLayouts = {
|
||||||
name = "x-keyboard-directory";
|
"coptic" = {
|
||||||
paths = [
|
languages = ["cop"];
|
||||||
"${pkgs.xkeyboard_config}/etc/X11/xkb"
|
description = "Coptic";
|
||||||
(pkgs.linkFarm "custom-x-keyboards" (
|
symbolsFile = ../lib/keyboards/coptic;
|
||||||
lib.mapAttrsToList (name: value: {
|
};
|
||||||
name = "symbols/${name}";
|
"gothic" = {
|
||||||
path = value;
|
languages = ["got"];
|
||||||
}) (lib.filterAttrs (_: value: !(value ? "code")) languages) ++ [
|
description = "Gothic";
|
||||||
{
|
symbolsFile = ../lib/keyboards/gothic;
|
||||||
name = "symbols/ir";
|
};
|
||||||
path = ../lib/keyboards/farsi;
|
"avestan" = {
|
||||||
}
|
languages = ["ave"];
|
||||||
]
|
description = "Avestan";
|
||||||
))
|
symbolsFile = ../lib/keyboards/avestan;
|
||||||
];
|
};
|
||||||
|
"farsi-good" = {
|
||||||
|
languages = ["fas"];
|
||||||
|
description = "Farsi, but good";
|
||||||
|
symbolsFile = ../lib/keyboards/farsi;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -66,7 +71,16 @@ in {
|
|||||||
pkgs.writers.writeDashBin "kb-${language}" ''
|
pkgs.writers.writeDashBin "kb-${language}" ''
|
||||||
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
|
${pkgs.xorg.setxkbmap}/bin/setxkbmap ${defaultLanguage.code},${code} ${defaultLanguage.variant},${variant} ${toString (map (option: "-option ${option}") xkbOptions)}
|
||||||
'')
|
'')
|
||||||
languages;
|
languages ++
|
||||||
|
lib.mapAttrsToList
|
||||||
|
(language: settings:
|
||||||
|
let
|
||||||
|
code = if settings ? "code" then settings.code else language;
|
||||||
|
variant = if settings ? "variant" then settings.variant else "";
|
||||||
|
in
|
||||||
|
pkgs.writers.writeDashBin "kb-niri-${language}" ''
|
||||||
|
${pkgs.gnused}/bin/sed -i 's/^\(\s*layout\) ".*"$/\1 "${defaultLanguage.code},${code}"/;s/^\(\s*variant\) ".*"$/\1 "${defaultLanguage.variant},${variant}"/' ~/.config/niri/config.kdl
|
||||||
|
'') languages;
|
||||||
|
|
||||||
# improve held key rate
|
# improve held key rate
|
||||||
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xset}/bin/xset r rate 300 50";
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ in {
|
|||||||
"Alt+j" = "add video-pan-y -0.05";
|
"Alt+j" = "add video-pan-y -0.05";
|
||||||
};
|
};
|
||||||
scripts = [
|
scripts = [
|
||||||
pkgs.mpvScripts.quality-menu
|
# pkgs.mpvScripts.quality-menu
|
||||||
niveumPackages.mpv-visualizer
|
niveumPackages.mpv-visualizer
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
(pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
|
||||||
(niveumPackages.vim.override {
|
(niveumPackages.vim.override {
|
||||||
stylixColors = config.lib.stylix.colors;
|
stylixColors = config.lib.stylix.colors;
|
||||||
colorscheme = "base16-gruvbox-light-medium";
|
# colorscheme = "base16-gruvbox-light-medium";
|
||||||
})
|
})
|
||||||
|
|
||||||
# language servers
|
# language servers
|
||||||
|
|||||||
445
configs/niri.nix
Normal file
445
configs/niri.nix
Normal file
@@ -0,0 +1,445 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
niveumPackages,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (import ../lib) defaultApplications;
|
||||||
|
niriConfig =
|
||||||
|
let
|
||||||
|
klem = niveumPackages.klem.override {
|
||||||
|
config.dmenu = "${pkgs.dmenu}/bin/dmenu -i -p klem";
|
||||||
|
config.scripts = {
|
||||||
|
"p.r paste" = pkgs.writers.writeDash "p.r" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs http://p.r --data-binary @- \
|
||||||
|
| ${pkgs.coreutils}/bin/tail --lines=1 \
|
||||||
|
| ${pkgs.gnused}/bin/sed 's/\\<r\\>/krebsco.de/'
|
||||||
|
'';
|
||||||
|
"envs.sh paste" = pkgs.writers.writeDash "envs-host" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "file=@-" https://envs.sh
|
||||||
|
'';
|
||||||
|
"envs.sh shorten" = pkgs.writers.writeDash "envs-shorten" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "shorten=$(${pkgs.coreutils}/bin/cat)" https://envs.sh
|
||||||
|
'';
|
||||||
|
"go.r shorten" = pkgs.writers.writeDash "go.r" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs http://go.r -F "uri=$(${pkgs.coreutils}/bin/cat)"
|
||||||
|
'';
|
||||||
|
"4d2.org paste" = pkgs.writers.writeDash "4d2-paste" ''
|
||||||
|
${pkgs.curl}/bin/curl -F "file=@-" https://depot.4d2.org/
|
||||||
|
'';
|
||||||
|
"0x0.st shorten" = pkgs.writers.writeDash "0x0.st" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs https://0x0.st -F "shorten=$(${pkgs.coreutils}/bin/cat)"
|
||||||
|
'';
|
||||||
|
"rot13" = pkgs.writers.writeDash "rot13" ''
|
||||||
|
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
|
||||||
|
'';
|
||||||
|
"ipa" = pkgs.writers.writeDash "ipa" ''
|
||||||
|
${niveumPackages.ipa}/bin/ipa
|
||||||
|
'';
|
||||||
|
"betacode" = pkgs.writers.writeDash "betacode" ''
|
||||||
|
${niveumPackages.betacode}/bin/betacode
|
||||||
|
'';
|
||||||
|
"curl" = pkgs.writers.writeDash "curl" ''
|
||||||
|
${pkgs.curl}/bin/curl -fSs "$(${pkgs.coreutils}/bin/cat)"
|
||||||
|
'';
|
||||||
|
ocr = pkgs.writers.writeDash "ocr" ''
|
||||||
|
${pkgs.tesseract4}/bin/tesseract -l eng+deu - stdout
|
||||||
|
'';
|
||||||
|
emojai = pkgs.writers.writeDash "emojai" ''
|
||||||
|
${pkgs.curl}/bin/curl https://www.emojai.app/api/generate -X POST -H 'Content-Type: application/json' --data-raw "$(${pkgs.jq}/bin/jq -sR '{emoji:.}')" | ${pkgs.jq}/bin/jq -r .result
|
||||||
|
'';
|
||||||
|
"gpt-3.5" = pkgs.writers.writeDash "gpt" ''
|
||||||
|
${niveumPackages.gpt35}/bin/gpt
|
||||||
|
'';
|
||||||
|
gpt-4 = pkgs.writers.writeDash "gpt" ''
|
||||||
|
${niveumPackages.gpt4}/bin/gpt
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in
|
||||||
|
''
|
||||||
|
spawn-at-startup "${pkgs.ironbar}/bin/ironbar"
|
||||||
|
spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
|
||||||
|
|
||||||
|
environment {
|
||||||
|
DISPLAY ":0"
|
||||||
|
ANKI_WAYLAND "1"
|
||||||
|
}
|
||||||
|
|
||||||
|
input {
|
||||||
|
warp-mouse-to-focus
|
||||||
|
focus-follows-mouse max-scroll-amount="0%"
|
||||||
|
|
||||||
|
keyboard {
|
||||||
|
repeat-rate 35
|
||||||
|
repeat-delay 350
|
||||||
|
track-layout "global"
|
||||||
|
|
||||||
|
xkb {
|
||||||
|
layout "de"
|
||||||
|
variant "T3"
|
||||||
|
options "ctrl:nocaps,compose:caps,grp:ctrls_toggle"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
touchpad {
|
||||||
|
click-method "clickfinger"
|
||||||
|
tap
|
||||||
|
dwt
|
||||||
|
dwtp
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
prefer-no-csd
|
||||||
|
|
||||||
|
hotkey-overlay {
|
||||||
|
skip-at-startup
|
||||||
|
}
|
||||||
|
|
||||||
|
layout {
|
||||||
|
gaps 5
|
||||||
|
|
||||||
|
default-column-width {
|
||||||
|
proportion 0.5
|
||||||
|
}
|
||||||
|
|
||||||
|
preset-column-widths {
|
||||||
|
proportion 0.33333
|
||||||
|
proportion 0.5
|
||||||
|
proportion 0.66667
|
||||||
|
}
|
||||||
|
|
||||||
|
focus-ring {
|
||||||
|
width 2
|
||||||
|
}
|
||||||
|
|
||||||
|
shadow {
|
||||||
|
// on
|
||||||
|
softness 30
|
||||||
|
spread 5
|
||||||
|
offset x=0 y=5
|
||||||
|
draw-behind-window true
|
||||||
|
color "#00000070"
|
||||||
|
// inactive-color "#00000054"
|
||||||
|
}
|
||||||
|
|
||||||
|
tab-indicator {
|
||||||
|
// off
|
||||||
|
hide-when-single-tab
|
||||||
|
place-within-column
|
||||||
|
gap 5
|
||||||
|
width 4
|
||||||
|
length total-proportion=1.0
|
||||||
|
position "right"
|
||||||
|
gaps-between-tabs 2
|
||||||
|
corner-radius 8
|
||||||
|
active-color "red"
|
||||||
|
inactive-color "gray"
|
||||||
|
urgent-color "blue"
|
||||||
|
// active-gradient from="#80c8ff" to="#bbddff" angle=45
|
||||||
|
// inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
|
||||||
|
// urgent-gradient from="#800" to="#a33" angle=45
|
||||||
|
}
|
||||||
|
|
||||||
|
border {
|
||||||
|
off
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
animations {
|
||||||
|
// off
|
||||||
|
workspace-switch {
|
||||||
|
spring damping-ratio=1.0 stiffness=1000 epsilon=0.0001
|
||||||
|
}
|
||||||
|
|
||||||
|
window-open {
|
||||||
|
duration-ms 150
|
||||||
|
curve "ease-out-expo"
|
||||||
|
}
|
||||||
|
|
||||||
|
window-close {
|
||||||
|
duration-ms 150
|
||||||
|
curve "ease-out-quad"
|
||||||
|
}
|
||||||
|
|
||||||
|
horizontal-view-movement {
|
||||||
|
spring damping-ratio=1.0 stiffness=800 epsilon=0.0001
|
||||||
|
}
|
||||||
|
|
||||||
|
window-movement {
|
||||||
|
spring damping-ratio=1.0 stiffness=800 epsilon=0.0001
|
||||||
|
}
|
||||||
|
|
||||||
|
window-resize {
|
||||||
|
spring damping-ratio=1.0 stiffness=800 epsilon=0.0001
|
||||||
|
}
|
||||||
|
|
||||||
|
config-notification-open-close {
|
||||||
|
spring damping-ratio=0.6 stiffness=1000 epsilon=0.001
|
||||||
|
}
|
||||||
|
|
||||||
|
screenshot-ui-open {
|
||||||
|
duration-ms 200
|
||||||
|
curve "ease-out-quad"
|
||||||
|
}
|
||||||
|
|
||||||
|
overview-open-close {
|
||||||
|
spring damping-ratio=1.0 stiffness=800 epsilon=0.0001
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
geometry-corner-radius 0
|
||||||
|
clip-to-geometry true
|
||||||
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
match app-id="mpv"
|
||||||
|
open-floating true
|
||||||
|
}
|
||||||
|
window-rule {
|
||||||
|
match app-id="rofi"
|
||||||
|
open-floating true
|
||||||
|
}
|
||||||
|
window-rule {
|
||||||
|
match app-id=r#"firefox$"# title="^Picture-in-Picture$"
|
||||||
|
open-floating true
|
||||||
|
default-floating-position x=32 y=32 relative-to="bottom-left"
|
||||||
|
}
|
||||||
|
|
||||||
|
window-rule {
|
||||||
|
match is-window-cast-target=true
|
||||||
|
|
||||||
|
border {
|
||||||
|
on
|
||||||
|
width 3
|
||||||
|
active-color "#f38ba8"
|
||||||
|
inactive-color "#7d0d2d"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
binds {
|
||||||
|
Mod+Shift+Slash { show-hotkey-overlay; }
|
||||||
|
Mod+Return { spawn "${(defaultApplications pkgs).terminal}"; }
|
||||||
|
Mod+D { spawn "${pkgs.wofi}/bin/wofi" "--show" "run"; }
|
||||||
|
Mod+Shift+D { spawn "${niveumPackages.notemenu}/bin/notemenu"; }
|
||||||
|
Mod+T { spawn "${(defaultApplications pkgs).fileManager}"; }
|
||||||
|
Mod+Y { spawn "${(defaultApplications pkgs).browser}"; }
|
||||||
|
Mod+P { spawn "${niveumPackages.passmenu}/bin/passmenu"; }
|
||||||
|
Mod+U { spawn "${niveumPackages.unicodmenu}/bin/unicodmenu"; }
|
||||||
|
Mod+Shift+Z { toggle-window-floating; }
|
||||||
|
|
||||||
|
Mod+B { spawn "${pkgs.ironbar}/bin/ironbar" "bar" "bar-1337" "toggle-visible"; }
|
||||||
|
Mod+F12 { spawn "${klem}/bin/klem"; }
|
||||||
|
|
||||||
|
Mod+Shift+Q { close-window; }
|
||||||
|
|
||||||
|
XF86AudioRaiseVolume allow-when-locked=true { spawn "${pkgs.pamixer}/bin/pamixer -i 5"; }
|
||||||
|
XF86AudioLowerVolume allow-when-locked=true { spawn "${pkgs.pamixer}/bin/pamixer -d 5"; }
|
||||||
|
XF86AudioMute allow-when-locked=true { spawn "${pkgs.pamixer}/bin/pamixer -t"; }
|
||||||
|
|
||||||
|
XF86AudioPause allow-when-locked=true { spawn "${pkgs.playerctl}/bin/playerctl play-pause"; }
|
||||||
|
XF86AudioPlay allow-when-locked=true { spawn "${pkgs.playerctl}/bin/playerctl play-pause"; }
|
||||||
|
XF86AudioNext allow-when-locked=true { spawn "${pkgs.playerctl}/bin/playerctl next"; }
|
||||||
|
XF86AudioPrev allow-when-locked=true { spawn "${pkgs.playerctl}/bin/playerctl previous"; }
|
||||||
|
XF86AudioStop allow-when-locked=true { spawn "${pkgs.playerctl}/bin/playerctl stop"; }
|
||||||
|
Print { spawn "flameshot gui"; }
|
||||||
|
Mod+Shift+W { spawn "swaylock"; }
|
||||||
|
|
||||||
|
Mod+Comma { consume-or-expel-window-left; }
|
||||||
|
Mod+Period { consume-or-expel-window-right; }
|
||||||
|
Mod+W { toggle-column-tabbed-display; }
|
||||||
|
Mod+A repeat=false { toggle-overview; }
|
||||||
|
Mod+F { maximize-column; }
|
||||||
|
Mod+C { center-column; }
|
||||||
|
Mod+Minus { set-column-width "-25%"; }
|
||||||
|
Mod+Plus { set-column-width "+25%"; }
|
||||||
|
|
||||||
|
Mod+Ctrl+0 { spawn "niri" "msg" "action" "switch-layout" "0"; }
|
||||||
|
Mod+Ctrl+1 { spawn "niri" "msg" "action" "switch-layout" "1"; }
|
||||||
|
Mod+Ctrl+2 { spawn "niri" "msg" "action" "switch-layout" "2"; }
|
||||||
|
Mod+Ctrl+3 { spawn "niri" "msg" "action" "switch-layout" "3"; }
|
||||||
|
Mod+Ctrl+4 { spawn "niri" "msg" "action" "switch-layout" "4"; }
|
||||||
|
Mod+Ctrl+5 { spawn "niri" "msg" "action" "switch-layout" "5"; }
|
||||||
|
Mod+Ctrl+6 { spawn "niri" "msg" "action" "switch-layout" "6"; }
|
||||||
|
Mod+Ctrl+7 { spawn "niri" "msg" "action" "switch-layout" "7"; }
|
||||||
|
Mod+Ctrl+8 { spawn "niri" "msg" "action" "switch-layout" "8"; }
|
||||||
|
Mod+Ctrl+9 { spawn "niri" "msg" "action" "switch-layout" "9"; }
|
||||||
|
|
||||||
|
Mod+H { focus-column-or-monitor-left; }
|
||||||
|
Mod+J { focus-window-or-workspace-down; }
|
||||||
|
Mod+K { focus-window-or-workspace-up; }
|
||||||
|
Mod+L { focus-column-or-monitor-right; }
|
||||||
|
|
||||||
|
Mod+Shift+H { move-column-left-or-to-monitor-left; }
|
||||||
|
Mod+Shift+J { move-window-down-or-to-workspace-down; }
|
||||||
|
Mod+Shift+K { move-window-up-or-to-workspace-up; }
|
||||||
|
Mod+Shift+L { move-column-right-or-to-monitor-right; }
|
||||||
|
|
||||||
|
Mod+Ctrl+H { focus-monitor-left; }
|
||||||
|
Mod+Ctrl+J { focus-monitor-down; }
|
||||||
|
Mod+Ctrl+K { focus-monitor-up; }
|
||||||
|
Mod+Ctrl+L { focus-monitor-right; }
|
||||||
|
|
||||||
|
Mod+Shift+Ctrl+H { move-column-to-monitor-left; }
|
||||||
|
Mod+Shift+Ctrl+J { move-column-to-workspace-down; }
|
||||||
|
Mod+Shift+Ctrl+K { move-column-to-workspace-up; }
|
||||||
|
Mod+Shift+Ctrl+L { move-column-to-monitor-right; }
|
||||||
|
|
||||||
|
Mod+Shift+Alt+Ctrl+H { move-workspace-to-monitor-left; }
|
||||||
|
Mod+Shift+Alt+Ctrl+J { move-workspace-down; }
|
||||||
|
Mod+Shift+Alt+Ctrl+K { move-workspace-up; }
|
||||||
|
Mod+Shift+Alt+Ctrl+L { move-workspace-to-monitor-right; }
|
||||||
|
|
||||||
|
Mod+1 { focus-workspace 1; }
|
||||||
|
Mod+2 { focus-workspace 2; }
|
||||||
|
Mod+3 { focus-workspace 3; }
|
||||||
|
Mod+4 { focus-workspace 4; }
|
||||||
|
Mod+5 { focus-workspace 5; }
|
||||||
|
Mod+6 { focus-workspace 6; }
|
||||||
|
Mod+7 { focus-workspace 7; }
|
||||||
|
Mod+8 { focus-workspace 8; }
|
||||||
|
Mod+9 { focus-workspace 9; }
|
||||||
|
Mod+0 { focus-workspace 10; }
|
||||||
|
|
||||||
|
Mod+Shift+1 { move-window-to-workspace "1"; }
|
||||||
|
Mod+Shift+2 { move-window-to-workspace "2"; }
|
||||||
|
Mod+Shift+3 { move-window-to-workspace "3"; }
|
||||||
|
Mod+Shift+4 { move-window-to-workspace "4"; }
|
||||||
|
Mod+Shift+5 { move-window-to-workspace "5"; }
|
||||||
|
Mod+Shift+6 { move-window-to-workspace "6"; }
|
||||||
|
Mod+Shift+7 { move-window-to-workspace "7"; }
|
||||||
|
Mod+Shift+8 { move-window-to-workspace "8"; }
|
||||||
|
Mod+Shift+9 { move-window-to-workspace "9"; }
|
||||||
|
Mod+Shift+0 { move-window-to-workspace "0"; }
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
system.activationScripts.niriConfig = {
|
||||||
|
text = ''
|
||||||
|
cp ${pkgs.writeText "config.kdl" niriConfig} ${config.users.users.me.home}/.config/niri/config.kdl
|
||||||
|
chown ${config.users.users.me.name}:${config.users.users.me.group} ${config.users.users.me.home}/.config/niri/config.kdl
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.niri.enable = true;
|
||||||
|
services.displayManager.defaultSession = lib.mkForce "niri";
|
||||||
|
home-manager.users.me = {
|
||||||
|
xdg.configFile."ironbar/style.css".text = ''
|
||||||
|
* {
|
||||||
|
font-size: 8pt;
|
||||||
|
font-family: "Gentium Plus", "BlexMono Nerd Font";
|
||||||
|
}
|
||||||
|
|
||||||
|
box, menubar, button {
|
||||||
|
background-color: unset;
|
||||||
|
box-shadow: none;
|
||||||
|
background-image: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.clock, .upower, .volume {
|
||||||
|
font-weight: unset;
|
||||||
|
}
|
||||||
|
|
||||||
|
tooltip * {
|
||||||
|
font-family: "BlexMono Nerd Font";
|
||||||
|
font-size: 7pt;
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
xdg.configFile."ironbar/config.json".source = (pkgs.formats.json { }).generate "ironbar.json" {
|
||||||
|
name = "bar-1337";
|
||||||
|
height = 12;
|
||||||
|
layer = "top";
|
||||||
|
position = "bottom";
|
||||||
|
start = [ ];
|
||||||
|
center = [
|
||||||
|
{
|
||||||
|
type = "tray";
|
||||||
|
icon_size = 8;
|
||||||
|
}
|
||||||
|
{ type = "clipboard"; }
|
||||||
|
{ type = "notifications"; }
|
||||||
|
];
|
||||||
|
end = [
|
||||||
|
{
|
||||||
|
type = "upower";
|
||||||
|
icon_size = 8;
|
||||||
|
format = "{percentage}%";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
tooltip = "{{df -h --output=size,used,avail,pcent,target}}";
|
||||||
|
label = "\t{{5000:df -h / --output=avail | tail +2}}";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
tooltip = "{{free -Lh --si | awk '{for(i=1;i<=NF;i++){printf \"%s%s\", $i, (i%2? OFS: ORS)} if(NF%2) printf ORS}'}}";
|
||||||
|
label = "\t{{500:free -h --si | awk 'NR==2{printf $3 \"\\n\"}'}}";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
tooltip = "{{}}";
|
||||||
|
on_click_left = "pamixer -t";
|
||||||
|
on_scroll_up = "pamixer -i 1";
|
||||||
|
on_scroll_down = "pamixer -d 1";
|
||||||
|
label = "{{500:if $(pamixer --get-mute) = true; then echo ; else echo ; fi}}\t{{500:pamixer --get-volume}}%";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
tooltip = "{{uptime}}";
|
||||||
|
label = "\t{{500:uptime | sed 's/.*load average: \\([^ ]*\\);.*/\\1/' | tr ' ' '\n'}}";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
tooltip = "{{khal list today today -d astro-test-3 }}";
|
||||||
|
label = "";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
tooltip = "{{curl wttr.in/?0 | ${pkgs.ansifilter}/bin/ansifilter}}";
|
||||||
|
label = "";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "label";
|
||||||
|
name = "cal";
|
||||||
|
tooltip = "{{cal}}";
|
||||||
|
label = "{{500:date +'<U+F017>\t%Y-%m-%d (%W %a) %H:%M'}}";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
programs.alacritty.enable = true; # Super+T in the default setting (terminal)
|
||||||
|
programs.swaylock.enable = true; # Super+Alt+L in the default setting (screen locker)
|
||||||
|
services.swaync = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
notification-window-width = 300;
|
||||||
|
control-center-width = 300;
|
||||||
|
widgets = [
|
||||||
|
"volume"
|
||||||
|
"mpris"
|
||||||
|
"title"
|
||||||
|
"dnd"
|
||||||
|
"notifications"
|
||||||
|
];
|
||||||
|
widget-config = {
|
||||||
|
title = {
|
||||||
|
text = "ⲡⲧⲏⲣϥ̄";
|
||||||
|
"clear-all-button" = true;
|
||||||
|
"button-text" = "ⲧⲁⲩⲟⲟⲩ";
|
||||||
|
};
|
||||||
|
dnd.text = "ⲙ̄ⲡⲣ̄ϣⲧⲣ̄ⲧⲱⲣⲧ̄";
|
||||||
|
label.text = "ⲧⲙⲏⲧⲉ";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.swayidle.enable = true; # idle management daemon
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
xdg-desktop-portal-gnome
|
||||||
|
swaybg
|
||||||
|
];
|
||||||
|
};
|
||||||
|
services.gnome.gnome-keyring.enable = true; # secret service
|
||||||
|
security.pam.services.swaylock = { };
|
||||||
|
}
|
||||||
@@ -73,6 +73,7 @@ in {
|
|||||||
pcmanfm
|
pcmanfm
|
||||||
# MEDIA
|
# MEDIA
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
simplescreenrecorder
|
||||||
imagemagick
|
imagemagick
|
||||||
exiftool
|
exiftool
|
||||||
nsxiv
|
nsxiv
|
||||||
@@ -85,7 +86,7 @@ in {
|
|||||||
gcc
|
gcc
|
||||||
python3Packages.jsonschema # json validation
|
python3Packages.jsonschema # json validation
|
||||||
pup # html toolkit
|
pup # html toolkit
|
||||||
xsv # csv toolkit
|
xan # csv toolkit
|
||||||
magic-wormhole-rs # file transfer
|
magic-wormhole-rs # file transfer
|
||||||
man-pages
|
man-pages
|
||||||
man-pages-posix
|
man-pages-posix
|
||||||
@@ -94,9 +95,10 @@ in {
|
|||||||
gnome-disk-utility
|
gnome-disk-utility
|
||||||
arandr # xrandr for noobs
|
arandr # xrandr for noobs
|
||||||
libnotify # for notify-send
|
libnotify # for notify-send
|
||||||
xclip # clipboard CLI
|
wl-clipboard # clipboard CLI
|
||||||
xdragon # drag and drop
|
xdragon # drag and drop
|
||||||
xorg.xkill # kill by clicking
|
xorg.xkill # kill by clicking
|
||||||
|
portfolio # personal finance overview
|
||||||
audacity
|
audacity
|
||||||
calibre
|
calibre
|
||||||
electrum
|
electrum
|
||||||
@@ -119,10 +121,10 @@ in {
|
|||||||
pdftk # pdf toolkit
|
pdftk # pdf toolkit
|
||||||
mupdf
|
mupdf
|
||||||
poppler_utils # pdf toolkit
|
poppler_utils # pdf toolkit
|
||||||
okular # the word is nucular
|
kdePackages.okular # the word is nucular
|
||||||
xournalpp # for annotating pdfs
|
xournalpp # for annotating pdfs
|
||||||
pdfpc # presenter console for pdf slides
|
pdfpc # presenter console for pdf slides
|
||||||
niveumPackages.hc # print files as qr codes
|
# niveumPackages.hc # print files as qr codes
|
||||||
yt-dlp
|
yt-dlp
|
||||||
espeak
|
espeak
|
||||||
rink # unit converter
|
rink # unit converter
|
||||||
@@ -142,11 +144,10 @@ in {
|
|||||||
niveumPackages.pls
|
niveumPackages.pls
|
||||||
niveumPackages.mpv-tv
|
niveumPackages.mpv-tv
|
||||||
niveumPackages.mpv-iptv
|
niveumPackages.mpv-iptv
|
||||||
jellyfin-media-player
|
# jellyfin-media-player
|
||||||
niveumPackages.devanagari
|
niveumPackages.devanagari
|
||||||
niveumPackages.betacode # ancient greek betacode to unicode converter
|
niveumPackages.betacode # ancient greek betacode to unicode converter
|
||||||
niveumPackages.meteo
|
niveumPackages.meteo
|
||||||
niveumPackages.mahlzeit
|
|
||||||
niveumPackages.jq-lsp
|
niveumPackages.jq-lsp
|
||||||
niveumPackages.swallow # window swallowing
|
niveumPackages.swallow # window swallowing
|
||||||
niveumPackages.literature-quote
|
niveumPackages.literature-quote
|
||||||
@@ -239,7 +240,7 @@ in {
|
|||||||
nodePackages.csslint
|
nodePackages.csslint
|
||||||
nodePackages.jsonlint
|
nodePackages.jsonlint
|
||||||
deno # better node.js
|
deno # better node.js
|
||||||
texlive.combined.scheme-full
|
# texlive.combined.scheme-full
|
||||||
latexrun
|
latexrun
|
||||||
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
||||||
# haskellPackages.pandoc-citeproc
|
# haskellPackages.pandoc-citeproc
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ in {
|
|||||||
stylix.enable = true;
|
stylix.enable = true;
|
||||||
stylix.image = generatedWallpaper;
|
stylix.image = generatedWallpaper;
|
||||||
|
|
||||||
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml";
|
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/ayu-light.yaml";
|
||||||
|
|
||||||
stylix.cursor = {
|
stylix.cursor = {
|
||||||
name = "capitaine-cursors-white";
|
name = "capitaine-cursors-white";
|
||||||
@@ -52,18 +52,18 @@ in {
|
|||||||
|
|
||||||
stylix.fonts = {
|
stylix.fonts = {
|
||||||
serif = {
|
serif = {
|
||||||
package = pkgs.noto-fonts;
|
package = pkgs.gentium;
|
||||||
name = "Noto Serif";
|
name = "Gentium Plus";
|
||||||
};
|
};
|
||||||
|
|
||||||
sansSerif = {
|
sansSerif = {
|
||||||
package = pkgs.noto-fonts;
|
package = pkgs.gentium;
|
||||||
name = "Noto Sans";
|
name = "Gentium Plus";
|
||||||
};
|
};
|
||||||
|
|
||||||
monospace = {
|
monospace = {
|
||||||
package = pkgs.noto-fonts;
|
package = pkgs.nerd-fonts.blex-mono;
|
||||||
name = "Noto Sans Mono";
|
name = "BlexMono Nerd Font";
|
||||||
};
|
};
|
||||||
|
|
||||||
emoji = {
|
emoji = {
|
||||||
|
|||||||
538
flake.lock
generated
538
flake.lock
generated
@@ -12,11 +12,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745630506,
|
"lastModified": 1750173260,
|
||||||
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
|
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "96e078c646b711aee04b82ba01aefbff87004ded",
|
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -125,11 +125,11 @@
|
|||||||
"fromYaml": "fromYaml_2"
|
"fromYaml": "fromYaml_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745523430,
|
"lastModified": 1746562888,
|
||||||
"narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
|
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
||||||
"owner": "SenchoPens",
|
"owner": "SenchoPens",
|
||||||
"repo": "base16.nix",
|
"repo": "base16.nix",
|
||||||
"rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
|
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -178,14 +178,14 @@
|
|||||||
"stockholm",
|
"stockholm",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737857314,
|
"lastModified": 1746626503,
|
||||||
"narHash": "sha256-T9THCbnlj4CkKbTP+lisA5PUMoTXE7uh4FyDQzui+dc=",
|
"narHash": "sha256-mRnIdJLP+0NSim9ao30ue0Z3ttSuxzXwQG7UN1KuKfU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "buildbot-nix",
|
"repo": "buildbot-nix",
|
||||||
"rev": "c077f430f3717d41bb303d031398058665315166",
|
"rev": "7ad9b4886eccb5eecc0686a16266ddabf6cbefe9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -194,6 +194,27 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"centerpiece": {
|
||||||
|
"inputs": {
|
||||||
|
"crane": "crane",
|
||||||
|
"home-manager": "home-manager",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1745697341,
|
||||||
|
"narHash": "sha256-KDYRly/9IKDBmH3D6Jv4BkVer3u/uwkQIXR0vhAuqro=",
|
||||||
|
"owner": "friedow",
|
||||||
|
"repo": "centerpiece",
|
||||||
|
"rev": "2a610e8e0a6b65b733ea98f2ca602235f695b4f3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "friedow",
|
||||||
|
"repo": "centerpiece",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"coptic-dictionary": {
|
"coptic-dictionary": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"kellia-dictionary": "kellia-dictionary",
|
"kellia-dictionary": "kellia-dictionary",
|
||||||
@@ -239,6 +260,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"crane": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1742394900,
|
||||||
|
"narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -287,7 +323,7 @@
|
|||||||
},
|
},
|
||||||
"fenix": {
|
"fenix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_7",
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
"rust-analyzer-src": "rust-analyzer-src"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -307,11 +343,11 @@
|
|||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743774811,
|
"lastModified": 1744642301,
|
||||||
"narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
|
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
|
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -337,7 +373,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733328505,
|
"lastModified": 1733328505,
|
||||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||||
@@ -382,11 +417,32 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736143030,
|
"lastModified": 1743550720,
|
||||||
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
|
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
|
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts_3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"stylix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733312601,
|
||||||
|
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -465,27 +521,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
"flake-utils_5": {
|
||||||
"inputs": {
|
|
||||||
"systems": [
|
|
||||||
"stylix",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_6": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1676283394,
|
"lastModified": 1676283394,
|
||||||
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||||
@@ -583,16 +618,16 @@
|
|||||||
"gnome-shell": {
|
"gnome-shell": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732369855,
|
"lastModified": 1744584021,
|
||||||
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
|
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
|
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"ref": "47.2",
|
"ref": "48.1",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -611,11 +646,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736917206,
|
"lastModified": 1744693102,
|
||||||
"narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=",
|
"narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "hercules-ci-effects",
|
"repo": "hercules-ci-effects",
|
||||||
"rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425",
|
"rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -625,6 +660,24 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1743259333,
|
||||||
|
"narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"coptic-dictionary",
|
"coptic-dictionary",
|
||||||
@@ -647,23 +700,23 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746171682,
|
"lastModified": 1749154018,
|
||||||
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
|
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "50eee705bbdbac942074a8c120e8194185633675",
|
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
"ref": "release-25.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -736,7 +789,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"fenix": "fenix",
|
"fenix": "fenix",
|
||||||
"flake-utils": "flake-utils_4",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_8"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702906210,
|
"lastModified": 1702906210,
|
||||||
@@ -815,12 +868,12 @@
|
|||||||
"agenix": "agenix_2",
|
"agenix": "agenix_2",
|
||||||
"coptic-dictionary": "coptic-dictionary_2",
|
"coptic-dictionary": "coptic-dictionary_2",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager_2",
|
||||||
"menstruation-backend": "menstruation-backend",
|
"menstruation-backend": "menstruation-backend",
|
||||||
"menstruation-telegram": "menstruation-telegram",
|
"menstruation-telegram": "menstruation-telegram",
|
||||||
"nix-on-droid": "nix-on-droid",
|
"nix-on-droid": "nix-on-droid",
|
||||||
"nixinate": "nixinate",
|
"nixinate": "nixinate",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs_4",
|
||||||
"nixpkgs-old": "nixpkgs-old",
|
"nixpkgs-old": "nixpkgs-old",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
@@ -995,7 +1048,7 @@
|
|||||||
},
|
},
|
||||||
"nixinate_2": {
|
"nixinate_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_9"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1742737607,
|
"lastModified": 1742737607,
|
||||||
@@ -1013,16 +1066,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693636127,
|
"lastModified": 1742669843,
|
||||||
"narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=",
|
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1",
|
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-23.05",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -1109,11 +1162,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable_2": {
|
"nixpkgs-unstable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746886008,
|
"lastModified": 1750553127,
|
||||||
"narHash": "sha256-JtzH3pV0oqlR9lTccOU5SbAY8PzbEp2lyXKlD/DGdRQ=",
|
"narHash": "sha256-zgPnxYqkf/CEl5m/lx02D+FaLWPRUM/RLo/qekTuu8Q=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0bb671aaa84205c180ec9122d9aa2f5823b7b2aa",
|
"rev": "ba476a871a35075644c3340b3651101ddf77ee0d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1124,6 +1177,54 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1750400657,
|
||||||
|
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-25.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_11": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1750365781,
|
||||||
|
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_12": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1746904237,
|
||||||
|
"narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_13": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659446231,
|
"lastModified": 1659446231,
|
||||||
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
||||||
@@ -1139,7 +1240,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_11": {
|
"nixpkgs_14": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615532953,
|
"lastModified": 1615532953,
|
||||||
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
||||||
@@ -1153,6 +1254,54 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1743076231,
|
||||||
|
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "6c5963357f3c1c840201eda129a99d455074db04",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735554305,
|
||||||
|
"narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1693636127,
|
||||||
|
"narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-23.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659446231,
|
"lastModified": 1659446231,
|
||||||
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
|
||||||
@@ -1168,7 +1317,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615532953,
|
"lastModified": 1615532953,
|
||||||
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
"narHash": "sha256-SWpaGjrp/INzorEqMz3HLi6Uuk9I0KAn4YS8B4n3q5g=",
|
||||||
@@ -1181,77 +1330,29 @@
|
|||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
|
||||||
"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_5": {
|
|
||||||
"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_6": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1653060744,
|
|
||||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746557022,
|
"lastModified": 1701436327,
|
||||||
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
|
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
|
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.11",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746663147,
|
"lastModified": 1701436327,
|
||||||
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
|
"narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
|
"rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1263,15 +1364,15 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_9": {
|
"nixpkgs_9": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737885589,
|
"lastModified": 1653060744,
|
||||||
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
|
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
|
"rev": "dfd82985c273aac6eced03625f454b334daae2e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
@@ -1391,15 +1492,41 @@
|
|||||||
"nur_2": {
|
"nur_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_11",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746881822,
|
"lastModified": 1750553086,
|
||||||
"narHash": "sha256-+U1n00EyLKzvZlMHK/YGS6OGIYsKfaz4j1qydyyrIRk=",
|
"narHash": "sha256-rtItxhQM+Zkd2ys/lT2MoXCUVEhyj51Em5o9Wd6qqGU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "887e5be213778cb047379434b6bb41ad09d9c8db",
|
"rev": "8d68e170fd6f9e8b8921db79419c209a1aeabc36",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "NUR",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nur_3": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-parts": [
|
||||||
|
"stylix",
|
||||||
|
"flake-parts"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"stylix",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"treefmt-nix": "treefmt-nix_4"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1746056780,
|
||||||
|
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "NUR",
|
||||||
|
"rev": "d476cd0972dd6242d76374fcc277e6735715c167",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1493,14 +1620,15 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
"centerpiece": "centerpiece",
|
||||||
"coptic-dictionary": "coptic-dictionary",
|
"coptic-dictionary": "coptic-dictionary",
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_3",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_3",
|
||||||
"menstruation-backend": "menstruation-backend_2",
|
"menstruation-backend": "menstruation-backend_2",
|
||||||
"menstruation-telegram": "menstruation-telegram_2",
|
"menstruation-telegram": "menstruation-telegram_2",
|
||||||
"nix-on-droid": "nix-on-droid_2",
|
"nix-on-droid": "nix-on-droid_2",
|
||||||
"nixinate": "nixinate_2",
|
"nixinate": "nixinate_2",
|
||||||
"nixpkgs": "nixpkgs_7",
|
"nixpkgs": "nixpkgs_10",
|
||||||
"nixpkgs-old": "nixpkgs-old_2",
|
"nixpkgs-old": "nixpkgs-old_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable_2",
|
"nixpkgs-unstable": "nixpkgs-unstable_2",
|
||||||
"nur": "nur_2",
|
"nur": "nur_2",
|
||||||
@@ -1568,11 +1696,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746844454,
|
"lastModified": 1750473400,
|
||||||
"narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=",
|
"narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "be092436d4c0c303b654e4007453b69c0e33009e",
|
"rev": "3d7d4c4e284f26d6dc4840491c66884912be0062",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1626,11 +1754,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746864785,
|
"lastModified": 1748892379,
|
||||||
"narHash": "sha256-e3v25k0qrpo0+8wr1JRxER9fYkkJNcIYuBM0LH3PXxU=",
|
"narHash": "sha256-mDDxMwKFURX1K1Z8X/kmt+jYjswofDf0br+Mkw2tmSE=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "scripts",
|
"repo": "scripts",
|
||||||
"rev": "394e5769da98ea1added4fbc152a6299551d20ea",
|
"rev": "f44c7a4a6caa1ef5d6b7bf7e93acea0d96f30c21",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1643,14 +1771,14 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"buildbot-nix": "buildbot-nix",
|
"buildbot-nix": "buildbot-nix",
|
||||||
"nix-writers": "nix-writers",
|
"nix-writers": "nix-writers",
|
||||||
"nixpkgs": "nixpkgs_9"
|
"nixpkgs": "nixpkgs_12"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739285100,
|
"lastModified": 1747157099,
|
||||||
"narHash": "sha256-tQZ8sXCU6yvC0ut/+ezRUSd89Nbyqqn0JVCjYDwcqQA=",
|
"narHash": "sha256-i2s6jU+8GLKVjhWDyvFYxmXI7A44c9p6apPPyKt0ETk=",
|
||||||
"owner": "krebs",
|
"owner": "krebs",
|
||||||
"repo": "stockholm",
|
"repo": "stockholm",
|
||||||
"rev": "8d0538bf86e4f9df4f5cc358a1760b255be797e9",
|
"rev": "d4abc837cc7b87b4f23fe48cc306df26e3de7aab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1697,7 +1825,7 @@
|
|||||||
"base16-vim": "base16-vim",
|
"base16-vim": "base16-vim",
|
||||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-parts": "flake-parts_3",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"gnome-shell": "gnome-shell",
|
"gnome-shell": "gnome-shell",
|
||||||
"home-manager": [
|
"home-manager": [
|
||||||
@@ -1706,22 +1834,25 @@
|
|||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
"nur": "nur_3",
|
||||||
"systems": "systems_5",
|
"systems": "systems_5",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-tmux": "tinted-tmux"
|
"tinted-schemes": "tinted-schemes",
|
||||||
|
"tinted-tmux": "tinted-tmux",
|
||||||
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746143246,
|
"lastModified": 1750370365,
|
||||||
"narHash": "sha256-O8rZjqJUIkUva66XTOZy0wcgfBP2eaxU9+Xt7ZHtfhI=",
|
"narHash": "sha256-Yblt2LusglzBXlg+ekckztIUgvl1WQwJ7gLRJEt/IHE=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "20ace60f9cb5e179cb2256abaee505780df8e804",
|
"rev": "cc82dae884f45ffeb996d2b5116afa70933e507f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"ref": "release-24.11",
|
"ref": "release-25.05",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -1804,7 +1935,7 @@
|
|||||||
"telebots": {
|
"telebots": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1677156381,
|
"lastModified": 1677156381,
|
||||||
@@ -1822,8 +1953,8 @@
|
|||||||
},
|
},
|
||||||
"telebots_2": {
|
"telebots_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_6",
|
"flake-utils": "flake-utils_5",
|
||||||
"nixpkgs": "nixpkgs_10"
|
"nixpkgs": "nixpkgs_13"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703313352,
|
"lastModified": 1703313352,
|
||||||
@@ -1884,11 +2015,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738004786,
|
"lastModified": 1748887042,
|
||||||
"narHash": "sha256-JQe2jTE1GS8qDtsEO5K1E0rLA6IHr7CqMlsm4Ne4YsM=",
|
"narHash": "sha256-WWQxnmKyQm/iccHxDdobdGOPfcVNf+PQwy9HQ2b9W8g=",
|
||||||
"owner": "kmein",
|
"owner": "kmein",
|
||||||
"repo": "tinc-graph",
|
"repo": "tinc-graph",
|
||||||
"rev": "b7027f323f322f4de3f7575ad2694493f341b1ae",
|
"rev": "8847b2d0e69065bf4bbb9885fbd465f3b1b2369a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1917,28 +2048,43 @@
|
|||||||
"tinted-kitty": {
|
"tinted-kitty": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716423189,
|
"lastModified": 1735730497,
|
||||||
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
|
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-kitty",
|
"repo": "tinted-kitty",
|
||||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-kitty",
|
"repo": "tinted-kitty",
|
||||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"tinted-schemes": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1744974599,
|
||||||
|
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "schemes",
|
||||||
|
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "schemes",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743296873,
|
"lastModified": 1745111349,
|
||||||
"narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
|
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
|
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1947,7 +2093,41 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"tinted-zed": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1725758778,
|
||||||
|
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-zed",
|
||||||
|
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "base16-zed",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"treefmt-nix": {
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_3"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1743081648,
|
||||||
|
"narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nur",
|
"nur",
|
||||||
@@ -1968,7 +2148,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"treefmt-nix_2": {
|
"treefmt-nix_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stockholm",
|
"stockholm",
|
||||||
@@ -1977,11 +2157,33 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737483750,
|
"lastModified": 1746216483,
|
||||||
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
|
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
|
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix_4": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"stylix",
|
||||||
|
"nur",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733222881,
|
||||||
|
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2029,7 +2231,7 @@
|
|||||||
"niveum",
|
"niveum",
|
||||||
"flake-utils"
|
"flake-utils"
|
||||||
],
|
],
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615819231,
|
"lastModified": 1615819231,
|
||||||
@@ -2051,7 +2253,7 @@
|
|||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"flake-utils"
|
"flake-utils"
|
||||||
],
|
],
|
||||||
"nixpkgs": "nixpkgs_11"
|
"nixpkgs": "nixpkgs_14"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615819231,
|
"lastModified": 1615819231,
|
||||||
|
|||||||
12
flake.nix
12
flake.nix
@@ -6,21 +6,22 @@
|
|||||||
# alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
|
# alew-web.url = "git+ssh://gitea@code.kmein.de:22022/kfm/alew-web.git?ref=refs/heads/master";
|
||||||
coptic-dictionary.url = "github:kmein/coptic-dictionary";
|
coptic-dictionary.url = "github:kmein/coptic-dictionary";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
home-manager.url = "github:nix-community/home-manager/release-25.05";
|
||||||
menstruation-backend.url = "github:kmein/menstruation.rs";
|
menstruation-backend.url = "github:kmein/menstruation.rs";
|
||||||
menstruation-telegram.url = "github:kmein/menstruation-telegram";
|
menstruation-telegram.url = "github:kmein/menstruation-telegram";
|
||||||
|
centerpiece.url = "github:friedow/centerpiece";
|
||||||
nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
|
nix-on-droid.url = "github:t184256/nix-on-droid/release-23.05";
|
||||||
nixinate.url = "github:matthewcroughan/nixinate";
|
nixinate.url = "github:matthewcroughan/nixinate";
|
||||||
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
|
nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0";
|
||||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/master";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
recht.url = "github:kmein/recht";
|
recht.url = "github:kmein/recht";
|
||||||
retiolum.url = "github:krebs/retiolum";
|
retiolum.url = "github:krebs/retiolum";
|
||||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||||
scripts.url = "github:kmein/scripts";
|
scripts.url = "github:kmein/scripts";
|
||||||
stockholm.url = "github:krebs/stockholm";
|
stockholm.url = "github:krebs/stockholm";
|
||||||
stylix.url = "github:danth/stylix/release-24.11";
|
stylix.url = "github:danth/stylix/release-25.05";
|
||||||
telebots.url = "github:kmein/telebots";
|
telebots.url = "github:kmein/telebots";
|
||||||
tinc-graph.url = "github:kmein/tinc-graph";
|
tinc-graph.url = "github:kmein/tinc-graph";
|
||||||
voidrice.url = "github:Lukesmithxyz/voidrice";
|
voidrice.url = "github:Lukesmithxyz/voidrice";
|
||||||
@@ -71,6 +72,7 @@
|
|||||||
nixinate,
|
nixinate,
|
||||||
flake-utils,
|
flake-utils,
|
||||||
nix-on-droid,
|
nix-on-droid,
|
||||||
|
centerpiece,
|
||||||
stylix,
|
stylix,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
@@ -318,7 +320,7 @@
|
|||||||
nur.overlays.default
|
nur.overlays.default
|
||||||
(self: super: {
|
(self: super: {
|
||||||
mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
|
mpv = super.mpv.override {scripts = [inputs.self.packages.${system}.mpv-visualizer super.mpvScripts.mpris];};
|
||||||
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
|
dmenu = super.writers.writeDashBin "dmenu" ''exec ${pkgs.wofi}/bin/wofi --dmenu "$@"'';
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -405,6 +407,7 @@
|
|||||||
text2pdf = pkgs.callPackage packages/text2pdf.nix {};
|
text2pdf = pkgs.callPackage packages/text2pdf.nix {};
|
||||||
timer = pkgs.callPackage packages/timer.nix {};
|
timer = pkgs.callPackage packages/timer.nix {};
|
||||||
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
tocharian-font = pkgs.callPackage packages/tocharian-font.nix {};
|
||||||
|
passmenu = pkgs.callPackage packages/passmenu.nix {};
|
||||||
trans = pkgs.callPackage packages/trans.nix {};
|
trans = pkgs.callPackage packages/trans.nix {};
|
||||||
ttspaste = pkgs.callPackage packages/ttspaste.nix {};
|
ttspaste = pkgs.callPackage packages/ttspaste.nix {};
|
||||||
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
|
unicodmenu = pkgs.callPackage packages/unicodmenu.nix {};
|
||||||
@@ -413,6 +416,7 @@
|
|||||||
vg = pkgs.callPackage packages/vg.nix {};
|
vg = pkgs.callPackage packages/vg.nix {};
|
||||||
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
|
vim = pkgs.callPackage packages/vim.nix {niveumPackages = self.packages.${system};};
|
||||||
obsidian-vim = pkgs.callPackage packages/obsidian-vim.nix {};
|
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-cheat-sh-vim = pkgs.callPackage packages/vimPlugins/cheat-sh.nix {};
|
||||||
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
|
vimPlugins-icalendar-vim = pkgs.callPackage packages/vimPlugins/icalendar-vim.nix {};
|
||||||
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
|
vimPlugins-jq-vim = pkgs.callPackage packages/vimPlugins/jq-vim.nix {};
|
||||||
|
|||||||
175
lib/style.css
Normal file
175
lib/style.css
Normal file
@@ -0,0 +1,175 @@
|
|||||||
|
* {
|
||||||
|
font-size: 14px;
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar {
|
||||||
|
/* `otf-font-awesome` is required to be installed for icons */
|
||||||
|
font-family: FontAwesome, monospace;
|
||||||
|
background-color: transparent;
|
||||||
|
border-bottom: 0px;
|
||||||
|
color: #ebdbb2;
|
||||||
|
transition-property: background-color;
|
||||||
|
transition-duration: .5s;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar.hidden {
|
||||||
|
opacity: 0.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
window#waybar.empty #window {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
window#waybar.empty {
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
window#waybar.solo {
|
||||||
|
background-color: #FFFFFF;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
.modules-right {
|
||||||
|
margin: 10px 10px 0 0;
|
||||||
|
}
|
||||||
|
.modules-center {
|
||||||
|
margin: 10px 0 0 0;
|
||||||
|
}
|
||||||
|
.modules-left {
|
||||||
|
margin: 10px 0 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
/* Use box-shadow instead of border so the text isn't offset */
|
||||||
|
/* box-shadow: inset 0 -3px transparent; */
|
||||||
|
border: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
|
||||||
|
/*
|
||||||
|
button:hover {
|
||||||
|
background: inherit;
|
||||||
|
box-shadow: inset 0 -3px #ebdbb2;
|
||||||
|
} */
|
||||||
|
|
||||||
|
#workspaces {
|
||||||
|
background-color: #282828;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button {
|
||||||
|
padding: 0 5px;
|
||||||
|
background-color: transparent;
|
||||||
|
color: #ebdbb2;
|
||||||
|
border-radius: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button:first-child {
|
||||||
|
border-radius: 5px 0 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button:last-child {
|
||||||
|
border-radius: 0 5px 5px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button:hover {
|
||||||
|
color: #d79921;
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.focused {
|
||||||
|
background-color: #665c54;
|
||||||
|
/* box-shadow: inset 0 -3px #ffffff; */
|
||||||
|
}
|
||||||
|
|
||||||
|
#workspaces button.urgent {
|
||||||
|
background-color: #b16286;
|
||||||
|
}
|
||||||
|
|
||||||
|
#idle_inhibitor,
|
||||||
|
#cava,
|
||||||
|
#scratchpad,
|
||||||
|
#mode,
|
||||||
|
#window,
|
||||||
|
#clock,
|
||||||
|
#battery,
|
||||||
|
#backlight,
|
||||||
|
#wireplumber,
|
||||||
|
#tray,
|
||||||
|
#mpris,
|
||||||
|
#load {
|
||||||
|
padding: 0 10px;
|
||||||
|
background-color: #282828;
|
||||||
|
color: #ebdbb2;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mode {
|
||||||
|
background-color: #689d6a;
|
||||||
|
color: #282828;
|
||||||
|
/* box-shadow: inset 0 -3px #ffffff; */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If workspaces is the leftmost module, omit left margin */
|
||||||
|
.modules-left > widget:first-child > #workspaces {
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If workspaces is the rightmost module, omit right margin */
|
||||||
|
.modules-right > widget:last-child > #workspaces {
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#cava {
|
||||||
|
padding: 0 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#battery.charging, #battery.plugged {
|
||||||
|
background-color: #98971a;
|
||||||
|
color: #282828;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes blink {
|
||||||
|
to {
|
||||||
|
background-color: #282828;
|
||||||
|
color: #ebdbb2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Using steps() instead of linear as a timing function to limit cpu usage */
|
||||||
|
#battery.critical:not(.charging) {
|
||||||
|
background-color: #cc241d;
|
||||||
|
color: #ebdbb2;
|
||||||
|
animation-name: blink;
|
||||||
|
animation-duration: 0.5s;
|
||||||
|
animation-timing-function: steps(12);
|
||||||
|
animation-iteration-count: infinite;
|
||||||
|
animation-direction: alternate;
|
||||||
|
}
|
||||||
|
|
||||||
|
label:focus {
|
||||||
|
background-color: #000000;
|
||||||
|
}
|
||||||
|
|
||||||
|
#wireplumber.muted {
|
||||||
|
background-color: #458588;
|
||||||
|
}
|
||||||
|
|
||||||
|
#tray > .passive {
|
||||||
|
-gtk-icon-effect: dim;
|
||||||
|
}
|
||||||
|
|
||||||
|
#tray > .needs-attention {
|
||||||
|
-gtk-icon-effect: highlight;
|
||||||
|
}
|
||||||
|
|
||||||
|
#mpris.playing {
|
||||||
|
background-color: #d79921;
|
||||||
|
color: #282828;
|
||||||
|
}
|
||||||
|
|
||||||
|
#tray menu {
|
||||||
|
font-family: sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
#scratchpad.empty {
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
@@ -40,8 +40,6 @@ let g:netrw_banner=0
|
|||||||
let g:netrw_browse_split=4
|
let g:netrw_browse_split=4
|
||||||
let g:netrw_altv=1 " open splits to the right
|
let g:netrw_altv=1 " open splits to the right
|
||||||
let g:netrw_liststyle=3 " tree view
|
let g:netrw_liststyle=3 " tree view
|
||||||
let g:netrw_list_hide=netrw_gitignore#Hide()
|
|
||||||
let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
|
|
||||||
let g:netrw_winsize = 25
|
let g:netrw_winsize = 25
|
||||||
|
|
||||||
call matchadd('colorcolumn', '\%101v', 100)
|
call matchadd('colorcolumn', '\%101v', 100)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
writers,
|
writers,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
xsv,
|
xan,
|
||||||
}: let
|
}: let
|
||||||
database = fetchurl {
|
database = fetchurl {
|
||||||
url = "http://c.krebsco.de/greek.csv";
|
url = "http://c.krebsco.de/greek.csv";
|
||||||
@@ -9,5 +9,5 @@
|
|||||||
};
|
};
|
||||||
in
|
in
|
||||||
writers.writeDashBin "heuretes" ''
|
writers.writeDashBin "heuretes" ''
|
||||||
${xsv}/bin/xsv search -s simple "^$*$" ${database} | ${xsv}/bin/xsv table
|
${xan}/bin/xan search -s simple "^$*$" ${database} | ${xan}/bin/xan table
|
||||||
''
|
''
|
||||||
|
|||||||
@@ -42,14 +42,14 @@ in
|
|||||||
pkgs.writers.writeDashBin "klem" ''
|
pkgs.writers.writeDashBin "klem" ''
|
||||||
set -efu
|
set -efu
|
||||||
|
|
||||||
${pkgs.xclip}/bin/xclip -selection ${cfg.selection} -out \
|
${pkgs.wl-clipboard}/bin/wl-paste \
|
||||||
| case $(echo "${
|
| case $(echo "${
|
||||||
lib.concatStringsSep "\n" (lib.attrNames cfg.scripts)
|
lib.concatStringsSep "\n" (lib.attrNames cfg.scripts)
|
||||||
}" | ${cfg.dmenu}) in
|
}" | ${cfg.dmenu}) in
|
||||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList scriptCase cfg.scripts)}
|
${lib.concatStringsSep "\n" (lib.mapAttrsToList scriptCase cfg.scripts)}
|
||||||
*) ${pkgs.coreutils}/bin/cat ;;
|
*) ${pkgs.coreutils}/bin/cat ;;
|
||||||
esac \
|
esac \
|
||||||
| ${pkgs.xclip}/bin/xclip -selection ${cfg.selection} -in
|
| ${pkgs.wl-clipboard}/bin/wl-copy
|
||||||
|
|
||||||
${pkgs.libnotify}/bin/notify-send --app-name="klem" "Result copied to clipboard."
|
${pkgs.libnotify}/bin/notify-send --app-name="klem" "Result copied to clipboard."
|
||||||
''
|
''
|
||||||
|
|||||||
@@ -1,31 +1,31 @@
|
|||||||
{
|
{
|
||||||
writers,
|
writers,
|
||||||
lib,
|
lib,
|
||||||
xsv,
|
xan,
|
||||||
curl,
|
curl,
|
||||||
gnused,
|
gnused,
|
||||||
}:
|
}:
|
||||||
writers.writeDashBin "literature-quote" ''
|
writers.writeDashBin "literature-quote" ''
|
||||||
PATH=$PATH:${lib.makeBinPath [xsv curl gnused]}
|
PATH=$PATH:${lib.makeBinPath [xan curl gnused]}
|
||||||
ROW=$(curl -Ls http://kmein.github.io/logotheca/quotes.csv | shuf -n1)
|
ROW=$(curl -Ls http://kmein.github.io/logotheca/quotes.csv | shuf -n1)
|
||||||
(
|
(
|
||||||
QUOTE="$(echo "$ROW" | xsv select 4)"
|
QUOTE="$(echo "$ROW" | xan select 3)"
|
||||||
|
|
||||||
echo "$QUOTE" | sed 's/^"//;s/"$//;s/\s*||\s*/\n\n/g;s/\s*|\s*/\n/g'
|
echo "$QUOTE" | sed 's/^"//;s/"$//;s/\s*||\s*/\n\n/g;s/\s*|\s*/\n/g'
|
||||||
echo
|
echo
|
||||||
|
|
||||||
AUTHOR="$(echo "$ROW" | xsv select 1)"
|
AUTHOR="$(echo "$ROW" | xan select 0)"
|
||||||
# Prepare the output
|
# Prepare the output
|
||||||
ATTRIBUTION="($AUTHOR"
|
ATTRIBUTION="($AUTHOR"
|
||||||
|
|
||||||
SOURCE="$(echo "$ROW" | xsv select 2)"
|
SOURCE="$(echo "$ROW" | xan select 1)"
|
||||||
|
|
||||||
# Add SOURCE if it's not empty
|
# Add SOURCE if it's not empty
|
||||||
if [ -n "$SOURCE" ]; then
|
if [ -n "$SOURCE" ]; then
|
||||||
ATTRIBUTION="$ATTRIBUTION: $SOURCE"
|
ATTRIBUTION="$ATTRIBUTION: $SOURCE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LOC="$(echo "$ROW" | xsv select 3 | sed 's/""//;s/-/–/g')"
|
LOC="$(echo "$ROW" | xan select 2 | sed 's/""//;s/-/–/g')"
|
||||||
# Add LOC if it's not empty
|
# Add LOC if it's not empty
|
||||||
if [ -n "$LOC" ]; then
|
if [ -n "$LOC" ]; then
|
||||||
ATTRIBUTION="$ATTRIBUTION, $LOC"
|
ATTRIBUTION="$ATTRIBUTION, $LOC"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
writers,
|
writers,
|
||||||
lib,
|
lib,
|
||||||
rofi,
|
wofi,
|
||||||
findutils,
|
findutils,
|
||||||
coreutils,
|
coreutils,
|
||||||
noteDirectory ? "~/state/obsidian",
|
noteDirectory ? "~/state/obsidian",
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
writers.writeDashBin "notemenu" ''
|
writers.writeDashBin "notemenu" ''
|
||||||
set -efu
|
set -efu
|
||||||
PATH=$PATH:${
|
PATH=$PATH:${
|
||||||
lib.makeBinPath [rofi findutils coreutils]
|
lib.makeBinPath [wofi findutils coreutils]
|
||||||
}
|
}
|
||||||
|
|
||||||
cd ${noteDirectory}
|
cd ${noteDirectory}
|
||||||
@@ -21,7 +21,7 @@ writers.writeDashBin "notemenu" ''
|
|||||||
echo $(date -I -d yesterday).md
|
echo $(date -I -d yesterday).md
|
||||||
''}
|
''}
|
||||||
find . -not -path '*/.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
|
find . -not -path '*/.*' -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2-
|
||||||
} | rofi -dmenu -i -p 'notes')
|
} | wofi -dmenu -i -p 'notes')
|
||||||
if test "$note_file"
|
if test "$note_file"
|
||||||
then
|
then
|
||||||
alacritty --working-directory ${noteDirectory} -e ${niveumPackages.obsidian-vim}/bin/nvim "$note_file"
|
alacritty --working-directory ${noteDirectory} -e ${niveumPackages.obsidian-vim}/bin/nvim "$note_file"
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ neovim.override {
|
|||||||
vimPlugins.nerdtree
|
vimPlugins.nerdtree
|
||||||
vimPlugins.fzf-vim
|
vimPlugins.fzf-vim
|
||||||
vimPlugins.fzfWrapper
|
vimPlugins.fzfWrapper
|
||||||
|
vimPlugins.vim-fugitive
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
18
packages/passmenu.nix
Normal file
18
packages/passmenu.nix
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
{ writers, wofi, pass, fd, libnotify, ... }:
|
||||||
|
writers.writeBashBin "passmenu" ''
|
||||||
|
shopt -s nullglob globstar
|
||||||
|
|
||||||
|
IFS=$'\n'
|
||||||
|
|
||||||
|
prefix=$(readlink -f ''${PASSWORD_STORE_DIR-~/.password-store})
|
||||||
|
password_files=( $( ${fd}/bin/fd -L ".gpg\$" "$prefix" ) )
|
||||||
|
password_files=( "''${password_files[@]#"$prefix"/}" )
|
||||||
|
password_files=( "''${password_files[@]%.gpg}" )
|
||||||
|
|
||||||
|
password=$( printf '%s\n' "''${password_files[@]}" | ${wofi}/bin/wofi -i -k /dev/null -d menu -- "$@" )
|
||||||
|
|
||||||
|
[[ -n $password ]] || exit
|
||||||
|
|
||||||
|
OUT=$(${pass}/bin/pass show --clip "$password")
|
||||||
|
${libnotify}/bin/notify-send -t 5000 "$(echo "$OUT" | grep '^login:' | sed 's/^login: //')"
|
||||||
|
''
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
writers,
|
writers,
|
||||||
mktemp,
|
mktemp,
|
||||||
qrencode,
|
qrencode,
|
||||||
xclip,
|
wl-clipboard,
|
||||||
nsxiv,
|
nsxiv,
|
||||||
}:
|
}:
|
||||||
writers.writeDashBin "qrpaste" ''
|
writers.writeDashBin "qrpaste" ''
|
||||||
@@ -11,6 +11,6 @@ writers.writeDashBin "qrpaste" ''
|
|||||||
clean() {
|
clean() {
|
||||||
rm "$file"
|
rm "$file"
|
||||||
}
|
}
|
||||||
${qrencode}/bin/qrencode "$(${xclip}/bin/xclip -selection clipboard -out)" -o "$file"
|
${qrencode}/bin/qrencode "$(${wl-clipboard}/bin/wl-paste)" -o "$file"
|
||||||
${nsxiv}/bin/nsxiv "$file"
|
${nsxiv}/bin/nsxiv "$file"
|
||||||
''
|
''
|
||||||
|
|||||||
47
packages/radio-news.nix
Normal file
47
packages/radio-news.nix
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
{ writers, lib, gnused, curl, jq, yq }:
|
||||||
|
writers.writeBashBin "radio-news" ''
|
||||||
|
set -efu
|
||||||
|
PATH=$PATH:${lib.makeBinPath [gnused curl jq yq]}
|
||||||
|
|
||||||
|
EVENTS=$(
|
||||||
|
curl https://www.goodnewsnetwork.org/feed/ \
|
||||||
|
| xq '
|
||||||
|
.rss.channel.item
|
||||||
|
| map(select((.pubDate|strptime("%a, %d %b %Y %H:%M:%S %z")) as $date | ($date | mktime) > (now - (60 * 60 * 24))) | {title, description})
|
||||||
|
'
|
||||||
|
)
|
||||||
|
|
||||||
|
SYSTEM_PROMPT=$(cat <<EOF
|
||||||
|
You are a news anchor writing a short news digest for a radio broadcast.
|
||||||
|
Summarize the following news headlines into a cohesive, engaging script under 400 words.
|
||||||
|
Keep it professional, concise as possible, and easy to follow.
|
||||||
|
Please no unnecessary explanations why the news is good.
|
||||||
|
|
||||||
|
Begin the digest with: "Here's your good news update."
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
REQUEST=$(cat <<EOF
|
||||||
|
{
|
||||||
|
"system_instruction": {
|
||||||
|
"parts": [
|
||||||
|
{
|
||||||
|
"text": $(jq -Rs <<< "$SYSTEM_PROMPT")
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"contents": [
|
||||||
|
{
|
||||||
|
"parts": [
|
||||||
|
{
|
||||||
|
"text": $(jq -Rs <<< "$EVENTS")
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
|
||||||
|
echo "$REQUEST" | curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash-8b:generateContent?key=$GEMINI_API_KEY" -s -H "Content-Type: application/json" -d @-
|
||||||
|
''
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
writers,
|
writers,
|
||||||
xclip,
|
wl-clipboard,
|
||||||
espeak,
|
espeak,
|
||||||
}:
|
}:
|
||||||
writers.writeDashBin "ttspaste" ''
|
writers.writeDashBin "ttspaste" ''
|
||||||
${xclip}/bin/xclip -selection clipboard -out | ${espeak}/bin/espeak
|
${wl-clipboard}/bin/paste | ${espeak}/bin/espeak
|
||||||
''
|
''
|
||||||
# curl, mpv,
|
# curl, mpv,
|
||||||
# ${curl}/bin/curl -G http://tts.r/api/tts --data-urlencode 'text@-' | ${mpv}/bin/mpv -
|
# ${curl}/bin/curl -G http://tts.r/api/tts --data-urlencode 'text@-' | ${mpv}/bin/mpv -
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
dmenu,
|
dmenu,
|
||||||
gnused,
|
gnused,
|
||||||
libnotify,
|
libnotify,
|
||||||
xclip,
|
wl-clipboard,
|
||||||
xdotool,
|
xdotool,
|
||||||
gawk,
|
gawk,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
@@ -90,7 +90,7 @@ in
|
|||||||
writers.writeDashBin "unicodmenu" ''
|
writers.writeDashBin "unicodmenu" ''
|
||||||
history_file=$HOME/.cache/unicodmenu
|
history_file=$HOME/.cache/unicodmenu
|
||||||
touch "$history_file"
|
touch "$history_file"
|
||||||
PATH=${lib.makeBinPath [coreutils dmenu gawk gnused libnotify xclip xdotool]}
|
PATH=${lib.makeBinPath [coreutils dmenu gawk gnused libnotify wl-clipboard xdotool]}
|
||||||
|
|
||||||
all_characters() {
|
all_characters() {
|
||||||
tac "$history_file"
|
tac "$history_file"
|
||||||
@@ -101,7 +101,7 @@ in
|
|||||||
|
|
||||||
[ "$chosen" != "" ] || exit
|
[ "$chosen" != "" ] || exit
|
||||||
|
|
||||||
echo "$chosen" | tr -d '\n' | xclip -selection clipboard
|
echo "$chosen" | tr -d '\n' | wl-copy
|
||||||
|
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
xdotool key Shift+Insert
|
xdotool key Shift+Insert
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ in {
|
|||||||
./radio.nix
|
./radio.nix
|
||||||
./panoptikon.nix
|
./panoptikon.nix
|
||||||
./hledger.nix
|
./hledger.nix
|
||||||
|
./wallabag.nix
|
||||||
./alew.nix
|
./alew.nix
|
||||||
../../configs/monitoring.nix
|
../../configs/monitoring.nix
|
||||||
../../configs/mycelium.nix
|
../../configs/mycelium.nix
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.hledger-backup = {
|
systemd.services.hledger-backup = {
|
||||||
enable = true;
|
enable = false;
|
||||||
startAt = "hourly";
|
startAt = "hourly";
|
||||||
wants = ["network-online.target"];
|
wants = ["network-online.target"];
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = ["multi-user.target"];
|
||||||
|
|||||||
44
systems/ful/wallabag.nix
Normal file
44
systems/ful/wallabag.nix
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
domain = "pocket.kmein.de";
|
||||||
|
port = "8088";
|
||||||
|
dataPath = "/var/lib/wallabag";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.nginx.virtualHosts.${domain} = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:${port}";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
extraConfig = ''
|
||||||
|
client_body_timeout 3000s;
|
||||||
|
client_header_timeout 3000s;
|
||||||
|
keepalive_timeout 3000s;
|
||||||
|
proxy_read_timeout 3000s;
|
||||||
|
proxy_connect_timeout 3000s;
|
||||||
|
proxy_send_timeout 3000s;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
services.restic.backups.niveum.paths = [ dataPath ];
|
||||||
|
|
||||||
|
virtualisation.oci-containers.containers."${domain}" = {
|
||||||
|
autoStart = true;
|
||||||
|
image = "wallabag/wallabag:2.6.12";
|
||||||
|
ports = [ "${port}:80" ];
|
||||||
|
volumes = [
|
||||||
|
"${dataPath}/data:/var/www/wallabag/data"
|
||||||
|
"${dataPath}/images:/var/www/wallabag/web/assets/images"
|
||||||
|
];
|
||||||
|
environment = {
|
||||||
|
SYMFONY__ENV__DOMAIN_NAME = "https://${domain}";
|
||||||
|
SYMFONY__ENV__FOSUSER_CONFIRMATION = "false";
|
||||||
|
PHP_MEMORY_LIMIT = "512M";
|
||||||
|
SYMFONY__ENV__SERVER_NAME = "Wallabag";
|
||||||
|
};
|
||||||
|
extraOptions = [ "--pull=always" ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,11 +1,16 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
|
niveumPackages,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
inputs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
|
# TODO wrap obsidian: obsidian --no-sandbox --ozone-platform=wayland --ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations %U
|
||||||
inherit (import ../../lib) retiolumAddresses;
|
inherit (import ../../lib) retiolumAddresses;
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../kibbeh/hardware-configuration.nix
|
../kibbeh/hardware-configuration.nix
|
||||||
../../configs/tlp.nix
|
../../configs/tlp.nix
|
||||||
@@ -45,13 +50,13 @@ in {
|
|||||||
wireguard-aether-psk.file = ../../secrets/kabsa-wireguard-aether-psk.age;
|
wireguard-aether-psk.file = ../../secrets/kabsa-wireguard-aether-psk.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.wg-quick.interfaces.aether.address = ["192.168.178.203/24"];
|
networking.wg-quick.interfaces.aether.address = [ "192.168.178.203/24" ];
|
||||||
|
|
||||||
environment.systemPackages = [pkgs.zeroad];
|
environment.systemPackages = [ pkgs.zeroad ];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "kabsa";
|
hostName = "kabsa";
|
||||||
wireless.interfaces = ["wlp3s0"];
|
wireless.interfaces = [ "wlp3s0" ];
|
||||||
retiolum = retiolumAddresses.kabsa;
|
retiolum = retiolumAddresses.kabsa;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,45 @@
|
|||||||
|
{ config, ... }:
|
||||||
let
|
let
|
||||||
inherit (import ../../lib) sshPort;
|
inherit (import ../../lib) sshPort;
|
||||||
domain = "https://code.kmein.de";
|
domain = "code.kmein.de";
|
||||||
in {
|
in {
|
||||||
|
services.anubis = {
|
||||||
|
defaultOptions.settings = {
|
||||||
|
USER_DEFINED_DEFAULT = true;
|
||||||
|
};
|
||||||
|
instances = {
|
||||||
|
"gitea".settings = {
|
||||||
|
TARGET = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
|
||||||
|
USER_DEFINED_INSTANCE = true;
|
||||||
|
OG_PASSTHROUGH = true;
|
||||||
|
SERVE_ROBOTS_TXT = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
users.users.nginx.extraGroups = [ config.services.anubis.instances."gitea".group ];
|
||||||
|
|
||||||
services.gitea = {
|
services.gitea = {
|
||||||
enable = true;
|
enable = true;
|
||||||
appName = "code.kmein.de";
|
appName = domain;
|
||||||
settings = {
|
settings = {
|
||||||
server.ROOT_URL = domain;
|
server.ROOT_URL = "https://${domain}";
|
||||||
|
server.DOMAIN = domain;
|
||||||
server.SSH_PORT = sshPort;
|
server.SSH_PORT = sshPort;
|
||||||
service.DISABLE_REGISTRATION = true;
|
service.DISABLE_REGISTRATION = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.nginx.virtualHosts."code.kmein.de" = {
|
services.nginx.virtualHosts.${domain} = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations."/".extraConfig = "proxy_pass http://localhost:3000;";
|
# locations."/".extraConfig = "proxy_pass http://localhost:3000;";
|
||||||
|
locations = {
|
||||||
|
"/" = {
|
||||||
|
proxyPass = "http://unix:${config.services.anubis.instances."gitea".settings.BIND}";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
"/metrics".proxyPass = "http://unix:${config.services.anubis.instances."gitea".settings.METRICS_BIND}";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
niveum.passport.services = [
|
niveum.passport.services = [
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
|
niveumPackages,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (import ../../lib) serveHtml;
|
inherit (import ../../lib) serveHtml;
|
||||||
@@ -22,55 +23,14 @@ in {
|
|||||||
];
|
];
|
||||||
startAt = "*:50";
|
startAt = "*:50";
|
||||||
script = ''
|
script = ''
|
||||||
set -efu
|
PATH=$PATH:${lib.makeBinPath [pkgs.gnused pkgs.curl pkgs.jq]}
|
||||||
PATH=$PATH:${lib.makeBinPath [pkgs.w3m pkgs.gnused pkgs.curl pkgs.jq]}
|
|
||||||
|
|
||||||
export GEMINI_API_KEY="$(cat "$CREDENTIALS_DIRECTORY/gemini-api-key")"
|
GEMINI_API_KEY="$(cat "$CREDENTIALS_DIRECTORY/gemini-api-key")" ${niveumPackages.radio-news}/bin/radio-news | jq --arg from "$(date -u -Is | sed 's/+00:00/Z/')" --arg to "$(date -u -Is -d 'now + 30 minutes' | sed 's/+00:00/Z/')" '
|
||||||
|
|
||||||
WIKI_URL="https://en.wikipedia.org/wiki/Portal:Current_events"
|
|
||||||
|
|
||||||
EVENTS=$(w3m -dump "$WIKI_URL" | sed -n "/$(date -I)/,/$(date -I -d yesterday)/p" | head -n -1)
|
|
||||||
|
|
||||||
SYSTEM_PROMPT=$(cat <<EOF
|
|
||||||
You are a news anchor writing a short news digest for a radio broadcast.
|
|
||||||
Summarize the following news headlines into a cohesive, engaging script under 400 words.
|
|
||||||
Keep it professional, concise, and easy to follow.
|
|
||||||
|
|
||||||
Begin the digest with: "Here's your news update for $(date -u +"%B %d, %Y")."
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
|
|
||||||
REQUEST=$(cat <<EOF
|
|
||||||
{
|
{
|
||||||
"system_instruction": {
|
from: $from,
|
||||||
"parts": [
|
to: $to,
|
||||||
{
|
text: .candidates[].content.parts[].text
|
||||||
"text": $(jq -Rs <<< "$SYSTEM_PROMPT")
|
}' | curl -s -X POST http://radio-news.r -H "Content-Type: application/json" -d @-
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"contents": [
|
|
||||||
{
|
|
||||||
"parts": [
|
|
||||||
{
|
|
||||||
"text": "Current events (from Wikipedia): $(echo "$EVENTS")"
|
|
||||||
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
|
|
||||||
RESPONSE=$(echo "$REQUEST" | curl "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash-8b:generateContent?key=$GEMINI_API_KEY" -s -H "Content-Type: application/json" -d @-)
|
|
||||||
|
|
||||||
echo "$RESPONSE" | jq --arg from "$(date -u -Is | sed 's/+00:00/Z/')" --arg to "$(date -u -Is -d 'now + 30 minutes' | sed 's/+00:00/Z/')" '
|
|
||||||
{
|
|
||||||
from: $from,
|
|
||||||
to: $to,
|
|
||||||
text: .candidates[].content.parts[].text
|
|
||||||
}' | curl -s -X POST http://radio-news.r -H "Content-Type: application/json" -d @-
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user