Compare commits
68 Commits
a056e4d98b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
60fe34de9d
|
|||
|
7ed23a63a3
|
|||
|
7fbab2b1f6
|
|||
|
df1cadae60
|
|||
|
b5cb085083
|
|||
|
2a2d96d97e
|
|||
|
307a8b5fb7
|
|||
|
9861866c6f
|
|||
|
05dd3fd75f
|
|||
|
15e2290267
|
|||
|
3646bceff9
|
|||
|
f429a50206
|
|||
|
024908500a
|
|||
|
c7098e2208
|
|||
|
0e86ca0371
|
|||
|
663f21bdda
|
|||
|
2533183d80
|
|||
|
f259b7d326
|
|||
|
ac1b8c9f07
|
|||
|
00e3713682
|
|||
|
84eabaa4d3
|
|||
|
d0916c49e5
|
|||
|
91c35fd55c
|
|||
|
166c35caec
|
|||
|
c204312423
|
|||
|
ddc5722bbe
|
|||
|
cadd7bd949
|
|||
|
2fbf61c052
|
|||
|
5d699a2d58
|
|||
|
593437fa94
|
|||
|
00e412cb20
|
|||
|
1290f14cb7
|
|||
|
132e52e4ad
|
|||
|
29970472f8
|
|||
|
6507cbc0e0
|
|||
|
7e3985bd34
|
|||
|
57b8980ebe
|
|||
|
f1ddccb0df
|
|||
|
0fb5c79df4
|
|||
|
b2915bdd90
|
|||
|
49ef17ac33
|
|||
|
debe85da8e
|
|||
|
558c497c74
|
|||
|
c4451939d5
|
|||
|
d1f010dcc8
|
|||
|
3d5a0f8cb5
|
|||
|
0831730903
|
|||
|
004eff3abf
|
|||
|
592e7e4bb9
|
|||
|
ec7247bc77
|
|||
|
e1d041f010
|
|||
|
84fec63204
|
|||
|
b434aaaccc
|
|||
|
4639fd8c7e
|
|||
|
7f22089765
|
|||
|
8c53eaf570
|
|||
|
c9a4b1a428
|
|||
|
288496afa1
|
|||
|
34f61d4f27
|
|||
|
77f169fef4
|
|||
|
8576db096f
|
|||
|
d20ce66646
|
|||
|
226b72dccf
|
|||
|
6147801194
|
|||
|
a1b8bc9555
|
|||
|
83ffca5e21
|
|||
|
eb782a67cb
|
|||
|
85a12edbcc
|
@ -98,38 +98,65 @@ rec {
|
||||
buildDebug = mkBuildScript "Debug";
|
||||
buildRelease = mkBuildScript "Release";
|
||||
|
||||
# Use this to specify commands that should be ran after entering fish shell
|
||||
initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
|
||||
echo "Entering \"${description}\" environment..."
|
||||
|
||||
# Determine the project root, used e.g. in cmake scripts
|
||||
set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel)
|
||||
|
||||
# Add project-local fish abbrs here
|
||||
abbrs = {
|
||||
# Rust Bevy:
|
||||
# abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
|
||||
# build-release-windows = "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc";
|
||||
|
||||
# C/C++:
|
||||
# abbr -a cmake-debug "${cmakeDebug}"
|
||||
# abbr -a cmake-release "${cmakeRelease}"
|
||||
# abbr -a build-debug "${buildDebug}"
|
||||
# abbr -a build-release "${buildRelease}"
|
||||
# cmake-debug = "${cmakeDebug}";
|
||||
# cmake-release = "${cmakeRelease}";
|
||||
# build-debug = "${buildDebug}";
|
||||
# build-release = "${buildRelease}";
|
||||
|
||||
# Clojure:
|
||||
# abbr -a clojure-deps "deps-lock --lein"
|
||||
# clojure-deps = "deps-lock --lein";
|
||||
|
||||
# Python:
|
||||
# abbr -a run "python ./app/main.py"
|
||||
# abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
|
||||
# abbr -a ptop "py-spy top -- python ./app/main.py"
|
||||
# run = "python ./app/main.py";
|
||||
# profile = "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg";
|
||||
# ptop = "py-spy top -- python ./app/main.py";
|
||||
};
|
||||
|
||||
eraseAbbr = name: value: ''abbr --erase ${name} 2>/dev/null'';
|
||||
createAbbr = name: value: ''abbr -a ${name} "${value}"'';
|
||||
|
||||
# This will be sourced by the global fish config if INIT_PROJECT_SHELL gets unset
|
||||
unloadProjectShell = pkgs.writers.writeFish "unload-shell.fish" ''
|
||||
echo "Unloading \"${description}\" environment..."
|
||||
|
||||
${builtins.concatStringsSep "\n" (lib.mapAttrsToList eraseAbbr abbrs)}
|
||||
'';
|
||||
|
||||
# This will be sourced by the global fish config if INIT_PROJECT_SHELL gets set
|
||||
initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
|
||||
# Unload just in case, to not have redefinition errors
|
||||
source ${unloadProjectShell}
|
||||
|
||||
echo "Sourcing \"${description}\" environment..."
|
||||
|
||||
${builtins.concatStringsSep "\n" (lib.mapAttrsToList createAbbr abbrs)}
|
||||
'';
|
||||
in
|
||||
builtins.concatStringsSep "\n" [
|
||||
# Launch into pure fish shell
|
||||
''
|
||||
exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
|
||||
# Determine the project root, used e.g. in cmake scripts
|
||||
export FLAKE_PROJECT_ROOT="$(git rev-parse --show-toplevel)"
|
||||
|
||||
# Can't do the "exec" with nix-direnv
|
||||
# - The "exec fish" would call direnv again => Infinite loop
|
||||
# - The shellHook is Bash/POSIX, so fish syntax doesn't work
|
||||
|
||||
# Use this for "nix develop" without direnv
|
||||
# exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
|
||||
|
||||
# Use this for direnv without "nix develop"
|
||||
export INIT_PROJECT_SHELL="${initProjectShell}"
|
||||
export UNLOAD_PROJECT_SHELL="${unloadProjectShell}"
|
||||
''
|
||||
|
||||
# Qt: Launch into wrapped fish shell
|
||||
# Qt: Launch into wrapped fish shell (direnv incompatible)
|
||||
# https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
|
||||
# ''
|
||||
# fishdir=$(mktemp -d)
|
||||
|
||||
@ -238,11 +238,11 @@ $ mode: echo -e "--export \tExport public key\n--export-secret-keys\t
|
||||
|
||||
% sops
|
||||
# Edit secrets.yaml
|
||||
sops ~/NixFlake/system/modules/sops-nix/secrets.yaml
|
||||
sops ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
|
||||
|
||||
% sops
|
||||
# Rekey secrets.yaml
|
||||
sops updatekeys ~/NixFlake/system/modules/sops-nix/secrets.yaml
|
||||
sops updatekeys ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml
|
||||
|
||||
% ssh
|
||||
# Generate a new SSH key
|
||||
@ -308,27 +308,33 @@ mkdir -p "<name>" && cd "<name>" && spotdl --client-id (cat /home/christoph/.sec
|
||||
|
||||
% ffmpeg
|
||||
# Create a slow motion version of a video with interpolated/blended frames
|
||||
ffmpeg -i "<input>" -filter:v "minterpolate='mi_mode=mci:mc_mode=aobmc:vsbmc=1:fps=<doublefps>',setpts=2*PTS" output.mp4
|
||||
ffmpeg -i <input> -filter:v "minterpolate='mi_mode=mci:mc_mode=aobmc:vsbmc=1:fps=<doublefps>',setpts=2*PTS" output.mp4
|
||||
$ input: eza -f -1
|
||||
|
||||
% ffmpeg
|
||||
# Detect black bar dimensions automatically by looking at the first 10 frames
|
||||
ffmpeg -i "<input>" -vframes 10 -vf cropdetect -f null -
|
||||
ffmpeg -i <input> -vframes 10 -vf cropdetect -f null -
|
||||
$ input: eza -f -1
|
||||
|
||||
% ffmpeg
|
||||
# Preview video with applied crop settings
|
||||
ffplay -vf crop=<width>:<height>:<x>:<y> "<input>"
|
||||
ffplay -vf crop=<width>:<height>:<x>:<y> <input>
|
||||
$ input: eza -f -1
|
||||
|
||||
% ffmpeg
|
||||
# Re-encode the video with applied crop settings
|
||||
ffmpeg -i "<input>" -vf crop=<width>:<height>:<x>:<y> -c:a copy output.mp4
|
||||
ffmpeg -i <input> -vf crop=<width>:<height>:<x>:<y> -c:a copy output.mp4
|
||||
$ input: eza -f -1
|
||||
|
||||
% ffmpeg
|
||||
# Reencode and compress the video using the h265 codec
|
||||
ffmpeg -i "<input>" -vcodec libx265 -crf <quality> "out_<input>"
|
||||
ffmpeg -i <input> -vcodec libx265 -crf <quality> out_<input>
|
||||
$ input: eza -f -1
|
||||
$ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"
|
||||
|
||||
% ffmpeg
|
||||
# Reencode, compress and scale the video using the h265 codec
|
||||
ffmpeg -i <input> -vcodec libx265 -crf <quality> -vf scale=<width>:-2,setsar=1:1 out_<input>
|
||||
$ input: eza -f -1
|
||||
$ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"
|
||||
|
||||
|
||||
10
config/obsidian/css_snippets/bordered_image.css
Normal file
10
config/obsidian/css_snippets/bordered_image.css
Normal file
@ -0,0 +1,10 @@
|
||||
.bordered-images img {
|
||||
border-radius: var(--callout-radius);
|
||||
/* border-style: solid; */
|
||||
/* border-width: var(--callout-border-width); */
|
||||
/* border-color: var(--color-purple-rgb); */
|
||||
/* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); */
|
||||
|
||||
/* Background color so PNGs with transparent backgrounds don't look weird */
|
||||
/* background-color: var(--background-secondary); */
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
img[alt*="center"] {
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
.center-images img {
|
||||
display: block !important;
|
||||
margin-left: auto !important;
|
||||
margin-right: auto !important;
|
||||
}
|
||||
|
||||
4
config/obsidian/css_snippets/fullwidth_image.css
Normal file
4
config/obsidian/css_snippets/fullwidth_image.css
Normal file
@ -0,0 +1,4 @@
|
||||
.fullwidth-images img {
|
||||
width: 100% !important;
|
||||
height: auto !important;
|
||||
}
|
||||
5
config/obsidian/css_snippets/justify_text.css
Normal file
5
config/obsidian/css_snippets/justify_text.css
Normal file
@ -0,0 +1,5 @@
|
||||
.justify-text.cm-s-obsidian,
|
||||
.justify-text.markdown-preview-view {
|
||||
text-align: justify;
|
||||
hyphens: auto;
|
||||
}
|
||||
349
flake.lock
generated
349
flake.lock
generated
@ -1,5 +1,24 @@
|
||||
{
|
||||
"nodes": {
|
||||
"comfyui-nix": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1776979072,
|
||||
"narHash": "sha256-1BUQDAMWGVcUhPuI5JFQmCTYlBmN/Fmon6MGmaKXrCk=",
|
||||
"owner": "utensils",
|
||||
"repo": "comfyui-nix",
|
||||
"rev": "8a90889efc8fae81a8e03b8d9a8406c9f8ff425b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "utensils",
|
||||
"repo": "comfyui-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1754269165,
|
||||
@ -17,7 +36,7 @@
|
||||
},
|
||||
"devshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768818222,
|
||||
@ -56,15 +75,15 @@
|
||||
},
|
||||
"elephant": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773079031,
|
||||
"narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=",
|
||||
"lastModified": 1775706155,
|
||||
"narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=",
|
||||
"owner": "abenz1267",
|
||||
"repo": "elephant",
|
||||
"rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c",
|
||||
"rev": "376ee71c66db38683daabd57350bf3f6f086eaf8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -96,29 +115,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-addons": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"textfox",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1754512310,
|
||||
"narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@ -165,6 +161,24 @@
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767609335,
|
||||
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"lanzaboote",
|
||||
@ -185,7 +199,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixvim",
|
||||
@ -193,11 +207,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -206,7 +220,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_3": {
|
||||
"flake-parts_4": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nur",
|
||||
@ -287,11 +301,11 @@
|
||||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1772972630,
|
||||
"narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
|
||||
"lastModified": 1776983936,
|
||||
"narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
|
||||
"rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -307,11 +321,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773332277,
|
||||
"narHash": "sha256-1V+wRrZD9Sw12AQBUWk9CR+XhDZQ8q6yBE0S3Wjbd1M=",
|
||||
"lastModified": 1777594677,
|
||||
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "4aeef1941f862fe3a70d1b8264b4e289358c2325",
|
||||
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -343,14 +357,14 @@
|
||||
},
|
||||
"hytale-launcher": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773947929,
|
||||
"narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=",
|
||||
"lastModified": 1777394001,
|
||||
"narHash": "sha256-FNHydw2We/qvxBJ2cMNc/eGcxSZkvOXZn2WYGiH6WfE=",
|
||||
"owner": "JPyke3",
|
||||
"repo": "hytale-launcher-nix",
|
||||
"rev": "a8d0a974b187f0997c03c23000dea552194edf39",
|
||||
"rev": "822e54c97348a6fbc28dfac563e5bbe9fe1783b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -362,7 +376,7 @@
|
||||
"impermanence": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769548169,
|
||||
@ -382,7 +396,7 @@
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
@ -412,11 +426,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773343116,
|
||||
"narHash": "sha256-5wnd9z3atP264FMin5MNq4ZaOR/2SYYspFXw8cecrKA=",
|
||||
"lastModified": 1776677689,
|
||||
"narHash": "sha256-wzdMqyyNkEPEfuCqSTzaz3ikH3+Rm7oWILNcURNax34=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6248c10a251c5f2628389b982919ba4a8125d71e",
|
||||
"revCount": 139,
|
||||
"rev": "768d26aa3fe80949bd64f62d6c5b35455c8cb768",
|
||||
"revCount": 140,
|
||||
"type": "git",
|
||||
"url": "https://gitea.local.chriphost.de/christoph/cpp-masssprings"
|
||||
},
|
||||
@ -428,7 +442,7 @@
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"nixpkgs": "nixpkgs_7"
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763384566,
|
||||
@ -456,11 +470,11 @@
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773329386,
|
||||
"narHash": "sha256-Xoy4j0NKRrZEAkiFxtTKTsmtUumpvjh3ievyat00eA8=",
|
||||
"lastModified": 1777542749,
|
||||
"narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "815e692569fbb01701770a49ad2fe942cec7f431",
|
||||
"rev": "36130bc452e0a84c07761d2e176ae875b48eebf3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -489,11 +503,11 @@
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1773130184,
|
||||
"narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
|
||||
"lastModified": 1777468255,
|
||||
"narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
|
||||
"rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -506,14 +520,14 @@
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771150922,
|
||||
"narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=",
|
||||
"lastModified": 1776242217,
|
||||
"narHash": "sha256-TRts0fKUPFcf1i6rZHFGUDTfti/x3oKEg/CqsPRpSgs=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d",
|
||||
"rev": "4c5e52dda0d6ab3de814e364046769321d3e1021",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -529,11 +543,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773000227,
|
||||
"narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
|
||||
"lastModified": 1775037210,
|
||||
"narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
|
||||
"owner": "nix-darwin",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
|
||||
"rev": "06648f4902343228ce2de79f291dd5a58ee12146",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -567,11 +581,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771130777,
|
||||
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
|
||||
"lastModified": 1775970782,
|
||||
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
|
||||
"rev": "bedba5989b04614fc598af9633033b95a937933f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -581,6 +595,69 @@
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1766902085,
|
||||
"narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1765674936,
|
||||
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1777428379,
|
||||
"narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "755f5aa91337890c432639c60b6064bb7fe67769",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1777428379,
|
||||
"narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "755f5aa91337890c432639c60b6064bb7fe67769",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1762156382,
|
||||
"narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
|
||||
@ -596,39 +673,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1773222311,
|
||||
"narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0590cd39f728e129122770c029970378a79d076a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1773814637,
|
||||
"narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1764242076,
|
||||
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
||||
@ -644,13 +689,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1773821835,
|
||||
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -660,7 +705,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
@ -676,39 +721,39 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1771008912,
|
||||
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1773122722,
|
||||
"narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
|
||||
"owner": "nixos",
|
||||
"lastModified": 1775710090,
|
||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
|
||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1752077645,
|
||||
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
|
||||
@ -724,13 +769,13 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
"lastModified": 1775710090,
|
||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -742,18 +787,18 @@
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772402258,
|
||||
"narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
|
||||
"lastModified": 1777236345,
|
||||
"narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
|
||||
"rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -787,17 +832,17 @@
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_3",
|
||||
"flake-parts": "flake-parts_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773339783,
|
||||
"narHash": "sha256-07iRHomuUvJ7Mmp+F7qo68xIb+y3gy0o/B7kuR1K2Qc=",
|
||||
"lastModified": 1777624369,
|
||||
"narHash": "sha256-nQOSodcDhXiKlfCKb4pE/4GBAs2FnBOD+AHVem0EqOc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "1a4ca0d650fbfd4c58e1b1c2b153151fec77d6b2",
|
||||
"rev": "c3ec6b994c235a53a28304564da6422a45230603",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -834,6 +879,7 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"comfyui-nix": "comfyui-nix",
|
||||
"devshell": "devshell",
|
||||
"disko": "disko",
|
||||
"elephant": "elephant",
|
||||
@ -847,7 +893,7 @@
|
||||
"nix-alien": "nix-alien",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"nixvim": "nixvim",
|
||||
"nps": "nps",
|
||||
@ -902,11 +948,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773096132,
|
||||
"narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
|
||||
"lastModified": 1777338324,
|
||||
"narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
|
||||
"rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -992,17 +1038,16 @@
|
||||
},
|
||||
"textfox": {
|
||||
"inputs": {
|
||||
"firefox-addons": "firefox-addons",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773044834,
|
||||
"narHash": "sha256-R2u3z09DuUbSoWClASPUqKXQG/QZYlBsiy8vYXrJ2VU=",
|
||||
"lastModified": 1777451299,
|
||||
"narHash": "sha256-Okqpw+zxAwHKXuuxlwYy9Ge9JUpnTbsMXqws2eOKfKo=",
|
||||
"owner": "adriankarlen",
|
||||
"repo": "textfox",
|
||||
"rev": "0b8873d30db55a94e9e0dd934405dcac5e4d8a73",
|
||||
"rev": "3af57df1ed3a38eb584475fd9e032d9643f2a94d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1016,15 +1061,15 @@
|
||||
"elephant": [
|
||||
"elephant"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1773675699,
|
||||
"narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=",
|
||||
"lastModified": 1777299395,
|
||||
"narHash": "sha256-ZoLkqwPVw8SdW+f9Raf15/ttyKqmC6vtKd5R+orNN/g=",
|
||||
"owner": "abenz1267",
|
||||
"repo": "walker",
|
||||
"rev": "d2702235710da3d7daf55c912ca7534261cf20f5",
|
||||
"rev": "7b0cb0fd1f8b0a60b241081483aea4277f0b4500",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1053,11 +1098,11 @@
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1772429643,
|
||||
"narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
|
||||
"lastModified": 1773622265,
|
||||
"narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
|
||||
"rev": "a879e5e0896a326adc79c474bf457b8b99011027",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
15
flake.nix
15
flake.nix
@ -78,10 +78,17 @@
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
|
||||
# nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this
|
||||
|
||||
# Instant Direnv (load environment in background)
|
||||
# direnv-instant.url = "github:Mic92/direnv-instant";
|
||||
# direnv-instant.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# Realtime audio
|
||||
# musnix.url = "github:musnix/musnix";
|
||||
# musnix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# ComfyUI
|
||||
comfyui-nix.url = "github:utensils/comfyui-nix";
|
||||
|
||||
# HyTale
|
||||
hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
|
||||
|
||||
@ -138,7 +145,7 @@
|
||||
inputs.nur.overlays.default
|
||||
inputs.niri.overlays.niri
|
||||
# inputs.emacs-overlay.overlay
|
||||
# inputs.comfyui-nix.overlays.default
|
||||
inputs.comfyui-nix.overlays.default
|
||||
|
||||
# All my own overlays (derivations + modifications)
|
||||
(import ./overlays {inherit inputs nixpkgs pkgs-stable;})
|
||||
@ -221,7 +228,9 @@
|
||||
hostname = "darwinix";
|
||||
username = "christoph";
|
||||
headless = false;
|
||||
extraModules = [];
|
||||
extraModules = [
|
||||
inputs.sops-nix.darwinModules.sops
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@ -248,7 +257,7 @@
|
||||
[
|
||||
inputs.disko.nixosModules.disko
|
||||
# inputs.nixified-ai.nixosModules.comfyui
|
||||
# inputs.comfyui-nix.nixosModules.default
|
||||
inputs.comfyui-nix.nixosModules.default
|
||||
]
|
||||
++ commonModules;
|
||||
};
|
||||
|
||||
@ -107,6 +107,10 @@
|
||||
handbrake
|
||||
teamspeak6-client
|
||||
|
||||
# virt-manager # use system program option
|
||||
virt-viewer
|
||||
gnome-boxes # doesn't list VMs imported using virsh
|
||||
|
||||
steam-devices-udev-rules
|
||||
];
|
||||
|
||||
@ -154,6 +158,8 @@
|
||||
"com.usebottles.bottles"
|
||||
"io.github.lawstorant.boxflat"
|
||||
|
||||
"org.onlyoffice.desktopeditors"
|
||||
|
||||
# "com.unity.UnityHub"
|
||||
];
|
||||
|
||||
|
||||
@ -2,30 +2,32 @@
|
||||
{pkgs, ...}: {
|
||||
config = {
|
||||
homemodules = {
|
||||
hyprland = {
|
||||
keyboard = {
|
||||
layout = "us";
|
||||
variant = "altgr-intl";
|
||||
option = "nodeadkeys";
|
||||
};
|
||||
# TODO: Niri config (needs to modularize niri module)
|
||||
|
||||
monitors = {
|
||||
"eDP-1" = {
|
||||
width = 1920;
|
||||
height = 1080;
|
||||
rate = 60;
|
||||
x = 0;
|
||||
y = 0;
|
||||
scale = 1;
|
||||
};
|
||||
};
|
||||
# hyprland = {
|
||||
# keyboard = {
|
||||
# layout = "us";
|
||||
# variant = "altgr-intl";
|
||||
# option = "nodeadkeys";
|
||||
# };
|
||||
#
|
||||
# monitors = {
|
||||
# "eDP-1" = {
|
||||
# width = 1920;
|
||||
# height = 1080;
|
||||
# rate = 60;
|
||||
# x = 0;
|
||||
# y = 0;
|
||||
# scale = 1;
|
||||
# };
|
||||
# };
|
||||
#
|
||||
# workspaces = {
|
||||
# "eDP-1" = [1 2 3 4 5 6 7 8 9];
|
||||
# };
|
||||
# };
|
||||
|
||||
workspaces = {
|
||||
"eDP-1" = [1 2 3 4 5 6 7 8 9];
|
||||
};
|
||||
};
|
||||
|
||||
waybar.monitor = "eDP-1";
|
||||
waybar.monitors = ["eDP-1"];
|
||||
};
|
||||
|
||||
home = {
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
./fastfetch
|
||||
./fish
|
||||
./git
|
||||
./jellyfin-tui
|
||||
./kitty
|
||||
./lazygit
|
||||
./neovim
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
./firefox
|
||||
./fish
|
||||
./git
|
||||
./jellyfin-tui
|
||||
./kitty
|
||||
./lazygit
|
||||
./mpd
|
||||
@ -38,6 +39,7 @@
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
inputs.textfox.homeManagerModules.default
|
||||
inputs.walker.homeManagerModules.default
|
||||
# inputs.direnv-instant.homeModules.direnv-instant
|
||||
# inputs.niri.homeModules.niri # Imported by system module
|
||||
# inputs.noctalia.homeModules.default
|
||||
# inputs.caelestia.homeManagerModules.default
|
||||
|
||||
@ -32,6 +32,9 @@ in {
|
||||
"Notes/Obsidian/Chriphost/latex_snippets.json".source = ../../../config/obsidian/latex_snippets.json; # TODO: Symlink
|
||||
"Notes/Obsidian/Chriphost/.obsidian/snippets/latex_preview.css".source = ../../../config/obsidian/css_snippets/latex_preview.css;
|
||||
"Notes/Obsidian/Chriphost/.obsidian/snippets/center_image.css".source = ../../../config/obsidian/css_snippets/center_image.css;
|
||||
"Notes/Obsidian/Chriphost/.obsidian/snippets/fullwidth_image.css".source = ../../../config/obsidian/css_snippets/fullwidth_image.css;
|
||||
"Notes/Obsidian/Chriphost/.obsidian/snippets/justify_text.css".source = ../../../config/obsidian/css_snippets/justify_text.css;
|
||||
"Notes/Obsidian/Chriphost/.obsidian/snippets/bordered_image.css".source = ../../../config/obsidian/css_snippets/bordered_image.css;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -103,9 +103,9 @@ in [
|
||||
(mkBm "Heise" "https://www.heise.de/")
|
||||
(mkBm "HN" "https://news.ycombinator.com/news")
|
||||
(mkBm "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/")
|
||||
(mkBm "F10" "https://f10.local.chriphost.de/race/Everyone")
|
||||
(mkBm "F11" "https://f11.local.chriphost.de/racepicks")
|
||||
(mkBm "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid")
|
||||
# (mkBm "F10" "https://f10.local.chriphost.de/race/Everyone")
|
||||
(mkBm "F12" "https://f12.local.chriphost.gay/racepicks")
|
||||
(mkBm "F12PB" "https://f12pb.local.chriphost.de/_/")
|
||||
(mkBm "ISBNDB" "https://isbndb.com/")
|
||||
(mkBm "Music" "https://bandcamp.com/chriphost")
|
||||
(mkBm "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/")
|
||||
|
||||
@ -86,6 +86,8 @@ in {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
|
||||
configPath = "${config.xdg.configHome}/mozilla/firefox";
|
||||
|
||||
# firefox-unwrapped is the pure firefox browser, wrapFirefox adds configuration ontop
|
||||
package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
|
||||
# About policies: https://github.com/mozilla/policy-templates#enterprisepoliciesenabled
|
||||
|
||||
@ -84,9 +84,50 @@ in {
|
||||
(lib.mkIf pkgs.stdenv.isLinux {
|
||||
generateCompletions = nixosConfig.programs.fish.generateCompletions;
|
||||
|
||||
# TODO: There's a bug with the direnv mechanism:
|
||||
# - When leaving an env, it unloads (good)
|
||||
# - When entering another env, it loads (good)
|
||||
# - When leaving this one, it doesn't unload (bad)
|
||||
# - When entering leaving it again, it works...
|
||||
# This only happens sometimes, is there a race condition?
|
||||
shellInit = ''
|
||||
set fish_greeting
|
||||
yes | fish_config theme save "system-theme"
|
||||
fish_vi_key_bindings
|
||||
|
||||
# Because we can't source that in a project flake's shellHook (is POSIX), source it here
|
||||
function __project_shell_reload --on-variable INIT_PROJECT_SHELL
|
||||
# Leaving the environment
|
||||
if not set -q INIT_PROJECT_SHELL; or test -z "$INIT_PROJECT_SHELL"
|
||||
if test -n "$__last_unload_project_shell"; and test -f "$__last_unload_project_shell"
|
||||
source "$__last_unload_project_shell"
|
||||
end
|
||||
set -e __last_init_project_shell
|
||||
set -e __last_unload_project_shell
|
||||
return
|
||||
end
|
||||
|
||||
# Entering or switching environments
|
||||
if test "$INIT_PROJECT_SHELL" != "$__last_init_project_shell"
|
||||
# Cleanup the previous environment
|
||||
if test -n "$__last_unload_project_shell"; and test -f "$__last_unload_project_shell"
|
||||
source "$__last_unload_project_shell"
|
||||
end
|
||||
|
||||
# Store into variables to persist until next environment switch in the same shell
|
||||
set -g __last_init_project_shell "$INIT_PROJECT_SHELL"
|
||||
if set -q UNLOAD_PROJECT_SHELL; and test -f "$UNLOAD_PROJECT_SHELL"
|
||||
set -g __last_unload_project_shell "$UNLOAD_PROJECT_SHELL"
|
||||
else
|
||||
set -e __last_unload_project_shell
|
||||
end
|
||||
|
||||
# Source the new environment
|
||||
if test -f "$INIT_PROJECT_SHELL"
|
||||
source "$INIT_PROJECT_SHELL"
|
||||
end
|
||||
end
|
||||
end
|
||||
'';
|
||||
|
||||
functions = lib.mergeAttrsList [
|
||||
|
||||
91
home/homemodules/jellyfin-tui/default.nix
Normal file
91
home/homemodules/jellyfin-tui/default.nix
Normal file
@ -0,0 +1,91 @@
|
||||
{
|
||||
config,
|
||||
nixosConfig,
|
||||
darwinConfig,
|
||||
lib,
|
||||
mylib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.homemodules) jellyfin-tui color;
|
||||
|
||||
systemConfig =
|
||||
if pkgs.stdenv.isLinux
|
||||
then nixosConfig
|
||||
else darwinConfig;
|
||||
in {
|
||||
options.homemodules.jellyfin-tui = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf jellyfin-tui.enable {
|
||||
home = {
|
||||
packages = [
|
||||
pkgs.jellyfin-tui
|
||||
];
|
||||
|
||||
file = let
|
||||
jellyfinUrl =
|
||||
if pkgs.stdenv.isLinux
|
||||
then "https://jellyfin.local.chriphost.de"
|
||||
else "https://jellyfin.vps.chriphost.de";
|
||||
|
||||
configFile = ''
|
||||
servers:
|
||||
- name: Mafia Dortmund
|
||||
url: ${jellyfinUrl}
|
||||
username: root
|
||||
password_file: ${systemConfig.sops.secrets.jellyfin-password.path}
|
||||
default: true
|
||||
|
||||
# All following settings are OPTIONAL. What you see here are the defaults.
|
||||
|
||||
# Show album cover image
|
||||
art: true
|
||||
# Save and restore the state of the player (queue, volume, etc.)
|
||||
persist: true
|
||||
# Grab the primary color from the cover image (false => uses the current theme's `accent` instead)
|
||||
auto_color: false
|
||||
# Time in milliseconds to fade between colors when the track changes
|
||||
auto_color_fade_ms: 400
|
||||
# Always show the lyrics pane, even if no lyrics are available
|
||||
lyrics: 'always' # options: 'always', 'never', 'auto'
|
||||
|
||||
rounded_corners: true
|
||||
|
||||
transcoding:
|
||||
bitrate: 320
|
||||
# container: mp3
|
||||
|
||||
# Discord Rich Presence. Shows your listening status on your Discord profile if Discord is running.
|
||||
# NOTE: I think we're allowed to leak this to the public (hopefully)?
|
||||
discord: 1466134677537685546 # https://discord.com/developers/applications
|
||||
# Displays album art on your Discord profile if enabled
|
||||
# !!CAUTION!! - Enabling this will expose the URL of your Jellyfin instance to all Discord users!
|
||||
discord_art: false
|
||||
|
||||
# Customize the title of the terminal window
|
||||
window_title: true # default -> {title} – {artist} ({year})
|
||||
# window_title: false # disable
|
||||
# Custom title: choose from current track's {title} {artist} {album} {year}
|
||||
# window_title: "\"{title}\" by {artist} ({year}) – jellyfin-tui"
|
||||
|
||||
# Options specified here will be passed to mpv - https://mpv.io/manual/master/#options
|
||||
mpv:
|
||||
log-file: /tmp/mpv.log
|
||||
no-config: true
|
||||
# af: lavfi=[loudnorm=I=-23:TP=-1]
|
||||
gapless-audio: weak
|
||||
prefetch-playlist: yes
|
||||
replaygain: no
|
||||
'';
|
||||
in
|
||||
lib.mkMerge [
|
||||
(lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
".config/jellyfin-tui/config.yaml".text = configFile;
|
||||
})
|
||||
(lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||
"Library/Application Support/jellyfin-tui/config.yaml".text = configFile;
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
7
home/homemodules/jellyfin-tui/options.nix
Normal file
7
home/homemodules/jellyfin-tui/options.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
mylib,
|
||||
...
|
||||
}: {
|
||||
enable = lib.mkEnableOption "Enable jellyfin-tui";
|
||||
}
|
||||
@ -31,8 +31,8 @@ in {
|
||||
settings = lib.mkMerge [
|
||||
# Linux config
|
||||
(lib.mkIf pkgs.stdenv.isLinux {
|
||||
allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
|
||||
listen_on = "unix:@mykitty";
|
||||
allow_remote_control = true; # For nnn file preview or nvim scrollback
|
||||
listen_on = lib.mkDefault "unix:@mykitty"; # This conflicts with direnv-instant
|
||||
})
|
||||
|
||||
# Common config
|
||||
@ -42,6 +42,7 @@ in {
|
||||
window_padding_width = 10; # Looks stupid with editors if bg doesn't match
|
||||
# hide_window_decorations = "yes";
|
||||
enabled_layouts = "grid,vertical,horizontal";
|
||||
cursor_trail = 3;
|
||||
|
||||
tab_bar_min_tabs = 2; # Don't show a single tab
|
||||
tab_bar_edge = "bottom";
|
||||
|
||||
@ -30,54 +30,59 @@ in {
|
||||
|
||||
(lib.optionals (!headless) [
|
||||
# Language servers
|
||||
autotools-language-server
|
||||
basedpyright
|
||||
clang-tools
|
||||
clojure-lsp
|
||||
cmake-language-server
|
||||
haskell-language-server
|
||||
jdt-language-server
|
||||
just-lsp
|
||||
ltex-ls # TODO: Only enable on-demand
|
||||
lua-language-server
|
||||
# nil
|
||||
basedpyright
|
||||
# perl5Packages.PLS
|
||||
perlnavigator
|
||||
pyrefly
|
||||
ty
|
||||
# rPackages.languageserver
|
||||
rust-analyzer
|
||||
svelte-language-server
|
||||
tailwindcss-language-server
|
||||
tex-fmt
|
||||
texlab
|
||||
tinymist
|
||||
ty
|
||||
typescript
|
||||
vscode-langservers-extracted # includes nodejs
|
||||
autotools-language-server
|
||||
just-lsp
|
||||
|
||||
# Linters
|
||||
checkstyle # java
|
||||
clippy # rust
|
||||
clj-kondo # clojure
|
||||
eslint_d # javascript
|
||||
python313Packages.ruff
|
||||
python313Packages.flake8
|
||||
python313Packages.pylint
|
||||
# python313Packages.ruff
|
||||
# python313Packages.flake8
|
||||
# python313Packages.pylint
|
||||
lua54Packages.luacheck
|
||||
vale # text
|
||||
# statix # nix (doesn't recognize pipe operator)
|
||||
|
||||
# Formatters
|
||||
air-formatter
|
||||
cljfmt
|
||||
python313Packages.black
|
||||
google-java-format
|
||||
html-tidy
|
||||
jq # json
|
||||
# prettierd # Use prettier instead because of plugins
|
||||
just-formatter
|
||||
mbake
|
||||
# nodePackages_latest.prettier # Use local install as plugins change per project
|
||||
# perl5Packages.PerlTidy
|
||||
# prettierd # Use prettier instead because of plugins
|
||||
# python313Packages.black
|
||||
rustfmt
|
||||
stylua
|
||||
typstyle
|
||||
mbake
|
||||
just-formatter
|
||||
tombi
|
||||
typstyle
|
||||
])
|
||||
|
||||
[
|
||||
@ -87,6 +92,48 @@ in {
|
||||
lua54Packages.jsregexp # For tree-sitter
|
||||
# nodejs_latest
|
||||
|
||||
# TODO: Create a perl module where I can add packages to, so I don't end up with multiple perl installations
|
||||
# TODO: The same is required for python and R (below)
|
||||
(perl.withPackages (p:
|
||||
with p; [
|
||||
PLS
|
||||
PerlTidy
|
||||
NetOpenSSH
|
||||
DateTime
|
||||
DBI
|
||||
DBDMariaDB
|
||||
CursesUI
|
||||
TextCSV_XS
|
||||
]))
|
||||
|
||||
(python314.withPackages (p:
|
||||
with p; [
|
||||
# Linters
|
||||
ruff
|
||||
flake8
|
||||
pylint
|
||||
|
||||
# Formatters
|
||||
black
|
||||
|
||||
numpy
|
||||
matplotlib
|
||||
requests
|
||||
]))
|
||||
|
||||
(rWrapper.override {
|
||||
packages = with rPackages; [
|
||||
languageserver
|
||||
ggplot2
|
||||
ggalluvial
|
||||
plotly
|
||||
shiny
|
||||
readr
|
||||
tibble
|
||||
svglite
|
||||
];
|
||||
})
|
||||
|
||||
nixd
|
||||
alejandra # nix
|
||||
]
|
||||
@ -523,8 +570,10 @@ in {
|
||||
make = ["bake"];
|
||||
markdown = ["prettierd" "prettier"];
|
||||
nix = ["alejandra"];
|
||||
perl = ["perltidy"];
|
||||
python = ["black"];
|
||||
qml = ["qmlformat"];
|
||||
r = ["air"];
|
||||
rust = ["rustfmt"];
|
||||
svelte = ["prettierd" "prettier"];
|
||||
toml = ["tombi"];
|
||||
@ -860,9 +909,8 @@ in {
|
||||
dependencies = [_lazydev];
|
||||
config = let
|
||||
servers = mylib.generators.toLuaObject [
|
||||
{name = "autotools-language-server";}
|
||||
{name = "basedpyright";}
|
||||
# {name = "pyrefly";} # TODO: Config
|
||||
# {name = "ty";} # TODO: Config
|
||||
{
|
||||
name = "clangd";
|
||||
extraOptions = {
|
||||
@ -914,7 +962,6 @@ in {
|
||||
};
|
||||
};
|
||||
}
|
||||
{name = "autotools-language-server";}
|
||||
# {name = "nil_ls";}
|
||||
{
|
||||
name = "nixd";
|
||||
@ -956,6 +1003,8 @@ in {
|
||||
};
|
||||
};
|
||||
}
|
||||
{name = "perlpls";}
|
||||
{name = "perlnavigator";}
|
||||
{
|
||||
name = "qmlls";
|
||||
extraOptions.cmd = [
|
||||
@ -963,6 +1012,8 @@ in {
|
||||
"-E" # Use QML_IMPORT_PATH env variable
|
||||
];
|
||||
}
|
||||
# {name = "pyrefly";} # TODO: Config
|
||||
{name = "r_language_server";}
|
||||
{name = "svelte";}
|
||||
{name = "tailwindcss";}
|
||||
{name = "texlab";}
|
||||
@ -974,6 +1025,7 @@ in {
|
||||
semanticTokens = "disable";
|
||||
};
|
||||
}
|
||||
# {name = "ty";} # TODO: Config
|
||||
|
||||
# {name = "jdtls";} # Don't set up when using nvim-jdtls
|
||||
# {name = "rust_analyzer";} # Don't set up when using rustaceanvim
|
||||
|
||||
@ -66,3 +66,16 @@ local rmpc =
|
||||
vim.g.toggle_rmpc = function()
|
||||
rmpc:toggle()
|
||||
end
|
||||
|
||||
-- Toggle FailNix UI
|
||||
local failnix = Terminal:new({
|
||||
cmd = "cd /home/christoph/Notes/TU/MastersThesis/FailNix && nix develop --command bash -c 'perl ./scripts/menu.pl'",
|
||||
hidden = true,
|
||||
close_on_exit = true,
|
||||
auto_scroll = false,
|
||||
direction = "float",
|
||||
})
|
||||
|
||||
vim.g.toggle_failnix = function()
|
||||
failnix:toggle()
|
||||
end
|
||||
|
||||
@ -340,6 +340,13 @@ _: let
|
||||
action = "<cmd>lua vim.g.toggle_rmpc()<cr>"; # Defined in extraConfigLua.lua
|
||||
options.desc = "Show Rmpc";
|
||||
}
|
||||
# TODO: Something with the environment activation doesn't work
|
||||
# {
|
||||
# mode = "n";
|
||||
# key = "<leader>.";
|
||||
# action = "<cmd>lua vim.g.toggle_failnix()<cr>"; # Defined in extraConfigLua.lua
|
||||
# options.desc = "Show FailNix";
|
||||
# }
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>i";
|
||||
|
||||
@ -19,30 +19,43 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
iconTheme.package = color.iconPackage;
|
||||
iconTheme.name = color.iconTheme;
|
||||
gtk = let
|
||||
gtkConfig = {
|
||||
enable = true;
|
||||
|
||||
colorScheme = "dark";
|
||||
gtk3.colorScheme = "dark";
|
||||
gtk4.colorScheme = "dark";
|
||||
colorScheme = "dark";
|
||||
|
||||
theme = {
|
||||
# name = "adw-gtk3-dark";
|
||||
# package = pkgs.adw-gtk3;
|
||||
name = "catppuccin-mocha-mauve-standard";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
variant = "mocha";
|
||||
accents = ["mauve"];
|
||||
size = "standard";
|
||||
iconTheme = {
|
||||
package = color.iconPackage;
|
||||
name = color.iconTheme;
|
||||
};
|
||||
|
||||
cursorTheme = {
|
||||
name = color.cursor;
|
||||
package = color.cursorPackage;
|
||||
};
|
||||
|
||||
theme = {
|
||||
# name = "adw-gtk3-dark";
|
||||
# package = pkgs.adw-gtk3;
|
||||
name = "catppuccin-mocha-mauve-standard";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
variant = "mocha";
|
||||
accents = ["mauve"];
|
||||
size = "standard";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
gtk3.extraConfig = {
|
||||
gtkExtraConfig = {
|
||||
gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
};
|
||||
in
|
||||
gtkConfig
|
||||
// {
|
||||
gtk3 = gtkConfig // {extraConfig = gtkExtraConfig;};
|
||||
gtk4 = gtkConfig // {extraConfig = gtkExtraConfig;};
|
||||
};
|
||||
|
||||
dconf = {
|
||||
enable = true;
|
||||
@ -130,8 +143,9 @@ in {
|
||||
xwayland-satellite
|
||||
# ncpamixer # Audio control
|
||||
wiremix # Audio control
|
||||
swww
|
||||
awww
|
||||
waypaper
|
||||
wtype # For elephant
|
||||
|
||||
# GTK apps (look good and work well with xdg portals)
|
||||
nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
|
||||
@ -195,6 +209,10 @@ in {
|
||||
default = ["desktopapplications"];
|
||||
};
|
||||
empty = ["desktopapplications"];
|
||||
|
||||
selection_wrap = true;
|
||||
hide_quick_activation = true;
|
||||
actions_as_menu = true;
|
||||
};
|
||||
|
||||
themes."cattpuccin-mocha" = let
|
||||
@ -563,15 +581,45 @@ in {
|
||||
# opacity = 0.8;
|
||||
}
|
||||
|
||||
# Rules for specific windows
|
||||
# Floating + unmaximized windows
|
||||
{
|
||||
matches = [{app-id = "Zotero";}];
|
||||
open-on-workspace = "2";
|
||||
matches = [
|
||||
{app-id = "com.github.finefindus.eyedropper";}
|
||||
{app-id = "re.sonny.Junction";}
|
||||
];
|
||||
|
||||
open-maximized = false;
|
||||
open-floating = true;
|
||||
|
||||
# default-floating-position = {
|
||||
# x = 0;
|
||||
# y = 0;
|
||||
# relative-to = "center";
|
||||
# };
|
||||
}
|
||||
|
||||
# Specific floating windows
|
||||
{
|
||||
matches = [
|
||||
{app-id = "re.sonny.Junction";}
|
||||
];
|
||||
default-column-width.fixed = 500;
|
||||
default-window-height.fixed = 250;
|
||||
}
|
||||
{
|
||||
matches = [
|
||||
{app-id = "com.github.finefindus.eyedropper";}
|
||||
];
|
||||
default-column-width.fixed = 250;
|
||||
default-window-height.fixed = 500;
|
||||
}
|
||||
|
||||
# Rules for specific windows
|
||||
{
|
||||
matches = [{app-id = "neovide";}];
|
||||
open-on-workspace = "2";
|
||||
open-maximized = true;
|
||||
open-focused = true;
|
||||
}
|
||||
{
|
||||
matches = [{app-id = "jetbrains-clion";}];
|
||||
@ -584,8 +632,21 @@ in {
|
||||
open-floating = true;
|
||||
}
|
||||
{
|
||||
matches = [{app-id = "obsidian";}];
|
||||
matches = [
|
||||
{
|
||||
app-id = "electron";
|
||||
title = ".*Chriphost - Obsidian.*";
|
||||
}
|
||||
];
|
||||
open-on-workspace = "3";
|
||||
# open-maximized = true;
|
||||
open-focused = true;
|
||||
}
|
||||
{
|
||||
matches = [{app-id = "Zotero";}];
|
||||
open-on-workspace = "3";
|
||||
# open-maximized = true;
|
||||
open-focused = true;
|
||||
}
|
||||
{
|
||||
matches = [{app-id = "firefox";}];
|
||||
@ -614,6 +675,12 @@ in {
|
||||
open-floating = true;
|
||||
open-maximized = true;
|
||||
}
|
||||
{
|
||||
matches = [{app-id = "factorio";}];
|
||||
open-on-workspace = "6";
|
||||
# open-floating = true;
|
||||
open-maximized = true;
|
||||
}
|
||||
{
|
||||
matches = [{app-id = "signal";}];
|
||||
open-on-workspace = "7";
|
||||
@ -644,8 +711,112 @@ in {
|
||||
};
|
||||
|
||||
# TODO: Move values to config option and set in home/christoph/niri.nix
|
||||
binds = with config.lib.niri.actions; {
|
||||
binds = with config.lib.niri.actions; let
|
||||
sessionMenu = mylib.rofi.mkMenu {
|
||||
prompt = "Session";
|
||||
layers = [
|
||||
{
|
||||
" Poweroff" = "poweroff";
|
||||
" Reboot" = "reboot";
|
||||
" Lock" = "loginctl lock-session";
|
||||
# " Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
|
||||
# " Reload Hyprland" = "hyprctl reload";
|
||||
# " Exit Hyprland" = "hyprctl dispatch exit";
|
||||
" Exit Niri" = "niri msg action quit";
|
||||
}
|
||||
];
|
||||
prompts = ["Select Session Action"];
|
||||
rofiCmd = "walker -d";
|
||||
};
|
||||
wallpaperMenu = mylib.rofi.mkMenu {
|
||||
prompt = "Wallpaper";
|
||||
layers = [
|
||||
"eza -1 ${config.paths.nixflake}/wallpapers"
|
||||
];
|
||||
prompts = ["Select Wallpaper"];
|
||||
# Use waypaper instead of swww directly, so the chosen wallpaper will be restored after reboot
|
||||
command = "waypaper --wallpaper ${config.paths.nixflake}/wallpapers/$OPTION0";
|
||||
rofiCmd = "walker -d";
|
||||
};
|
||||
# No lectures anymore :) - Kept as example
|
||||
lecturesMenu = mylib.rofi.mkMenu {
|
||||
prompt = "Lecture";
|
||||
layers = [
|
||||
"eza -1 -D ~/Notes/TU"
|
||||
"eza -1 -D ~/Notes/TU/$OPTION0"
|
||||
"eza -1 ~/Notes/TU/$OPTION0/$OPTION1 | grep '.pdf'"
|
||||
];
|
||||
prompts = [
|
||||
"Select Lecture"
|
||||
"Select Subfolder"
|
||||
"Select Deck"
|
||||
];
|
||||
command = "xdg-open ~/Notes/TU/$OPTION0/$OPTION1/$OPTION2";
|
||||
rofiCmd = "walker -d";
|
||||
};
|
||||
# niriMenu = mylib.rofi.mkMenu {
|
||||
# prompt = "Niri";
|
||||
# layers = [
|
||||
# {
|
||||
# " Take Region Screenshot" = "niri msg action screenshot -p false";
|
||||
# " Take Window Screenshot" = "niri msg action screenshot-window -p false -d true";
|
||||
# " Take Full-Screen Screenshot" = "niri msg action screenshot-screen -p false -d true";
|
||||
# }
|
||||
# ];
|
||||
# prompts = ["Execute Niri Action"];
|
||||
# rofiCmd = "walker -d";
|
||||
# };
|
||||
globalMenu = mylib.rofi.mkMenu {
|
||||
prompt = "Global";
|
||||
layers = [
|
||||
{
|
||||
" Control Session" = "${sessionMenu}/bin/rofi-menu-Session";
|
||||
" Change Wallpaper" = "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
|
||||
" View Keybindings" = "niri msg action show-hotkey-overlay";
|
||||
" Open Lecture Material" = "${lecturesMenu}/bin/rofi-menu-Lecture";
|
||||
# " Niri Actions" = "${niriMenu}/bin/rofi-menu-Niri";
|
||||
# TODO: What else? SSH menu?
|
||||
}
|
||||
];
|
||||
prompts = ["Select Action"];
|
||||
rofiCmd = "walker -d";
|
||||
};
|
||||
in {
|
||||
# DMenu
|
||||
"Mod+Shift+A" = {
|
||||
action = spawn "walker" "-m" "providerlist";
|
||||
hotkey-overlay = {title = "Toggle the launcher.";};
|
||||
};
|
||||
"Mod+A" = {
|
||||
action = spawn "walker" "-m" "desktopapplications";
|
||||
hotkey-overlay = {title = "Toggle the application launcher.";};
|
||||
};
|
||||
"Mod+C" = {
|
||||
action = spawn "walker" "-m" "clipboard";
|
||||
hotkey-overlay = {title = "Show clipboard history.";};
|
||||
};
|
||||
"Mod+Escape" = {
|
||||
action = spawn "${sessionMenu}/bin/rofi-menu-Session";
|
||||
hotkey-overlay = {title = "Toggle the session menu.";};
|
||||
};
|
||||
"Mod+W" = {
|
||||
action = spawn "${wallpaperMenu}/bin/rofi-menu-Wallpaper";
|
||||
hotkey-overlay = {title = "Open wallpaper menu.";};
|
||||
};
|
||||
"Mod+D" = {
|
||||
action = spawn "${globalMenu}/bin/rofi-menu-Global";
|
||||
hotkey-overlay = {title = "Open global menu.";};
|
||||
};
|
||||
|
||||
# Applications
|
||||
"Mod+Ctrl+W" = {
|
||||
action = spawn "waypaper";
|
||||
hotkey-overlay = {title = "Open waypaper.";};
|
||||
};
|
||||
"Mod+Shift+W" = {
|
||||
action = spawn "waypaper" "--random";
|
||||
hotkey-overlay = {title = "Select random wallpaper.";};
|
||||
};
|
||||
"Mod+T" = {
|
||||
action = spawn "kitty";
|
||||
hotkey-overlay = {title = "Spawn Kitty.";};
|
||||
@ -678,52 +849,24 @@ in {
|
||||
action = spawn "neovide" "${config.paths.dotfiles}/flake.nix";
|
||||
hotkey-overlay = {title = "Edit the NixFlake.";};
|
||||
};
|
||||
"Mod+W" = {
|
||||
action = spawn "waypaper";
|
||||
hotkey-overlay = {title = "Open wallpaper chooser.";};
|
||||
};
|
||||
"Mod+Shift+W" = {
|
||||
action = spawn "waypaper" "--random";
|
||||
hotkey-overlay = {title = "Select random wallpaper.";};
|
||||
};
|
||||
|
||||
"Mod+A" = {
|
||||
action = spawn "walker" "-m" "desktopapplications";
|
||||
hotkey-overlay = {title = "Toggle the application launcher.";};
|
||||
};
|
||||
"Mod+Shift+A" = {
|
||||
action = spawn "walker" "-m" "providerlist";
|
||||
hotkey-overlay = {title = "Toggle the launcher.";};
|
||||
};
|
||||
"Mod+Escape" = let
|
||||
powerMenu = mylib.rofi.mkSimpleMenu rec {
|
||||
prompt = "Session";
|
||||
attrs = {
|
||||
" Poweroff" = "poweroff";
|
||||
" Reboot" = "reboot";
|
||||
" Lock" = "loginctl lock-session";
|
||||
# " Reload Hyprpanel" = "systemctl --user restart hyprpanel.service";
|
||||
# " Reload Hyprland" = "hyprctl reload";
|
||||
# " Exit Hyprland" = "hyprctl dispatch exit";
|
||||
};
|
||||
command = "walker -d -p ${prompt}";
|
||||
};
|
||||
in {
|
||||
action = spawn "${powerMenu}/bin/rofi-menu-Session";
|
||||
hotkey-overlay = {title = "Toggle the session menu.";};
|
||||
};
|
||||
"Mod+C" = {
|
||||
action = spawn "walker" "-m" "clipboard";
|
||||
hotkey-overlay = {title = "Show clipboard history.";};
|
||||
};
|
||||
|
||||
# Screenshots
|
||||
"Mod+S" = {
|
||||
action.screenshot-window = {write-to-disk = true;};
|
||||
action.screenshot-window = {
|
||||
write-to-disk = true;
|
||||
show-pointer = false;
|
||||
};
|
||||
hotkey-overlay = {title = "Take a screenshot of the current window.";};
|
||||
};
|
||||
"Mod+Ctrl+S" = {
|
||||
action.screenshot-screen = {
|
||||
write-to-disk = true;
|
||||
show-pointer = false;
|
||||
};
|
||||
hotkey-overlay = {title = "Take a screenshot of the current screen.";};
|
||||
};
|
||||
"Mod+Shift+S" = {
|
||||
action.screenshot = {show-pointer = true;};
|
||||
action.screenshot = {show-pointer = false;};
|
||||
hotkey-overlay = {title = "Take a screenshot of a region.";};
|
||||
};
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ in {
|
||||
options.homemodules.packages = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf packages.enable {
|
||||
# TODO: Add extra packages option and use that from host-specific configs
|
||||
home.packages = with pkgs;
|
||||
lib.mkMerge [
|
||||
# Common packages
|
||||
@ -74,7 +75,9 @@ in {
|
||||
# Common !headless packages
|
||||
(lib.optionals (!headless) [
|
||||
ripdrag # drag & drop from terminal
|
||||
jellyfin-tui
|
||||
# jellyfin-tui # Use module
|
||||
|
||||
inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
|
||||
])
|
||||
|
||||
# Linux exclusive packages
|
||||
@ -82,7 +85,7 @@ in {
|
||||
pastel # Color tools
|
||||
nvd # Nix rebuild diff
|
||||
nurl # Generate nix fetcher sections based on URLs
|
||||
python313 # Nicer scripting than bash
|
||||
# python313 # Nicer scripting than bash
|
||||
lazyjournal # Journalctl viewer
|
||||
systemctl-tui
|
||||
restic # Backups
|
||||
@ -92,6 +95,7 @@ in {
|
||||
jujutsu # git-like vcs
|
||||
lurk # strace analysis
|
||||
radare2
|
||||
disktui
|
||||
|
||||
# Hardware/Software info
|
||||
pciutils # lspci
|
||||
@ -132,34 +136,29 @@ in {
|
||||
|
||||
# Linux exclusive packages (!headless)
|
||||
(lib.optionals (pkgs.stdenv.isLinux && (!headless)) [
|
||||
veracrypt
|
||||
wl-clipboard
|
||||
|
||||
# Proton
|
||||
protonvpn-gui
|
||||
proton-vpn
|
||||
protonmail-bridge-gui
|
||||
|
||||
# GUI stuff
|
||||
nautilus # Just in case
|
||||
signal-desktop
|
||||
anki
|
||||
font-manager # Previews fonts, but doesn't set them
|
||||
nextcloud-client
|
||||
keepassxc
|
||||
thunderbird # TODO: Email module
|
||||
obsidian
|
||||
zotero
|
||||
zeal # docs browser
|
||||
# helvum # unmaintained
|
||||
crosspipe
|
||||
vlc
|
||||
audacity
|
||||
ferdium
|
||||
gparted
|
||||
# ferdium
|
||||
# feishin # electron :(
|
||||
jellyfin-tui
|
||||
playerctl # Media player control
|
||||
czkawka-full # file deduplicator
|
||||
binaryninja-free # reverse engineering
|
||||
tableplus # database explorer
|
||||
|
||||
# Office
|
||||
kdePackages.wacomtablet # For xournalpp/krita
|
||||
@ -168,7 +167,19 @@ in {
|
||||
hunspellDicts.en_US
|
||||
hunspellDicts.de_DE
|
||||
|
||||
inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
|
||||
# GTK-Apps
|
||||
# gnome-calculator
|
||||
# gnome-calendar
|
||||
# helvum # unmaintained
|
||||
crosspipe
|
||||
nautilus # Just in case
|
||||
font-manager # Previews fonts, but doesn't set them
|
||||
gparted
|
||||
resources
|
||||
# celluloid
|
||||
# cine
|
||||
eyedropper
|
||||
junction
|
||||
])
|
||||
|
||||
# Darwin exclusive packages
|
||||
@ -178,8 +189,13 @@ in {
|
||||
# discord
|
||||
# obsidian
|
||||
# nextcloud-client
|
||||
# protonvpn-gui
|
||||
# proton-vpn
|
||||
# iina
|
||||
|
||||
# TODO: Update the docs module to be darwinix compatible
|
||||
# - The filepaths need to be adapted
|
||||
texliveFull
|
||||
typst
|
||||
])
|
||||
];
|
||||
|
||||
@ -190,9 +206,19 @@ in {
|
||||
|
||||
direnv = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
silent = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
# This replaces the normal direnv.enableFishIntegration.
|
||||
# direnv-instant = {
|
||||
# enable = true;
|
||||
# enableFishIntegration = true;
|
||||
# enableKittyIntegration = true;
|
||||
# settings.use_cache = true;
|
||||
# };
|
||||
|
||||
eza = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
|
||||
@ -18,7 +18,10 @@ in {
|
||||
matchBlocks = {
|
||||
"*" = {
|
||||
forwardAgent = false;
|
||||
addKeysToAgent = "no";
|
||||
addKeysToAgent =
|
||||
if pkgs.stdenv.isLinux
|
||||
then "no"
|
||||
else "yes"; # Don't have keychain on darwin
|
||||
compression = true;
|
||||
serverAliveInterval = 0;
|
||||
serverAliveCountMax = 3;
|
||||
|
||||
@ -26,6 +26,7 @@ in {
|
||||
signCommits = true;
|
||||
};
|
||||
|
||||
jellyfin-tui.enable = true;
|
||||
kitty.enable = true;
|
||||
lazygit.enable = true;
|
||||
|
||||
|
||||
@ -85,6 +85,11 @@ in {
|
||||
run = ''xdg-open "$@"'';
|
||||
desc = "Open selection";
|
||||
}
|
||||
{
|
||||
# TODO: For some reason, junction does not exit after choosing an application...
|
||||
run = ''junction "$@"'';
|
||||
desc = "Open selection in chosen application";
|
||||
}
|
||||
];
|
||||
extract = [
|
||||
{
|
||||
|
||||
@ -9,14 +9,40 @@
|
||||
mkCommonNixSettings = username: {
|
||||
enable = true;
|
||||
package = pkgs.nixVersions.stable;
|
||||
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes pipe-operators
|
||||
'';
|
||||
settings.trusted-users = ["root" username];
|
||||
gc.automatic = false;
|
||||
gc.options = "--delete-older-than 5d";
|
||||
settings.auto-optimise-store = true;
|
||||
optimise.automatic = true;
|
||||
|
||||
settings = {
|
||||
trusted-users = ["root" username];
|
||||
auto-optimise-store = true;
|
||||
|
||||
substituters = [
|
||||
"https://cache.nixos.org"
|
||||
"https://nix-community.cachix.org"
|
||||
"https://comfyui.cachix.org"
|
||||
# "https://ai.cachix.org"
|
||||
# "https://app.cachix.org/cache/nixos-rocm"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
"comfyui.cachix.org-1:33mf9VzoIjzVbp0zwj+fT51HG0y31ZTK3nzYZAX0rec="
|
||||
# "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
|
||||
# "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
|
||||
];
|
||||
};
|
||||
|
||||
gc = {
|
||||
automatic = false;
|
||||
options = "--delete-older-than 5d";
|
||||
};
|
||||
|
||||
optimise = {
|
||||
automatic = true;
|
||||
};
|
||||
|
||||
registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
|
||||
nixPath = [
|
||||
"nixpkgs=${inputs.nixpkgs.outPath}"
|
||||
@ -49,7 +75,6 @@
|
||||
|
||||
# Import the toplevel system configuration module.
|
||||
../system
|
||||
../system/cachix.nix
|
||||
|
||||
# Host specific configuration
|
||||
../system/${hostname}
|
||||
@ -123,14 +148,11 @@
|
||||
# to allow installation of unfree software and my own overlays.
|
||||
{nixpkgs.pkgs = pkgs;}
|
||||
|
||||
# Import the toplevel system configuration module.
|
||||
../system/cachix.nix
|
||||
|
||||
# Host specific configuration
|
||||
../system/${hostname}
|
||||
|
||||
# Import all of my custom system modules
|
||||
# ../system/systemmodules # TODO:
|
||||
../system/systemmodules/darwin.nix
|
||||
]
|
||||
|
||||
extraModules
|
||||
|
||||
197
lib/rofi.nix
197
lib/rofi.nix
@ -3,79 +3,164 @@
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: rec {
|
||||
}: {
|
||||
# Receives attrs like:
|
||||
# {
|
||||
# "Poweroff" = "poweroff";
|
||||
# "Reload Hyprland" = "hyprctl reload";
|
||||
# }
|
||||
mkSimpleMenu = let
|
||||
# Makes a string like ''"Poweroff" "Reload Hyprland"''
|
||||
unpack-options = attrs: "\"${lib.concatStringsSep "\" \"" (builtins.attrNames attrs)}\"";
|
||||
# mkSimpleMenu = let
|
||||
# # Makes a string like ''"Poweroff" "Reload Hyprland"''
|
||||
# unpack-options = attrs: "\"${lib.concatStringsSep "\" \"" (builtins.attrNames attrs)}\"";
|
||||
#
|
||||
# mkCase = option: action: "else if test \"${option}\" = $OPTION\n set ACTION \"${action}\"";
|
||||
#
|
||||
# cases = attrs:
|
||||
# attrs
|
||||
# |> builtins.mapAttrs mkCase
|
||||
# |> builtins.attrValues
|
||||
# |> builtins.concatStringsSep "\n";
|
||||
# in
|
||||
# {
|
||||
# prompt,
|
||||
# attrs,
|
||||
# command ? ''rofi -dmenu -i'',
|
||||
# }:
|
||||
# pkgs.writeScriptBin "rofi-menu-${prompt}" ''
|
||||
# #! ${pkgs.fish}/bin/fish
|
||||
#
|
||||
# # OPTIONS contains all possible values Rofi will display
|
||||
# set OPTIONS ${unpack-options attrs}
|
||||
#
|
||||
# # We choose a single OPTION using Rofi
|
||||
# set OPTION (echo -e (string join "\n" $OPTIONS) | ${command} -p "${prompt}")
|
||||
#
|
||||
# # Check if the chosen OPTION is a valid choice from OPTIONS
|
||||
# if not contains $OPTION $OPTIONS
|
||||
# exit
|
||||
# end
|
||||
#
|
||||
# # Set a command to execute based on the chosen OPTION
|
||||
# if false
|
||||
# exit # Easier to generate with this
|
||||
# ${cases attrs}
|
||||
# else
|
||||
# exit
|
||||
# end
|
||||
#
|
||||
# # Execute the command
|
||||
# eval $ACTION
|
||||
# '';
|
||||
|
||||
mkCase = option: action: "else if test \"${option}\" = $OPTION\n set ACTION \"${action}\"";
|
||||
# Rofi/Dmenu menu generator.
|
||||
#
|
||||
# Each element in `layers` is one of:
|
||||
# - attrset { "Label" = "value"; } # static options: selected value → $OPTIONn
|
||||
# - string "shell-cmd" # dynamic options from command: selected text → $OPTIONn
|
||||
# # may reference $OPTION0, $OPTION1, ... from earlier layers
|
||||
#
|
||||
# The "command" is the last action, it can reference $OPTION0, $OPTION1, ...
|
||||
# If no "command" is given and the last layer is a static attrset, its selected value is evaluated directly.
|
||||
#
|
||||
# The "prompts" list are optional per-layer prompt strings (falls back to "prompt" if not provided).
|
||||
#
|
||||
# vpn.fish equivalent:
|
||||
# mkMenu {
|
||||
# prompt = "vpn";
|
||||
# layers = [
|
||||
# "cat /etc/rofi-vpns"
|
||||
# { "start" = "start"; "stop" = "stop"; "status" = "status"; }
|
||||
# ];
|
||||
# command = "systemctl $OPTION1 $OPTION0.service";
|
||||
# }
|
||||
#
|
||||
# lectures.fish equivalent:
|
||||
# mkMenu {
|
||||
# prompt = "lecture";
|
||||
# layers = [
|
||||
# "eza -1 -D ~/Notes/TU"
|
||||
# "eza -1 ~/Notes/TU/$OPTION0/Lecture | grep '.pdf'"
|
||||
# ];
|
||||
# command = "xdg-open ~/Notes/TU/$OPTION0/Lecture/$OPTION1";
|
||||
# }
|
||||
mkMenu = {
|
||||
prompt,
|
||||
layers,
|
||||
prompts ? [],
|
||||
command ? null,
|
||||
rofiCmd ? "rofi -dmenu -i",
|
||||
}: let
|
||||
isStaticLayer = layer: builtins.isAttrs layer && !(layer ? options);
|
||||
isDynamicLayer = layer: builtins.isString layer;
|
||||
|
||||
cases = attrs:
|
||||
attrs
|
||||
|> builtins.mapAttrs mkCase
|
||||
|> builtins.attrValues
|
||||
|> builtins.concatStringsSep "\n";
|
||||
in
|
||||
{
|
||||
prompt,
|
||||
attrs,
|
||||
command ? ''rofi -dmenu -p " ${prompt} " -i'',
|
||||
}:
|
||||
pkgs.writeScriptBin "rofi-menu-${prompt}" ''
|
||||
#! ${pkgs.fish}/bin/fish
|
||||
escStr = s: builtins.replaceStrings [''"'' "\\"] [''\"'' "\\\\"] s;
|
||||
|
||||
# OPTIONS contains all possible values Rofi will display
|
||||
set OPTIONS ${unpack-options attrs}
|
||||
layerPrompt = i:
|
||||
if i < builtins.length prompts
|
||||
then lib.elemAt prompts i
|
||||
else prompt;
|
||||
|
||||
# We choose a single OPTION using Rofi
|
||||
set OPTION (echo -e (string join "\n" $OPTIONS) | ${command})
|
||||
|
||||
# Check if the chosen OPTION is a valid choice from OPTIONS
|
||||
if not contains $OPTION $OPTIONS
|
||||
# Static layer: attrset of label -> value
|
||||
# Displays labels in rofi; maps selected label to its value -> $OPTIONi
|
||||
mkStaticLayer = i: attrs: let
|
||||
lp = layerPrompt i;
|
||||
labels = builtins.attrNames attrs;
|
||||
optsStr = "\"${lib.concatStringsSep "\" \"" (map escStr labels)}\"";
|
||||
mkCase = label: value: "else if test \"${escStr label}\" = $_LABEL${toString i}\n set OPTION${toString i} \"${escStr value}\"";
|
||||
casesStr =
|
||||
builtins.concatStringsSep "\n"
|
||||
(builtins.attrValues (builtins.mapAttrs mkCase attrs));
|
||||
in {
|
||||
script = ''
|
||||
set _OPTS${toString i} ${optsStr}
|
||||
set _LABEL${toString i} (echo -e (string join "\n" $_OPTS${toString i}) | ${rofiCmd} -p "${lp}")
|
||||
if not contains $_LABEL${toString i} $_OPTS${toString i}
|
||||
exit
|
||||
end
|
||||
|
||||
# Set a command to execute based on the chosen OPTION
|
||||
if false
|
||||
exit # Easier to generate with this
|
||||
${cases attrs}
|
||||
exit
|
||||
${casesStr}
|
||||
else
|
||||
exit
|
||||
end
|
||||
|
||||
# Execute the command
|
||||
eval $ACTION
|
||||
'';
|
||||
};
|
||||
|
||||
# TODO: I want to generate the containers menu using the actionsA and actionsB attrs:
|
||||
# - actionsA will be generated from the stuff in oci-containers.containers
|
||||
# - actionsB will be set statically for start, stop, status
|
||||
# Dynamic layer: shell command string whose output is piped to rofi
|
||||
# Selected text -> $OPTIONi; may reference earlier $OPTIONn variables
|
||||
mkDynamicLayer = i: cmd: let
|
||||
lp = layerPrompt i;
|
||||
in {
|
||||
script = ''
|
||||
set OPTION${toString i} (${cmd} | ${rofiCmd} -p "${lp}")
|
||||
if test -z $OPTION${toString i}
|
||||
exit
|
||||
end
|
||||
'';
|
||||
};
|
||||
|
||||
# Receives attrs like:
|
||||
# {
|
||||
# optionA = "exa -1 -D ~/Notes/TU";
|
||||
# optionB = "exa -1 -D ~/Notes/TU/$OPTIONA/Lecture | grep \".pdf\"";
|
||||
# commandB = "xdg-open ~/Notes/TU/$OPTIONA/Lecture/$OPTIONB";
|
||||
# }
|
||||
#
|
||||
# Keys:
|
||||
# - optionA, optionB # Command that generates Rofi options:
|
||||
# exa -1 -D ~/Notes/TU
|
||||
# cat /etc/rofi-vpns
|
||||
# - commandA, commandB # Action to execute after sth. was chosen (mutually excl. with command)
|
||||
# - actionsA, actionsB # Configure actions by lookup (mutually excl. with command):
|
||||
# actionsB = {"status" = "systemctl status..."}
|
||||
# - colorA, colorB # Configure highlighting conditions:
|
||||
# colorA = {"red" = "systemctl ... | grep ..."};
|
||||
#
|
||||
# Use $OPTIONA and $OPTIONB to use the options chosen by option<A/B>-command and rofi
|
||||
# Use $EVALA and $EVALB to use the outputs generated by command<A/B>
|
||||
mkMenu = let
|
||||
mkLayer = i: layer:
|
||||
if isStaticLayer layer
|
||||
then mkStaticLayer i layer
|
||||
else if isDynamicLayer layer
|
||||
then mkDynamicLayer i layer
|
||||
else throw "mkMenu: layer ${toString i} has invalid type";
|
||||
|
||||
layerResults = lib.imap0 mkLayer layers; # Map with 0-based index
|
||||
layerScripts = map (r: r.script) layerResults;
|
||||
lastLayer = lib.last layers;
|
||||
|
||||
finalCmd =
|
||||
if command != null
|
||||
then command
|
||||
else if isStaticLayer lastLayer
|
||||
then "$OPTION${toString (builtins.length layers - 1)}"
|
||||
else throw "mkMenu: 'command' must be set when the last layer is not a static attrset";
|
||||
in
|
||||
prompt: attrs: "";
|
||||
pkgs.writeScriptBin "rofi-menu-${prompt}" ''
|
||||
#! ${pkgs.fish}/bin/fish
|
||||
|
||||
${lib.concatStringsSep "\n" layerScripts}
|
||||
eval "${finalCmd}"
|
||||
'';
|
||||
}
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# WARN: this file will get overwritten by $ cachix use <name>
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
folder = ./cachix;
|
||||
toImport = name: value: folder + ("/" + name);
|
||||
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
|
||||
imports =
|
||||
lib.mapAttrsToList toImport
|
||||
(lib.filterAttrs filterCaches (builtins.readDir folder));
|
||||
in {
|
||||
inherit imports;
|
||||
nix.settings.substituters = ["https://cache.nixos.org/"];
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
{
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://nix-community.cachix.org"
|
||||
# "https://app.cachix.org/cache/nixos-rocm"
|
||||
# "https://ai.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
# "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
|
||||
# "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
|
||||
];
|
||||
};
|
||||
}
|
||||
@ -10,6 +10,19 @@
|
||||
hostname,
|
||||
...
|
||||
}: {
|
||||
systemmodules = {
|
||||
sops-nix.bootSecrets.${username} = [
|
||||
"user-password"
|
||||
];
|
||||
|
||||
sops-nix.secrets.${username} = [
|
||||
"ssh-private-key"
|
||||
"nix-github-token"
|
||||
"docker-password"
|
||||
"jellyfin-password"
|
||||
];
|
||||
};
|
||||
|
||||
nix = mylib.nixos.mkCommonNixSettings username;
|
||||
|
||||
networking = {
|
||||
@ -75,10 +88,13 @@
|
||||
};
|
||||
|
||||
users.users.${username} = {
|
||||
isHidden = false;
|
||||
name = "${username}";
|
||||
description = "Christoph";
|
||||
home = "/Users/${username}";
|
||||
uid = 501;
|
||||
gid = 20;
|
||||
createHome = false;
|
||||
home = "/Users/${username}";
|
||||
isHidden = false;
|
||||
|
||||
# NOTE: Not set if the user already exists on darwin, so use chsh for the root user
|
||||
shell = pkgs.fish;
|
||||
@ -125,6 +141,10 @@
|
||||
upgrade = true;
|
||||
};
|
||||
|
||||
# taps = [
|
||||
# "homebrew-zathura/zathura"
|
||||
# ];
|
||||
|
||||
brews = [];
|
||||
|
||||
casks = [
|
||||
@ -135,6 +155,9 @@
|
||||
"obsidian"
|
||||
"protonvpn"
|
||||
"signal"
|
||||
# "zathura"
|
||||
# "zathura-pdf-mupdf"
|
||||
"zotero"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -91,6 +91,7 @@ with mylib.networking; {
|
||||
"ssh-private-key"
|
||||
"nix-github-token"
|
||||
"docker-password"
|
||||
"jellyfin-password"
|
||||
];
|
||||
};
|
||||
|
||||
@ -143,7 +144,7 @@ with mylib.networking; {
|
||||
|
||||
documentation = {
|
||||
# NOTE: Disable this while configuring stuff, it's slow
|
||||
enable = true;
|
||||
enable = false;
|
||||
man.enable = config.documentation.enable;
|
||||
man.cache.enable = true; # Slow but needed for neovim man picker
|
||||
info.enable = config.documentation.enable;
|
||||
@ -234,6 +235,7 @@ with mylib.networking; {
|
||||
description = "Christoph";
|
||||
group = "users";
|
||||
uid = 1000;
|
||||
home = "/home/${username}";
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
./disks.nix
|
||||
|
||||
# General services
|
||||
../services/comfyui.nix
|
||||
# ../services/comfyui.nix
|
||||
../services/fileflows-node.nix
|
||||
];
|
||||
|
||||
@ -158,7 +158,7 @@
|
||||
};
|
||||
|
||||
boot = {
|
||||
# kernelPackages = pkgs.linuxPackages_zen;
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
# kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# Why do I need to know if something fails during boot???
|
||||
@ -193,7 +193,25 @@
|
||||
# };
|
||||
};
|
||||
|
||||
# environment.systemPackages = with pkgs; [];
|
||||
environment.systemPackages = with pkgs; [
|
||||
spice
|
||||
spice-gtk
|
||||
];
|
||||
|
||||
virtualisation = {
|
||||
libvirtd = {
|
||||
enable = true;
|
||||
qemu = {
|
||||
package = pkgs.qemu_kvm;
|
||||
# ovmf.enable = true; # deprecated
|
||||
swtpm.enable = true;
|
||||
runAsRoot = true;
|
||||
};
|
||||
};
|
||||
spiceUSBRedirection.enable = true;
|
||||
};
|
||||
|
||||
networking.firewall.trustedInterfaces = ["virbr0"]; # libvirt
|
||||
|
||||
programs = {
|
||||
ausweisapp = {
|
||||
@ -205,6 +223,8 @@
|
||||
enable = true;
|
||||
gdb = true;
|
||||
};
|
||||
|
||||
virt-manager.enable = true;
|
||||
};
|
||||
|
||||
services = {
|
||||
|
||||
@ -82,7 +82,8 @@
|
||||
};
|
||||
"swap" = {
|
||||
mountpoint = "/swap";
|
||||
swap.swapfile.size = "16G";
|
||||
# Configured in hardware-configuration.nix
|
||||
# swap.swapfile.size = "64G";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -131,8 +131,9 @@
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/var/swap";
|
||||
size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM
|
||||
device = "/swap/swapfile";
|
||||
size = 1024 * 64; # Without hibernation 4.0 GB to 0.5 x RAM
|
||||
randomEncryption.enable = false; # The disk is already encrypted. Useless and might lead to system freeze.
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
../services/kiwix.nix
|
||||
../services/kopia.nix
|
||||
../services/nextcloud.nix
|
||||
../services/ntfy.nix
|
||||
../services/nginx-proxy-manager.nix
|
||||
../services/paperless.nix
|
||||
# ../services/plex.nix # Their monetization strategy is absolutely atrocious
|
||||
@ -110,6 +111,8 @@
|
||||
"kopia-server-password"
|
||||
"kopia-user-password"
|
||||
"paperless-nextcloud-sync-password"
|
||||
"ntfy-auth-users"
|
||||
"ntfy-auth-tokens"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
boxVersion = "v0.30.1";
|
||||
boxVersion = "v0.31.0";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
box = {
|
||||
|
||||
@ -6,7 +6,9 @@
|
||||
...
|
||||
}: let
|
||||
# comfyuiVersion = "cu128-slim-20260316";
|
||||
comfyuiVersion = "cu128-megapak-20260323";
|
||||
# comfyuiVersion = "cu128-megapak-20260413";
|
||||
# comfyuiVersion = "cu130-megapak-pt211-20260330";
|
||||
comfyuiVersion = "cu130-megapak-pt211-20260413";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
comfyui = {
|
||||
@ -24,13 +26,28 @@ in {
|
||||
volumes = let
|
||||
rootDir = "/home/christoph/Games/ComfyUI";
|
||||
in [
|
||||
"${rootDir}/storage:/root"
|
||||
# cu128-slim / cu128-megapak
|
||||
# "${rootDir}/storage:/root"
|
||||
# "${rootDir}/storage-models/models:/root/ComfyUI/models"
|
||||
# "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
|
||||
# "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
|
||||
# "${rootDir}/storage-user/input:/root/ComfyUI/input"
|
||||
# "${rootDir}/storage-user/output:/root/ComfyUI/output"
|
||||
# "${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows"
|
||||
|
||||
# cu130-megapak
|
||||
"${rootDir}/storage-cache/dot-cache:/root/.cache"
|
||||
"${rootDir}/storage-cache/dot-config:/root/.config"
|
||||
"${rootDir}/storage-nodes/dot-local:/root/.local"
|
||||
"${rootDir}/storage-nodes/comfy-extras:/root/ComfyUI/comfy_extras"
|
||||
"${rootDir}/storage-nodes/custom_nodes:/root/ComfyUI/custom_nodes"
|
||||
"${rootDir}/storage-models/models:/root/ComfyUI/models"
|
||||
"${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
|
||||
"${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
|
||||
"${rootDir}/storage-user/input:/root/ComfyUI/input"
|
||||
"${rootDir}/storage-user/output:/root/ComfyUI/output"
|
||||
"${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows"
|
||||
"${rootDir}/storage-user/user-profile:/root/ComfyUI/user"
|
||||
"${rootDir}/storage-user/user-scripts:/root/user-scripts"
|
||||
];
|
||||
|
||||
environment = {
|
||||
@ -39,11 +56,15 @@ in {
|
||||
TZ = "Europe/Berlin";
|
||||
|
||||
# https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py
|
||||
# --use-sage-attention # => OOM
|
||||
# --lowvram
|
||||
# --disable-pinned-memory
|
||||
# --cache-none
|
||||
# CLI_ARGS = "--use-sage-attention";
|
||||
CLI_ARGS = lib.concatStringsSep " " [
|
||||
# "--cache-none" # Leads to single nodes being executed multiple times for each output connection :/
|
||||
"--lowvram"
|
||||
"--disable-smart-memory"
|
||||
"--disable-pinned-memory"
|
||||
"--disable-xformers"
|
||||
"--use-sage-attention" # Crashes
|
||||
# "--reserve-vram 1" # (1 or 2) => Assume less vram is available to mitigate OOM due to wrong vram estimation
|
||||
];
|
||||
};
|
||||
|
||||
extraOptions = [
|
||||
|
||||
79
system/services/ntfy.nix
Normal file
79
system/services/ntfy.nix
Normal file
@ -0,0 +1,79 @@
|
||||
{
|
||||
mylib,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
ntfyVersion = "v2.21";
|
||||
in {
|
||||
# If we need to pass secrets to containers we can't use plain env variables.
|
||||
sops.templates."ntfy_secrets.env".content = ''
|
||||
NTFY_AUTH_USERS=${config.sops.placeholder.ntfy-auth-users}
|
||||
NTFY_AUTH_TOKENS=${config.sops.placeholder.ntfy-auth-tokens}
|
||||
'';
|
||||
|
||||
virtualisation.oci-containers.containers = {
|
||||
# NTFY_AUTH_USERS='admin:$2b$10$13iMkFcSNXcb/DKlUSS03OM25saLd8/hDlKkowFtXYctu2fQBoLJK:admin,christoph:$2b$10$8jgrgBltBXj/Qw0BxBWf1eIfH53VV6wTdlJZEqWBIH3htwEP9PKgq:user'
|
||||
# NTFY_AUTH_TOKENS="christoph:tk_rx8fd6hojuz4ekcb72j7juugkbmga:FAIL*-Notif"
|
||||
|
||||
# NTFY_BASE_URL="https://ntfy.vps.chriphost.de"
|
||||
# NTFY_BEHIND_PROXY="true"
|
||||
# NTFY_AUTH_FILE="/var/lib/ntfy/auth.db"
|
||||
# NTFY_AUTH_DEFAULT_ACCESS="deny-all"
|
||||
# NTFY_ENABLE_LOGIN="true"
|
||||
# NTFY_REQUIRE_LOGIN="true"
|
||||
# NTFY_ATTACHMENT_CACHE_DIR="/var/cache/ntfy/attachments"
|
||||
# NTFY_CACHE_FILE="/var/cache/ntfy/cache.db"
|
||||
# NTFY_UPSTREAM_BASE_URL="https://ntfy.sh"
|
||||
# NTFY_AUTH_ACCESS="christoph:*:read-write"
|
||||
ntfy = {
|
||||
image = "binwiederhier/ntfy:${ntfyVersion}";
|
||||
autoStart = true;
|
||||
|
||||
login = mylib.containers.mkDockerLogin config;
|
||||
|
||||
dependsOn = [];
|
||||
|
||||
ports = [
|
||||
"8042:80"
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"ntfy_cache:/var/cache/ntfy"
|
||||
"ntfy_attachments:/var/cache/ntfy/attachments"
|
||||
"ntfy_lib:/var/lib/ntfy"
|
||||
"ntfy_etc:/etc/ntfy"
|
||||
];
|
||||
|
||||
cmd = ["serve"];
|
||||
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
PGID = "1000";
|
||||
TZ = "Europe/Berlin";
|
||||
|
||||
NTFY_BASE_URL = "https://ntfy.vps.chriphost.de";
|
||||
NTFY_BEHIND_PROXY = "true";
|
||||
NTFY_AUTH_FILE = "/var/lib/ntfy/auth.db";
|
||||
NTFY_AUTH_DEFAULT_ACCESS = "deny-all";
|
||||
NTFY_ENABLE_LOGIN = "true";
|
||||
NTFY_REQUIRE_LOGIN = "true";
|
||||
NTFY_ATTACHMENT_CACHE_DIR = "/var/cache/ntfy/attachments";
|
||||
NTFY_CACHE_FILE = "/var/cache/ntfy/cache.db";
|
||||
NTFY_UPSTREAM_BASE_URL = "https://ntfy.sh";
|
||||
NTFY_AUTH_ACCESS = "christoph:*:read-write";
|
||||
};
|
||||
|
||||
environmentFiles = [
|
||||
config.sops.templates."ntfy_secrets.env".path
|
||||
];
|
||||
|
||||
extraOptions = [
|
||||
# "--privileged"
|
||||
# "--device=nvidia.com/gpu=all"
|
||||
"--net=behind-nginx"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -5,7 +5,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
teamspeakVersion = "v6.0.0-beta7";
|
||||
teamspeakVersion = "v6.0.0-beta8";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
teamspeak = {
|
||||
@ -24,7 +24,8 @@ in {
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"teamspeak_data:/var/tsserver"
|
||||
# "teamspeak_data:/var/tsserver"
|
||||
"teamspeak_data2:/var/tsserver"
|
||||
];
|
||||
|
||||
environment = {
|
||||
|
||||
5
system/systemmodules/darwin.nix
Normal file
5
system/systemmodules/darwin.nix
Normal file
@ -0,0 +1,5 @@
|
||||
{...}: {
|
||||
imports = [
|
||||
./sops-nix
|
||||
];
|
||||
}
|
||||
@ -72,7 +72,6 @@ in {
|
||||
if docker.podman
|
||||
then "podman"
|
||||
else "docker"; # "docker" or "podman"
|
||||
libvirtd.enable = true;
|
||||
};
|
||||
|
||||
systemd.services = let
|
||||
|
||||
@ -69,7 +69,10 @@ in {
|
||||
# https://github.com/nix-community/impermanence/issues/253
|
||||
(mkRDir "/usr/systemd-placeholder" m755)
|
||||
|
||||
(mkDir "mandb" "/var/cache/man" m755)
|
||||
# TODO: Why does this use the mandb user?
|
||||
# TODO: Why does this apparently conflict with comfyui-nix?
|
||||
# (mkDir "mandb" "/var/cache/man" m755)
|
||||
|
||||
# (mkRDir "/var/cache/restic-backups-synology" m755)
|
||||
|
||||
(mkRDir "/var/db/sudo" m711)
|
||||
@ -129,6 +132,7 @@ in {
|
||||
# (mkUDir ".nv" m755) # Unity
|
||||
# (mkUDir ".ollama" m755)
|
||||
# (mkUDir ".plastic4" m755) # Unity
|
||||
(mkUDir ".tableplus" m755)
|
||||
(mkUDir ".tiddl" m755)
|
||||
(mkUDir ".var/app" m755)
|
||||
(mkUDir ".vim/undo" m755)
|
||||
@ -143,6 +147,7 @@ in {
|
||||
|
||||
# Config
|
||||
# (mkUDir ".config/.android" m755) # Unity
|
||||
# (mkUDir ".config/beekeeper-studio" m755)
|
||||
(mkUDir ".config/beets" m755)
|
||||
(mkUDir ".config/blender" m755)
|
||||
(mkUDir ".config/chromium" m755) # TODO: Remove this someday
|
||||
@ -152,13 +157,13 @@ in {
|
||||
(mkUDir ".config/ghidra" m755)
|
||||
(mkUDir ".config/impermanence" m755)
|
||||
(mkUDir ".config/jellyfin-mpv-shim" m755)
|
||||
(mkUDir ".config/jellyfin-tui" m755) # TODO: Generate this config file, have to use sops because it includes the password in cleartext
|
||||
# (mkUDir ".config/jellyfin-tui" m755) # Configured using nix
|
||||
(mkUDir ".config/JetBrains" m755)
|
||||
(mkUDir ".config/kdeconnect" m755)
|
||||
(mkUDir ".config/keepassxc" m755)
|
||||
(mkUDir ".config/Msty" m755)
|
||||
(mkUDir ".config/Nextcloud" m755)
|
||||
(mkUDir ".config/niri/dms" m755)
|
||||
# (mkUDir ".config/niri/dms" m755)
|
||||
(mkUDir ".config/obsidian" m755)
|
||||
(mkUDir ".config/obs-studio" m755)
|
||||
(mkUDir ".config/Signal" m755)
|
||||
@ -168,6 +173,7 @@ in {
|
||||
(mkUDir ".config/tidal_dl_ng" m755)
|
||||
# (mkUDir ".config/unity3d" m755) # Unity
|
||||
# (mkUDir ".config/unityhub" m755) # Unity
|
||||
(mkUDir ".config/Vector 35" m755)
|
||||
(mkUDir ".config/vlc" m755)
|
||||
(mkUDir ".config/Zeal" m755)
|
||||
(mkUDir ".config/zed" m755)
|
||||
|
||||
@ -26,17 +26,23 @@ in {
|
||||
defaultSopsFile = ./secrets.yaml;
|
||||
|
||||
age = {
|
||||
keyFile = lib.mkDefault "/home/${username}/.secrets/age/age.key";
|
||||
keyFile = lib.mkDefault "${config.users.users.${username}.home}/.secrets/age/age.key";
|
||||
generateKey = false;
|
||||
sshKeyPaths = [];
|
||||
};
|
||||
|
||||
secrets = let
|
||||
mkSecret = name: {
|
||||
${name} = {
|
||||
owner = config.users.users.${username}.name;
|
||||
group = config.users.users.${username}.group;
|
||||
};
|
||||
${name} = lib.mkMerge [
|
||||
(lib.optionalAttrs pkgs.stdenv.isLinux {
|
||||
owner = config.users.users.${username}.name;
|
||||
group = config.users.users.${username}.group;
|
||||
})
|
||||
(lib.optionalAttrs pkgs.stdenv.isDarwin {
|
||||
owner = config.users.users.${username}.name;
|
||||
group = "staff"; # Apparently there's no way to get the primary group?
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
mkBootSecret = name: {
|
||||
|
||||
@ -5,6 +5,7 @@ user-password: ENC[AES256_GCM,data:okgvaTTesCDwriI8PxhNdHZF8XgzB4yxapuFl2/CK8x4W
|
||||
ssh-private-key: ENC[AES256_GCM,data:JrRarfeS3y6b9gxg4Za5GIc5Ci3aGR+OyZxQybj4dcv2mzxXmT/bm7KOwM1zkz1PFl1xW5X82T5jte+XQOKx0+6m4ovjUgUmQUMP4E/yosp8XSdi0+YlUKBEHEJx6HqCZy+v6qx5kfp9JC6fZqCbL1J6FIqWqAoKTFXoiou1YnhmBa2fM17Q++i6TflDWiVrUS7X9xjuZFq1hz1aQXS303uvJEUOEpXdqPyJvUKJWzVsFrAwpa9FG+reO70SSc+1hBbqdw1QjrzNWh3eNnztwZURauJtVFBYUZ5ozHmWBr4aVFjYvqz+t6G1SAunmBRbVqbH4bjBv9jXXjHAB4U0wanvkJN2C+EY1zxwjyx2fWckMdhoLr9gtC1FJKMbV49UFHJ3iXWNczKj1t7LrctehEKXJa0Eb3UogYuaRxbVYbC++kD8LvL4AY8ertgc9/pxQQZmogdINJmIxKN4HTlGbX8kSDLbohZLheOfzZ5ycTlrbOjfJ1EBMLo+mJcMUW0qhFySl1aamPqTeII7lvgTOE3xV/d/9VAQTFKsftWPNkfhAJIym51bYrrMPV8AVeFQnLhSid3d3zK4w20zIQKSYnq9A8zcNhM0keddiv4XC+M=,iv:7HP7VCFpMRZXRD6GD/zFzDSBO02V/DyxKLmuDCLXTLU=,tag:Ugx81JwCP8HmhtflYoevLg==,type:str]
|
||||
nix-github-token: ENC[AES256_GCM,data:AXV0ODLhfa4M6+7clulfIKm0qCOeo3lQ+66iYgoDeR12RxZOV19UtA==,iv:1XECVKyzH3NumKwRSPKNlUwJMLFwptcG8DQ09U4LrGk=,tag:QdtvJNV8BttWjhH4v0RtRQ==,type:str]
|
||||
docker-password: ENC[AES256_GCM,data:mK5YWEQPKWBtVCgRBZvwWTdVAi8MEGbLnLeP7hfDkcc=,iv:Az8+eAK6R6xssmmbhuEsDbLU+ks8lS+qzc4L33WfefA=,tag:NSXvRhbIuRZZqRR28Tu0PQ==,type:str]
|
||||
jellyfin-password: ENC[AES256_GCM,data:ugfwgpkIiLY0O+m/UGnBB5AFPBkCcai+RQOkxiCSohE=,iv:VP+Jyv2lUIBz1dFow038uN0KT+tQKK9uGr7/T5crlgk=,tag:rPGPpaqZApfHkecLBSs4Yw==,type:str]
|
||||
#
|
||||
#ENC[AES256_GCM,data:y5dlZFhK38dR+Q==,iv:1JYizUeyWeMR4KUblkj7kVSHPCL5l8mFpaQdo774BcM=,tag:kUTnBZb46KYQyi8bgIYSOQ==,type:comment]
|
||||
#
|
||||
@ -18,6 +19,8 @@ kopia-server-username: ENC[AES256_GCM,data:4onewFkWpi9g,iv:aA4WSS8T6KUcGbAIHDd8B
|
||||
kopia-server-password: ENC[AES256_GCM,data:6nMnhRA=,iv:Qz9qP+m0obzL+eHFmW1qVmc/0TR4Iw4X1GL4zACOSMk=,tag:v3v+33+g4y6se5q+b4e8mA==,type:str]
|
||||
kopia-user-password: ENC[AES256_GCM,data:jPWeru4e2w9qzA==,iv:WpZS3Qmx8v12v3q1Lq1YrPnWw7BY0FhxurXYuaOdfwA=,tag:+8bQAnHRh55rUMdyoK6N8w==,type:str]
|
||||
paperless-nextcloud-sync-password: ENC[AES256_GCM,data:pfLg3OVBqLsM4R7mSgLQEachj9gMkexPjBMSyzU=,iv:XBe1cdwlTjPfQW70NIEjD8CikK58iGErI9ZTlLWtCA4=,tag:qO35GdjljgS3/z5/1fCOFg==,type:str]
|
||||
ntfy-auth-users: ENC[AES256_GCM,data:IHnJJgUL9RqkEAoJ2Q9Oo0RkfgLXG7vih5NFPrPNBoIzMafdLXxHqNOAd1oRaOUd6AKmWdQ3uKAZINj7oGZEKMsMxUEv1WW6IXUuPnDeJe5EthINWCuaW2Z64PJl+uqgnWr4wDi7QT0zwjb/oL3gYfjH1xtfMadTzkWbmnxQ9jlP/nXe9JR1/oCrHv3dio5uU017cA==,iv:JmWnu25ZB/qqI2RsgHQ0bcat69V7p5MJ6cf5eFcSsns=,tag:6Z2LseCav/qyLh2nn+7uuw==,type:str]
|
||||
ntfy-auth-tokens: ENC[AES256_GCM,data:C23r9djvEukUgDDloFGm52spwcW1DB5Jcwt9kxghLjL3vNiQ9HzGrvlSl5oEppoNa23BF0+t,iv:O9LepUKGbyXTHMvwn1avdJEhcMgtr2Sb1imIJ8ALMYY=,tag:o3g6f7YZL2VfgfeymzJK1g==,type:str]
|
||||
#
|
||||
#ENC[AES256_GCM,data:Gdh/hjCaOuAE,iv:XjPXn3SskpUPUkDIEDl5701/g9QhuS83fACMaoPMiIM=,tag:Q7s8xZG/GsOtQrasekBnkQ==,type:comment]
|
||||
#
|
||||
@ -33,7 +36,7 @@ sops:
|
||||
SURMTmh1TGIrRmtENzc0Sk4rNFJNUE0KOpjN6jkEHO+lvdWdp4P++r9SNSPWaT0h
|
||||
FAbbvZZ/EdIk/njLEcayFN7B4ftTcD/f4XJZiyosilZnIkk76bMOHA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2025-07-19T01:29:00Z"
|
||||
mac: ENC[AES256_GCM,data:IzLYRuOlkUpry37sw7OB5MglntVflMjCcNiWpi7rvT2suOivLX9IT36qZFfYIbVIFXDmfsi1hsTvsPyekD7vVWQ1vkajAlGQYYTVpnO2cFrK3+TfWCyYjiD01rQBiRikybrR11zWRq6atieurDIxMUMEI7ypiqFOwpYaqSePAFc=,iv:9bc6rc4gjuiJWNjg1g0KfySqxnPjpzmlzDi/R+Iv2g4=,tag:tEwthVZAmdXbwRtoNykGrQ==,type:str]
|
||||
lastmodified: "2026-04-17T12:17:23Z"
|
||||
mac: ENC[AES256_GCM,data:YEHM2ebPhV6ycj8OxNy7mOlpy6VrvV6Gz9sHEWc9alnrwZ0qLzp5m4AUMuWBSfFTMtVgeAFdJ8Nf4X5b+AzQXahlHWJVAwiMiE8KqhRLGWF21OyDN2aIdwd4ue2vYyPDGYP43mC+19v9SW5isF901G28e5Q9SxmGJjNOkiVuiCI=,iv:WFvCN/7YGQnCSqjXBkkfiuPoNQ37bpxHx9jreZDc3EM=,tag:AUjFpbJ6//eScnn6P2QMgA==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.10.2
|
||||
version: 3.12.2
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 MiB |
BIN
wallpapers/Moon_1.jpg
(Stored with Git LFS)
Normal file
BIN
wallpapers/Moon_1.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
wallpapers/Moon_2.jpg
(Stored with Git LFS)
Normal file
BIN
wallpapers/Moon_2.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
wallpapers/Moon_3.jpg
(Stored with Git LFS)
Normal file
BIN
wallpapers/Moon_3.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
wallpapers/Moon_4.jpg
(Stored with Git LFS)
Normal file
BIN
wallpapers/Moon_4.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
wallpapers/Moon_5.jpg
(Stored with Git LFS)
Normal file
BIN
wallpapers/Moon_5.jpg
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
wallpapers/NASA.jpg
(Stored with Git LFS)
BIN
wallpapers/NASA.jpg
(Stored with Git LFS)
Binary file not shown.
BIN
wallpapers/Windows_1.jpg
(Stored with Git LFS)
BIN
wallpapers/Windows_1.jpg
(Stored with Git LFS)
Binary file not shown.
Reference in New Issue
Block a user