christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

base: christoph:master
Branches Tags
christoph:master
..
compare: christoph:c90e685808526bc4e65b0cb98849749485f8db82
Branches Tags
christoph:master

1 Commits
master ... c90e685808

Author SHA1 Message Date
Christoph Urlacher
c90e685808 Home: Extract common nixos/darwin packages/programs/module-configs into terminal+packages modules 2026-03-24 11:57:05 +01:00
55 changed files with 438 additions and 1216 deletions
Expand all files Collapse all files

63
config/flake.nix
View File

@ -98,65 +98,38 @@ rec {
buildDebug = mkBuildScript "Debug"; buildDebug = mkBuildScript "Debug";
buildRelease = mkBuildScript "Release"; buildRelease = mkBuildScript "Release";
# Add project-local fish abbrs here # Use this to specify commands that should be ran after entering fish shell
abbrs = { 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)
# Rust Bevy: # Rust Bevy:
# build-release-windows = "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"; # abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
# C/C++: # C/C++:
# cmake-debug = "${cmakeDebug}"; # abbr -a cmake-debug "${cmakeDebug}"
# cmake-release = "${cmakeRelease}"; # abbr -a cmake-release "${cmakeRelease}"
# build-debug = "${buildDebug}"; # abbr -a build-debug "${buildDebug}"
# build-release = "${buildRelease}"; # abbr -a build-release "${buildRelease}"
# Clojure: # Clojure:
# clojure-deps = "deps-lock --lein"; # abbr -a clojure-deps "deps-lock --lein"
# Python: # Python:
# run = "python ./app/main.py"; # abbr -a run "python ./app/main.py"
# profile = "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"; # abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
# ptop = "py-spy top -- python ./app/main.py"; # abbr -a 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 in
builtins.concatStringsSep "\n" [ builtins.concatStringsSep "\n" [
# Launch into pure fish shell # Launch into pure fish shell
'' ''
# Determine the project root, used e.g. in cmake scripts exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
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 (direnv incompatible) # Qt: Launch into wrapped fish shell
# https://nixos.org/manual/nixpkgs/stable/#sec-language-qt # https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
# '' # ''
# fishdir=$(mktemp -d) # fishdir=$(mktemp -d)

20
config/navi/christoph.cheat
View File

@ -238,11 +238,11 @@ $ mode: echo -e "--export \tExport public key\n--export-secret-keys\t
% sops % sops
# Edit secrets.yaml # Edit secrets.yaml
sops ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml sops ~/NixFlake/system/modules/sops-nix/secrets.yaml
% sops % sops
# Rekey secrets.yaml # Rekey secrets.yaml
sops updatekeys ~/NixFlake/system/systemmodules/sops-nix/secrets.yaml sops updatekeys ~/NixFlake/system/modules/sops-nix/secrets.yaml
% ssh % ssh
# Generate a new SSH key # Generate a new SSH key
@ -308,33 +308,27 @@ mkdir -p "<name>" && cd "<name>" && spotdl --client-id (cat /home/christoph/.sec
% ffmpeg % ffmpeg
# Create a slow motion version of a video with interpolated/blended frames # 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 $ input: eza -f -1
% ffmpeg % ffmpeg
# Detect black bar dimensions automatically by looking at the first 10 frames # 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 $ input: eza -f -1
% ffmpeg % ffmpeg
# Preview video with applied crop settings # 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 $ input: eza -f -1
% ffmpeg % ffmpeg
# Re-encode the video with applied crop settings # 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 $ input: eza -f -1
% ffmpeg % ffmpeg
# Reencode and compress the video using the h265 codec # 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 $ input: eza -f -1
$ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n" $ quality: echo -e "24\n25\n26\n27\n28\n29\n30\n"

10
config/obsidian/css_snippets/bordered_image.css
View File

@ -1,10 +0,0 @@
.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); */
}

8
config/obsidian/css_snippets/center_image.css
View File

@ -1,5 +1,5 @@
.center-images img { img[alt*="center"] {
display: block !important; display: block;
margin-left: auto !important; margin-left: auto;
margin-right: auto !important; margin-right: auto;
} }

4
config/obsidian/css_snippets/fullwidth_image.css
View File

@ -1,4 +0,0 @@
.fullwidth-images img {
width: 100% !important;
height: auto !important;
}

5
config/obsidian/css_snippets/justify_text.css
View File

@ -1,5 +0,0 @@
.justify-text.cm-s-obsidian,
.justify-text.markdown-preview-view {
text-align: justify;
hyphens: auto;
}

347
flake.lock generated
View File

@ -1,24 +1,5 @@
{ {
"nodes": { "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": { "crane": {
"locked": { "locked": {
"lastModified": 1754269165, "lastModified": 1754269165,
@ -36,7 +17,7 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1768818222, "lastModified": 1768818222,
@ -75,15 +56,15 @@
}, },
"elephant": { "elephant": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1775706155, "lastModified": 1773079031,
"narHash": "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A=", "narHash": "sha256-RvCzINnVISBT3d0F1DoIcQFbQsbRJISW9qZeKTzmNaA=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "elephant", "repo": "elephant",
"rev": "376ee71c66db38683daabd57350bf3f6f086eaf8", "rev": "53afe39cef252010f7c55bd33c5bae6dd50dcf0c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -115,6 +96,29 @@
"type": "github" "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -161,24 +165,6 @@
} }
}, },
"flake-parts": { "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": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"lanzaboote", "lanzaboote",
@ -199,7 +185,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_3": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@ -207,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1769996383,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -220,7 +206,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nur", "nur",
@ -301,11 +287,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1776983936, "lastModified": 1772972630,
"narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +307,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777594677, "lastModified": 1773332277,
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", "narHash": "sha256-1V+wRrZD9Sw12AQBUWk9CR+XhDZQ8q6yBE0S3Wjbd1M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da", "rev": "4aeef1941f862fe3a70d1b8264b4e289358c2325",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -357,14 +343,14 @@
}, },
"hytale-launcher": { "hytale-launcher": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1777394001, "lastModified": 1773947929,
"narHash": "sha256-FNHydw2We/qvxBJ2cMNc/eGcxSZkvOXZn2WYGiH6WfE=", "narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=",
"owner": "JPyke3", "owner": "JPyke3",
"repo": "hytale-launcher-nix", "repo": "hytale-launcher-nix",
"rev": "822e54c97348a6fbc28dfac563e5bbe9fe1783b8", "rev": "a8d0a974b187f0997c03c23000dea552194edf39",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -376,7 +362,7 @@
"impermanence": { "impermanence": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1769548169,
@ -396,7 +382,7 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -426,11 +412,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776677689, "lastModified": 1773343116,
"narHash": "sha256-wzdMqyyNkEPEfuCqSTzaz3ikH3+Rm7oWILNcURNax34=", "narHash": "sha256-5wnd9z3atP264FMin5MNq4ZaOR/2SYYspFXw8cecrKA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "768d26aa3fe80949bd64f62d6c5b35455c8cb768", "rev": "6248c10a251c5f2628389b982919ba4a8125d71e",
"revCount": 140, "revCount": 139,
"type": "git", "type": "git",
"url": "https://gitea.local.chriphost.de/christoph/cpp-masssprings" "url": "https://gitea.local.chriphost.de/christoph/cpp-masssprings"
}, },
@ -442,7 +428,7 @@
"naersk": { "naersk": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1763384566, "lastModified": 1763384566,
@ -470,11 +456,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1777542749, "lastModified": 1773329386,
"narHash": "sha256-j4W+WwdiRxTTFdsoB8A7jlLNLbMQANKJxh9eKf8nOIs=", "narHash": "sha256-Xoy4j0NKRrZEAkiFxtTKTsmtUumpvjh3ievyat00eA8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "36130bc452e0a84c07761d2e176ae875b48eebf3", "rev": "815e692569fbb01701770a49ad2fe942cec7f431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +489,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1777468255, "lastModified": 1773130184,
"narHash": "sha256-lBZc1UMy+1P1T/E41j3jQrpS7EFI3qegd+ktHZdamIg=", "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "dd1c3bcb9f1ef416df33ffa22d1d9bcee1398e7d", "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,14 +506,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1776242217, "lastModified": 1771150922,
"narHash": "sha256-TRts0fKUPFcf1i6rZHFGUDTfti/x3oKEg/CqsPRpSgs=", "narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "4c5e52dda0d6ab3de814e364046769321d3e1021", "rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +529,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775037210, "lastModified": 1773000227,
"narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "06648f4902343228ce2de79f291dd5a58ee12146", "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -581,11 +567,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775970782, "lastModified": 1771130777,
"narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=", "narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "bedba5989b04614fc598af9633033b95a937933f", "rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -595,69 +581,6 @@
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1762156382, "lastModified": 1762156382,
"narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=",
@ -673,7 +596,39 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "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": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
@ -689,13 +644,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1777268161, "lastModified": 1773821835,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -705,7 +660,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1768564909, "lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@ -721,13 +676,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1771008912,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,23 +692,23 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": {
"locked": {
"lastModified": 1773122722,
"narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": { "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": { "locked": {
"lastModified": 1752077645, "lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
@ -769,13 +724,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1768564909,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,18 +742,18 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1777236345, "lastModified": 1772402258,
"narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=", "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4", "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,17 +787,17 @@
}, },
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1777624369, "lastModified": 1773339783,
"narHash": "sha256-nQOSodcDhXiKlfCKb4pE/4GBAs2FnBOD+AHVem0EqOc=", "narHash": "sha256-07iRHomuUvJ7Mmp+F7qo68xIb+y3gy0o/B7kuR1K2Qc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c3ec6b994c235a53a28304564da6422a45230603", "rev": "1a4ca0d650fbfd4c58e1b1c2b153151fec77d6b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -879,7 +834,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"comfyui-nix": "comfyui-nix",
"devshell": "devshell", "devshell": "devshell",
"disko": "disko", "disko": "disko",
"elephant": "elephant", "elephant": "elephant",
@ -893,7 +847,7 @@
"nix-alien": "nix-alien", "nix-alien": "nix-alien",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"nps": "nps", "nps": "nps",
@ -948,11 +902,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1777338324, "lastModified": 1773096132,
"narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1038,16 +992,17 @@
}, },
"textfox": { "textfox": {
"inputs": { "inputs": {
"firefox-addons": "firefox-addons",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1777451299, "lastModified": 1773044834,
"narHash": "sha256-Okqpw+zxAwHKXuuxlwYy9Ge9JUpnTbsMXqws2eOKfKo=", "narHash": "sha256-R2u3z09DuUbSoWClASPUqKXQG/QZYlBsiy8vYXrJ2VU=",
"owner": "adriankarlen", "owner": "adriankarlen",
"repo": "textfox", "repo": "textfox",
"rev": "3af57df1ed3a38eb584475fd9e032d9643f2a94d", "rev": "0b8873d30db55a94e9e0dd934405dcac5e4d8a73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1061,15 +1016,15 @@
"elephant": [ "elephant": [
"elephant" "elephant"
], ],
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_8",
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1777299395, "lastModified": 1773675699,
"narHash": "sha256-ZoLkqwPVw8SdW+f9Raf15/ttyKqmC6vtKd5R+orNN/g=", "narHash": "sha256-GrormZ2KxchtCLuO90+5fioEQmlUCKBIil0Mzr9w0Iw=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "walker", "repo": "walker",
"rev": "7b0cb0fd1f8b0a60b241081483aea4277f0b4500", "rev": "d2702235710da3d7daf55c912ca7534261cf20f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1098,11 +1053,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1773622265, "lastModified": 1772429643,
"narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "a879e5e0896a326adc79c474bf457b8b99011027", "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
flake.nix
View File

@ -78,17 +78,10 @@
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
# nix-flatpak.inputs.nixpkgs.follows = "nixpkgs"; # nix-flatpak doesn't have this # 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 # Realtime audio
# musnix.url = "github:musnix/musnix"; # musnix.url = "github:musnix/musnix";
# musnix.inputs.nixpkgs.follows = "nixpkgs"; # musnix.inputs.nixpkgs.follows = "nixpkgs";
# ComfyUI
comfyui-nix.url = "github:utensils/comfyui-nix";
# HyTale # HyTale
hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
@ -145,7 +138,7 @@
inputs.nur.overlays.default inputs.nur.overlays.default
inputs.niri.overlays.niri inputs.niri.overlays.niri
# inputs.emacs-overlay.overlay # inputs.emacs-overlay.overlay
inputs.comfyui-nix.overlays.default # inputs.comfyui-nix.overlays.default
# All my own overlays (derivations + modifications) # All my own overlays (derivations + modifications)
(import ./overlays {inherit inputs nixpkgs pkgs-stable;}) (import ./overlays {inherit inputs nixpkgs pkgs-stable;})
@ -228,9 +221,7 @@
hostname = "darwinix"; hostname = "darwinix";
username = "christoph"; username = "christoph";
headless = false; headless = false;
extraModules = [ extraModules = [];
inputs.sops-nix.darwinModules.sops
];
}; };
}; };
@ -257,7 +248,7 @@
[ [
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
# inputs.nixified-ai.nixosModules.comfyui # inputs.nixified-ai.nixosModules.comfyui
inputs.comfyui-nix.nixosModules.default # inputs.comfyui-nix.nixosModules.default
] ]
++ commonModules; ++ commonModules;
}; };

1
home/christoph/darwinix/default.nix
View File

@ -26,7 +26,6 @@
}; };
packages.enable = true; packages.enable = true;
terminal.enable = true;
}; };
home = { home = {

6
home/christoph/nixinator/default.nix
View File

@ -107,10 +107,6 @@
handbrake handbrake
teamspeak6-client teamspeak6-client
# virt-manager # use system program option
virt-viewer
gnome-boxes # doesn't list VMs imported using virsh
steam-devices-udev-rules steam-devices-udev-rules
]; ];
@ -158,8 +154,6 @@
"com.usebottles.bottles" "com.usebottles.bottles"
"io.github.lawstorant.boxflat" "io.github.lawstorant.boxflat"
"org.onlyoffice.desktopeditors"
# "com.unity.UnityHub" # "com.unity.UnityHub"
]; ];

46
home/christoph/nixtop/default.nix
View File

@ -2,32 +2,30 @@
{pkgs, ...}: { {pkgs, ...}: {
config = { config = {
homemodules = { homemodules = {
# TODO: Niri config (needs to modularize niri module) hyprland = {
keyboard = {
layout = "us";
variant = "altgr-intl";
option = "nodeadkeys";
};
# hyprland = { monitors = {
# keyboard = { "eDP-1" = {
# layout = "us"; width = 1920;
# variant = "altgr-intl"; height = 1080;
# option = "nodeadkeys"; rate = 60;
# }; x = 0;
# y = 0;
# monitors = { scale = 1;
# "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];
# };
# };
waybar.monitors = ["eDP-1"]; workspaces = {
"eDP-1" = [1 2 3 4 5 6 7 8 9];
};
};
waybar.monitor = "eDP-1";
}; };
home = { home = {

4
home/homemodules/darwin.nix
View File

@ -2,19 +2,15 @@
imports = [ imports = [
# My own HM modules # My own HM modules
./bat ./bat
./btop
./color ./color
./fastfetch ./fastfetch
./fish ./fish
./git ./git
./jellyfin-tui
./kitty ./kitty
./lazygit ./lazygit
./neovim ./neovim
./packages
./paths ./paths
./ssh ./ssh
./terminal
./tmux ./tmux
./yazi ./yazi

2
home/homemodules/default.nix
View File

@ -15,7 +15,6 @@
./firefox ./firefox
./fish ./fish
./git ./git
./jellyfin-tui
./kitty ./kitty
./lazygit ./lazygit
./mpd ./mpd
@ -39,7 +38,6 @@
inputs.nixvim.homeModules.nixvim inputs.nixvim.homeModules.nixvim
inputs.textfox.homeManagerModules.default inputs.textfox.homeManagerModules.default
inputs.walker.homeManagerModules.default inputs.walker.homeManagerModules.default
# inputs.direnv-instant.homeModules.direnv-instant
# inputs.niri.homeModules.niri # Imported by system module # inputs.niri.homeModules.niri # Imported by system module
# inputs.noctalia.homeModules.default # inputs.noctalia.homeModules.default
# inputs.caelestia.homeManagerModules.default # inputs.caelestia.homeManagerModules.default

3
home/homemodules/docs/default.nix
View File

@ -32,9 +32,6 @@ in {
"Notes/Obsidian/Chriphost/latex_snippets.json".source = ../../../config/obsidian/latex_snippets.json; # TODO: Symlink "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/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/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;
}; };
}; };
}; };

6
home/homemodules/firefox/bookmarks.nix
View File

@ -103,9 +103,9 @@ in [
(mkBm "Heise" "https://www.heise.de/") (mkBm "Heise" "https://www.heise.de/")
(mkBm "HN" "https://news.ycombinator.com/news") (mkBm "HN" "https://news.ycombinator.com/news")
(mkBm "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/") (mkBm "Reddit" "https://www.reddit.com/user/FightingMushroom/saved/")
# (mkBm "F10" "https://f10.local.chriphost.de/race/Everyone") (mkBm "F10" "https://f10.local.chriphost.de/race/Everyone")
(mkBm "F12" "https://f12.local.chriphost.gay/racepicks") (mkBm "F11" "https://f11.local.chriphost.de/racepicks")
(mkBm "F12PB" "https://f12pb.local.chriphost.de/_/") (mkBm "F11PB" "https://f11pb.local.chriphost.de/_/#/collections?collection=pbc_1736455494&filter=&sort=-%40rowid")
(mkBm "ISBNDB" "https://isbndb.com/") (mkBm "ISBNDB" "https://isbndb.com/")
(mkBm "Music" "https://bandcamp.com/chriphost") (mkBm "Music" "https://bandcamp.com/chriphost")
(mkBm "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/") (mkBm "Albums" "https://www.albumoftheyear.org/user/chriphost/list/307966/2025/")

2
home/homemodules/firefox/default.nix
View File

@ -86,8 +86,6 @@ in {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
configPath = "${config.xdg.configHome}/mozilla/firefox";
# firefox-unwrapped is the pure firefox browser, wrapFirefox adds configuration ontop # firefox-unwrapped is the pure firefox browser, wrapFirefox adds configuration ontop
package = pkgs.wrapFirefox pkgs.firefox-unwrapped { package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
# About policies: https://github.com/mozilla/policy-templates#enterprisepoliciesenabled # About policies: https://github.com/mozilla/policy-templates#enterprisepoliciesenabled

41
home/homemodules/fish/default.nix
View File

@ -84,50 +84,9 @@ in {
(lib.mkIf pkgs.stdenv.isLinux { (lib.mkIf pkgs.stdenv.isLinux {
generateCompletions = nixosConfig.programs.fish.generateCompletions; 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 = '' shellInit = ''
set fish_greeting set fish_greeting
yes | fish_config theme save "system-theme" 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 [ functions = lib.mergeAttrsList [

91
home/homemodules/jellyfin-tui/default.nix
View File

@ -1,91 +0,0 @@
{
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
View File

@ -1,7 +0,0 @@
{
lib,
mylib,
...
}: {
enable = lib.mkEnableOption "Enable jellyfin-tui";
}

5
home/homemodules/kitty/default.nix
View File

@ -31,8 +31,8 @@ in {
settings = lib.mkMerge [ settings = lib.mkMerge [
# Linux config # Linux config
(lib.mkIf pkgs.stdenv.isLinux { (lib.mkIf pkgs.stdenv.isLinux {
allow_remote_control = true; # For nnn file preview or nvim scrollback allow_remote_control = "yes"; # For nnn file preview or nvim scrollback
listen_on = lib.mkDefault "unix:@mykitty"; # This conflicts with direnv-instant listen_on = "unix:@mykitty";
}) })
# Common config # Common config
@ -42,7 +42,6 @@ in {
window_padding_width = 10; # Looks stupid with editors if bg doesn't match window_padding_width = 10; # Looks stupid with editors if bg doesn't match
# hide_window_decorations = "yes"; # hide_window_decorations = "yes";
enabled_layouts = "grid,vertical,horizontal"; enabled_layouts = "grid,vertical,horizontal";
cursor_trail = 3;
tab_bar_min_tabs = 2; # Don't show a single tab tab_bar_min_tabs = 2; # Don't show a single tab
tab_bar_edge = "bottom"; tab_bar_edge = "bottom";

82
home/homemodules/neovim/default.nix
View File

@ -30,59 +30,54 @@ in {
(lib.optionals (!headless) [ (lib.optionals (!headless) [
# Language servers # Language servers
autotools-language-server
basedpyright
clang-tools clang-tools
clojure-lsp clojure-lsp
cmake-language-server cmake-language-server
haskell-language-server haskell-language-server
jdt-language-server jdt-language-server
just-lsp
ltex-ls # TODO: Only enable on-demand ltex-ls # TODO: Only enable on-demand
lua-language-server lua-language-server
# nil # nil
# perl5Packages.PLS basedpyright
perlnavigator
pyrefly pyrefly
# rPackages.languageserver ty
rust-analyzer rust-analyzer
svelte-language-server svelte-language-server
tailwindcss-language-server tailwindcss-language-server
tex-fmt tex-fmt
texlab texlab
tinymist tinymist
ty
typescript typescript
vscode-langservers-extracted # includes nodejs vscode-langservers-extracted # includes nodejs
autotools-language-server
just-lsp
# Linters # Linters
checkstyle # java checkstyle # java
clippy # rust clippy # rust
clj-kondo # clojure clj-kondo # clojure
eslint_d # javascript eslint_d # javascript
# python313Packages.ruff python313Packages.ruff
# python313Packages.flake8 python313Packages.flake8
# python313Packages.pylint python313Packages.pylint
lua54Packages.luacheck lua54Packages.luacheck
vale # text vale # text
# statix # nix (doesn't recognize pipe operator) # statix # nix (doesn't recognize pipe operator)
# Formatters # Formatters
air-formatter
cljfmt cljfmt
python313Packages.black
google-java-format google-java-format
html-tidy html-tidy
jq # json jq # json
just-formatter
mbake
# nodePackages_latest.prettier # Use local install as plugins change per project
# perl5Packages.PerlTidy
# prettierd # Use prettier instead because of plugins # prettierd # Use prettier instead because of plugins
# python313Packages.black # nodePackages_latest.prettier # Use local install as plugins change per project
rustfmt rustfmt
stylua stylua
tombi
typstyle typstyle
mbake
just-formatter
tombi
]) ])
[ [
@ -92,48 +87,6 @@ in {
lua54Packages.jsregexp # For tree-sitter lua54Packages.jsregexp # For tree-sitter
# nodejs_latest # 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 nixd
alejandra # nix alejandra # nix
] ]
@ -570,10 +523,8 @@ in {
make = ["bake"]; make = ["bake"];
markdown = ["prettierd" "prettier"]; markdown = ["prettierd" "prettier"];
nix = ["alejandra"]; nix = ["alejandra"];
perl = ["perltidy"];
python = ["black"]; python = ["black"];
qml = ["qmlformat"]; qml = ["qmlformat"];
r = ["air"];
rust = ["rustfmt"]; rust = ["rustfmt"];
svelte = ["prettierd" "prettier"]; svelte = ["prettierd" "prettier"];
toml = ["tombi"]; toml = ["tombi"];
@ -909,8 +860,9 @@ in {
dependencies = [_lazydev]; dependencies = [_lazydev];
config = let config = let
servers = mylib.generators.toLuaObject [ servers = mylib.generators.toLuaObject [
{name = "autotools-language-server";}
{name = "basedpyright";} {name = "basedpyright";}
# {name = "pyrefly";} # TODO: Config
# {name = "ty";} # TODO: Config
{ {
name = "clangd"; name = "clangd";
extraOptions = { extraOptions = {
@ -962,6 +914,7 @@ in {
}; };
}; };
} }
{name = "autotools-language-server";}
# {name = "nil_ls";} # {name = "nil_ls";}
{ {
name = "nixd"; name = "nixd";
@ -1003,8 +956,6 @@ in {
}; };
}; };
} }
{name = "perlpls";}
{name = "perlnavigator";}
{ {
name = "qmlls"; name = "qmlls";
extraOptions.cmd = [ extraOptions.cmd = [
@ -1012,8 +963,6 @@ in {
"-E" # Use QML_IMPORT_PATH env variable "-E" # Use QML_IMPORT_PATH env variable
]; ];
} }
# {name = "pyrefly";} # TODO: Config
{name = "r_language_server";}
{name = "svelte";} {name = "svelte";}
{name = "tailwindcss";} {name = "tailwindcss";}
{name = "texlab";} {name = "texlab";}
@ -1025,7 +974,6 @@ in {
semanticTokens = "disable"; semanticTokens = "disable";
}; };
} }
# {name = "ty";} # TODO: Config
# {name = "jdtls";} # Don't set up when using nvim-jdtls # {name = "jdtls";} # Don't set up when using nvim-jdtls
# {name = "rust_analyzer";} # Don't set up when using rustaceanvim # {name = "rust_analyzer";} # Don't set up when using rustaceanvim

13
home/homemodules/neovim/extraConfigLua.lua
View File

@ -66,16 +66,3 @@ local rmpc =
vim.g.toggle_rmpc = function() vim.g.toggle_rmpc = function()
rmpc:toggle() rmpc:toggle()
end 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

7
home/homemodules/neovim/mappings.nix
View File

@ -340,13 +340,6 @@ _: let
action = "<cmd>lua vim.g.toggle_rmpc()<cr>"; # Defined in extraConfigLua.lua action = "<cmd>lua vim.g.toggle_rmpc()<cr>"; # Defined in extraConfigLua.lua
options.desc = "Show Rmpc"; 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"; mode = "n";
key = "<leader>i"; key = "<leader>i";

271
home/homemodules/niri/default.nix
View File

@ -19,43 +19,30 @@ in {
} }
]; ];
gtk = let gtk = {
gtkConfig = { enable = true;
enable = true; iconTheme.package = color.iconPackage;
iconTheme.name = color.iconTheme;
colorScheme = "dark"; colorScheme = "dark";
gtk3.colorScheme = "dark";
gtk4.colorScheme = "dark";
iconTheme = { theme = {
package = color.iconPackage; # name = "adw-gtk3-dark";
name = color.iconTheme; # package = pkgs.adw-gtk3;
}; name = "catppuccin-mocha-mauve-standard";
package = pkgs.catppuccin-gtk.override {
cursorTheme = { variant = "mocha";
name = color.cursor; accents = ["mauve"];
package = color.cursorPackage; size = "standard";
};
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";
};
}; };
}; };
gtkExtraConfig = { gtk3.extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
}; };
in };
gtkConfig
// {
gtk3 = gtkConfig // {extraConfig = gtkExtraConfig;};
gtk4 = gtkConfig // {extraConfig = gtkExtraConfig;};
};
dconf = { dconf = {
enable = true; enable = true;
@ -143,9 +130,8 @@ in {
xwayland-satellite xwayland-satellite
# ncpamixer # Audio control # ncpamixer # Audio control
wiremix # Audio control wiremix # Audio control
awww swww
waypaper waypaper
wtype # For elephant
# GTK apps (look good and work well with xdg portals) # GTK apps (look good and work well with xdg portals)
nautilus # Fallback file chooser used by xdg-desktop-portal-gnome nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
@ -209,10 +195,6 @@ in {
default = ["desktopapplications"]; default = ["desktopapplications"];
}; };
empty = ["desktopapplications"]; empty = ["desktopapplications"];
selection_wrap = true;
hide_quick_activation = true;
actions_as_menu = true;
}; };
themes."cattpuccin-mocha" = let themes."cattpuccin-mocha" = let
@ -581,45 +563,15 @@ in {
# opacity = 0.8; # opacity = 0.8;
} }
# Floating + unmaximized windows
{
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 # Rules for specific windows
{
matches = [{app-id = "Zotero";}];
open-on-workspace = "2";
}
{ {
matches = [{app-id = "neovide";}]; matches = [{app-id = "neovide";}];
open-on-workspace = "2"; open-on-workspace = "2";
open-maximized = true; open-maximized = true;
open-focused = true;
} }
{ {
matches = [{app-id = "jetbrains-clion";}]; matches = [{app-id = "jetbrains-clion";}];
@ -632,21 +584,8 @@ in {
open-floating = true; open-floating = true;
} }
{ {
matches = [ matches = [{app-id = "obsidian";}];
{
app-id = "electron";
title = ".*Chriphost - Obsidian.*";
}
];
open-on-workspace = "3"; 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";}]; matches = [{app-id = "firefox";}];
@ -675,12 +614,6 @@ in {
open-floating = true; open-floating = true;
open-maximized = true; open-maximized = true;
} }
{
matches = [{app-id = "factorio";}];
open-on-workspace = "6";
# open-floating = true;
open-maximized = true;
}
{ {
matches = [{app-id = "signal";}]; matches = [{app-id = "signal";}];
open-on-workspace = "7"; open-on-workspace = "7";
@ -711,112 +644,8 @@ in {
}; };
# TODO: Move values to config option and set in home/christoph/niri.nix # TODO: Move values to config option and set in home/christoph/niri.nix
binds = with config.lib.niri.actions; let binds = with config.lib.niri.actions; {
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 # 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" = { "Mod+T" = {
action = spawn "kitty"; action = spawn "kitty";
hotkey-overlay = {title = "Spawn Kitty.";}; hotkey-overlay = {title = "Spawn Kitty.";};
@ -849,24 +678,52 @@ in {
action = spawn "neovide" "${config.paths.dotfiles}/flake.nix"; action = spawn "neovide" "${config.paths.dotfiles}/flake.nix";
hotkey-overlay = {title = "Edit the NixFlake.";}; 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 # Screenshots
"Mod+S" = { "Mod+S" = {
action.screenshot-window = { action.screenshot-window = {write-to-disk = true;};
write-to-disk = true;
show-pointer = false;
};
hotkey-overlay = {title = "Take a screenshot of the current window.";}; 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" = { "Mod+Shift+S" = {
action.screenshot = {show-pointer = false;}; action.screenshot = {show-pointer = true;};
hotkey-overlay = {title = "Take a screenshot of a region.";}; hotkey-overlay = {title = "Take a screenshot of a region.";};
}; };

56
home/homemodules/packages/default.nix
View File

@ -13,7 +13,6 @@ in {
options.homemodules.packages = import ./options.nix {inherit lib mylib;}; options.homemodules.packages = import ./options.nix {inherit lib mylib;};
config = lib.mkIf packages.enable { config = lib.mkIf packages.enable {
# TODO: Add extra packages option and use that from host-specific configs
home.packages = with pkgs; home.packages = with pkgs;
lib.mkMerge [ lib.mkMerge [
# Common packages # Common packages
@ -37,8 +36,6 @@ in {
unzip # Unzip stuff unzip # Unzip stuff
progress # Find coreutils processes and show their progress progress # Find coreutils processes and show their progress
tokei # Text file statistics in a project tokei # Text file statistics in a project
ttyper
wiki-tui
# Nix # Nix
nix-search-tv # Search nixpkgs, nur, nixos options and homemanager options nix-search-tv # Search nixpkgs, nur, nixos options and homemanager options
@ -65,8 +62,6 @@ in {
rclone # Rsync for cloud rclone # Rsync for cloud
httpie # Cool http client httpie # Cool http client
speedtest-cli speedtest-cli
bandwhich
snitch
# Use NixCommunity binary cache # Use NixCommunity binary cache
cachix cachix
@ -75,9 +70,7 @@ in {
# Common !headless packages # Common !headless packages
(lib.optionals (!headless) [ (lib.optionals (!headless) [
ripdrag # drag & drop from terminal ripdrag # drag & drop from terminal
# jellyfin-tui # Use module jellyfin-tui
inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
]) ])
# Linux exclusive packages # Linux exclusive packages
@ -85,7 +78,7 @@ in {
pastel # Color tools pastel # Color tools
nvd # Nix rebuild diff nvd # Nix rebuild diff
nurl # Generate nix fetcher sections based on URLs nurl # Generate nix fetcher sections based on URLs
# python313 # Nicer scripting than bash python313 # Nicer scripting than bash
lazyjournal # Journalctl viewer lazyjournal # Journalctl viewer
systemctl-tui systemctl-tui
restic # Backups restic # Backups
@ -95,7 +88,6 @@ in {
jujutsu # git-like vcs jujutsu # git-like vcs
lurk # strace analysis lurk # strace analysis
radare2 radare2
disktui
# Hardware/Software info # Hardware/Software info
pciutils # lspci pciutils # lspci
@ -136,29 +128,34 @@ in {
# Linux exclusive packages (!headless) # Linux exclusive packages (!headless)
(lib.optionals (pkgs.stdenv.isLinux && (!headless)) [ (lib.optionals (pkgs.stdenv.isLinux && (!headless)) [
veracrypt
wl-clipboard wl-clipboard
# Proton # Proton
proton-vpn protonvpn-gui
protonmail-bridge-gui protonmail-bridge-gui
# GUI stuff # GUI stuff
nautilus # Just in case
signal-desktop signal-desktop
anki anki
font-manager # Previews fonts, but doesn't set them
nextcloud-client nextcloud-client
keepassxc keepassxc
thunderbird # TODO: Email module thunderbird # TODO: Email module
obsidian obsidian
zotero zotero
zeal # docs browser zeal # docs browser
# helvum # unmaintained
crosspipe
vlc vlc
audacity audacity
# ferdium ferdium
gparted
# feishin # electron :( # feishin # electron :(
jellyfin-tui
playerctl # Media player control playerctl # Media player control
czkawka-full # file deduplicator czkawka-full # file deduplicator
binaryninja-free # reverse engineering
tableplus # database explorer
# Office # Office
kdePackages.wacomtablet # For xournalpp/krita kdePackages.wacomtablet # For xournalpp/krita
@ -167,19 +164,7 @@ in {
hunspellDicts.en_US hunspellDicts.en_US
hunspellDicts.de_DE hunspellDicts.de_DE
# GTK-Apps inputs.masssprings.packages.${stdenv.hostPlatform.system}.default
# 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 # Darwin exclusive packages
@ -189,13 +174,8 @@ in {
# discord # discord
# obsidian # obsidian
# nextcloud-client # nextcloud-client
# proton-vpn # protonvpn-gui
# iina # iina
# TODO: Update the docs module to be darwinix compatible
# - The filepaths need to be adapted
texliveFull
typst
]) ])
]; ];
@ -206,19 +186,9 @@ in {
direnv = { direnv = {
enable = true; enable = true;
enableFishIntegration = true;
silent = true;
nix-direnv.enable = true; nix-direnv.enable = true;
}; };
# This replaces the normal direnv.enableFishIntegration.
# direnv-instant = {
# enable = true;
# enableFishIntegration = true;
# enableKittyIntegration = true;
# settings.use_cache = true;
# };
eza = { eza = {
enable = true; enable = true;
enableFishIntegration = config.homemodules.fish.enable; enableFishIntegration = config.homemodules.fish.enable;

5
home/homemodules/ssh/default.nix
View File

@ -18,10 +18,7 @@ in {
matchBlocks = { matchBlocks = {
"*" = { "*" = {
forwardAgent = false; forwardAgent = false;
addKeysToAgent = addKeysToAgent = "no";
if pkgs.stdenv.isLinux
then "no"
else "yes"; # Don't have keychain on darwin
compression = true; compression = true;
serverAliveInterval = 0; serverAliveInterval = 0;
serverAliveCountMax = 3; serverAliveCountMax = 3;

1
home/homemodules/terminal/default.nix
View File

@ -26,7 +26,6 @@ in {
signCommits = true; signCommits = true;
}; };
jellyfin-tui.enable = true;
kitty.enable = true; kitty.enable = true;
lazygit.enable = true; lazygit.enable = true;

5
home/homemodules/yazi/default.nix
View File

@ -85,11 +85,6 @@ in {
run = ''xdg-open "$@"''; run = ''xdg-open "$@"'';
desc = "Open selection"; desc = "Open selection";
} }
{
# TODO: For some reason, junction does not exit after choosing an application...
run = ''junction "$@"'';
desc = "Open selection in chosen application";
}
]; ];
extract = [ extract = [
{ {

44
lib/nixos.nix
View File

@ -9,42 +9,14 @@
mkCommonNixSettings = username: { mkCommonNixSettings = username: {
enable = true; enable = true;
package = pkgs.nixVersions.stable; package = pkgs.nixVersions.stable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes pipe-operators experimental-features = nix-command flakes pipe-operators
''; '';
settings.trusted-users = ["root" username];
settings = { gc.automatic = false;
trusted-users = ["root" username]; gc.options = "--delete-older-than 5d";
auto-optimise-store = true; settings.auto-optimise-store = true;
optimise.automatic = true;
download-buffer-size = 524288000; # 500MB
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; registry = lib.mapAttrs' (n: v: lib.nameValuePair n {flake = v;}) inputs;
nixPath = [ nixPath = [
"nixpkgs=${inputs.nixpkgs.outPath}" "nixpkgs=${inputs.nixpkgs.outPath}"
@ -77,6 +49,7 @@
# Import the toplevel system configuration module. # Import the toplevel system configuration module.
../system ../system
../system/cachix.nix
# Host specific configuration # Host specific configuration
../system/${hostname} ../system/${hostname}
@ -150,11 +123,14 @@
# to allow installation of unfree software and my own overlays. # to allow installation of unfree software and my own overlays.
{nixpkgs.pkgs = pkgs;} {nixpkgs.pkgs = pkgs;}
# Import the toplevel system configuration module.
../system/cachix.nix
# Host specific configuration # Host specific configuration
../system/${hostname} ../system/${hostname}
# Import all of my custom system modules # Import all of my custom system modules
../system/systemmodules/darwin.nix # ../system/systemmodules # TODO:
] ]
extraModules extraModules

197
lib/rofi.nix
View File

@ -3,164 +3,79 @@
pkgs, pkgs,
lib, lib,
... ...
}: { }: rec {
# Receives attrs like: # Receives attrs like:
# { # {
# "Poweroff" = "poweroff"; # "Poweroff" = "poweroff";
# "Reload Hyprland" = "hyprctl reload"; # "Reload Hyprland" = "hyprctl reload";
# } # }
# mkSimpleMenu = let mkSimpleMenu = let
# # Makes a string like ''"Poweroff" "Reload Hyprland"'' # Makes a string like ''"Poweroff" "Reload Hyprland"''
# unpack-options = attrs: "\"${lib.concatStringsSep "\" \"" (builtins.attrNames attrs)}\""; 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
# '';
# Rofi/Dmenu menu generator. mkCase = option: action: "else if test \"${option}\" = $OPTION\n set ACTION \"${action}\"";
#
# 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;
escStr = s: builtins.replaceStrings [''"'' "\\"] [''\"'' "\\\\"] s; 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
layerPrompt = i: # OPTIONS contains all possible values Rofi will display
if i < builtins.length prompts set OPTIONS ${unpack-options attrs}
then lib.elemAt prompts i
else prompt;
# Static layer: attrset of label -> value # We choose a single OPTION using Rofi
# Displays labels in rofi; maps selected label to its value -> $OPTIONi set OPTION (echo -e (string join "\n" $OPTIONS) | ${command})
mkStaticLayer = i: attrs: let
lp = layerPrompt i; # Check if the chosen OPTION is a valid choice from OPTIONS
labels = builtins.attrNames attrs; if not contains $OPTION $OPTIONS
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 exit
end end
# Set a command to execute based on the chosen OPTION
if false if false
exit exit # Easier to generate with this
${casesStr} ${cases attrs}
else else
exit exit
end end
# Execute the command
eval $ACTION
''; '';
};
# Dynamic layer: shell command string whose output is piped to rofi # TODO: I want to generate the containers menu using the actionsA and actionsB attrs:
# Selected text -> $OPTIONi; may reference earlier $OPTIONn variables # - actionsA will be generated from the stuff in oci-containers.containers
mkDynamicLayer = i: cmd: let # - actionsB will be set statically for start, stop, status
lp = layerPrompt i;
in {
script = ''
set OPTION${toString i} (${cmd} | ${rofiCmd} -p "${lp}")
if test -z $OPTION${toString i}
exit
end
'';
};
mkLayer = i: layer: # Receives attrs like:
if isStaticLayer layer # {
then mkStaticLayer i layer # optionA = "exa -1 -D ~/Notes/TU";
else if isDynamicLayer layer # optionB = "exa -1 -D ~/Notes/TU/$OPTIONA/Lecture | grep \".pdf\"";
then mkDynamicLayer i layer # commandB = "xdg-open ~/Notes/TU/$OPTIONA/Lecture/$OPTIONB";
else throw "mkMenu: layer ${toString i} has invalid type"; # }
#
layerResults = lib.imap0 mkLayer layers; # Map with 0-based index # Keys:
layerScripts = map (r: r.script) layerResults; # - optionA, optionB # Command that generates Rofi options:
lastLayer = lib.last layers; # exa -1 -D ~/Notes/TU
# cat /etc/rofi-vpns
finalCmd = # - commandA, commandB # Action to execute after sth. was chosen (mutually excl. with command)
if command != null # - actionsA, actionsB # Configure actions by lookup (mutually excl. with command):
then command # actionsB = {"status" = "systemctl status..."}
else if isStaticLayer lastLayer # - colorA, colorB # Configure highlighting conditions:
then "$OPTION${toString (builtins.length layers - 1)}" # colorA = {"red" = "systemctl ... | grep ..."};
else throw "mkMenu: 'command' must be set when the last layer is not a static attrset"; #
# 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
in in
pkgs.writeScriptBin "rofi-menu-${prompt}" '' prompt: attrs: "";
#! ${pkgs.fish}/bin/fish
${lib.concatStringsSep "\n" layerScripts}
eval "${finalCmd}"
'';
} }

16
system/cachix.nix Normal file
View File

@ -0,0 +1,16 @@
# 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/"];
}

14
system/cachix/nix-community.nix Normal file
View File

@ -0,0 +1,14 @@
{
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="
];
};
}

29
system/darwinix/default.nix
View File

@ -10,19 +10,6 @@
hostname, 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; nix = mylib.nixos.mkCommonNixSettings username;
networking = { networking = {
@ -88,13 +75,10 @@
}; };
users.users.${username} = { users.users.${username} = {
name = "${username}";
description = "Christoph";
uid = 501;
gid = 20;
createHome = false;
home = "/Users/${username}";
isHidden = false; isHidden = false;
description = "Christoph";
home = "/Users/${username}";
createHome = false;
# NOTE: Not set if the user already exists on darwin, so use chsh for the root user # NOTE: Not set if the user already exists on darwin, so use chsh for the root user
shell = pkgs.fish; shell = pkgs.fish;
@ -141,10 +125,6 @@
upgrade = true; upgrade = true;
}; };
# taps = [
# "homebrew-zathura/zathura"
# ];
brews = []; brews = [];
casks = [ casks = [
@ -155,9 +135,6 @@
"obsidian" "obsidian"
"protonvpn" "protonvpn"
"signal" "signal"
# "zathura"
# "zathura-pdf-mupdf"
"zotero"
]; ];
}; };

4
system/default.nix
View File

@ -91,7 +91,6 @@ with mylib.networking; {
"ssh-private-key" "ssh-private-key"
"nix-github-token" "nix-github-token"
"docker-password" "docker-password"
"jellyfin-password"
]; ];
}; };
@ -144,7 +143,7 @@ with mylib.networking; {
documentation = { documentation = {
# NOTE: Disable this while configuring stuff, it's slow # NOTE: Disable this while configuring stuff, it's slow
enable = false; enable = true;
man.enable = config.documentation.enable; man.enable = config.documentation.enable;
man.cache.enable = true; # Slow but needed for neovim man picker man.cache.enable = true; # Slow but needed for neovim man picker
info.enable = config.documentation.enable; info.enable = config.documentation.enable;
@ -235,7 +234,6 @@ with mylib.networking; {
description = "Christoph"; description = "Christoph";
group = "users"; group = "users";
uid = 1000; uid = 1000;
home = "/home/${username}";
extraGroups = [ extraGroups = [
"networkmanager" "networkmanager"
"wheel" "wheel"

26
system/nixinator/default.nix
View File

@ -12,7 +12,7 @@
./disks.nix ./disks.nix
# General services # General services
# ../services/comfyui.nix ../services/comfyui.nix
../services/fileflows-node.nix ../services/fileflows-node.nix
]; ];
@ -158,7 +158,7 @@
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_zen; # kernelPackages = pkgs.linuxPackages_zen;
# kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
# Why do I need to know if something fails during boot??? # Why do I need to know if something fails during boot???
@ -193,25 +193,7 @@
# }; # };
}; };
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 = { programs = {
ausweisapp = { ausweisapp = {
@ -223,8 +205,6 @@
enable = true; enable = true;
gdb = true; gdb = true;
}; };
virt-manager.enable = true;
}; };
services = { services = {

3
system/nixinator/disks.nix
View File

@ -82,8 +82,7 @@
}; };
"swap" = { "swap" = {
mountpoint = "/swap"; mountpoint = "/swap";
# Configured in hardware-configuration.nix swap.swapfile.size = "16G";
# swap.swapfile.size = "64G";
}; };
}; };
}; };

5
system/nixinator/hardware-configuration.nix
View File

@ -131,9 +131,8 @@
swapDevices = [ swapDevices = [
{ {
device = "/swap/swapfile"; device = "/var/swap";
size = 1024 * 64; # Without hibernation 4.0 GB to 0.5 x RAM size = 1024 * 16; # 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.
} }
]; ];

3
system/servenix/default.nix
View File

@ -32,7 +32,6 @@
../services/kiwix.nix ../services/kiwix.nix
../services/kopia.nix ../services/kopia.nix
../services/nextcloud.nix ../services/nextcloud.nix
../services/ntfy.nix
../services/nginx-proxy-manager.nix ../services/nginx-proxy-manager.nix
../services/paperless.nix ../services/paperless.nix
# ../services/plex.nix # Their monetization strategy is absolutely atrocious # ../services/plex.nix # Their monetization strategy is absolutely atrocious
@ -111,8 +110,6 @@
"kopia-server-password" "kopia-server-password"
"kopia-user-password" "kopia-user-password"
"paperless-nextcloud-sync-password" "paperless-nextcloud-sync-password"
"ntfy-auth-users"
"ntfy-auth-tokens"
]; ];
}; };

2
system/services/box.nix
View File

@ -5,7 +5,7 @@
pkgs, pkgs,
... ...
}: let }: let
boxVersion = "v0.31.0"; boxVersion = "v0.30.1";
in { in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
box = { box = {

37
system/services/comfyui.nix
View File

@ -6,9 +6,7 @@
... ...
}: let }: let
# comfyuiVersion = "cu128-slim-20260316"; # comfyuiVersion = "cu128-slim-20260316";
# comfyuiVersion = "cu128-megapak-20260413"; comfyuiVersion = "cu128-megapak-20260323";
# comfyuiVersion = "cu130-megapak-pt211-20260330";
comfyuiVersion = "cu130-megapak-pt211-20260413";
in { in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
comfyui = { comfyui = {
@ -26,28 +24,13 @@ in {
volumes = let volumes = let
rootDir = "/home/christoph/Games/ComfyUI"; rootDir = "/home/christoph/Games/ComfyUI";
in [ in [
# cu128-slim / cu128-megapak "${rootDir}/storage:/root"
# "${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/models:/root/ComfyUI/models"
"${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub" "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub"
"${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub" "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub"
"${rootDir}/storage-user/input:/root/ComfyUI/input" "${rootDir}/storage-user/input:/root/ComfyUI/input"
"${rootDir}/storage-user/output:/root/ComfyUI/output" "${rootDir}/storage-user/output:/root/ComfyUI/output"
"${rootDir}/storage-user/user-profile:/root/ComfyUI/user" "${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows"
"${rootDir}/storage-user/user-scripts:/root/user-scripts"
]; ];
environment = { environment = {
@ -56,15 +39,11 @@ in {
TZ = "Europe/Berlin"; TZ = "Europe/Berlin";
# https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py # https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py
CLI_ARGS = lib.concatStringsSep " " [ # --use-sage-attention # => OOM
# "--cache-none" # Leads to single nodes being executed multiple times for each output connection :/ # --lowvram
"--lowvram" # --disable-pinned-memory
"--disable-smart-memory" # --cache-none
"--disable-pinned-memory" # CLI_ARGS = "--use-sage-attention";
"--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 = [ extraOptions = [

79
system/services/ntfy.nix
View File

@ -1,79 +0,0 @@
{
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
system/services/teamspeak.nix
View File

@ -5,7 +5,7 @@
pkgs, pkgs,
... ...
}: let }: let
teamspeakVersion = "v6.0.0-beta8"; teamspeakVersion = "v6.0.0-beta7";
in { in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
teamspeak = { teamspeak = {
@ -24,8 +24,7 @@ in {
]; ];
volumes = [ volumes = [
# "teamspeak_data:/var/tsserver" "teamspeak_data:/var/tsserver"
"teamspeak_data2:/var/tsserver"
]; ];
environment = { environment = {

5
system/systemmodules/darwin.nix
View File

@ -1,5 +0,0 @@
{...}: {
imports = [
./sops-nix
];
}

1
system/systemmodules/docker/default.nix
View File

@ -72,6 +72,7 @@ in {
if docker.podman if docker.podman
then "podman" then "podman"
else "docker"; # "docker" or "podman" else "docker"; # "docker" or "podman"
libvirtd.enable = true;
}; };
systemd.services = let systemd.services = let

12
system/systemmodules/impermanence/default.nix
View File

@ -69,10 +69,7 @@ in {
# https://github.com/nix-community/impermanence/issues/253 # https://github.com/nix-community/impermanence/issues/253
(mkRDir "/usr/systemd-placeholder" m755) (mkRDir "/usr/systemd-placeholder" m755)
# TODO: Why does this use the mandb user? (mkDir "mandb" "/var/cache/man" m755)
# TODO: Why does this apparently conflict with comfyui-nix?
# (mkDir "mandb" "/var/cache/man" m755)
# (mkRDir "/var/cache/restic-backups-synology" m755) # (mkRDir "/var/cache/restic-backups-synology" m755)
(mkRDir "/var/db/sudo" m711) (mkRDir "/var/db/sudo" m711)
@ -132,7 +129,6 @@ in {
# (mkUDir ".nv" m755) # Unity # (mkUDir ".nv" m755) # Unity
# (mkUDir ".ollama" m755) # (mkUDir ".ollama" m755)
# (mkUDir ".plastic4" m755) # Unity # (mkUDir ".plastic4" m755) # Unity
(mkUDir ".tableplus" m755)
(mkUDir ".tiddl" m755) (mkUDir ".tiddl" m755)
(mkUDir ".var/app" m755) (mkUDir ".var/app" m755)
(mkUDir ".vim/undo" m755) (mkUDir ".vim/undo" m755)
@ -147,7 +143,6 @@ in {
# Config # Config
# (mkUDir ".config/.android" m755) # Unity # (mkUDir ".config/.android" m755) # Unity
# (mkUDir ".config/beekeeper-studio" m755)
(mkUDir ".config/beets" m755) (mkUDir ".config/beets" m755)
(mkUDir ".config/blender" m755) (mkUDir ".config/blender" m755)
(mkUDir ".config/chromium" m755) # TODO: Remove this someday (mkUDir ".config/chromium" m755) # TODO: Remove this someday
@ -157,13 +152,13 @@ in {
(mkUDir ".config/ghidra" m755) (mkUDir ".config/ghidra" m755)
(mkUDir ".config/impermanence" m755) (mkUDir ".config/impermanence" m755)
(mkUDir ".config/jellyfin-mpv-shim" m755) (mkUDir ".config/jellyfin-mpv-shim" m755)
# (mkUDir ".config/jellyfin-tui" m755) # Configured using nix (mkUDir ".config/jellyfin-tui" m755) # TODO: Generate this config file, have to use sops because it includes the password in cleartext
(mkUDir ".config/JetBrains" m755) (mkUDir ".config/JetBrains" m755)
(mkUDir ".config/kdeconnect" m755) (mkUDir ".config/kdeconnect" m755)
(mkUDir ".config/keepassxc" m755) (mkUDir ".config/keepassxc" m755)
(mkUDir ".config/Msty" m755) (mkUDir ".config/Msty" m755)
(mkUDir ".config/Nextcloud" m755) (mkUDir ".config/Nextcloud" m755)
# (mkUDir ".config/niri/dms" m755) (mkUDir ".config/niri/dms" m755)
(mkUDir ".config/obsidian" m755) (mkUDir ".config/obsidian" m755)
(mkUDir ".config/obs-studio" m755) (mkUDir ".config/obs-studio" m755)
(mkUDir ".config/Signal" m755) (mkUDir ".config/Signal" m755)
@ -173,7 +168,6 @@ in {
(mkUDir ".config/tidal_dl_ng" m755) (mkUDir ".config/tidal_dl_ng" m755)
# (mkUDir ".config/unity3d" m755) # Unity # (mkUDir ".config/unity3d" m755) # Unity
# (mkUDir ".config/unityhub" m755) # Unity # (mkUDir ".config/unityhub" m755) # Unity
(mkUDir ".config/Vector 35" m755)
(mkUDir ".config/vlc" m755) (mkUDir ".config/vlc" m755)
(mkUDir ".config/Zeal" m755) (mkUDir ".config/Zeal" m755)
(mkUDir ".config/zed" m755) (mkUDir ".config/zed" m755)

16
system/systemmodules/sops-nix/default.nix
View File

@ -26,23 +26,17 @@ in {
defaultSopsFile = ./secrets.yaml; defaultSopsFile = ./secrets.yaml;
age = { age = {
keyFile = lib.mkDefault "${config.users.users.${username}.home}/.secrets/age/age.key"; keyFile = lib.mkDefault "/home/${username}/.secrets/age/age.key";
generateKey = false; generateKey = false;
sshKeyPaths = []; sshKeyPaths = [];
}; };
secrets = let secrets = let
mkSecret = name: { mkSecret = name: {
${name} = lib.mkMerge [ ${name} = {
(lib.optionalAttrs pkgs.stdenv.isLinux { owner = config.users.users.${username}.name;
owner = config.users.users.${username}.name; group = config.users.users.${username}.group;
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: { mkBootSecret = name: {

9
system/systemmodules/sops-nix/secrets.yaml
View File

@ -5,7 +5,6 @@ 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] 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] 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] 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] #ENC[AES256_GCM,data:y5dlZFhK38dR+Q==,iv:1JYizUeyWeMR4KUblkj7kVSHPCL5l8mFpaQdo774BcM=,tag:kUTnBZb46KYQyi8bgIYSOQ==,type:comment]
# #
@ -19,8 +18,6 @@ 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-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] 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] 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] #ENC[AES256_GCM,data:Gdh/hjCaOuAE,iv:XjPXn3SskpUPUkDIEDl5701/g9QhuS83fACMaoPMiIM=,tag:Q7s8xZG/GsOtQrasekBnkQ==,type:comment]
# #
@ -36,7 +33,7 @@ sops:
SURMTmh1TGIrRmtENzc0Sk4rNFJNUE0KOpjN6jkEHO+lvdWdp4P++r9SNSPWaT0h SURMTmh1TGIrRmtENzc0Sk4rNFJNUE0KOpjN6jkEHO+lvdWdp4P++r9SNSPWaT0h
FAbbvZZ/EdIk/njLEcayFN7B4ftTcD/f4XJZiyosilZnIkk76bMOHA== FAbbvZZ/EdIk/njLEcayFN7B4ftTcD/f4XJZiyosilZnIkk76bMOHA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2026-04-17T12:17:23Z" lastmodified: "2025-07-19T01:29:00Z"
mac: ENC[AES256_GCM,data:YEHM2ebPhV6ycj8OxNy7mOlpy6VrvV6Gz9sHEWc9alnrwZ0qLzp5m4AUMuWBSfFTMtVgeAFdJ8Nf4X5b+AzQXahlHWJVAwiMiE8KqhRLGWF21OyDN2aIdwd4ue2vYyPDGYP43mC+19v9SW5isF901G28e5Q9SxmGJjNOkiVuiCI=,iv:WFvCN/7YGQnCSqjXBkkfiuPoNQ37bpxHx9jreZDc3EM=,tag:AUjFpbJ6//eScnn6P2QMgA==,type:str] mac: ENC[AES256_GCM,data:IzLYRuOlkUpry37sw7OB5MglntVflMjCcNiWpi7rvT2suOivLX9IT36qZFfYIbVIFXDmfsi1hsTvsPyekD7vVWQ1vkajAlGQYYTVpnO2cFrK3+TfWCyYjiD01rQBiRikybrR11zWRq6atieurDIxMUMEI7ypiqFOwpYaqSePAFc=,iv:9bc6rc4gjuiJWNjg1g0KfySqxnPjpzmlzDi/R+Iv2g4=,tag:tEwthVZAmdXbwRtoNykGrQ==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.12.2 version: 3.10.2

BIN
wallpapers/Concrete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 MiB

BIN
wallpapers/Moon_1.jpg (Stored with Git LFS)
View File

Binary file not shown.

BIN
wallpapers/Moon_2.jpg (Stored with Git LFS)
View File

Binary file not shown.

BIN
wallpapers/Moon_3.jpg (Stored with Git LFS)
View File

Binary file not shown.

BIN
wallpapers/Moon_4.jpg (Stored with Git LFS)
View File

Binary file not shown.

BIN
wallpapers/Moon_5.jpg (Stored with Git LFS)
View File

Binary file not shown.

BIN
wallpapers/NASA.jpg (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
wallpapers/Windows_1.jpg (Stored with Git LFS) Normal file
View File

Binary file not shown.