christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

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

5 Commits
master ... a81fc48127

Author SHA1 Message Date
Christoph Urlacher
a81fc48127 System: Use LTS kernel as default for all hosts 2025-11-07 13:30:14 +01:00
Christoph Urlacher
f6d5c83a8e Services/Portainer: Update to v2.33.3 2025-11-06 02:04:06 +01:00
Christoph Urlacher
695e196024 Services/Nginx: Update to v2.13.1 2025-11-06 01:43:17 +01:00
Christoph Urlacher
8ae48df307 Services/Jellyfin: Update to v10.11.2 2025-11-05 23:57:48 +01:00
Christoph Urlacher
0e893bc106 Home/Beets: Add musicbrainz auto-tagger data source 2025-11-05 20:03:11 +01:00
207 changed files with 1729 additions and 6441 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,4 +11,3 @@ config/neovim/store
home/modules/ags/config/types home/modules/ags/config/types
home/modules/ags/config/tsconfig.json home/modules/ags/config/tsconfig.json
system/modules/agenix/secrets.nix system/modules/agenix/secrets.nix
config/neovim/nvim_bundle

BIN
Niri.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 777 KiB

16
README.md
View File

@ -1,6 +1,6 @@
# NixOS Configuration # NixOS Configuration
Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolling desktop. Modular NixOS configuration, using Hyprland for a lightweight desktop.
![](FastFetch.png) ![](FastFetch.png)
@ -10,10 +10,7 @@ Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolli
<img src="/Btop.png" width="33%" /> <img src="/Btop.png" width="33%" />
</p> </p>
![](Niri.png)
To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`. To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
Alternatively, use `nh os switch` or `nh os boot`.
## NixFlake/system ## NixFlake/system
@ -21,8 +18,7 @@ Contains all the system configurations.
- There is a common configuration used for all systems: `NixFlake/system/default.nix` - There is a common configuration used for all systems: `NixFlake/system/default.nix`
- Every system has its own special configuration: `NixFlake/system/<hostname>/default.nix` - Every system has its own special configuration: `NixFlake/system/<hostname>/default.nix`
- System modules are located in `NixFlake/system/systemmodules` - System modules are located in `NixFlake/system/modules`
- Hosted services are located in `NixFlake/system/services`
When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported. When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
Because the hostname is propagated to the common configuration, it can import the host-specific config by itself. Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
@ -33,7 +29,7 @@ Contains all the home-manager configurations.
- There is a common configuration for each user: `NixFlake/home/<username>/default.nix` - There is a common configuration for each user: `NixFlake/home/<username>/default.nix`
- There is a configuration for a single system of this user: `NixFlake/home/<username>/<hostname>/default.nix` - There is a configuration for a single system of this user: `NixFlake/home/<username>/<hostname>/default.nix`
- Home-Manager modules are located in `NixFlake/home/homemodules` - Home-Manager modules are located in `NixFlake/home/modules`
When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported. When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
Because the hostname is propagated to the common configuration, it can import the host-specific config by itself. Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
@ -45,6 +41,6 @@ Each derivation is loaded into `NixFlake/derivations/default.nix`.
## NixFlake/overlays ## NixFlake/overlays
Contains all overlays, e.g. package version overrides. Contains (not at the moment) all overlays.
The `NixFlake/overlays/default.nix` imports all overlays and all derivations. The `NixFlake/overlays/default.nix` imports all of the overlays and all of the derivations.
It is then imported by the top-level `NixFlake/flake.nix`, to make everything available to the system/home configurations. It is then imported by the toplevel `NixFlake/flake.nix`, to make everything available to the system/home configurations.

555
config/dankmaterialshell/catppuccin-mauve.json
View File

@ -1,555 +0,0 @@
{
"id": "catppuccin",
"name": "Catppuccin",
"version": "1.0.0",
"author": "Avenge Media",
"description": "Soothing pastel theme for the high-spirited",
"dark": {},
"light": {},
"variants": {
"type": "multi",
"defaults": {
"dark": {
"accent": "mauve",
"flavor": "mocha"
},
"light": {
"accent": "mauve",
"flavor": "latte"
}
},
"flavors": [
{
"id": "mocha",
"name": "Mocha",
"dark": {
"surface": "#181825",
"surfaceText": "#cdd6f4",
"surfaceVariant": "#1e1e2e",
"surfaceVariantText": "#a6adc8",
"background": "#1e1e2e",
"backgroundText": "#cdd6f4",
"outline": "#6c7086",
"surfaceContainer": "#1e1e2e",
"surfaceContainerHigh": "#313244",
"surfaceContainerHighest": "#45475a",
"error": "#f38ba8",
"warning": "#fab387",
"info": "#89b4fa"
},
"light": {}
},
{
"id": "macchiato",
"name": "Macchiato",
"dark": {
"surface": "#1e2030",
"surfaceText": "#cad3f5",
"surfaceVariant": "#24273a",
"surfaceVariantText": "#a5adcb",
"background": "#24273a",
"backgroundText": "#cad3f5",
"outline": "#6e738d",
"surfaceContainer": "#24273a",
"surfaceContainerHigh": "#363a4f",
"surfaceContainerHighest": "#494d64",
"error": "#ed8796",
"warning": "#f5a97f",
"info": "#8aadf4"
},
"light": {}
},
{
"id": "frappe",
"name": "Frappé",
"dark": {
"surface": "#292c3c",
"surfaceText": "#c6d0f5",
"surfaceVariant": "#303446",
"surfaceVariantText": "#a5adce",
"background": "#303446",
"backgroundText": "#c6d0f5",
"outline": "#737994",
"surfaceContainer": "#303446",
"surfaceContainerHigh": "#414559",
"surfaceContainerHighest": "#51576d",
"error": "#e78284",
"warning": "#ef9f76",
"info": "#8caaee"
},
"light": {}
},
{
"id": "latte",
"name": "Latte",
"dark": {},
"light": {
"surface": "#e6e9ef",
"surfaceText": "#4c4f69",
"surfaceVariant": "#eff1f5",
"surfaceVariantText": "#6c6f85",
"background": "#eff1f5",
"backgroundText": "#4c4f69",
"outline": "#9ca0b0",
"surfaceContainer": "#e6e9ef",
"surfaceContainerHigh": "#ccd0da",
"surfaceContainerHighest": "#bcc0cc",
"error": "#d20f39",
"warning": "#fe640b",
"info": "#1e66f5"
}
}
],
"accents": [
{
"frappe": {
"primary": "#f2d5cf",
"primaryText": "#303446",
"primaryContainer": "#76534f",
"secondary": "#eebebe",
"surfaceTint": "#3a2f33"
},
"id": "rosewater",
"latte": {
"primary": "#dc8a78",
"primaryText": "#eff1f5",
"primaryContainer": "#f6e7e3",
"secondary": "#dd7878",
"surfaceTint": "#f6e7e3"
},
"macchiato": {
"primary": "#f4dbd6",
"primaryText": "#24273a",
"primaryContainer": "#7a5853",
"secondary": "#f0c6c6",
"surfaceTint": "#3b3035"
},
"mocha": {
"primary": "#f5e0dc",
"primaryText": "#1e1e2e",
"primaryContainer": "#7d5d56",
"secondary": "#f2cdcd",
"surfaceTint": "#3d3237"
},
"name": "Rosewater"
},
{
"frappe": {
"primary": "#eebebe",
"primaryText": "#303446",
"primaryContainer": "#744f52",
"secondary": "#f2d5cf",
"surfaceTint": "#392e31"
},
"id": "flamingo",
"latte": {
"primary": "#dd7878",
"primaryText": "#eff1f5",
"primaryContainer": "#f6e5e5",
"secondary": "#dc8a78",
"surfaceTint": "#f6e5e5"
},
"macchiato": {
"primary": "#f0c6c6",
"primaryText": "#24273a",
"primaryContainer": "#775256",
"secondary": "#f4dbd6",
"surfaceTint": "#3a3033"
},
"mocha": {
"primary": "#f2cdcd",
"primaryText": "#1e1e2e",
"primaryContainer": "#7a555a",
"secondary": "#f5e0dc",
"surfaceTint": "#3c3134"
},
"name": "Flamingo"
},
{
"frappe": {
"primary": "#f4b8e4",
"primaryText": "#303446",
"primaryContainer": "#793d65",
"secondary": "#ca9ee6",
"surfaceTint": "#3c2e37"
},
"id": "pink",
"latte": {
"primary": "#ea76cb",
"primaryText": "#eff1f5",
"primaryContainer": "#f7d7ee",
"secondary": "#8839ef",
"surfaceTint": "#f7d7ee"
},
"macchiato": {
"primary": "#f5bde6",
"primaryText": "#24273a",
"primaryContainer": "#7a3e67",
"secondary": "#c6a0f6",
"surfaceTint": "#3d2f38"
},
"mocha": {
"primary": "#f5c2e7",
"primaryText": "#1e1e2e",
"primaryContainer": "#7a3f69",
"secondary": "#cba6f7",
"surfaceTint": "#3d2f39"
},
"name": "Pink"
},
{
"frappe": {
"primary": "#ca9ee6",
"primaryText": "#303446",
"primaryContainer": "#542f79",
"secondary": "#babbf1",
"surfaceTint": "#33293c"
},
"id": "mauve",
"latte": {
"primary": "#8839ef",
"primaryText": "#eff1f5",
"primaryContainer": "#eadcff",
"secondary": "#7287fd",
"surfaceTint": "#eadcff"
},
"macchiato": {
"primary": "#c6a0f6",
"primaryText": "#24273a",
"primaryContainer": "#532f7d",
"secondary": "#b7bdf8",
"surfaceTint": "#32293e"
},
"mocha": {
"primary": "#cba6f7",
"primaryText": "#1e1e2e",
"primaryContainer": "#55307f",
"secondary": "#b4befe",
"surfaceTint": "#33293f"
},
"name": "Mauve"
},
{
"frappe": {
"primary": "#e78284",
"primaryText": "#303446",
"primaryContainer": "#692233",
"secondary": "#ea999c",
"surfaceTint": "#38272e"
},
"id": "red",
"latte": {
"primary": "#d20f39",
"primaryText": "#eff1f5",
"primaryContainer": "#f6d0d6",
"secondary": "#e64553",
"surfaceTint": "#f6d0d6"
},
"macchiato": {
"primary": "#ed8796",
"primaryText": "#24273a",
"primaryContainer": "#6c2336",
"secondary": "#ee99a0",
"surfaceTint": "#3a2830"
},
"mocha": {
"primary": "#f38ba8",
"primaryText": "#1e1e2e",
"primaryContainer": "#6f2438",
"secondary": "#eba0ac",
"surfaceTint": "#3c2930"
},
"name": "Red"
},
{
"frappe": {
"primary": "#ea999c",
"primaryText": "#303446",
"primaryContainer": "#69333d",
"secondary": "#e78284",
"surfaceTint": "#382a2f"
},
"id": "maroon",
"latte": {
"primary": "#e64553",
"primaryText": "#eff1f5",
"primaryContainer": "#f7d8dc",
"secondary": "#d20f39",
"surfaceTint": "#f7d8dc"
},
"macchiato": {
"primary": "#ee99a0",
"primaryText": "#24273a",
"primaryContainer": "#6b343f",
"secondary": "#ed8796",
"surfaceTint": "#392b30"
},
"mocha": {
"primary": "#eba0ac",
"primaryText": "#1e1e2e",
"primaryContainer": "#6d3641",
"secondary": "#f38ba8",
"surfaceTint": "#3a2c31"
},
"name": "Maroon"
},
{
"frappe": {
"primary": "#ef9f76",
"primaryText": "#303446",
"primaryContainer": "#6d3e24",
"secondary": "#e5c890",
"surfaceTint": "#382e27"
},
"id": "peach",
"latte": {
"primary": "#fe640b",
"primaryText": "#eff1f5",
"primaryContainer": "#ffe4d5",
"secondary": "#df8e1d",
"surfaceTint": "#ffe4d5"
},
"macchiato": {
"primary": "#f5a97f",
"primaryText": "#24273a",
"primaryContainer": "#704025",
"secondary": "#eed49f",
"surfaceTint": "#3a2f28"
},
"mocha": {
"primary": "#fab387",
"primaryText": "#1e1e2e",
"primaryContainer": "#734226",
"secondary": "#f9e2af",
"surfaceTint": "#3b3028"
},
"name": "Peach"
},
{
"frappe": {
"primary": "#e5c890",
"primaryText": "#303446",
"primaryContainer": "#68542c",
"secondary": "#a6d189",
"surfaceTint": "#383428"
},
"id": "yellow",
"latte": {
"primary": "#df8e1d",
"primaryText": "#eff1f5",
"primaryContainer": "#fff6d6",
"secondary": "#40a02b",
"surfaceTint": "#fff6d6"
},
"macchiato": {
"primary": "#eed49f",
"primaryText": "#24273a",
"primaryContainer": "#6b572e",
"secondary": "#a6da95",
"surfaceTint": "#393529"
},
"mocha": {
"primary": "#f9e2af",
"primaryText": "#1e1e2e",
"primaryContainer": "#6e5a2f",
"secondary": "#a6e3a1",
"surfaceTint": "#3a362a"
},
"name": "Yellow"
},
{
"frappe": {
"primary": "#a6d189",
"primaryText": "#303446",
"primaryContainer": "#2d5932",
"secondary": "#81c8be",
"surfaceTint": "#2a362b"
},
"id": "green",
"latte": {
"primary": "#40a02b",
"primaryText": "#eff1f5",
"primaryContainer": "#dff4e0",
"secondary": "#179299",
"surfaceTint": "#dff4e0"
},
"macchiato": {
"primary": "#a6da95",
"primaryText": "#24273a",
"primaryContainer": "#2e5c34",
"secondary": "#8bd5ca",
"surfaceTint": "#2b372c"
},
"mocha": {
"primary": "#a6e3a1",
"primaryText": "#1e1e2e",
"primaryContainer": "#2f5f36",
"secondary": "#94e2d5",
"surfaceTint": "#2b382c"
},
"name": "Green"
},
{
"frappe": {
"primary": "#81c8be",
"primaryText": "#303446",
"primaryContainer": "#2c5853",
"secondary": "#99d1db",
"surfaceTint": "#2a3634"
},
"id": "teal",
"latte": {
"primary": "#179299",
"primaryText": "#eff1f5",
"primaryContainer": "#daf3f1",
"secondary": "#04a5e5",
"surfaceTint": "#daf3f1"
},
"macchiato": {
"primary": "#8bd5ca",
"primaryText": "#24273a",
"primaryContainer": "#2d5b56",
"secondary": "#91d7e3",
"surfaceTint": "#2b3735"
},
"mocha": {
"primary": "#94e2d5",
"primaryText": "#1e1e2e",
"primaryContainer": "#2e5e59",
"secondary": "#89dceb",
"surfaceTint": "#2b3836"
},
"name": "Teal"
},
{
"frappe": {
"primary": "#99d1db",
"primaryText": "#303446",
"primaryContainer": "#245464",
"secondary": "#85c1dc",
"surfaceTint": "#283438"
},
"id": "sky",
"latte": {
"primary": "#04a5e5",
"primaryText": "#eff1f5",
"primaryContainer": "#dbf1fb",
"secondary": "#209fb5",
"surfaceTint": "#dbf1fb"
},
"macchiato": {
"primary": "#91d7e3",
"primaryText": "#24273a",
"primaryContainer": "#245667",
"secondary": "#7dc4e4",
"surfaceTint": "#293539"
},
"mocha": {
"primary": "#89dceb",
"primaryText": "#1e1e2e",
"primaryContainer": "#24586a",
"secondary": "#74c7ec",
"surfaceTint": "#29363a"
},
"name": "Sky"
},
{
"frappe": {
"primary": "#85c1dc",
"primaryText": "#303446",
"primaryContainer": "#1f4967",
"secondary": "#8caaee",
"surfaceTint": "#27323a"
},
"id": "sapphire",
"latte": {
"primary": "#209fb5",
"primaryText": "#eff1f5",
"primaryContainer": "#def3f8",
"secondary": "#1e66f5",
"surfaceTint": "#def3f8"
},
"macchiato": {
"primary": "#7dc4e4",
"primaryText": "#24273a",
"primaryContainer": "#1f4b6b",
"secondary": "#8aadf4",
"surfaceTint": "#27333b"
},
"mocha": {
"primary": "#74c7ec",
"primaryText": "#1e1e2e",
"primaryContainer": "#1f4d6f",
"secondary": "#89b4fa",
"surfaceTint": "#27343c"
},
"name": "Sapphire"
},
{
"frappe": {
"primary": "#8caaee",
"primaryText": "#303446",
"primaryContainer": "#243d6f",
"secondary": "#babbf1",
"surfaceTint": "#282f3b"
},
"id": "blue",
"latte": {
"primary": "#1e66f5",
"primaryText": "#eff1f5",
"primaryContainer": "#e0e9ff",
"secondary": "#7287fd",
"surfaceTint": "#e0e9ff"
},
"macchiato": {
"primary": "#8aadf4",
"primaryText": "#24273a",
"primaryContainer": "#243e72",
"secondary": "#b7bdf8",
"surfaceTint": "#29303c"
},
"mocha": {
"primary": "#89b4fa",
"primaryText": "#1e1e2e",
"primaryContainer": "#243f75",
"secondary": "#b4befe",
"surfaceTint": "#29313d"
},
"name": "Blue"
},
{
"frappe": {
"primary": "#babbf1",
"primaryText": "#303446",
"primaryContainer": "#3d427b",
"secondary": "#ca9ee6",
"surfaceTint": "#2e2f3e"
},
"id": "lavender",
"latte": {
"primary": "#7287fd",
"primaryText": "#eff1f5",
"primaryContainer": "#e5e8ff",
"secondary": "#8839ef",
"surfaceTint": "#e5e8ff"
},
"macchiato": {
"primary": "#b7bdf8",
"primaryText": "#24273a",
"primaryContainer": "#3e437e",
"secondary": "#c6a0f6",
"surfaceTint": "#2f303f"
},
"mocha": {
"primary": "#b4befe",
"primaryText": "#1e1e2e",
"primaryContainer": "#3f4481",
"secondary": "#cba6f7",
"surfaceTint": "#2f3140"
},
"name": "Lavender"
}
]
},
"sourceDir": "catppuccin"
}

BIN
config/face.jpeg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 70 KiB

4
config/flake.nix
View File

@ -68,7 +68,7 @@ rec {
# bintools = pkgs.bintools.bintools; # Unwrapped bintools # bintools = pkgs.bintools.bintools; # Unwrapped bintools
# libc = pkgs.glibc; # libc = pkgs.glibc;
# }; # };
# gcc = lib.hiPrio (pkgs.wrapCCWith { # gcc = pkgs.hiPrio (pkgs.wrapCCWith {
# cc = pkgs.gcc.cc; # Unwrapped gcc # cc = pkgs.gcc.cc; # Unwrapped gcc
# libc = pkgs.glibc; # libc = pkgs.glibc;
# bintools = bintools; # bintools = bintools;
@ -84,7 +84,7 @@ rec {
# bintools = pkgs.bintools.bintools; # Unwrapped bintools # bintools = pkgs.bintools.bintools; # Unwrapped bintools
# libc = pkgs.glibc_multi; # libc = pkgs.glibc_multi;
# }; # };
# gcc_multilib = lib.hiPrio (pkgs.wrapCCWith { # gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith {
# cc = pkgs.gcc.cc; # Unwrapped gcc # cc = pkgs.gcc.cc; # Unwrapped gcc
# libc = pkgs.glibc_multi; # libc = pkgs.glibc_multi;
# bintools = bintools_multilib; # bintools = bintools_multilib;

4
config/navi/christoph.cheat
View File

@ -210,10 +210,6 @@ Convert line endings to dos format
unix2dos <file> unix2dos <file>
$ file: eza -1 $ file: eza -1
% tiddl
Download stuff from tidal
tiddl download --track-quality max --path ~/Downloads/Beet/Albums --videos none url "<url>"
; =========================== ; ===========================
; SECRETS ; SECRETS
; =========================== ; ===========================

204
config/neovim/bundle.py
View File

@ -1,204 +0,0 @@
#!/usr/bin/env python3
import argparse
import os
import re
import shutil
import subprocess
from typing import cast
from urllib.request import urlretrieve
INIT_LUA: str = "/home/christoph/.config/nvim/init.lua"
def patch_paths(text: str, mappings: dict[str, str]) -> str:
"""Patches /nix/store paths in init.lua"""
patched = text
for old, new in mappings.items():
print(f"Patching init.lua: {old} -> {new}")
patched = patched.replace(old, new)
return patched
def patch_various(text: str) -> str:
"""Patches various incompatibilities with NixVim init.lua"""
# Install lazy
print("Patching init.lua: Bootstrap lazy.nvim")
patched = (
"""-- Bootstrap lazy.nvim
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then
vim.api.nvim_echo({
{ "Failed to clone lazy.nvim:\\n", "ErrorMsg" },
{ out, "WarningMsg" },
{ "\\nPress any key to exit..." },
}, true, {})
vim.fn.getchar()
os.exit(1)
end
end
vim.opt.rtp:prepend(lazypath)
"""
+ text
)
# print("Patching init.lua: Disabling vim.loader")
# patched = patched.replace("vim.loader.enable(true)", "vim.loader.enable(false)")
return patched
def copy_plugins(text: str, path: str) -> dict[str, str]:
"""Copies NeoVim plugins from the Nix Store"""
os.makedirs(path, exist_ok=True)
plugins_path: str = re.findall(r"\"(/nix/store/.*-lazy-plugins)\"", text)[0]
print(f"Copying: {plugins_path} -> {path}/plugins")
_ = shutil.copytree(plugins_path, f"{path}/plugins")
treesitter_path: str = re.findall(
r"\"(/nix/store/.*-vimplugin-nvim-treesitter.*)\"", text
)[0]
print(f"Copying: {treesitter_path} -> {path}/treesitter")
_ = shutil.copytree(treesitter_path, f"{path}/treesitter")
parsers_path: str = re.findall(r"\"(/nix/store/.*-treesitter-parsers)\"", text)[0]
print(f"Copying: {parsers_path} -> {path}/parsers")
_ = shutil.copytree(parsers_path, f"{path}/parsers")
return {
plugins_path: "./plugins",
treesitter_path: "./treesitter",
parsers_path: "./parsers",
}
def write_file(text: str, path: str) -> None:
"""Write text to a file"""
with open(path, "w") as file:
_ = file.write(text)
# TODO: Could add etc. nvim/lsp/formatter/linter binaries here
# TODO: Needs "install recipe", as in most cases the download will be an archive
DOWNLOADS: list[tuple[str, str]] = [
# (
# "https://github.com/neovim/neovim/releases/download/v0.11.6/nvim-linux-x86_64.tar.gz",
# "nvim",
# ),
]
def download_binaries(path: str, urls: list[tuple[str, str]]) -> None:
"""Download required binaries"""
os.makedirs(f"{path}/bin", exist_ok=True)
def download(url: str, path: str) -> None:
"""Download from URL"""
print(f"Downloading: {url}")
_ = urlretrieve(url, path)
for url, name in urls:
download(url, f"{path}/bin/{name}")
def build_nvim(path: str) -> None:
"""Builds a static nvim binary against musl"""
# TODO: Build etc. is working, but on the target system there are
# lua-ffi errors from noice.nvim with the static binary.
# This does not happen with nvim from system package repository.
def run(command: list[str]) -> None:
"""Run a subprocess"""
print(f"Running: {' '.join(command)}")
_ = subprocess.run(command)
os.makedirs(f"{path}/nvim-build", exist_ok=True)
with open(f"{path}/nvim-build/build-nvim.sh", "w") as file:
_ = file.write(
"\n".join(
[
"#!/bin/sh",
"git clone https://github.com/neovim/neovim",
"cd neovim",
"git checkout stable",
'make -j$(nproc) CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="-DSTATIC_BUILD=1"',
"make CMAKE_INSTALL_PREFIX=/workdir/install install",
]
)
)
run(
[
"docker",
"run",
"--rm",
"-it",
"-v",
f"{os.path.abspath(path)}/nvim-build:/workdir",
"-w",
"/workdir",
"alpine:3.23.3",
"/bin/sh",
"-c",
"apk add build-base cmake coreutils curl gettext-tiny-dev git && chmod +x ./build-nvim.sh && ./build-nvim.sh",
]
)
_ = shutil.copytree(f"{path}/nvim-build/install/bin", f"{path}/bin")
_ = shutil.copytree(f"{path}/nvim-build/install/lib", f"{path}/lib")
_ = shutil.copytree(f"{path}/nvim-build/install/share", f"{path}/share")
_ = shutil.rmtree(f"{path}/nvim-build")
def bundle() -> None:
"""Creates a standalone NeoVim bundle from the NixVim configuration"""
parser = argparse.ArgumentParser()
_ = parser.add_argument(
"--config",
type=str,
default=INIT_LUA,
help="init.lua or other config file",
)
_ = parser.add_argument(
"--out",
type=str,
default="./nvim_bundle",
help="destination folder",
)
args = parser.parse_args()
args.config = cast(str, args.config)
args.out = cast(str, args.out)
with open(args.config, "r") as file:
patched_init_lua: str = file.read()
path_mappings = copy_plugins(patched_init_lua, args.out)
patched_init_lua = patch_paths(patched_init_lua, path_mappings)
patched_init_lua = patch_various(patched_init_lua)
write_file(patched_init_lua, f"{args.out}/init.lua")
# build_nvim(args.out)
# download_binaries(args.out, DOWNLOADS)
if __name__ == "__main__":
bundle()

6
config/neovim/info.md
View File

@ -1,6 +0,0 @@
# NeoVim Portable
## Requirements
- Base packages: `sudo apt install neovim git direnv ripgrep curl fzf`
- Link or copy the generated `nvim_bundle` to `~/.config/nvim` on the target machine

2
derivations/1_deprecated/modules-options-doc/default.nix
View File

@ -7,7 +7,7 @@
... ...
}: let }: let
# create a module that only contains the options, type can be home or system # create a module that only contains the options, type can be home or system
toModule = type: name: {options.systemmodules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};}; toModule = type: name: {options.modules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
# evaluate a single module # evaluate a single module
evalModule = type: name: (lib.evalModules {modules = [(toModule type name)];}); evalModule = type: name: (lib.evalModules {modules = [(toModule type name)];});

1
derivations/default.nix
View File

@ -9,5 +9,4 @@
msty = pkgs.callPackage ./msty {}; msty = pkgs.callPackage ./msty {};
unityhub = pkgs.callPackage ./unityhub {}; unityhub = pkgs.callPackage ./unityhub {};
tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {}; tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {};
tiddl = pkgs.callPackage ./tiddl {};
} }

57
derivations/tidal-dl-ng/default.nix
View File

@ -10,12 +10,11 @@
# #
pythonPkgs = pkgs.python313Packages.overrideScope (self: super: { pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
typer = super.typer.overridePythonAttrs (old: { typer = super.typer.overridePythonAttrs (old: {
version = "0.20.1"; version = "0.20.0";
src = super.fetchPypi { src = super.fetchPypi {
inherit (old) pname; inherit (old) pname;
version = "0.20.1"; version = "0.20.0";
# sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc="; # v0.20.0 sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
sha256 = "sha256-aFhesbASA2icQZm8RA1r5hbwhR6fDrQeSneIRcWg/Vs="; # v0.20.1
}; };
}); });
@ -49,33 +48,30 @@
# doCheck = false; # doCheck = false;
# }); # });
# rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
# version = "14.2.0";
# src = pkgs.fetchFromGitHub {
# owner = "Textualize";
# repo = "rich";
# tag = "v14.2.0";
# hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=";
# };
# });
tidalDlNg = pythonPkgs.buildPythonApplication rec { tidalDlNg = pythonPkgs.buildPythonApplication rec {
pname = "tidal_dl_ng_for_dj"; pname = "tidal-dl-ng";
version = "0.33.2"; version = "0.31.3";
format = "pyproject"; format = "pyproject";
# The official repo was deleted src = pkgs.fetchFromGitHub {
# src = pkgs.fetchFromGitHub { owner = "exislow";
# owner = "exislow"; repo = "tidal-dl-ng";
# repo = "tidal-dl-ng"; rev = "v${version}";
# rev = "v${version}"; sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
# sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
# };
# Package now also deleted from PyPi
# src = pythonPkgs.fetchPypi {
# inherit pname version;
# sha256 = "sha256-rOMyxnT7uVnMbn678DFtqAu4+Uc5VFGcqGI0jxplnpc=";
# };
# TODO: Borked
# "For DJ"-Fork
src = pythonPkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-605cgBqZV6L7sxWtEa4Ki+9hBqX4m3Rk+X5oY5bv/FQ=";
}; };
dontCheckRuntimeDeps = true; doCheck = false;
catchConflicts = false;
nativeBuildInputs = with pythonPkgs; [poetry-core setuptools]; nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
@ -100,6 +96,13 @@
typer typer
rich rich
]; ];
# pythonOutputDistPhase = ''
# echo "⚠️Skipping pythonOutputDistPhase"
# '';
# pythonCatchConflictsPhase = ''
# echo "🛑 Skipping pythonCatchConflictsPhase"
# '';
}; };
# #
@ -128,7 +131,7 @@
tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation { tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
pname = "tdng"; pname = "tdng";
version = "0.33.2"; version = "0.31.3";
dontUnpack = true; dontUnpack = true;
nativeBuildInputs = [pkgs.makeWrapper]; nativeBuildInputs = [pkgs.makeWrapper];

60
derivations/tiddl/default.nix
View File

@ -1,60 +0,0 @@
{
lib,
stdenv,
pkgs,
}: let
pythonPkgs = pkgs.python314Packages.overrideScope (self: super: {
typer = super.typer.overridePythonAttrs (old: {
version = "0.20.1";
src = pkgs.fetchPypi {
pname = "typer";
version = "0.20.0";
sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
};
});
aiofiles = super.aiofiles.overridePythonAttrs (old: {
version = "25.1.0";
src = pkgs.fetchFromGitHub {
owner = "Tinche";
repo = "aiofiles";
tag = "v25.1.0";
hash = "sha256-NBmzoUb2una3+eWqR1HraVPibaRb9I51aYwskrjxskQ=";
};
# Build system changed in this version
build-system = with pythonPkgs; [
hatchling
hatch-vcs
];
});
});
in
pythonPkgs.buildPythonApplication rec {
pname = "tiddl";
version = "3.2.0";
format = "pyproject";
src = pythonPkgs.fetchPypi {
inherit pname version;
sha256 = "sha256-uLkGyIScYPqFgQdPAOYJDJG0jp+nDAwIl2kFkaJZFco=";
};
dontCheckRuntimeDeps = true;
build-system = with pythonPkgs; [
poetry-core
setuptools
];
propagatedBuildInputs = with pythonPkgs; [
# Nixpkgs
aiofiles
aiohttp
m3u8
mutagen
pydantic
requests
requests-cache
typer
];
}

893
flake.lock generated
View File

File diff suppressed because it is too large Load Diff

43
flake.nix
View File

@ -49,40 +49,6 @@
# https://github.com/thiagokokada/nix-alien#user-content-nixos-installation-with-flakes # https://github.com/thiagokokada/nix-alien#user-content-nixos-installation-with-flakes
# nix-alien.inputs.nixpkgs.follows = "nixpkgs"; # nix-alien.inputs.nixpkgs.follows = "nixpkgs";
# Niri
niri.url = "github:sodiboo/niri-flake";
niri.inputs.nixpkgs.follows = "nixpkgs";
# Quickshell
quickshell.url = "github:quickshell-mirror/quickshell";
quickshell.inputs.nixpkgs.follows = "nixpkgs";
# Noctalia shell
noctalia.url = "github:noctalia-dev/noctalia-shell";
noctalia.inputs.nixpkgs.follows = "nixpkgs";
# noctalia.inputs.quickshell.follows = "quickshell";
# Lol
waifu-cursors.url = "github:kagurazakei/waifu-cursors";
# Caelestia shell
caelestia.url = "github:caelestia-dots/shell";
caelestia.inputs.nixpkgs.follows = "nixpkgs";
caelestia.inputs.quickshell.follows = "quickshell";
# caelestia-cli.url = "github:caelestia-dots/cli";
# caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
# DankMaterialShell
# dgop.url = "github:AvengeMedia/dgop";
# dgop.inputs.nixpkgs.follows = "nixpkgs";
# dms-cli.url = "github:AvengeMedia/danklinux";
# dms-cli.inputs.nixpkgs.follows = "nixpkgs";
dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
# dank-material-shell.inputs.dgop.follows = "dgop";
danksearch.url = "github:AvengeMedia/danksearch";
danksearch.inputs.nixpkgs.follows = "nixpkgs";
# Hyprland (use flake so plugins are not built from source) # Hyprland (use flake so plugins are not built from source)
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs";
@ -164,7 +130,6 @@
in [ in [
inputs.devshell.overlays.default inputs.devshell.overlays.default
inputs.nur.overlays.default inputs.nur.overlays.default
inputs.niri.overlays.niri
# inputs.emacs-overlay.overlay # inputs.emacs-overlay.overlay
# All my own overlays (derivations + modifications) # All my own overlays (derivations + modifications)
@ -202,10 +167,6 @@
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
inputs.lanzaboote.nixosModules.lanzaboote inputs.lanzaboote.nixosModules.lanzaboote
# We need the niri module also on the headless hosts
# so nix can parse the config (although it is disabled...)
inputs.niri.nixosModules.niri # This also imports the HM module
]; ];
in { in {
# Local shell for NixFlake directory # Local shell for NixFlake directory
@ -241,7 +202,9 @@
hostname = "nixtop"; hostname = "nixtop";
username = "christoph"; username = "christoph";
headless = false; headless = false;
extraModules = [] ++ commonModules; extraModules =
[]
++ commonModules;
}; };
servenix = mylib.nixos.mkNixosConfigWithHomeManagerModule { servenix = mylib.nixos.mkNixosConfigWithHomeManagerModule {
inherit system mylib publicKeys; inherit system mylib publicKeys;

1727
home/christoph/default.nix
View File

File diff suppressed because it is too large Load Diff

161
home/christoph/hyprland.nix Normal file
View File

@ -0,0 +1,161 @@
{
pkgs,
config,
headless,
}: {
enable = !headless;
dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
bars.enable = false;
dynamicCursor.enable = false;
trails.enable = true;
hyprspace.enable = false; # Always broken
keybindings = {
main-mod = "SUPER";
bindings = {
"$mainMod, t" = ["exec, kitty"];
"$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
"$mainMod, n" = ["exec, neovide"];
# "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
"$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
"$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
"$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
"$mainMod, p" = ["exec, hyprpicker --autocopy --format=hex"];
"$mainMod, s" = ["exec, grim -g \"$(slurp)\""];
"$mainMod CTRL, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
"$mainMod SHIFT, s" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
", XF86AudioPlay" = ["exec, playerctl play-pause"];
", XF86AudioPrev" = ["exec, playerctl previous"];
", XF86AudioNext" = ["exec, playerctl next"];
", XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset gamma -10"];
", XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset gamma +10"];
"$mainMod, XF86MonBrightnessDown" = ["exec, hyprctl hyprsunset temperature 5750"];
"$mainMod, XF86MonBrightnessUp" = ["exec, hyprctl hyprsunset identity"];
"CTRL ALT, f" = let
hyprctl = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl";
grep = "${pkgs.gnugrep}/bin/grep";
awk = "${pkgs.gawk}/bin/gawk";
notify = "${pkgs.libnotify}/bin/notify-send";
toggleMouseFocus = pkgs.writeScriptBin "hypr-toggle-mouse-focus" ''
CURRENT=$(${hyprctl} getoption input:follow_mouse | ${grep} int | ${awk} -F' ' '{print $2}')
if [[ "$CURRENT" == "1" ]]; then
${hyprctl} keyword input:follow_mouse 0
${notify} "Disabled Mouse Focus!"
else
${hyprctl} keyword input:follow_mouse 1
${notify} "Enabled Mouse Focus!"
fi
'';
in ["exec, ${toggleMouseFocus}/bin/hypr-toggle-mouse-focus"];
# "CTRL ALT, t" = ["exec, bash -c 'systemctl --user restart hyprpanel.service'"];
};
ws-bindings = {
# "<Workspace>" = "<Key>";
"1" = "1";
"2" = "2";
"3" = "3";
"4" = "4";
"5" = "5";
"6" = "6";
"7" = "7";
"8" = "8";
"9" = "9";
"10" = "0";
};
special-ws-bindings = {
"ferdium" = "x";
"msty" = "z";
"btop" = "b";
"rmpc" = "r";
};
};
autostart = {
immediate = [
"kitty --hold fastfetch"
"zeal"
"nextcloud --background"
"protonvpn-app"
# "kdeconnect-indicator" # started by services.kdeconnect.indicator
];
delayed = [
"keepassxc" # The tray doesn't work when started too early
];
special-silent = {
"ferdium" = ["ferdium"];
"msty" = ["msty"];
"btop" = ["kitty --title=Btop btop"];
"rmpc" = ["kitty --title=Rmpc rmpc"];
};
};
windowrules = [
# Fix jetbrains tooltip flicker
"float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
"nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
];
workspacerules = {
"1" = [];
"2" = ["Zotero" "neovide" "code-url-handler"];
"3" = ["obsidian"];
"4" = ["firefox" "Google-chrome" "chromium-browser" "org.qutebrowser.qutebrowser"];
"5" = ["steam"];
"6" = ["steam_app_(.+)"];
"7" = ["signal"];
"8" = ["tidal-hifi"];
"9" = ["discord"];
"10" = ["python3"];
};
floating = [
{class = "org.kde.polkit-kde-authentication-agent-1";}
{
class = "thunar";
title = "File Operation Progress";
}
{class = "ffplay";}
{class = "Unity";}
];
transparent-opacity = "0.75";
transparent = [
"kitty"
"Alacritty"
"discord"
"signal"
"vesktop"
"Spotify"
"tidal-hifi"
"obsidian"
"firefox"
"org.qutebrowser.qutebrowser"
"jetbrains-clion"
"jetbrains-idea"
"jetbrains-pycharm"
"jetbrains-rustrover"
"jetbrains-rider"
"jetbrains-webstorm"
"code-url-handler"
"neovide"
"steam"
"ferdium"
"Msty"
];
}

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

@ -8,8 +8,12 @@
username, username,
... ...
}: { }: {
imports = [
../../modules
];
config = { config = {
homemodules = { modules = {
btop.cuda = true; btop.cuda = true;
# This has been relocated here from the default config, # This has been relocated here from the default config,
@ -119,10 +123,9 @@
# jetbrains.idea-ultimate # jetbrains.idea-ultimate
# jetbrains.webstorm # jetbrains.webstorm
# jetbrains.rider # jetbrains.rider
zed-editor
vscode
# Unity Stuff # Unity Stuff
# TODO: Unity module
# unityhub # unityhub
# rider-unity # rider-unity
# dotnetCore # dotnetCore
@ -133,20 +136,10 @@
godot_4 godot_4
(obs-studio.override {cudaSupport = true;}) (obs-studio.override {cudaSupport = true;})
kdePackages.kdenlive kdePackages.kdenlive
# davinci-resolve
krita krita
makemkv makemkv
lrcget lrcget
# msty msty
# jellyfin-media-player # CVE, can't install
jellyfin-desktop
jellyfin-mpv-shim
# tidal-hifi
# tidal-dl-ng # TODO: Borked
tiddl
picard
handbrake
teamspeak6-client
steam-devices-udev-rules steam-devices-udev-rules
]; ];
@ -182,7 +175,7 @@
services = { services = {
ollama = { ollama = {
enable = false; enable = true;
acceleration = "cuda"; acceleration = "cuda";
# home = "/var/lib/ollama"; # home = "/var/lib/ollama";
@ -226,14 +219,6 @@
]; ];
overrides = { overrides = {
"org.prismlauncher.PrismLauncher".Context = {
filesystems = [
"${config.home.homeDirectory}/Downloads"
"/tmp" # To allow temporary world folder creation for datapack installation
];
};
"com.valvesoftware.Steam".Context = { "com.valvesoftware.Steam".Context = {
filesystems = [ filesystems = [
"${config.home.homeDirectory}/Games" "${config.home.homeDirectory}/Games"

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

@ -1,7 +1,11 @@
# Here goes the stuff that will only be enabled on the laptop # Here goes the stuff that will only be enabled on the laptop
{...}: { {...}: {
imports = [
../../modules
];
config = { config = {
homemodules = { modules = {
hyprland = { hyprland = {
keyboard = { keyboard = {
layout = "us"; layout = "us";

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

@ -6,8 +6,12 @@
username, username,
... ...
}: { }: {
imports = [
../../modules
];
config = { config = {
homemodules = { modules = {
btop.cuda = true; btop.cuda = true;
}; };

4
home/christoph/thinknix/default.nix
View File

@ -6,6 +6,10 @@
username, username,
... ...
}: { }: {
imports = [
../../modules
];
config = { config = {
home.packages = with pkgs; [ home.packages = with pkgs; [
docker-compose docker-compose

14
home/homemodules/0_template/default.nix
View File

@ -1,14 +0,0 @@
{
config,
nixosConfig,
lib,
mylib,
pkgs,
...
}: let
inherit (config.homemodules) TEMPLATE color;
in {
options.homemodules.TEMPLATE = import ./options.nix {inherit lib mylib;};
config = lib.mkIf TEMPLATE.enable {};
}

516
home/homemodules/hyprland/caelestia.nix
View File

@ -1,516 +0,0 @@
{
config,
hyprland,
color,
}: {
enable = hyprland.caelestia.enable;
systemd = {
enable = false; # Start from hyprland autostart
target = "graphical-session.target";
environment = [];
};
settings = {
appearance = {
anim = {durations = {scale = 1;};};
font = {
family = {
clock = "Rubik";
material = "Material Symbols Rounded";
mono = color.font;
sans = color.font;
};
size = {scale = 1;};
};
padding = {scale = 1;};
rounding = {scale = 1;};
spacing = {scale = 1;};
transparency = {
base = 0.85;
enabled = false;
layers = 0.4;
};
};
background = {
desktopClock = {enabled = false;};
enabled = true;
# Lags when visible on both monitors (different refresh rates?)
visualiser = {
autoHide = true;
blur = true;
enabled = false;
rounding = 1;
spacing = 1;
};
};
bar = {
clock = {showIcon = true;};
dragThreshold = 20;
entries = [
{
enabled = true;
id = "logo";
}
{
enabled = true;
id = "workspaces";
}
{
enabled = true;
id = "spacer";
}
{
enabled = true;
id = "activeWindow";
}
{
enabled = true;
id = "spacer";
}
{
enabled = true;
id = "clock";
}
{
enabled = true;
id = "tray";
}
{
enabled = true;
id = "statusIcons";
}
{
enabled = true;
id = "power";
}
];
persistent = true;
popouts = {
activeWindow = true;
statusIcons = true;
tray = true;
};
scrollActions = {
brightness = false;
volume = true;
workspaces = true;
};
showOnHover = true;
status = {
showAudio = true;
showBattery = false;
showBluetooth = true;
showKbLayout = false;
showLockStatus = true;
showMicrophone = false;
showNetwork = true;
};
tray = {
background = true;
compact = false;
iconSubs = [];
recolour = false;
};
workspaces = {
activeIndicator = true;
activeLabel = "󰮯";
activeTrail = true;
label = " ";
occupiedBg = false;
occupiedLabel = "󰮯";
perMonitorWorkspaces = false;
showWindows = false;
shown = 10;
# Pick them here: https://fonts.google.com/icons
specialWorkspaceIcons = [
{
icon = "music_note";
name = "rmpc";
}
{
icon = "memory";
name = "btop";
}
{
icon = "mark_chat_unread";
name = "ferdium";
}
{
icon = "network_intelligence";
name = "msty";
}
];
};
};
border = {
rounding = 25;
thickness = 10;
};
dashboard = {
dragThreshold = 50;
enabled = true;
mediaUpdateInterval = 500;
showOnHover = true;
};
general = {
apps = {
audio = ["kitty" "--title=NcpaMixer" "-e" "ncpamixer"];
explorer = ["kitty" "--title=Yazi" "-e" "yazi"];
playback = ["mpv"];
terminal = ["kitty"];
};
battery = {
criticalLevel = 3;
warnLevels = [
{
icon = "battery_android_frame_2";
level = 20;
message = "You might want to plug in a charger";
title = "Low battery";
}
{
icon = "battery_android_frame_1";
level = 10;
message = "You should probably plug in a charger <b>now</b>";
title = "Did you see the previous message?";
}
{
critical = true;
icon = "battery_android_alert";
level = 5;
message = "PLUG THE CHARGER RIGHT NOW!!";
title = "Critical battery level";
}
];
};
idle = {
inhibitWhenAudio = true;
lockBeforeSleep = true;
timeouts = [
{
idleAction = "lock";
timeout = 600;
}
{
# idleAction = "dpms off";
# returnAction = "dpms on";
idleAction = "echo 'idle'";
returnAction = "echo 'return'";
timeout = 10000;
}
{
# idleAction = ["systemctl" "suspend-then-hibernate"];
idleAction = ["echo" "'idle'"];
timeout = 20000;
}
];
};
};
launcher = {
actionPrefix = ">";
actions = [
{
command = ["autocomplete" "calc"];
dangerous = false;
description = "Do simple math equations (powered by Qalc)";
enabled = true;
icon = "calculate";
name = "Calculator";
}
{
command = ["autocomplete" "scheme"];
dangerous = false;
description = "Change the current colour scheme";
enabled = true;
icon = "palette";
name = "Scheme";
}
{
command = ["autocomplete" "wallpaper"];
dangerous = false;
description = "Change the current wallpaper";
enabled = true;
icon = "image";
name = "Wallpaper";
}
{
command = ["autocomplete" "variant"];
dangerous = false;
description = "Change the current scheme variant";
enabled = true;
icon = "colors";
name = "Variant";
}
{
command = ["autocomplete" "transparency"];
dangerous = false;
description = "Change shell transparency";
enabled = false;
icon = "opacity";
name = "Transparency";
}
{
command = ["caelestia" "wallpaper" "-r"];
dangerous = false;
description = "Switch to a random wallpaper";
enabled = false;
icon = "casino";
name = "Random";
}
{
command = ["setMode" "light"];
dangerous = false;
description = "Change the scheme to light mode";
enabled = true;
icon = "light_mode";
name = "Light";
}
{
command = ["setMode" "dark"];
dangerous = false;
description = "Change the scheme to dark mode";
enabled = true;
icon = "dark_mode";
name = "Dark";
}
{
command = ["systemctl" "poweroff"];
dangerous = true;
description = "Shutdown the system";
enabled = true;
icon = "power_settings_new";
name = "Shutdown";
}
{
command = ["systemctl" "reboot"];
dangerous = true;
description = "Reboot the system";
enabled = true;
icon = "cached";
name = "Reboot";
}
{
command = ["loginctl" "terminate-user" ""];
dangerous = true;
description = "Log out of the current session";
enabled = true;
icon = "exit_to_app";
name = "Logout";
}
{
command = ["loginctl" "lock-session"];
dangerous = false;
description = "Lock the current session";
enabled = true;
icon = "lock";
name = "Lock";
}
{
command = ["systemctl" "suspend-then-hibernate"];
dangerous = false;
description = "Suspend then hibernate";
enabled = false;
icon = "bedtime";
name = "Sleep";
}
];
dragThreshold = 50;
enableDangerousActions = true;
hiddenApps = [];
maxShown = 7;
maxWallpapers = 9;
showOnHover = false;
specialPrefix = "@";
useFuzzy = {
actions = false;
apps = false;
schemes = false;
variants = false;
wallpapers = false;
};
vimKeybinds = false;
};
lock = {recolourLogo = false;};
notifs = {
actionOnClick = false;
clearThreshold = 0.3;
defaultExpireTimeout = 5000;
expandThreshold = 20;
expire = true;
};
osd = {
enableBrightness = false;
enableMicrophone = true;
enabled = true;
hideDelay = 2000;
};
paths = {
mediaGif = "root:/assets/bongocat.gif";
sessionGif = "root:/assets/kurukuru.gif";
wallpaperDir = "~/NixFlake/wallpapers";
};
services = {
audioIncrement = 0.1;
defaultPlayer = "MPD";
gpuType = "";
maxVolume = 1;
playerAliases = [
{
from = "com.github.th_ch.youtube_music";
to = "YT Music";
}
];
smartScheme = true;
useFahrenheit = false;
useTwelveHourClock = false;
visualiserBars = 45;
weatherLocation = "Dortmund, Germany";
};
session = {
commands = {
hibernate = ["systemctl" "hibernate"];
logout = ["loginctl" "terminate-user" ""];
reboot = ["systemctl" "reboot"];
shutdown = ["systemctl" "poweroff"];
};
dragThreshold = 30;
enabled = true;
vimKeybinds = false;
};
sidebar = {
dragThreshold = 80;
enabled = true;
};
utilities = {
enabled = true;
maxToasts = 4;
toasts = {
audioInputChanged = true;
audioOutputChanged = true;
capsLockChanged = true;
chargingChanged = true;
configLoaded = true;
dndChanged = true;
gameModeChanged = true;
kbLayoutChanged = false;
nowPlaying = false;
numLockChanged = true;
vpnChanged = true;
};
vpn = {
enabled = false;
provider = [
{
displayName = "Wireguard (Your VPN)";
interface = "your-connection-name";
name = "wireguard";
}
];
};
};
};
cli = {
enable = hyprland.caelestia.enable;
settings = {
record = {extraArgs = [];};
theme = {
enableBtop = false;
enableDiscord = false;
enableFuzzel = false;
enableGtk = false;
enableHypr = false;
enableQt = false;
enableSpicetify = false;
enableTerm = false;
};
toggles = {
communication = {
discord = {
command = ["discord"];
enable = false;
match = [{class = "discord";}];
move = true;
};
whatsapp = {
enable = false;
match = [{class = "whatsapp";}];
move = true;
};
};
music = {
feishin = {
enable = false;
match = [{class = "feishin";}];
move = true;
};
spotify = {
command = ["spicetify" "watch" "-s"];
enable = false;
match = [{class = "Spotify";} {initialTitle = "Spotify";} {initialTitle = "Spotify Free";}];
move = true;
};
};
sysmon = {
btop = {
command = ["kitty" "--title" "Btop" "-e" "btop"];
enable = false;
match = [
{
class = "btop";
title = "Btop";
workspace = {name = "special:sysmon";};
}
];
};
};
todo = {
todoist = {
command = ["todoist"];
enable = false;
match = [{class = "Todoist";}];
move = true;
};
};
};
wallpaper = {postHook = "echo $WALLPAPER_PATH";};
};
};
}

10
home/homemodules/hyprpanel/options.nix
View File

@ -1,10 +0,0 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOption "Enable Hyprpanel";
systemd.enable = mkEnableOption "Start using systemd";
}

664
home/homemodules/niri/dankMaterialShell.nix
View File

@ -1,664 +0,0 @@
{
config,
color,
}: {
enable = true;
systemd = {
enable = false;
restartIfChanged = true;
};
# Deprecated
# enableClipboard = true;
# enableBrightnessControl = false;
# enableColorPicker = true;
# enableSystemSound = false;
enableSystemMonitoring = true;
enableVPN = true;
enableDynamicTheming = false;
enableAudioWavelength = true;
enableCalendarEvents = false;
niri = {
enableKeybinds = false;
enableSpawn = false;
};
# This is generated from the DMS settings dialog.
# Run: nix eval --impure --expr 'builtins.fromJSON (builtins.readFile ~/.config/DankMaterialShell/settings.json)'
settings = {
acLockTimeout = 0;
acMonitorTimeout = 0;
acProfileName = "";
acSuspendBehavior = 0;
acSuspendTimeout = 0;
activeDisplayProfile = {};
animationSpeed = 1;
appDrawerSectionViewModes = {};
appIdSubstitutions = [
{
pattern = "Spotify";
replacement = "spotify";
type = "exact";
}
{
pattern = "beepertexts";
replacement = "beeper";
type = "exact";
}
{
pattern = "home assistant desktop";
replacement = "homeassistant-desktop";
type = "exact";
}
{
pattern = "com.transmissionbt.transmission";
replacement = "transmission-gtk";
type = "contains";
}
{
pattern = "^steam_app_(\\d+)$";
replacement = "steam_icon_$1";
type = "regex";
}
];
appLauncherGridColumns = 4;
appLauncherViewMode = "list";
appPickerViewMode = "grid";
appsDockActiveColorMode = "primary";
appsDockColorizeActive = false;
appsDockEnlargeOnHover = false;
appsDockEnlargePercentage = 125;
appsDockHideIndicators = false;
appsDockIconSizePercentage = 100;
audioInputDevicePins = {};
audioOutputDevicePins = {};
audioScrollMode = "volume";
audioVisualizerEnabled = true;
audioWheelScrollAmount = 5;
barConfigs = [
{
autoHide = false;
autoHideDelay = 250;
borderColor = "surfaceText";
borderEnabled = false;
borderOpacity = 1;
borderThickness = 2;
bottomGap = 0;
centerWidgets = [
{
enabled = true;
id = "music";
mediaSize = 1;
}
];
enabled = true;
fontScale = 1.1;
gothCornerRadiusOverride = false;
gothCornerRadiusValue = 12;
gothCornersEnabled = false;
id = "default";
innerPadding = 4;
leftWidgets = [
{
enabled = true;
id = "launcherButton";
}
{
enabled = true;
id = "workspaceSwitcher";
}
{
enabled = true;
focusedWindowCompactMode = true;
id = "focusedWindow";
}
];
maximizeDetection = true;
name = "Main Bar";
noBackground = false;
openOnOverview = true;
popupGapsAuto = true;
popupGapsManual = 4;
position = 0;
rightWidgets = [
{
enabled = true;
id = "privacyIndicator";
}
{
enabled = true;
id = "cpuUsage";
minimumWidth = true;
}
{
enabled = true;
id = "memUsage";
minimumWidth = true;
}
{
enabled = true;
id = "diskUsage";
}
{
enabled = true;
id = "colorPicker";
}
{
enabled = true;
id = "clipboard";
}
{
enabled = true;
id = "vpn";
}
{
enabled = true;
id = "controlCenterButton";
}
{
enabled = true;
id = "systemTray";
}
{
clockCompactMode = true;
enabled = true;
id = "clock";
}
{
enabled = true;
id = "notificationButton";
}
];
screenPreferences = ["all"];
showOnLastDisplay = true;
spacing = 0;
squareCorners = true;
transparency = 1;
visible = true;
widgetOutlineColor = "primary";
widgetOutlineEnabled = false;
widgetOutlineOpacity = 1;
widgetOutlineThickness = 2;
widgetTransparency = 1;
}
];
barMaxVisibleApps = 0;
barMaxVisibleRunningApps = 0;
barShowOverflowBadge = true;
batteryChargeLimit = 100;
batteryLockTimeout = 0;
batteryMonitorTimeout = 0;
batteryProfileName = "";
batterySuspendBehavior = 0;
batterySuspendTimeout = 0;
bluetoothDevicePins = {};
blurWallpaperOnOverview = true;
blurredWallpaperLayer = true;
brightnessDevicePins = {};
browserPickerViewMode = "grid";
browserUsageHistory = {};
builtInPluginSettings = {dms_settings_search = {trigger = "?";};};
buttonColorMode = "primary";
centeringMode = "index";
clipboardEnterToPaste = false;
clockCompactMode = false;
clockDateFormat = "yyyy-MM-dd";
configVersion = 5;
controlCenterShowAudioIcon = true;
controlCenterShowAudioPercent = false;
controlCenterShowBatteryIcon = false;
controlCenterShowBluetoothIcon = true;
controlCenterShowBrightnessIcon = false;
controlCenterShowBrightnessPercent = false;
controlCenterShowMicIcon = true;
controlCenterShowMicPercent = false;
controlCenterShowNetworkIcon = true;
controlCenterShowPrinterIcon = false;
controlCenterShowScreenSharingIcon = true;
controlCenterShowVpnIcon = true;
controlCenterTileColorMode = "primary";
controlCenterWidgets = [
{
enabled = true;
id = "volumeSlider";
width = 50;
}
{
enabled = true;
id = "brightnessSlider";
width = 50;
}
{
enabled = true;
id = "wifi";
width = 50;
}
{
enabled = true;
id = "bluetooth";
width = 50;
}
{
enabled = true;
id = "audioOutput";
width = 50;
}
{
enabled = true;
id = "audioInput";
width = 50;
}
{
enabled = true;
id = "nightMode";
width = 50;
}
{
enabled = true;
id = "darkMode";
width = 50;
}
];
cornerRadius = 10;
currentThemeCategory = "registry";
currentThemeName = "custom";
cursorSettings = {
dwl = {cursorHideTimeout = 0;};
hyprland = {
hideOnKeyPress = false;
hideOnTouch = false;
inactiveTimeout = 0;
};
niri = {
hideAfterInactiveMs = 0;
hideWhenTyping = false;
};
size = 24;
theme = "System Default";
};
customAnimationDuration = 500;
customPowerActionHibernate = "";
customPowerActionLock = "";
customPowerActionLogout = "";
customPowerActionPowerOff = "";
customPowerActionReboot = "";
customPowerActionSuspend = "";
customThemeFile = "/home/christoph/NixFlake/config/dankmaterialshell/catppuccin-mauve.json";
dankLauncherV2BorderColor = "primary";
dankLauncherV2BorderEnabled = false;
dankLauncherV2BorderThickness = 2;
dankLauncherV2ShowFooter = true;
dankLauncherV2Size = "compact";
dankLauncherV2UnloadOnClose = false;
desktopClockColorMode = "primary";
desktopClockCustomColor = {
a = 1;
b = 1;
g = 1;
hslHue = -1;
hslLightness = 1;
hslSaturation = 0;
hsvHue = -1;
hsvSaturation = 0;
hsvValue = 1;
r = 1;
valid = true;
};
desktopClockDisplayPreferences = ["all"];
desktopClockEnabled = false;
desktopClockHeight = 180;
desktopClockShowAnalogNumbers = false;
desktopClockShowAnalogSeconds = true;
desktopClockShowDate = true;
desktopClockStyle = "analog";
desktopClockTransparency = 0.8;
desktopClockWidth = 280;
desktopClockX = -1;
desktopClockY = -1;
desktopWidgetGridSettings = {};
desktopWidgetGroups = [];
desktopWidgetInstances = [];
desktopWidgetPositions = {};
displayNameMode = "system";
displayProfileAutoSelect = false;
displayProfiles = {};
displayShowDisconnected = false;
displaySnapToEdge = true;
dockAutoHide = false;
dockBorderColor = "surfaceText";
dockBorderEnabled = false;
dockBorderOpacity = 1;
dockBorderThickness = 1;
dockBottomGap = 0;
dockGroupByApp = false;
dockIconSize = 40;
dockIndicatorStyle = "circle";
dockIsolateDisplays = false;
dockLauncherEnabled = false;
dockLauncherLogoBrightness = 0.5;
dockLauncherLogoColorOverride = "";
dockLauncherLogoContrast = 1;
dockLauncherLogoCustomPath = "";
dockLauncherLogoMode = "apps";
dockLauncherLogoSizeOffset = 0;
dockMargin = 0;
dockMaxVisibleApps = 0;
dockMaxVisibleRunningApps = 0;
dockOpenOnOverview = false;
dockPosition = 1;
dockShowOverflowBadge = true;
dockSmartAutoHide = false;
dockSpacing = 4;
dockTransparency = 1;
dwlShowAllTags = false;
enableFprint = false;
enableRippleEffects = true;
enabledGpuPciIds = [];
fadeToDpmsEnabled = true;
fadeToDpmsGracePeriod = 5;
fadeToLockEnabled = true;
fadeToLockGracePeriod = 5;
filePickerUsageHistory = {};
focusedWindowCompactMode = false;
fontFamily = "MonoLisa Normal";
fontScale = 1;
fontWeight = 500;
groupWorkspaceApps = true;
gtkThemingEnabled = false;
hideBrightnessSlider = false;
hyprlandLayoutBorderSize = -1;
hyprlandLayoutGapsOverride = -1;
hyprlandLayoutRadiusOverride = -1;
hyprlandOutputSettings = {};
iconTheme = "System Default";
keyboardLayoutNameCompactMode = false;
launchPrefix = "";
launcherLogoBrightness = 0.5;
launcherLogoColorInvertOnMode = false;
launcherLogoColorOverride = "";
launcherLogoContrast = 1;
launcherLogoCustomPath = "";
launcherLogoMode = "os";
launcherLogoSizeOffset = 0;
launcherPluginOrder = [];
launcherPluginVisibility = {};
lockAtStartup = false;
lockBeforeSuspend = false;
lockDateFormat = "yyyy-MM-dd";
lockScreenActiveMonitor = "all";
lockScreenInactiveColor = "#000000";
lockScreenNotificationMode = 0;
lockScreenPowerOffMonitorsOnLock = false;
lockScreenShowDate = true;
lockScreenShowMediaPlayer = true;
lockScreenShowPasswordField = true;
lockScreenShowPowerActions = true;
lockScreenShowProfileImage = true;
lockScreenShowSystemIcons = true;
lockScreenShowTime = true;
loginctlLockIntegration = true;
mangoLayoutBorderSize = -1;
mangoLayoutGapsOverride = -1;
mangoLayoutRadiusOverride = -1;
matugenScheme = "scheme-tonal-spot";
matugenTargetMonitor = "";
matugenTemplateAlacritty = true;
matugenTemplateDgop = true;
matugenTemplateEmacs = true;
matugenTemplateEquibop = true;
matugenTemplateFirefox = true;
matugenTemplateFoot = true;
matugenTemplateGhostty = true;
matugenTemplateGtk = true;
matugenTemplateHyprland = true;
matugenTemplateKcolorscheme = true;
matugenTemplateKitty = true;
matugenTemplateMangowc = true;
matugenTemplateNeovim = true;
matugenTemplateNiri = true;
matugenTemplatePywalfox = true;
matugenTemplateQt5ct = true;
matugenTemplateQt6ct = true;
matugenTemplateVesktop = true;
matugenTemplateVscode = true;
matugenTemplateWezterm = true;
matugenTemplateZenBrowser = true;
maxFprintTries = 15;
maxWorkspaceIcons = 3;
mediaSize = 1;
modalAnimationSpeed = 1;
modalCustomAnimationDuration = 150;
modalDarkenBackground = true;
monoFontFamily = "MonoLisa Normal";
networkPreference = "auto";
nightModeEnabled = false;
niriLayoutBorderSize = -1;
niriLayoutGapsOverride = -1;
niriLayoutRadiusOverride = -1;
niriOutputSettings = {};
niriOverviewOverlayEnabled = true;
notepadFontFamily = "";
notepadFontSize = 14;
notepadLastCustomTransparency = 0.7;
notepadShowLineNumbers = false;
notepadTransparencyOverride = -1;
notepadUseMonospace = true;
notificationAnimationSpeed = 1;
notificationCompactMode = false;
notificationCustomAnimationDuration = 400;
notificationHistoryEnabled = true;
notificationHistoryMaxAgeDays = 7;
notificationHistoryMaxCount = 50;
notificationHistorySaveCritical = true;
notificationHistorySaveLow = true;
notificationHistorySaveNormal = true;
notificationOverlayEnabled = false;
notificationPopupPosition = 0;
notificationPopupPrivacyMode = false;
notificationPopupShadowEnabled = true;
notificationRules = [];
notificationTimeoutCritical = 0;
notificationTimeoutLow = 5000;
notificationTimeoutNormal = 5000;
osdAlwaysShowValue = true;
osdAudioOutputEnabled = true;
osdBrightnessEnabled = true;
osdCapsLockEnabled = true;
osdIdleInhibitorEnabled = true;
osdMediaPlaybackEnabled = true;
osdMediaVolumeEnabled = true;
osdMicMuteEnabled = true;
osdPosition = 7;
osdPowerProfileEnabled = false;
osdVolumeEnabled = true;
padHours12Hour = false;
popoutAnimationSpeed = 1;
popoutCustomAnimationDuration = 150;
popupTransparency = 1;
powerActionConfirm = true;
powerActionHoldDuration = 0.5;
powerMenuActions = ["reboot" "logout" "poweroff" "lock" "restart"];
powerMenuDefaultAction = "poweroff";
powerMenuGridLayout = false;
privacyShowCameraIcon = false;
privacyShowMicIcon = false;
privacyShowScreenShareIcon = false;
qtThemingEnabled = false;
registryThemeVariants = {};
reverseScrolling = false;
runDmsMatugenTemplates = false;
runUserMatugenTemplates = false;
runningAppsCompactMode = true;
runningAppsCurrentMonitor = false;
runningAppsCurrentWorkspace = false;
runningAppsGroupByApp = false;
screenPreferences = {};
scrollTitleEnabled = true;
selectedGpuIndex = 0;
showBattery = false;
showCapsLockIndicator = false;
showClipboard = true;
showClock = true;
showControlCenterButton = true;
showCpuTemp = true;
showCpuUsage = true;
showDock = false;
showFocusedWindow = true;
showGpuTemp = false;
showLauncherButton = true;
showMemUsage = true;
showMusic = true;
showNotificationButton = true;
showOccupiedWorkspacesOnly = false;
showOnLastDisplay = {};
showPrivacyButton = false;
showSeconds = true;
showSystemTray = true;
showWeather = true;
showWorkspaceApps = false;
showWorkspaceIndex = false;
showWorkspaceName = false;
showWorkspacePadding = false;
showWorkspaceSwitcher = true;
sortAppsAlphabetically = false;
soundNewNotification = true;
soundPluggedIn = true;
soundVolumeChanged = true;
soundsEnabled = false;
spotlightCloseNiriOverview = true;
spotlightModalViewMode = "list";
spotlightSectionViewModes = {};
syncComponentAnimationSpeeds = true;
syncModeWithPortal = true;
systemMonitorColorMode = "primary";
systemMonitorCustomColor = {
a = 1;
b = 1;
g = 1;
hslHue = -1;
hslLightness = 1;
hslSaturation = 0;
hsvHue = -1;
hsvSaturation = 0;
hsvValue = 1;
r = 1;
valid = true;
};
systemMonitorDisplayPreferences = ["all"];
systemMonitorEnabled = false;
systemMonitorGpuPciId = "";
systemMonitorGraphInterval = 60;
systemMonitorHeight = 480;
systemMonitorLayoutMode = "auto";
systemMonitorShowCpu = true;
systemMonitorShowCpuGraph = true;
systemMonitorShowCpuTemp = true;
systemMonitorShowDisk = true;
systemMonitorShowGpuTemp = false;
systemMonitorShowHeader = true;
systemMonitorShowMemory = true;
systemMonitorShowMemoryGraph = true;
systemMonitorShowNetwork = true;
systemMonitorShowNetworkGraph = true;
systemMonitorShowTopProcesses = false;
systemMonitorTopProcessCount = 3;
systemMonitorTopProcessSortBy = "cpu";
systemMonitorTransparency = 0.8;
systemMonitorVariants = [];
systemMonitorWidth = 320;
systemMonitorX = -1;
systemMonitorY = -1;
terminalsAlwaysDark = false;
updaterCustomCommand = "";
updaterHideWidget = false;
updaterTerminalAdditionalParams = "";
updaterUseCustomCommand = false;
use24HourClock = true;
useAutoLocation = false;
useFahrenheit = false;
useSystemSoundTheme = false;
wallpaperFillMode = "Fill";
waveProgressEnabled = true;
weatherEnabled = true;
widgetBackgroundColor = "sc";
widgetColorMode = "default";
wifiNetworkPins = {};
windSpeedUnit = "kmh";
workspaceAppIconSizeOffset = 0;
workspaceColorMode = "default";
workspaceDragReorder = true;
workspaceFocusedBorderColor = "primary";
workspaceFocusedBorderEnabled = false;
workspaceFocusedBorderThickness = 2;
workspaceFollowFocus = false;
workspaceNameIcons = {};
workspaceOccupiedColorMode = "none";
workspaceScrolling = false;
workspaceUnfocusedColorMode = "default";
workspaceUrgentColorMode = "default";
};
session = {
# Settings
doNotDisturb = false;
isLightMode = false;
weatherHourlyDetailed = true;
# Night
nightModeAutoEnabled = true;
nightModeAutoMode = "time";
nightModeEnabled = true;
nightModeEndHour = 6;
nightModeEndMinute = 0;
nightModeHighTemperature = 6500;
nightModeLocationProvider = "";
nightModeStartHour = 22;
nightModeStartMinute = 0;
nightModeTemperature = 5500;
nightModeUseIPLocation = false;
# Hardware
nonNvidiaGpuTempEnabled = false;
nvidiaGpuTempEnabled = false;
selectedGpuIndex = 0;
wifiDeviceOverride = "";
enabledGpuPciIds = [];
lastBrightnessDevice = "";
# Wallpapers
perModeWallpaper = false;
perMonitorWallpaper = false;
wallpaperCyclingEnabled = false;
wallpaperCyclingInterval = 300;
wallpaperCyclingMode = "interval";
wallpaperCyclingTime = "06:00";
wallpaperPath = "/home/christoph/NixFlake/wallpapers/Windows.jpg";
wallpaperPathDark = "";
wallpaperPathLight = "";
wallpaperTransition = "iris bloom";
# Random shit
includedTransitions = ["fade" "wipe" "disc" "stripes" "iris bloom" "pixelate" "portal"];
launchPrefix = "";
latitude = 0;
longitude = 0;
pinnedApps = [];
hiddenTrayIds = [];
recentColors = [];
showThirdPartyPlugins = true;
# Ultra random shit
monitorCyclingSettings = {};
monitorWallpapers = {};
monitorWallpapersDark = {};
monitorWallpapersLight = {};
brightnessExponentValues = {};
brightnessExponentialDevices = {};
brightnessUserSetValues = {};
configVersion = 1;
};
}

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

@ -1,598 +0,0 @@
{
config,
nixosConfig,
lib,
mylib,
inputs,
pkgs,
...
}: let
inherit (config.homemodules) niri color;
in {
options.homemodules.niri = import ./options.nix {inherit lib mylib;};
config = lib.mkIf niri.enable rec {
assertions = [
{
assertion = nixosConfig.programs.niri.enable;
message = "Can't enable Niri config with Niri disabled!";
}
{
assertion = !(programs.noctalia-shell.enable && programs.dank-material-shell.enable);
message = "Can't enable Noctalia and DankMaterialShell at the same time!";
}
];
gtk = {
enable = true;
iconTheme.package = color.iconPackage;
iconTheme.name = color.iconTheme;
};
# Disable niri polkit if we use DMS, as it has its own
systemd.user.services.niri-flake-polkit = lib.mkForce {};
home = {
sessionVariables = {
QT_QPA_PLATFORMTHEME = "gtk3"; # For Noctalia
GDK_BACKEND = "wayland"; # For screen sharing
};
pointerCursor = {
gtk.enable = true;
x11.enable = true;
package = color.cursorPackage;
name = color.cursor;
size = color.cursorSize;
};
packages = with pkgs; [
xwayland-satellite
ncpamixer # Audio control
nautilus # Fallback file chooser used by xdg-desktop-portal-gnome
# In case we fallback to the default config
alacritty
fuzzel
];
};
programs = {
# TODO: Those should be modules with their own options
noctalia-shell = import ./noctalia.nix {inherit color;};
dank-material-shell = import ./dankMaterialShell.nix {inherit config color;};
dsearch.enable = true;
# TODO: Extract options
niri = {
# enable = true; # Enabled in system module
settings = {
input = {
focus-follows-mouse = {
enable = true;
max-scroll-amount = "0%"; # Skip partial windows that would scroll the viewport on focus
};
keyboard = {
xkb = {
layout = "us";
variant = "altgr-intl";
options = "nodeadkeys";
};
};
touchpad = {
click-method = "clickfinger";
tap = true;
drag = true;
dwt = true;
natural-scroll = true;
scroll-method = "two-finger";
};
};
hotkey-overlay = {
hide-not-bound = true;
skip-at-startup = true;
};
prefer-no-csd = true; # Disable client-side decorations (e.g. window titlebars)
spawn-at-startup = [
# TODO: Depend on options
# {argv = ["noctalia-shell"];}
{argv = ["dms" "run"];}
{argv = ["kitty" "--hold" "fastfetch"];}
{argv = ["zeal"];}
{argv = ["protonvpn-app"];}
{argv = ["fcitx5"];}
{argv = ["jellyfin-mpv-shim"];}
{sh = "sleep 5s && nextcloud --background";}
{sh = "sleep 5s && keepassxc";}
];
workspaces = {
"1" = {open-on-output = "DP-1";};
"2" = {open-on-output = "DP-1";};
"3" = {open-on-output = "DP-1";};
"4" = {open-on-output = "DP-1";};
"5" = {open-on-output = "DP-1";};
"6" = {open-on-output = "DP-1";};
"7" = {open-on-output = "DP-1";};
"8" = {open-on-output = "DP-1";};
"9" = {open-on-output = "DP-1";};
"10" = {open-on-output = "DP-2";};
};
outputs = {
"DP-1" = {
focus-at-startup = true;
mode = {
width = 3440;
height = 1440;
refresh = 164.999;
};
position = {
x = 1920;
y = 0;
};
};
"DP-2" = {
focus-at-startup = false;
mode = {
width = 1920;
height = 1080;
refresh = 60.0;
};
position = {
x = 0;
y = 0;
};
};
};
cursor = {
hide-when-typing = true;
theme = color.cursor;
size = color.cursorSize;
};
layout = {
# This border is drawn INSIDE the window
border = {
enable = true;
width = 2;
active = {color = color.hex.accent;};
inactive = {color = color.hex.base;};
};
# This border is drawn OUTSIDE of the focused window
focus-ring = {
enable = false;
};
# Hint where a dragged window will be inserted
insert-hint = {
enable = true;
display = {color = color.hex.accentDim;};
};
always-center-single-column = true;
# Gaps between windows
gaps = 8;
# Gaps at screen borders
struts = {
# left = 8;
# right = 8;
top = 4; # Somehow the bar eclusivity doesn't work as expected
bottom = 2;
};
};
gestures = {
hot-corners = {enable = false;};
};
window-rules = [
# Rules for all windows
{
default-column-width.proportion = 0.5;
default-window-height.proportion = 1.0;
# Rounded corners
clip-to-geometry = true;
geometry-corner-radius = {
bottom-left = 8.0;
bottom-right = 8.0;
top-left = 8.0;
top-right = 8.0;
};
# open-floating = false;
# open-focused = false;
# open-fullscreen = false;
# open-maximized = false;
# open-on-output = "DP-1";
# open-on-workspace = "2";
# opacity = 0.8;
}
# Rules for specific windows
{
matches = [{app-id = "Zotero";}];
open-on-workspace = "2";
}
{
matches = [{app-id = "neovide";}];
open-on-workspace = "2";
open-maximized = true;
}
{
matches = [{app-id = "code-url-handler";}];
open-on-workspace = "2";
open-floating = true;
}
{
matches = [{app-id = "obsidian";}];
open-on-workspace = "3";
}
{
matches = [{app-id = "firefox";}];
open-on-workspace = "4";
open-maximized = true;
}
{
matches = [{app-id = "Google-chrome";}];
open-on-workspace = "4";
}
{
matches = [{app-id = "chromium-browser";}];
open-on-workspace = "4";
}
{
matches = [{app-id = "org.qutebrowser.qutebrowser";}];
open-on-workspace = "4";
}
{
matches = [{app-id = "steam";}];
open-on-workspace = "5";
}
{
matches = [{app-id = "steam_app_(.+)";}];
open-on-workspace = "6";
open-floating = true;
open-maximized = true;
}
{
matches = [{app-id = "signal";}];
open-on-workspace = "7";
open-maximized = true;
}
{
matches = [{app-id = "discord";}];
open-on-workspace = "9";
open-maximized = true;
}
];
layer-rules = [
{
# Set the overview wallpaper on the backdrop (Noctalia).
matches = [{namespace = "^noctalia-overview*";}];
place-within-backdrop = true;
}
{
# Set the overview wallpaper on the backdrop (DMS).
matches = [{namespace = "^dms:blurwallpaper$";}];
place-within-backdrop = true;
}
];
debug = {
# Allows notification actions and window activation from Noctalia.
honor-xdg-activation-with-invalid-serial = [];
};
# TODO: Only start hypr... stuff with hyprland, not systemd (hypridle, hyprpaper currently)
# TODO: Move values to config option and set in home/christoph/niri.nix
binds = with config.lib.niri.actions; {
# Applications
"Mod+T" = {
action = spawn "kitty";
hotkey-overlay = {title = "Spawn Kitty.";};
};
"Mod+E" = {
action = spawn "kitty" "--title=Yazi" "yazi";
hotkey-overlay = {title = "Spawn Yazi.";};
};
"Mod+B" = {
action = spawn "kitty" "--title=Btop" "btop";
hotkey-overlay = {title = "Spawn Btop.";};
};
"Mod+R" = {
action = spawn "kitty" "--title=Rmpc" "rmpc";
hotkey-overlay = {title = "Spawn Rmpc.";};
};
"Mod+N" = {
action = spawn "neovide";
hotkey-overlay = {title = "Spawn Neovide.";};
};
"Mod+Ctrl+N" = {
action = spawn "kitty" "--title=Navi" "navi";
hotkey-overlay = {title = "Call Navi for help.";};
};
"Mod+Shift+N" = {
action = spawn "neovide" "${config.paths.dotfiles}/navi/christoph.cheat";
hotkey-overlay = {title = "Edit the Navi cheats.";};
};
"Mod+Shift+F" = {
action = spawn "neovide" "${config.paths.dotfiles}/flake.nix";
hotkey-overlay = {title = "Edit the NixFlake.";};
};
# TODO: Enable with Noctalia option
# Noctalia
# "Mod+A" = {
# action = spawn "noctalia-shell" "ipc" "call" "launcher" "toggle";
# hotkey-overlay = {title = "Toggle the application launcher.";};
# };
# "Mod+Ctrl+L" = {
# action = spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock";
# hotkey-overlay = {title = "Lock the screen.";};
# };
# "Mod+W" = {
# action = spawn "noctalia-shell" "ipc" "call" "wallpaper" "toggle";
# hotkey-overlay = {title = "Toggle the wallpaper chooser.";};
# };
# "Mod+Escape" = {
# action = spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle";
# hotkey-overlay = {title = "Toggle the session menu.";};
# };
# TODO: Enable with DMS option
# DankMaterialShell
"Mod+A" = {
action = spawn "dms" "ipc" "call" "spotlight" "toggle";
hotkey-overlay = {title = "Toggle the application launcher.";};
};
"Mod+Ctrl+L" = {
action = spawn "dms" "ipc" "call" "lock" "lock";
hotkey-overlay = {title = "Lock the screen.";};
};
"Mod+Escape" = {
action = spawn "dms" "ipc" "call" "powermenu" "toggle";
hotkey-overlay = {title = "Toggle the session menu.";};
};
"Mod+C" = {
action = spawn "dms" "ipc" "call" "clipboard" "toggle";
hotkey-overlay = {title = "Show clipboard history.";};
};
# Screenshots
"Mod+S" = {
action.screenshot-window = {write-to-disk = true;};
hotkey-overlay = {title = "Take a screenshot of the current window.";};
};
"Mod+Shift+S" = {
action.screenshot = {show-pointer = true;};
hotkey-overlay = {title = "Take a screenshot of a region.";};
};
# Niri
"Mod+Shift+Slash" = {
action = show-hotkey-overlay;
hotkey-overlay = {hidden = true;};
};
# "Alt+Tab" = {
# action = "next-window";
# hotkey-overlay = {title = "Switch to next window.";};
# };
# "Alt+Shift+Tab" = {
# action = "previous-window";
# hotkey-overlay = {title = "Switch to previous window.";};
# };
# Audio
"XF86AudioRaiseVolume" = {
action = spawn "wpctl" "set-volume" "-l" "1.5" "@DEFAULT_AUDIO_SINK@" "5%+";
hotkey-overlay = {hidden = true;};
};
"XF86AudioLowerVolume" = {
action = spawn "wpctl" "set-volume" "-l" "1.5" "@DEFAULT_AUDIO_SINK@" "5%-";
hotkey-overlay = {hidden = true;};
};
"XF86AudioPlay" = {
action = spawn "playerctl" "play-pause";
hotkey-overlay = {hidden = true;};
};
"XF86AudioPrev" = {
action = spawn "playerctl" "previous";
hotkey-overlay = {hidden = true;};
};
"XF86AudioNext" = {
action = spawn "playerctl" "next";
hotkey-overlay = {hidden = true;};
};
# Niri windows
"Mod+Q" = {
action = close-window;
hotkey-overlay = {title = "Close the current window.";};
};
"Mod+F" = {
action = fullscreen-window;
hotkey-overlay = {title = "Toggle between fullscreen and tiled window.";};
};
"Mod+Equal" = {
action = set-column-width "+10%";
hotkey-overlay = {title = "Increase column width";};
};
"Mod+Minus" = {
action = set-column-width "-10%";
hotkey-overlay = {title = "Decrease column width";};
};
"Mod+Shift+M" = {
action = set-column-width "50%";
hotkey-overlay = {title = "Set column width to 50%";};
};
"Mod+M" = {
action = maximize-column;
hotkey-overlay = {title = "Maximize column.";};
};
"Mod+Comma" = {
action = reset-window-height;
hotkey-overlay = {title = "Reset window height.";};
};
"Mod+V" = {
action = toggle-window-floating;
hotkey-overlay = {title = "Toggle between floating and tiled window.";};
};
"Mod+O" = {
action = toggle-overview;
hotkey-overlay = {title = "Toggle overlay.";};
};
"Mod+H" = {
action = focus-column-or-monitor-left;
hotkey-overlay = {title = "Focus column on the left. Equivalent bindings for other directions.";};
};
"Mod+J" = {
action = focus-window-or-workspace-down;
hotkey-overlay = {hidden = true;};
};
"Mod+K" = {
action = focus-window-or-workspace-up;
hotkey-overlay = {hidden = true;};
};
"Mod+L" = {
action = focus-column-or-monitor-right;
hotkey-overlay = {hidden = true;};
};
"Mod+WheelScrollUp" = {
action = focus-column-left;
hotkey-overlay = {title = "Focus column on the left. Equivalent binding for other direction.";};
};
"Mod+WheelScrollDown" = {
action = focus-column-right;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+WheelScrollUp" = {
action = focus-workspace-up;
hotkey-overlay = {title = "Focus previous workspace. Equivalent binding for other direction.";};
};
"Mod+Shift+WheelScrollDown" = {
action = focus-workspace-down;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+H" = {
action = move-column-left-or-to-monitor-left;
hotkey-overlay = {title = "Move column to the left. Equivalent bindings for other directions.";};
};
"Mod+Shift+J" = {
action = move-window-down-or-to-workspace-down;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+K" = {
action = move-window-up-or-to-workspace-up;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+L" = {
action = move-column-right-or-to-monitor-right;
hotkey-overlay = {hidden = true;};
};
# Niri workspaces
"Mod+1" = {
action = focus-workspace 1;
hotkey-overlay = {title = "Focus workspace 1. Equivalent bindings for other workspaces.";};
};
"Mod+2" = {
action = focus-workspace 2;
hotkey-overlay = {hidden = true;};
};
"Mod+3" = {
action = focus-workspace 3;
hotkey-overlay = {hidden = true;};
};
"Mod+4" = {
action = focus-workspace 4;
hotkey-overlay = {hidden = true;};
};
"Mod+5" = {
action = focus-workspace 5;
hotkey-overlay = {hidden = true;};
};
"Mod+6" = {
action = focus-workspace 6;
hotkey-overlay = {hidden = true;};
};
"Mod+7" = {
action = focus-workspace 7;
hotkey-overlay = {hidden = true;};
};
"Mod+8" = {
action = focus-workspace 8;
hotkey-overlay = {hidden = true;};
};
"Mod+9" = {
action = focus-workspace 9;
hotkey-overlay = {hidden = true;};
};
"Mod+0" = {
action = focus-workspace 10;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+1" = {
action.move-window-to-workspace = 1;
hotkey-overlay = {title = "Move current window to workspace 1. Equivalent bindings for other workspaces.";};
};
"Mod+Shift+2" = {
action.move-window-to-workspace = 2;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+3" = {
action.move-window-to-workspace = 3;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+4" = {
action.move-window-to-workspace = 4;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+5" = {
action.move-window-to-workspace = 5;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+6" = {
action.move-window-to-workspace = 6;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+7" = {
action.move-window-to-workspace = 7;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+8" = {
action.move-window-to-workspace = 8;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+9" = {
action.move-window-to-workspace = 9;
hotkey-overlay = {hidden = true;};
};
"Mod+Shift+0" = {
action.move-window-to-workspace = 10;
hotkey-overlay = {hidden = true;};
};
};
};
};
};
};
}

265
home/homemodules/niri/noctalia.nix
View File

@ -1,265 +0,0 @@
{color}: {
enable = false;
settings = {
# configure noctalia here; defaults will
# be deep merged with these attributes.
colorSchemes.predefinedScheme = "Catppuccin";
general = {
avatarImage = ../../../config/face.jpeg;
radiusRatio = 0.2;
showScreenCorners = false;
forceBlackScreenCorners = false;
dimDesktop = true;
scaleRatio = 1;
screenRadiusRatio = 1;
animationSpeed = 1;
animationDisabled = false;
compactLockScreen = false;
lockOnSuspend = true;
enableShadows = true;
shadowDirection = "bottom_right";
shadowOffsetX = 2;
shadowOffsetY = 3;
language = "";
};
ui = {
fontDefault = color.font;
fontFixed = color.font;
tooltipsEnabled = true;
panelsAttachedToBar = true;
settingsPanelAttachTobar = true;
fontDefaultScale = 1;
fontFixedScale = 1;
settingsPanelAttachToBar = false;
};
location = {
name = "Dortmund, Germany";
monthBeforeDay = true;
weatherEnabled = true;
useFahrenheit = false;
use12hourFormat = false;
showWeekNumberInCalendar = false;
showCalendarEvents = true;
showCalendarWeather = true;
analogClockInCalendar = false;
firstDayOfWeek = -1;
};
screenRecorder = {
directory = "~/Videos/Recordings";
frameRate = 60;
audioCodec = "aac";
videoCodec = "h265";
quality = "very_high";
colorRange = "limited";
showCursor = true;
audioSource = "default_output";
videoSource = "portal";
};
wallpaper = {
enabled = true;
overviewEnabled = true;
directory = "~/NixFlake/wallpapers";
enableMultiMonitorDirectories = false;
recursiveSearch = false;
setWallpaperOnAllMonitors = true;
defaultWallpaper = ../../../wallpapers/Windows.jpg;
fillMode = "crop";
fillColor = "#000000";
randomEnabled = false;
randomIntervalSec = 300;
transitionDuration = 1500;
transitionType = "random";
transitionEdgeSmoothness = 0.05;
monitors = [];
panelPosition = "follow_bar";
};
appLauncher = {
enableClipboardHistory = true;
position = "center";
backgroundOpacity = 1;
pinnedExecs = [];
useApp2Unit = false;
sortByMostUsed = true;
terminalCommand = "kitty -e";
customLaunchPrefixEnabled = false;
customLaunchPrefix = "";
};
dock = {
enabled = false;
};
network = {
wifiEnabled = true;
bluetoothEnabled = true;
};
notifications = {
enabled = true;
monitors = [];
location = "top_right";
overlayLayer = true;
backgroundOpacity = 1;
respectExpireTimeout = false;
lowUrgencyDuration = 3;
normalUrgencyDuration = 8;
criticalUrgencyDuration = 15;
};
osd = {
enabled = true;
location = "top_right";
monitors = [];
autoHideMs = 2000;
overlayLayer = true;
};
audio = {
volumeStep = 5;
volumeOverdrive = true;
cavaFrameRate = 30;
visualizerType = "linear";
visualizerQuality = "high";
mprisBlacklist = [];
preferredPlayer = "";
externalMixer = "kitty --title=Ncpamixer ncpamixer";
};
nightLight = {
enabled = false;
forced = false;
autoSchedule = true;
nightTemp = "5000";
dayTemp = "6500";
manualSunrise = "06:30";
manualSunset = "21:30";
};
sessionMenu = {
countdownDuration = 10000;
enableCountdown = true;
position = "center";
powerOptions = [
{
action = "lock";
enabled = true;
}
{
action = "suspend";
enabled = false;
}
{
action = "reboot";
enabled = true;
}
{
action = "logout";
enabled = true;
}
{
action = "shutdown";
enabled = true;
}
];
showHeader = true;
};
bar = {
density = "default";
position = "top";
showCapsule = false;
outerCorners = false;
exclusive = true;
backgroundOpacity = 1;
monitors = [];
floating = false;
marginVertical = 0.25;
marginHorizontal = 0.25;
widgets = {
left = [
{
id = "SidePanelToggle";
useDistroLogo = true;
}
{
hideUnoccupied = false;
id = "Workspace";
labelMode = "none";
}
{
id = "ActiveWindow";
maxWidth = 250;
}
];
center = [
{
id = "MediaMini";
maxWidth = 250;
showAlbumArt = true;
}
{
id = "AudioVisualizer";
width = 100;
visualizerType = "mirrored";
}
];
right = [
# {
# id = "SystemMonitor";
# usePrimaryColor = true;
# showCpuUsage = true;
# showCpuTemp = false;
# showMemoryUsage = true;
# showMemoryAsPercent = false;
# showNetworkStats = true;
# showDiskUsage = true;
# diskPath = "/";
# }
{
id = "Volume";
# displayMode = "alwaysShow";
}
{
id = "Microphone";
# displayMode = "alwaysShow";
}
{
id = "Bluetooth";
# displayMode = "alwaysShow";
}
{
id = "WiFi";
# displayMode = "alwaysShow";
}
{
id = "VPN";
# displayMode = "alwaysShow";
}
{
id = "Tray";
drawerEnabled = false;
}
{
formatHorizontal = "yyyy-MM-dd HH:mm";
formatVertical = "HH mm";
id = "Clock";
useMonospacedFont = true;
usePrimaryColor = true;
}
{
id = "NotificationHistory";
}
];
};
};
};
}

7
home/homemodules/niri/options.nix
View File

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

14
home/modules/0_template/default.nix Normal file
View File

@ -0,0 +1,14 @@
{
config,
nixosConfig,
lib,
mylib,
pkgs,
...
}: let
inherit (config.modules) TEMPLATE color;
in {
options.modules.TEMPLATE = import ./options.nix {inherit lib mylib;};
config = lib.mkIf TEMPLATE.enable {};
}

0
home/homemodules/0_template/options.nix → home/modules/0_template/options.nix
View File

0
home/homemodules/1_deprecated/ags/config/.gitignore → home/modules/1_deprecated/ags/config/.gitignore vendored
View File

0
home/homemodules/1_deprecated/ags/config/app.ts → home/modules/1_deprecated/ags/config/app.ts
View File

0
home/homemodules/1_deprecated/ags/config/env.d.ts → home/modules/1_deprecated/ags/config/env.d.ts vendored
View File

0
home/homemodules/1_deprecated/ags/config/package.json → home/modules/1_deprecated/ags/config/package.json
View File

0
home/homemodules/1_deprecated/ags/config/style.scss → home/modules/1_deprecated/ags/config/style.scss
View File

0
home/homemodules/1_deprecated/ags/config/tsconfig.json → home/modules/1_deprecated/ags/config/tsconfig.json
View File

0
home/homemodules/1_deprecated/ags/config/widget/Bar.tsx → home/modules/1_deprecated/ags/config/widget/Bar.tsx
View File

0
home/homemodules/1_deprecated/ags/config/widget/SysTray.tsx → home/modules/1_deprecated/ags/config/widget/SysTray.tsx
View File

36
home/homemodules/1_deprecated/ags/default.nix → home/modules/1_deprecated/ags/default.nix
View File

@ -6,9 +6,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) ags; inherit (config.modules) ags;
in { in {
options.homemodules.ags = import ./options.nix {inherit lib mylib;}; options.modules.ags = import ./options.nix {inherit lib mylib;};
config = lib.mkIf ags.enable { config = lib.mkIf ags.enable {
programs.ags = { programs.ags = {
@ -17,20 +17,20 @@ in {
# AGS libs go here # AGS libs go here
extraPackages = [ extraPackages = [
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.apps inputs.ags.packages.${pkgs.system}.apps
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.auth inputs.ags.packages.${pkgs.system}.auth
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.battery inputs.ags.packages.${pkgs.system}.battery
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.bluetooth inputs.ags.packages.${pkgs.system}.bluetooth
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.cava inputs.ags.packages.${pkgs.system}.cava
# inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.greet # inputs.ags.packages.${pkgs.system}.greet
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.hyprland inputs.ags.packages.${pkgs.system}.hyprland
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.mpris inputs.ags.packages.${pkgs.system}.mpris
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.network inputs.ags.packages.${pkgs.system}.network
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.notifd inputs.ags.packages.${pkgs.system}.notifd
# inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.powerprofiles # inputs.ags.packages.${pkgs.system}.powerprofiles
# inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.river # inputs.ags.packages.${pkgs.system}.river
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.tray inputs.ags.packages.${pkgs.system}.tray
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.wireplumber inputs.ags.packages.${pkgs.system}.wireplumber
]; ];
# This should symlink but doesn't, it copies the files :/ # This should symlink but doesn't, it copies the files :/
@ -40,7 +40,7 @@ in {
# The ags module doesn't expose the "astal" cli tool or extraPackages # The ags module doesn't expose the "astal" cli tool or extraPackages
home.packages = home.packages =
[ [
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.io inputs.ags.packages.${pkgs.system}.io
] ]
++ config.programs.ags.extraPackages; ++ config.programs.ags.extraPackages;
@ -68,7 +68,7 @@ in {
# ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.nixflake}/home/modules/ags/config"; # ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.nixflake}/home/modules/ags/config";
# NOTE: Don't symlink to ~/.config/ags/colors.scss, since that is already used by configDir # NOTE: Don't symlink to ~/.config/ags/colors.scss, since that is already used by configDir
".config/_colors.scss".text = with config.homemodules.color.hex; '' ".config/_colors.scss".text = with config.modules.color.hex; ''
$dark-rosewater: #${dark.rosewater}; $dark-rosewater: #${dark.rosewater};
$dark-flamingo: #${dark.flamingo}; $dark-flamingo: #${dark.flamingo};
$dark-pink: #${dark.pink}; $dark-pink: #${dark.pink};

0
home/homemodules/1_deprecated/ags/options.nix → home/modules/1_deprecated/ags/options.nix
View File

4
home/homemodules/1_deprecated/alacritty/default.nix → home/modules/1_deprecated/alacritty/default.nix
View File

@ -5,9 +5,9 @@
... ...
}: }:
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.alacritty; cfg = config.modules.alacritty;
in { in {
options.homemodules.alacritty = import ./options.nix {inherit lib mylib;}; options.modules.alacritty = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.alacritty = { programs.alacritty = {

0
home/homemodules/1_deprecated/alacritty/options.nix → home/modules/1_deprecated/alacritty/options.nix
View File

6
home/homemodules/1_deprecated/audio/default.nix → home/modules/1_deprecated/audio/default.nix
View File

@ -8,14 +8,14 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.audio; cfg = config.modules.audio;
cfgfp = config.homemodules.flatpak; cfgfp = config.modules.flatpak;
in { in {
imports = [ imports = [
../flatpak ../flatpak
]; ];
options.homemodules.audio = import ./options.nix {inherit lib mylib;}; options.modules.audio = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [

0
home/homemodules/1_deprecated/audio/options.nix → home/modules/1_deprecated/audio/options.nix
View File

4
home/homemodules/1_deprecated/emacs/default.nix → home/modules/1_deprecated/emacs/default.nix
View File

@ -12,13 +12,13 @@ with lib;
with mylib.modules; let with mylib.modules; let
# This is the current state of the option that this module defines # This is the current state of the option that this module defines
# We use it to determine if the config should be changed below # We use it to determine if the config should be changed below
cfg = config.homemodules.emacs; cfg = config.modules.emacs;
in { in {
imports = []; imports = [];
# Options is a vector of options this module defines # Options is a vector of options this module defines
# This module defines only the "emacs" option and suboptions "enable" and "doom" # This module defines only the "emacs" option and suboptions "enable" and "doom"
options.homemodules.emacs = import ./options.nix {inherit lib mylib;}; options.modules.emacs = import ./options.nix {inherit lib mylib;};
# Config is the merged set of all module configurations # Config is the merged set of all module configurations
# Here we define what happens to the config if the module is active (but only if the module is active) # Here we define what happens to the config if the module is active (but only if the module is active)

0
home/homemodules/1_deprecated/emacs/options.nix → home/modules/1_deprecated/emacs/options.nix
View File

4
home/homemodules/1_deprecated/email/default.nix → home/modules/1_deprecated/email/default.nix
View File

@ -13,9 +13,9 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.email; cfg = config.modules.email;
in { in {
options.homemodules.email = import ./options.nix {inherit lib mylib;}; options.modules.email = import ./options.nix {inherit lib mylib;};
# TODO: Add Maildir to nextcloud sync # TODO: Add Maildir to nextcloud sync
config = mkIf cfg.enable { config = mkIf cfg.enable {

0
home/homemodules/1_deprecated/email/options.nix → home/modules/1_deprecated/email/options.nix
View File

4
home/homemodules/1_deprecated/flatpak/default.nix → home/modules/1_deprecated/flatpak/default.nix
View File

@ -12,9 +12,9 @@ with mylib.modules;
# It is important that every flatpak interaction is handled through this module # It is important that every flatpak interaction is handled through this module
# to prevent that anything is removed by a module although it is required by another one # to prevent that anything is removed by a module although it is required by another one
let let
cfg = config.homemodules.flatpak; cfg = config.modules.flatpak;
in { in {
options.homemodules.flatpak = import ./options.nix {inherit lib mylib;}; options.modules.flatpak = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [

0
home/homemodules/1_deprecated/flatpak/options.nix → home/modules/1_deprecated/flatpak/options.nix
View File

8
home/homemodules/1_deprecated/gaming/default.nix → home/modules/1_deprecated/gaming/default.nix
View File

@ -7,11 +7,11 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.gaming; cfg = config.modules.gaming;
cfgfp = config.homemodules.flatpak; cfgfp = config.modules.flatpak;
in { in {
imports = [ imports = [
# NOTE: I don't know if this is the right approach or if I should use config.homemodules.flatpak # NOTE: I don't know if this is the right approach or if I should use config.modules.flatpak
../flatpak ../flatpak
]; ];
@ -19,7 +19,7 @@ in {
# TODO: SteamTinkerLaunch option # TODO: SteamTinkerLaunch option
# TODO: Dolphin + SteamRomManager option # TODO: Dolphin + SteamRomManager option
options.homemodules.gaming = import ./options.nix {inherit lib mylib;}; options.modules.gaming = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [

0
home/homemodules/1_deprecated/gaming/options.nix → home/modules/1_deprecated/gaming/options.nix
View File

4
home/homemodules/1_deprecated/helix/default.nix → home/modules/1_deprecated/helix/default.nix
View File

@ -10,9 +10,9 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.helix; cfg = config.modules.helix;
in { in {
options.homemodules.helix = import ./options.nix {inherit lib mylib;}; options.modules.helix = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.sessionVariables = { home.sessionVariables = {

0
home/homemodules/1_deprecated/helix/options.nix → home/modules/1_deprecated/helix/options.nix
View File

4
home/homemodules/1_deprecated/misc/default.nix → home/modules/1_deprecated/misc/default.nix
View File

@ -9,9 +9,9 @@
# TODO: Remove this module, put protonmail into the email module # TODO: Remove this module, put protonmail into the email module
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.misc; cfg = config.modules.misc;
in { in {
options.homemodules.misc = import ./options.nix {inherit lib mylib;}; options.modules.misc = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; home.packages = with pkgs;

0
home/homemodules/1_deprecated/misc/options.nix → home/modules/1_deprecated/misc/options.nix
View File

4
home/homemodules/1_deprecated/nextcloud/default.nix → home/modules/1_deprecated/nextcloud/default.nix
View File

@ -12,9 +12,9 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.nextcloud; cfg = config.modules.nextcloud;
in { in {
options.homemodules.nextcloud = import ./options.nix {inherit lib mylib;}; options.modules.nextcloud = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [ assertions = [

0
home/homemodules/1_deprecated/nextcloud/options.nix → home/modules/1_deprecated/nextcloud/options.nix
View File

4
home/homemodules/1_deprecated/ranger/default.nix → home/modules/1_deprecated/ranger/default.nix
View File

@ -8,9 +8,9 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.ranger; cfg = config.modules.ranger;
in { in {
options.homemodules.ranger = import ./options.nix {inherit lib mylib;}; options.modules.ranger = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; home.packages = with pkgs;

0
home/homemodules/1_deprecated/ranger/options.nix → home/modules/1_deprecated/ranger/options.nix
View File

4
home/homemodules/1_deprecated/vscode/default.nix → home/modules/1_deprecated/vscode/default.nix
View File

@ -9,9 +9,9 @@
}: }:
with lib; with lib;
with mylib.modules; let with mylib.modules; let
cfg = config.homemodules.vscode; cfg = config.modules.vscode;
in { in {
options.homemodules.vscode = import ./options.nix {inherit lib mylib;}; options.modules.vscode = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.vscode = { programs.vscode = {

0
home/homemodules/1_deprecated/vscode/options.nix → home/modules/1_deprecated/vscode/options.nix
View File

14
home/homemodules/beets/default.nix → home/modules/beets/default.nix
View File

@ -6,9 +6,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) beets; inherit (config.modules) beets;
in { in {
options.homemodules.beets = import ./options.nix {inherit lib mylib;}; options.modules.beets = import ./options.nix {inherit lib mylib;};
config = lib.mkIf beets.enable { config = lib.mkIf beets.enable {
programs.beets = { programs.beets = {
@ -50,7 +50,7 @@ in {
"edit" # edit metadata in text editor "edit" # edit metadata in text editor
"fetchart" # pickup local cover art or search online "fetchart" # pickup local cover art or search online
"fish" # beet fish generates ~/.config/fish/completions file "fish" # beet fish generates ~/.config/fish/completions file
# "lyrics" # fetch song lyrics "lyrics" # fetch song lyrics
"musicbrainz" # auto tagger data source "musicbrainz" # auto tagger data source
"replaygain" # write replaygain tags for automatic loudness adjustments "replaygain" # write replaygain tags for automatic loudness adjustments
]; ];
@ -60,10 +60,10 @@ in {
sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order
}; };
# lyrics = { lyrics = {
# auto = "yes"; # only embeds lyrics into metadata, needed for jellyfin but useless for rmpc auto = "yes"; # only embeds lyrics into metadata, needed for jellyfin but useless for rmpc
# synced = "yes"; # prefer synced lyrics if provided synced = "yes"; # prefer synced lyrics if provided
# }; };
replaygain = { replaygain = {
auto = "yes"; # analyze on import automatically auto = "yes"; # analyze on import automatically

0
home/homemodules/beets/options.nix → home/modules/beets/options.nix
View File

4
home/homemodules/btop/default.nix → home/modules/btop/default.nix
View File

@ -6,9 +6,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) btop color; inherit (config.modules) btop color;
in { in {
options.homemodules.btop = import ./options.nix {inherit lib mylib;}; options.modules.btop = import ./options.nix {inherit lib mylib;};
config = lib.mkIf btop.enable { config = lib.mkIf btop.enable {
programs.btop = { programs.btop = {

0
home/homemodules/btop/options.nix → home/modules/btop/options.nix
View File

4
home/homemodules/chromium/default.nix → home/modules/chromium/default.nix
View File

@ -5,9 +5,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) chromium; inherit (config.modules) chromium;
in { in {
options.homemodules.chromium = import ./options.nix {inherit lib mylib;}; options.modules.chromium = import ./options.nix {inherit lib mylib;};
config = lib.mkIf chromium.enable { config = lib.mkIf chromium.enable {
home.packages = with pkgs; home.packages = with pkgs;

0
home/homemodules/chromium/options.nix → home/modules/chromium/options.nix
View File

0
home/homemodules/color/applyColors.py → home/modules/color/applyColors.py
View File

17
home/homemodules/color/default.nix → home/modules/color/default.nix
View File

@ -5,9 +5,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) color; inherit (config.modules) color;
in { in {
options.homemodules.color = import ./options.nix {inherit lib mylib pkgs;}; options.modules.color = import ./options.nix {inherit lib mylib;};
config = { config = {
home.packages = let home.packages = let
@ -50,16 +50,13 @@ in {
|> builtins.concatStringsSep "\n") |> builtins.concatStringsSep "\n")
''echo ${lib.concatStrings (lib.replicate 20 "=")}'' ''echo ${lib.concatStrings (lib.replicate 20 "=")}''
]); ]);
in in [
[ applyColors
applyColors printNixColors
printNixColors ];
]
++ (lib.optionals color.installPackages [color.iconPackage color.cursorPackage])
++ (lib.optionals color.installPackages color.extraPackages);
# This module sets its own options to the values specified in a colorscheme file. # This module sets its own options to the values specified in a colorscheme file.
homemodules.color = let modules.color = let
scheme = import ./schemes/${color.scheme}.nix; scheme = import ./schemes/${color.scheme}.nix;
# Add the aliases # Add the aliases

49
home/homemodules/color/options.nix → home/modules/color/options.nix
View File

@ -1,7 +1,6 @@
{ {
lib, lib,
mylib, mylib,
pkgs,
... ...
}: let }: let
colorKeys = [ colorKeys = [
@ -51,54 +50,6 @@ in rec {
default = "JetBrainsMono Nerd Font Mono"; default = "JetBrainsMono Nerd Font Mono";
}; };
cursor = lib.mkOption {
type = lib.types.str;
description = "The cursor to use";
example = "Bibata-Modern-Classic";
default = "Bibata-Modern-Classic";
};
cursorSize = lib.mkOption {
type = lib.types.int;
description = "The cursor size";
example = 24;
default = 24;
};
cursorPackage = lib.mkOption {
type = lib.types.package;
description = "The cursor package";
example = pkgs.bibata-cursors;
default = pkgs.bibata-cursors;
};
iconTheme = lib.mkOption {
type = lib.types.str;
description = "The icon theme to use";
example = "Papirus";
default = "Papirus";
};
iconPackage = lib.mkOption {
type = lib.types.package;
description = "The icon theme package";
example = pkgs.papirus-icon-theme;
default = pkgs.papirus-icon-theme;
};
extraPackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
description = "Extra packages to install";
example = ''
[
pkgs.bibata-cursors
]
'';
default = [];
};
installPackages = lib.mkEnableOption "Install cursor and icon themes";
# This option is set automatically # This option is set automatically
wallpapers = let wallpapers = let
# Collect all the available wallpapers. # Collect all the available wallpapers.

0
home/homemodules/color/schemes/0_template.nix → home/modules/color/schemes/0_template.nix
View File

0
home/homemodules/color/schemes/catppuccin-latte.nix → home/modules/color/schemes/catppuccin-latte.nix
View File

0
home/homemodules/color/schemes/catppuccin-mocha.nix → home/modules/color/schemes/catppuccin-mocha.nix
View File

7
home/homemodules/default.nix → home/modules/default.nix
View File

@ -18,7 +18,6 @@
./lazygit ./lazygit
./mpd ./mpd
./neovim ./neovim
./niri
./nnn ./nnn
./paths ./paths
./qutebrowser ./qutebrowser
@ -32,12 +31,6 @@
inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.nix-flatpak.homeManagerModules.nix-flatpak
inputs.nixvim.homeModules.nixvim inputs.nixvim.homeModules.nixvim
inputs.textfox.homeManagerModules.default inputs.textfox.homeManagerModules.default
# inputs.niri.homeModules.niri # Imported by system module
inputs.noctalia.homeModules.default
inputs.caelestia.homeManagerModules.default
inputs.dank-material-shell.homeModules.dank-material-shell
inputs.dank-material-shell.homeModules.niri
inputs.danksearch.homeModules.default
# NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse) # NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse)
# inputs.impermanence.homeManagerModules.impermanence # inputs.impermanence.homeManagerModules.impermanence

9
home/homemodules/docs/default.nix → home/modules/docs/default.nix
View File

@ -5,18 +5,15 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) docs; inherit (config.modules) docs;
in { in {
options.homemodules.docs = import ./options.nix {inherit lib mylib;}; options.modules.docs = import ./options.nix {inherit lib mylib;};
config = lib.mkIf docs.enable { config = lib.mkIf docs.enable {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
texliveFull
inkscape inkscape
texliveFull # TODO: LaTeX packages
typst # TODO: Typst packages
]; ];
file = { file = {

0
home/homemodules/docs/options.nix → home/modules/docs/options.nix
View File

4
home/homemodules/fcitx/default.nix → home/modules/fcitx/default.nix
View File

@ -5,9 +5,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) fcitx; inherit (config.modules) fcitx;
in { in {
options.homemodules.fcitx = import ./options.nix {inherit lib mylib;}; options.modules.fcitx = import ./options.nix {inherit lib mylib;};
config = lib.mkIf fcitx.enable { config = lib.mkIf fcitx.enable {
i18n.inputMethod = { i18n.inputMethod = {

0
home/homemodules/fcitx/options.nix → home/modules/fcitx/options.nix
View File

1
home/homemodules/firefox/bookmarks.nix → home/modules/firefox/bookmarks.nix
View File

@ -69,7 +69,6 @@ in [
(mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html") (mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
(mkBm "RustOS" "https://os.phil-opp.com/") (mkBm "RustOS" "https://os.phil-opp.com/")
(mkBm "Interpreters" "https://craftinginterpreters.com/contents.html") (mkBm "Interpreters" "https://craftinginterpreters.com/contents.html")
(mkBm "Godbolt" "https://godbolt.org")
]; ];
} }
{ {

0
home/homemodules/firefox/customizationState.json → home/modules/firefox/customizationState.json
View File

14
home/homemodules/firefox/default.nix → home/modules/firefox/default.nix
View File

@ -6,15 +6,15 @@
hostname, hostname,
... ...
}: let }: let
inherit (config.homemodules) firefox color; inherit (config.modules) firefox color;
in { in {
options.homemodules.firefox = import ./options.nix {inherit lib mylib;}; options.modules.firefox = import ./options.nix {inherit lib mylib;};
config = lib.mkIf firefox.enable { config = lib.mkIf firefox.enable {
textfox = { textfox = {
enable = firefox.textfox; enable = firefox.textfox;
# useLegacyExtensions = false; useLegacyExtensions = false;
profiles = ["default"]; profile = "default";
config = { config = {
background = { background = {
@ -54,9 +54,7 @@ in {
}; };
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [vdhcoapp];
# vdhcoapp # No longer required since VDH >= 10
];
home.sessionVariables = lib.mkMerge [ home.sessionVariables = lib.mkMerge [
{ {
@ -245,7 +243,7 @@ in {
# catppuccin-web-file-icons # catppuccin-web-file-icons
clearurls clearurls
# cookie-autodelete # cookie-autodelete
# dark-background-light-text dark-background-light-text
display-_anchors # Easier linking to specific website parts display-_anchors # Easier linking to specific website parts
don-t-fuck-with-paste don-t-fuck-with-paste
# enhancer-for-youtube # Discontinued, use tweaks-for-youtube # enhancer-for-youtube # Discontinued, use tweaks-for-youtube

0
home/homemodules/firefox/options.nix → home/modules/firefox/options.nix
View File

0
home/homemodules/firefox/settings.nix → home/modules/firefox/settings.nix
View File

18
home/homemodules/fish/default.nix → home/modules/fish/default.nix
View File

@ -7,9 +7,9 @@
nixosConfig, nixosConfig,
... ...
}: let }: let
inherit (config.homemodules) fish color; inherit (config.modules) fish color;
in { in {
options.homemodules.fish = import ./options.nix {inherit lib mylib;}; options.modules.fish = import ./options.nix {inherit lib mylib;};
config = lib.mkIf fish.enable { config = lib.mkIf fish.enable {
# https://github.com/catppuccin/fish/blob/main/themes/Catppuccin%20Mocha.theme # https://github.com/catppuccin/fish/blob/main/themes/Catppuccin%20Mocha.theme
@ -47,7 +47,7 @@ in {
generateCompletions = nixosConfig.programs.fish.generateCompletions; generateCompletions = nixosConfig.programs.fish.generateCompletions;
functions = lib.mergeAttrsList [ functions = lib.mergeAttrsList [
(lib.optionalAttrs config.homemodules.nnn.enable { (lib.optionalAttrs config.modules.nnn.enable {
nnncd = { nnncd = {
wraps = "nnn"; wraps = "nnn";
description = "support nnn quit and change directory"; description = "support nnn quit and change directory";
@ -101,7 +101,7 @@ in {
# Same as above but with args for bat # Same as above but with args for bat
batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args)); batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
# These can be used for my config.homemodules and for HM config.programs, # These can be used for my config.modules and for HM config.programs,
# as both of these add the package to home.packages # as both of these add the package to home.packages
hasHomePackage = package: (mylib.modules.contains config.home.packages package); hasHomePackage = package: (mylib.modules.contains config.home.packages package);
@ -167,15 +167,15 @@ in {
gcl = "git clone"; gcl = "git clone";
}) })
(lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";}) (lib.optionalAttrs config.modules.kitty.enable {ssh = "kitty +kitten ssh";})
(abbrify pkgs.lazygit {lg = "lazygit";}) (abbrify pkgs.lazygit {lg = "lazygit";})
(abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";}) (abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
# Doesn't work with abbrify because I have nnn.override... # Doesn't work with abbrify because I have nnn.override...
(lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";}) (lib.optionalAttrs config.modules.nnn.enable {n = "nnncd -a";})
(lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";}) (lib.optionalAttrs config.modules.nnn.enable {np = "nnncd -a -P p";})
(abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";}) (abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
@ -184,7 +184,7 @@ in {
# grep = rg; # grep = rg;
}) })
(lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";}) (lib.optionalAttrs config.modules.rmpc.enable {r = "rcmp";})
(abbrify pkgs.rsync rec { (abbrify pkgs.rsync rec {
rsync = "rsync -ahv --inplace --partial --info=progress2"; rsync = "rsync -ahv --inplace --partial --info=progress2";
@ -197,7 +197,7 @@ in {
programs.starship = { programs.starship = {
enable = true; enable = true;
enableFishIntegration = config.homemodules.fish.enable; enableFishIntegration = config.modules.fish.enable;
settings = { settings = {
# Other config here # Other config here
format = "$all"; # Remove this line to disable the default prompt format format = "$all"; # Remove this line to disable the default prompt format

0
home/homemodules/fish/options.nix → home/modules/fish/options.nix
View File

4
home/homemodules/git/default.nix → home/modules/git/default.nix
View File

@ -6,9 +6,9 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) git; inherit (config.modules) git;
in { in {
options.homemodules.git = import ./options.nix {inherit lib mylib;}; options.modules.git = import ./options.nix {inherit lib mylib;};
config = lib.mkIf git.enable { config = lib.mkIf git.enable {
programs.diff-so-fancy = { programs.diff-so-fancy = {

0
home/homemodules/git/options.nix → home/modules/git/options.nix
View File

2
home/homemodules/hyprland/autostart.nix → home/modules/hyprland/autostart.nix
View File

@ -6,8 +6,6 @@
}: }:
builtins.concatLists [ builtins.concatLists [
(lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications (lib.optionals hyprland.dunst.enable ["dunst"]) # Notifications
(lib.optionals hyprland.hyprpanel.enable ["hyprpanel"]) # Panel
(lib.optionals hyprland.caelestia.enable ["caelestia shell"]) # Panel/Shell # TODO: Crashes on startup
[ [
# Start clipboard management # Start clipboard management
"wl-paste -t text --watch clipman store --no-persist" "wl-paste -t text --watch clipman store --no-persist"

64
home/homemodules/hyprland/default.nix → home/modules/hyprland/default.nix
View File

@ -8,7 +8,7 @@
username, username,
... ...
}: let }: let
inherit (config.homemodules) hyprland color; inherit (config.modules) hyprland color;
# Autostart programs # Autostart programs
always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;}; always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
@ -22,7 +22,7 @@
"$mainMod, mouse:273" = ["resizewindow"]; "$mainMod, mouse:273" = ["resizewindow"];
}; };
in { in {
options.homemodules.hyprland = import ./options.nix {inherit lib mylib;}; options.modules.hyprland = import ./options.nix {inherit lib mylib;};
config = lib.mkIf hyprland.enable { config = lib.mkIf hyprland.enable {
assertions = [ assertions = [
@ -34,29 +34,21 @@ in {
assertion = builtins.hasAttr "hyprlock" nixosConfig.security.pam.services; assertion = builtins.hasAttr "hyprlock" nixosConfig.security.pam.services;
message = "Can't enable Hyprland module without Hyprlock PAM service!"; message = "Can't enable Hyprland module without Hyprlock PAM service!";
} }
{
assertion = hyprland.hyprpanel.enable != hyprland.caelestia.enable;
message = "Can't enable Hyprpanel and Caelestia at the same time!";
}
]; ];
gtk = { gtk = {
enable = true; enable = true;
iconTheme.package = lib.mkDefault color.iconPackage; iconTheme.package = pkgs.papirus-icon-theme;
iconTheme.name = color.iconTheme; iconTheme.name = "Papirus";
};
homemodules = {
hyprpanel.enable = hyprland.hyprpanel.enable;
}; };
home = { home = {
pointerCursor = { pointerCursor = {
gtk.enable = lib.mkDefault true; gtk.enable = true;
x11.enable = lib.mkDefault true; x11.enable = true;
package = lib.mkDefault color.cursorPackage; package = pkgs.bibata-cursors;
name = color.cursor; name = "Bibata-Modern-Classic";
size = color.cursorSize; size = 24;
}; };
packages = with pkgs; [ packages = with pkgs; [
@ -121,29 +113,33 @@ in {
programs = { programs = {
hyprlock = import ./hyprlock.nix {inherit config hyprland color;}; hyprlock = import ./hyprlock.nix {inherit config hyprland color;};
caelestia = import ./caelestia.nix {inherit config hyprland color;};
# TODO: IMV shouldn't be part of the hyprland module
imv = {
enable = true;
settings = {
options = {
background = "${color.hex.base}";
overlay = true;
overlay_font = "${color.font}:12";
overlay_background_color = "${color.hex.accent}";
overlay_text_color = "${color.hex.accentText}";
};
};
};
}; };
services = { services = {
# TODO: Dunst shouldn't be part of the hyprland module
dunst = import ./dunst.nix {inherit pkgs config hyprland color;}; dunst = import ./dunst.nix {inherit pkgs config hyprland color;};
hypridle = import ./hypridle.nix {inherit config hyprland color;}; hypridle = import ./hypridle.nix {inherit config hyprland color;};
hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;}; hyprpaper = import ./hyprpaper.nix {inherit config hyprland color;};
}; };
# Make sure the units only start when using Hyprland
systemd.user.services.dunst.Unit.After = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.dunst.Unit.PartOf = lib.mkIf hyprland.dunst.enable (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.hypridle.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.hypridle.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.hypridle.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.hyprpaper.Install.WantedBy = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.hyprpaper.Unit.After = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
systemd.user.services.hyprpaper.Unit.PartOf = lib.mkIf (!hyprland.caelestia.enable) (lib.mkForce ["hyprland-session.target"]);
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
systemd.enable = true; # Enable hyprland-session.target systemd.enable = true; # Enable hyprland-session.target
systemd.variables = ["--all"]; # Import PATH into systemd systemd.variables = ["--all"]; # Import PATH into systemd
@ -152,16 +148,16 @@ in {
plugins = builtins.concatLists [ plugins = builtins.concatLists [
(lib.optionals (lib.optionals
hyprland.bars.enable hyprland.bars.enable
[inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars]) [inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars])
(lib.optionals (lib.optionals
hyprland.dynamicCursor.enable hyprland.dynamicCursor.enable
[inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors]) [inputs.hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors])
(lib.optionals (lib.optionals
hyprland.trails.enable hyprland.trails.enable
[inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails]) [inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails])
(lib.optionals (lib.optionals
hyprland.hyprspace.enable hyprland.hyprspace.enable
[inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace]) [inputs.hyprspace.packages.${pkgs.system}.Hyprspace])
]; ];
settings = import ./settings.nix { settings = import ./settings.nix {

6
home/homemodules/hyprland/dunst.nix → home/modules/hyprland/dunst.nix
View File

@ -6,12 +6,12 @@
}: { }: {
enable = hyprland.dunst.enable; enable = hyprland.dunst.enable;
iconTheme.package = color.iconPackage; iconTheme.package = pkgs.papirus-icon-theme;
iconTheme.name = color.iconTheme; iconTheme.name = "Papirus";
settings = { settings = {
global = { global = {
monitor = config.homemodules.waybar.monitor; monitor = config.modules.waybar.monitor;
font = "${color.font} 11"; font = "${color.font} 11";
offset = "10x10"; offset = "10x10";
background = color.hexS.base; background = color.hexS.base;

2
home/homemodules/hyprland/hypridle.nix → home/modules/hyprland/hypridle.nix
View File

@ -3,7 +3,7 @@
hyprland, hyprland,
color, color,
}: { }: {
enable = !hyprland.caelestia.enable; enable = true;
settings = { settings = {
general = { general = {

0
home/homemodules/hyprland/hyprlock.nix → home/modules/hyprland/hyprlock.nix
View File

2
home/homemodules/hyprland/hyprpaper.nix → home/modules/hyprland/hyprpaper.nix
View File

@ -3,7 +3,7 @@
hyprland, hyprland,
color, color,
}: { }: {
enable = !hyprland.caelestia.enable; enable = true;
settings = { settings = {
ipc = "on"; ipc = "on";

4
home/homemodules/hyprland/mappings.nix → home/modules/hyprland/mappings.nix
View File

@ -6,10 +6,14 @@
lib.mergeAttrsList [ lib.mergeAttrsList [
{ {
# Hyprland control # Hyprland control
"$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
"$mainMod, q" = ["killactive"]; "$mainMod, q" = ["killactive"];
"$mainMod, v" = ["togglefloating"]; "$mainMod, v" = ["togglefloating"];
"$mainMod, f" = ["fullscreen"]; "$mainMod, f" = ["fullscreen"];
"$mainMod, c" = ["exec, clipman pick --tool=rofi"];
"$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
"$mainMod, tab" = ["workspace, previous"]; "$mainMod, tab" = ["workspace, previous"];
"ALT, tab" = ["exec, rofi -show window"];
# "$mainMod, g" = ["togglegroup"]; # "$mainMod, g" = ["togglegroup"];
# "ALT, tab" = ["changegroupactive"]; # "ALT, tab" = ["changegroupactive"];

6
home/homemodules/hyprland/options.nix → home/modules/hyprland/options.nix
View File

@ -5,13 +5,11 @@
}: { }: {
enable = lib.mkEnableOption "Hyprland Window Manager + Compositor"; enable = lib.mkEnableOption "Hyprland Window Manager + Compositor";
dunst.enable = lib.mkEnableOption "Enable Dunst notification daemon"; dunst.enable = lib.mkEnableOption "Enable dunst notification daemon";
bars.enable = lib.mkEnableOption "Enable window bars"; bars.enable = lib.mkEnableOption "Enable window bars";
dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors"; dynamicCursor.enable = lib.mkEnableOption "Enable dynamic cursors";
trails.enable = lib.mkEnableOption "Enable dynamic window trails"; trails.enable = lib.mkEnableOption "Enable dynamic window trails";
hyprspace.enable = lib.mkEnableOption "Enable Hyprspace workspace overview"; hyprspace.enable = lib.mkEnableOption "Enable hyprspace workspace overview";
hyprpanel.enable = lib.mkEnableOption "Enable Hyprpanel";
caelestia.enable = lib.mkEnableOption "Enable Caelestia";
keyboard = { keyboard = {
layout = lib.mkOption { layout = lib.mkOption {

30
home/homemodules/hyprland/settings.nix → home/modules/hyprland/settings.nix
View File

@ -111,19 +111,19 @@
windowrule = let windowrule = let
mkWorkspaceRule = workspace: class: mkWorkspaceRule = workspace: class:
"match:class ^(${class})$, " "workspace ${workspace}, "
+ "workspace ${workspace}"; + "class:^(${class})$";
mkWorkspaceRules = workspace: class-list: mkWorkspaceRules = workspace: class-list:
builtins.map (mkWorkspaceRule workspace) class-list; builtins.map (mkWorkspaceRule workspace) class-list;
mkFloatingRule = attrs: mkFloatingRule = attrs:
(lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ") "float"
+ (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ") + (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
+ "float 1"; + (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
mkTranslucentRule = class: mkTranslucentRule = class:
"match:class ^(${class})$, " "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
+ "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}"; + "class:^(${class})$";
in in
lib.mkMerge [ lib.mkMerge [
(hyprland.workspacerules (hyprland.workspacerules
@ -165,15 +165,15 @@
# Because those are not windows, but layers, # Because those are not windows, but layers,
# we have to blur them explicitly # we have to blur them explicitly
layerrule = [ layerrule = [
"match:class rofi, blur 1" "blur,rofi"
# "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners "ignorealpha 0.001,rofi" # Fix pixelated corners
# "match:class rofi, xray 0" # Render on top of other windows "xray 0,rofi" # Render on top of other windows
# "match:class rofi, dim_around 1" "dimaround,rofi"
"match:class waybar, blur 1" "blur,waybar"
"match:class gtk4-layer-shell, blur 1" "blur,gtk4-layer-shell"
"match:class bar-0, blur 1" "blur,bar-0"
"match:class bar-1, blur 1" "blur,bar-1"
]; ];
decoration = { decoration = {

6
home/homemodules/hyprpanel/default.nix → home/modules/hyprpanel/default.nix
View File

@ -6,14 +6,14 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (config.homemodules) hyprpanel color; inherit (config.modules) hyprpanel color;
in { in {
options.homemodules.hyprpanel = import ./options.nix {inherit lib mylib;}; options.modules.hyprpanel = import ./options.nix {inherit lib mylib;};
config = lib.mkIf hyprpanel.enable { config = lib.mkIf hyprpanel.enable {
programs.hyprpanel = { programs.hyprpanel = {
enable = true; enable = true;
systemd.enable = hyprpanel.systemd.enable; systemd.enable = true;
settings = { settings = {
# #

9
home/modules/hyprpanel/options.nix Normal file
View File

@ -0,0 +1,9 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOption "hyprpanel";
}

6
home/homemodules/kitty/default.nix → home/modules/kitty/default.nix
View File

@ -5,9 +5,9 @@
mylib, mylib,
... ...
}: let }: let
inherit (config.homemodules) kitty color; inherit (config.modules) kitty color;
in { in {
options.homemodules.kitty = import ./options.nix {inherit lib mylib;}; options.modules.kitty = import ./options.nix {inherit lib mylib;};
config = lib.mkIf kitty.enable { config = lib.mkIf kitty.enable {
programs.kitty = { programs.kitty = {
@ -15,7 +15,7 @@ in {
shellIntegration.enableFishIntegration = true; shellIntegration.enableFishIntegration = true;
font = { font = {
name = "${config.homemodules.color.font}"; name = "${config.modules.color.font}";
size = 12; size = 12;
}; };

Some files were not shown because too many files have changed in this diff Show More