jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Compare commits

base: jahanson:8f5942938e1fb199faa000e538780b4e7d10377b
Branches Tags
jahanson:main
jahanson:renovate/ghcr.io-koush-scrypted-0.x
jahanson:renovate/docker.io-ollama-ollama-0.x
jahanson:qbittorrent
jahanson:talos-pxe-bootstrap
jahanson:update_flake_lock_action
jahanson:renovate/lock-file-maintenance
..
compare: jahanson:d77f227cf54dfe5472987e22286674494c65052c
Branches Tags
jahanson:renovate/ghcr.io-koush-scrypted-0.x
jahanson:renovate/docker.io-ollama-ollama-0.x
jahanson:main
jahanson:qbittorrent
jahanson:talos-pxe-bootstrap
jahanson:update_flake_lock_action
jahanson:renovate/lock-file-maintenance

1 commit
8f5942938e ... d77f227cf5

Author SHA1 Message Date
Renovate Bot
d77f227cf5 chore(deps): update ghcr.io/koush/scrypted docker tag to v0.138.5 2025-03-03 19:00:52 +00:00
12 changed files with 112 additions and 109 deletions
Show stats Expand all files Collapse all files

3
.archive/home/modules/programs/de/default.nix
View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
imports = [ imports = [
./gnome ./gnome
]; ];

83
flake.lock generated
View file

@ -162,6 +162,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -260,11 +276,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1710146030,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -472,11 +488,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1741035361, "lastModified": 1740614171,
"narHash": "sha256-WSfqkzWUY8FMFnaGm0n9QcoO0cgqJbYcv3ccfkFv7Qw=", "narHash": "sha256-M4V9mn/XlGaz0ghcAICZZ5ErU7gB/J4dRGZ5eC9axng=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "d7e7a292613a4f20218074ff8299dff099a80098", "rev": "d5920bc5da75b8eaf3476bc814bd46d225709788",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -941,11 +957,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741053056, "lastModified": 1740620959,
"narHash": "sha256-ygah91MEXq8f82EbqGMk8VTnV2Ur2zFBUnj/0E3yfug=", "narHash": "sha256-2yp4ipvKG1cZf4OJYelOiDMtZ4qxGn4PPFXlpiVMcuo=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "df6064e16c85263e587f0490aa804f67fbc224ff", "rev": "91ee2f20fe2500359ba04f6ca86d39e950345d1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -956,17 +972,18 @@
}, },
"nix-vscode-extensions": { "nix-vscode-extensions": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1741126766, "lastModified": 1740655383,
"narHash": "sha256-Irgm6XQBenXE+qqE7VfQmmZCACm5DfEaQamshHiIRZY=", "narHash": "sha256-HHb6wtlHWy/CW3oCtOyOQrNnzgtsvwvwM6wAlDvfTec=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "7524932bd3093e551e87103bb72f096a2352500e", "rev": "bcf7577daac02aa1a7dfaddc79324b7c6ca4af81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1049,11 +1066,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1740560979,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1065,11 +1082,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1740932899, "lastModified": 1740463929,
"narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1081,11 +1098,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1740560979,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1170,11 +1187,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1741128337, "lastModified": 1740661727,
"narHash": "sha256-tnzgx8XmDr/jetKbELktR7kCrWyHWs99yOL6PDZV8fM=", "narHash": "sha256-FayYwfyYLL+EtaRcN2H3YV8Z0XJhjYRvhOYPpq7k9NA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "862010e51dce8bc528188b0ad116fa07141da92b", "rev": "32eb8668e5b3de02c6d5891ee1736c2ab35148f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1194,11 +1211,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1741120430, "lastModified": 1740659022,
"narHash": "sha256-n+Qeb9qU+olGrGcAPcpTccb0zUQscH69o58ncHg2Ufg=", "narHash": "sha256-eUbuxeOQFKZln1ctHDgJDyRzvEK8XkjG6pMVkONQEBA=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "27978c7186b26e78c7765de4c093a816617f9f39", "rev": "7e53fc47243448fdd01adf2a5b780831853c5dca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1413,11 +1430,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741043164, "lastModified": 1739262228,
"narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1569,11 +1586,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741057234, "lastModified": 1740628241,
"narHash": "sha256-1UEFyD9WxJUSECyEzKwM4AQ6BRFVVkrBjfGAUySV80Q=", "narHash": "sha256-7yzmrdbrw7PzTAeWwEr+r5lmevbSuife4cOJl96Kv7w=",
"owner": "budimanjojo", "owner": "budimanjojo",
"repo": "talhelper", "repo": "talhelper",
"rev": "4e593a7d938b5ca18a31d4aa808bb000627ee7f5", "rev": "e23e0e77e3c7c9fb08e0d783a11fa1d92227a70d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
nixos/home/jahanson/global.nix
View file

@ -54,7 +54,6 @@
direnv direnv
git git
python3 python3
pipx
fzf fzf
ripgrep ripgrep
lsd lsd

30
nixos/home/modules/de/hyprland.nix
View file

@ -12,25 +12,12 @@ in {
imports = [inputs.ags.homeManagerModules.default]; imports = [inputs.ags.homeManagerModules.default];
config = mkIf cfg.enable { config = mkIf cfg.enable {
# Downloads the Theme Resources
home.packages = with pkgs; [
andromeda-gtk-theme
flat-remix-icon-theme
bibata-cursors
];
# 'Installs' (sym-links) the Theme Resources
home.file = {
".themes/Andromeda".source = "${pkgs.andromeda-gtk-theme}/share/themes/Andromeda";
".icons/Flat-Remix-Blue-Dark".source = "${pkgs.flat-remix-icon-theme}/share/icons/Flat-Remix-Blue-Dark";
".icons/Bibata-Modern-Ice".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Ice";
};
# Theme settings
gtk = { gtk = {
enable = true; enable = true;
# Some apps just need the good ol' ini files.
gtk3.extraConfig = { gtk3.extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
gtk-theme-name = "Andromeda"; gtk-theme-name = "Andromeda-dark";
gtk-icon-theme-name = "Flat-Remix-Blue-Dark"; gtk-icon-theme-name = "Flat-Remix-Blue-Dark";
gtk-font-name = "Fira Code Semi-Bold 14"; gtk-font-name = "Fira Code Semi-Bold 14";
gtk-cursor-theme-name = "Bibata-Modern-Ice"; gtk-cursor-theme-name = "Bibata-Modern-Ice";
@ -48,7 +35,7 @@ in {
}; };
gtk4.extraConfig = { gtk4.extraConfig = {
gtk-application-prefer-dark-theme = "1"; gtk-application-prefer-dark-theme = "1";
gtk-theme-name = "Andromeda"; gtk-theme-name = "Andromeda-dark";
gtk-icon-theme-name = "Flat-Remix-Blue-Dark"; gtk-icon-theme-name = "Flat-Remix-Blue-Dark";
gtk-font-name = "Fira Code Semi-Bold 14"; gtk-font-name = "Fira Code Semi-Bold 14";
gtk-cursor-theme-name = "Bibata-Modern-Ice"; gtk-cursor-theme-name = "Bibata-Modern-Ice";
@ -65,18 +52,9 @@ in {
gtk-xft-rgba = "rgb"; gtk-xft-rgba = "rgb";
}; };
}; };
# Wayland and apps pull from dconf since we're using the gtk portal.
dconf.settings = {
"org/gnome/desktop/interface" = {
color-scheme = "prefer-dark";
cursor-size = 24;
cursor-theme = "Bibata-Modern-Ice";
gtk-theme = "Andromeda";
icon-theme = "Flat-Remix-Blue-Dark";
};
};
programs.ags = { programs.ags = {
enable = true; enable = true;
# I don't want Home Manager to manage these config files. # I don't want Home Manager to manage these config files.
# Just setup the programs. # Just setup the programs.
configDir = null; configDir = null;

53
nixos/hosts/telchar/default.nix
View file

@ -1,25 +1,53 @@
{pkgs, ...}: { {
config,
pkgs,
myPkgs,
inputs,
...
}: let
hypr-pkgs = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in {
imports = []; imports = [];
swapDevices = []; swapDevices = [];
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
# System packages # System packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# myPkgs.modrinth-app-unwrapped uv
dconf-editor
fastfetch fastfetch
gtk3 gtk3
nodejs_22 dconf-editor
pavucontrol # Pulseaudio volume control # myPkgs.modrinth-app-unwrapped
vesktop # Discord custom client
zulu # Java OpenJDK zulu # Java OpenJDK
nodejs_22
vesktop
]; ];
hardware.graphics = {
package = hypr-pkgs.mesa.drivers;
};
environment.sessionVariables = { environment.sessionVariables = {
# Wayland and Chromium/Electron apps. # Wayland and Chromium/Electron apps.
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
}; };
# sops
# sops.secrets = {
# "syncthing/publicCert" = {
# sopsFile = ./secrets.sops.yaml;
# owner = "jahanson";
# mode = "400";
# restartUnits = ["syncthing.service"];
# };
# "syncthing/privateKey" = {
# sopsFile = ./secrets.sops.yaml;
# owner = "jahanson";
# mode = "400";
# restartUnits = ["syncthing.service"];
# };
#};
services = { services = {
# Tailscale # Tailscale
tailscale = { tailscale = {
@ -30,19 +58,8 @@
pipewire = { pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
jack.enable = true;
pulse.enable = true; pulse.enable = true;
extraConfig.pipewire = {
"10-clock-rate" = {
"context.properties" = {
"default.clock.rate" = 48000;
};
};
"10-clock-quantum" = {
"context.properties" = {
"default.clock.quantum" = 1024;
};
};
};
}; };
blueman.enable = true; blueman.enable = true;
}; };

1
nixos/lib/default.nix
View file

@ -12,7 +12,6 @@ with lib; rec {
# Create custom package set # Create custom package set
mkMyPkgs = pkgs: { mkMyPkgs = pkgs: {
borgmatic = pkgs.callPackage ../../nixos/packages/borgmatic {}; borgmatic = pkgs.callPackage ../../nixos/packages/borgmatic {};
mods = pkgs.callPackage ../../nixos/packages/charm-mods {};
# modrinth-app-unwrapped = pkgs.callPackage ../../nixos/packages/modrinth {}; # modrinth-app-unwrapped = pkgs.callPackage ../../nixos/packages/modrinth {};
}; };

2
nixos/modules/nixos/containers/scrypted/default.nix
View file

@ -7,7 +7,7 @@
with lib; let with lib; let
app = "scrypted"; app = "scrypted";
# renovate: depName=ghcr.io/koush/scrypted datasource=docker versioning=docker # renovate: depName=ghcr.io/koush/scrypted datasource=docker versioning=docker
version = "v0.138.6-noble-nvidia"; version = "v0.138.5-noble-nvidia";
image = "ghcr.io/koush/scrypted:${version}"; image = "ghcr.io/koush/scrypted:${version}";
cfg = config.mySystem.containers.${app}; cfg = config.mySystem.containers.${app};
in { in {

7
nixos/modules/nixos/de/hyprland.nix
View file

@ -6,7 +6,6 @@
... ...
}: let }: let
cfg = config.mySystem.de.hyprland; cfg = config.mySystem.de.hyprland;
hypr-pkgs = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
in { in {
options = { options = {
mySystem.de.hyprland = { mySystem.de.hyprland = {
@ -18,12 +17,6 @@ in {
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# We need all hyprland packages to follow the same MESA version
hardware = {
graphics = {
package = hypr-pkgs.mesa.drivers;
};
};
# Hyprland nixpkgs system packages # Hyprland nixpkgs system packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Hyprland # Hyprland

11
nixos/packages/charm-mods/default.nix → nixos/overlays/charm-mods/default.nix
View file

@ -7,19 +7,20 @@
testers, testers,
mods, mods,
}: }:
buildGoModule rec { buildGoModule rec {
pname = "mods"; pname = "mods";
version = "1.7.0"; version = "1.6.0";
commitHash = "bf8337f9f4c586aaa267f8019ac2d0daa3b30129"; commitHash = "2a7f9d4dc11b6c828bf35a0b3d0be709f3ed79b9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charmbracelet"; owner = "charmbracelet";
repo = "mods"; repo = "mods";
rev = commitHash; rev = commitHash;
hash = "sha256-EoDia+7ObtpnTDjJMzOk9djyCrW0m9pIToNHEDZ8Ch8="; hash = "sha256-23gtb8BOx/0c643/paRt7VFHEyMyF4Q4a5b5+a4+kNU=";
}; };
vendorHash = "sha256-dnKvT3VcvidfDcgJ9FerjtReIOwvRZtJZiBwNx2BEQ8="; vendorHash = "sha256-RV/Nr60BpCLcUL2Yy1Dd2ScwoI0BhGhTb/igCEcJPjI=";
nativeBuildInputs = [ nativeBuildInputs = [
installShellFiles installShellFiles
@ -32,7 +33,7 @@ buildGoModule rec {
]; ];
# These tests require internet access. # These tests require internet access.
checkFlags = ["-skip=^TestLoad/http_url$|^TestLoad/https_url$"]; checkFlags = [ "-skip=^TestLoad/http_url$|^TestLoad/https_url$" ];
passthru = { passthru = {
updateScript = gitUpdater { updateScript = gitUpdater {

25
nixos/overlays/default.nix
View file

@ -1,15 +1,17 @@
{inputs, ...}: let { inputs, ... }:
let
# smartmontoolsOverlay = import ./smartmontools { }; # smartmontoolsOverlay = import ./smartmontools { };
# vivaldiOverlay = self: super: { vivaldi = super.callPackage ./vivaldi { }; }; # vivaldiOverlay = self: super: { vivaldi = super.callPackage ./vivaldi { }; };
coderOverlay = self: super: {coder = super.callPackage ./coder {};}; coderOverlay = self: super: { coder = super.callPackage ./coder { }; };
# modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; }; modsOverlay = self: super: { mods = super.callPackage ./charm-mods { }; };
termiusOverlay = self: super: {termius = super.callPackage ./termius {};}; termiusOverlay = self: super: { termius = super.callPackage ./termius { }; };
in { in
{
# smartmontools = smartmontoolsOverlay; # smartmontools = smartmontoolsOverlay;
# vivaldi = vivaldiOverlay; # vivaldi = vivaldiOverlay;
coder = coderOverlay; coder = coderOverlay;
comm-packages = inputs.nix-vscode-extensions.overlays.default; comm-packages = inputs.nix-vscode-extensions.overlays.default;
# mods = modsOverlay; mods = modsOverlay;
nix-minecraft = inputs.nix-minecraft.overlay; nix-minecraft = inputs.nix-minecraft.overlay;
nur = inputs.nur.overlays.default; nur = inputs.nur.overlays.default;
termius = termiusOverlay; termius = termiusOverlay;
@ -25,18 +27,17 @@ in {
// { // {
# Add talosctl to the unstable set # Add talosctl to the unstable set
talosctl = final.unstable.callPackage ./talosctl { talosctl = final.unstable.callPackage ./talosctl {
inherit inherit (final.unstable)
(final.unstable)
lib lib
buildGoModule buildGoModule
fetchFromGitHub fetchFromGitHub
installShellFiles installShellFiles
; ;
}; };
xpipe = final.unstable.callPackage ./xpipe/ptb.nix {}; xpipe = final.unstable.callPackage ./xpipe/ptb.nix { };
prowlarr = final.unstable.callPackage ./arr/prowlarr.nix {}; prowlarr = final.unstable.callPackage ./arr/prowlarr.nix { };
radarr = final.unstable.callPackage ./arr/radarr.nix {}; radarr = final.unstable.callPackage ./arr/radarr.nix { };
sonarr = final.unstable.callPackage ./arr/sonarr.nix {}; sonarr = final.unstable.callPackage ./arr/sonarr.nix { };
}; };
}; };
} }

1
nixos/profiles/hw-framework-16-7840hs.nix
View file

@ -1,7 +1,6 @@
{ {
lib, lib,
config, config,
pkgs,
... ...
}: { }: {
imports = []; imports = [];

4
nixos/profiles/role-dev.nix
View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
myPkgs,
inputs, inputs,
... ...
}: }:
@ -29,7 +28,6 @@
alejandra alejandra
# dev # dev
uv # python package manager
bash-language-server bash-language-server
fd fd
gh gh
@ -59,8 +57,8 @@
inputs.talhelper.packages.${pkgs.system}.default inputs.talhelper.packages.${pkgs.system}.default
# charmbracelet tools # charmbracelet tools
myPkgs.mods
gum gum
mods
skate skate
soft-serve soft-serve
unstable.glow unstable.glow