Compare commits

..

No commits in common. "415903451f90a69b1cf9a0875e94bfdf2d6832f7" and "8d04d9c64963065940ebfbc9e68a365de317522f" have entirely different histories.

75 changed files with 393 additions and 61 deletions

View file

@ -1,4 +1,8 @@
{pkgs, ...}: { {
config,
pkgs,
...
}: {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
nativeMessagingHosts = [pkgs.firefoxpwa]; nativeMessagingHosts = [pkgs.firefoxpwa];

View file

@ -1,4 +1,9 @@
{...}: { {
lib,
pkgs,
inputs,
...
}: {
programs.foot = { programs.foot = {
enable = true; enable = true;
catppuccin.enable = true; catppuccin.enable = true;

View file

@ -1,4 +1,9 @@
{...}: { {
lib,
pkgs,
inputs,
...
}: {
home.file = { home.file = {
"profile" = { "profile" = {
source = ./Catppuccin.profile; source = ./Catppuccin.profile;

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./lillian.nix ./lillian.nix

View file

@ -1,6 +1,13 @@
# This is your home-manager configuration file # This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
# If you want to use modules your own flake exports (from modules/home-manager): # If you want to use modules your own flake exports (from modules/home-manager):

View file

@ -1,4 +1,11 @@
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
./shell/helix ./shell/helix
./shell/zellij ./shell/zellij
@ -28,7 +35,6 @@
lazygit lazygit
navi navi
yazi yazi
nil
]; ];
programs.navi.enable = true; programs.navi.enable = true;
} }

View file

@ -1,4 +1,8 @@
{pkgs, ...}: { {
lib,
pkgs,
...
}: {
programs.bat = { programs.bat = {
enable = true; enable = true;
extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch]; extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch];

View file

@ -1,4 +1,4 @@
{...}: { {lib, ...}: {
programs.eza = { programs.eza = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;

View file

@ -1,4 +1,9 @@
{pkgs, ...}: let {
config,
lib,
pkgs,
...
}: let
yazi = yazi =
pkgs.writeText "open_in_helix_from_yazi.zsh" pkgs.writeText "open_in_helix_from_yazi.zsh"
'' ''
@ -27,10 +32,9 @@
} }
send_to_jupyter() { send_to_jupyter() {
is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25 && zellij action write 17 is_new && zellij run -f -n "jupyter console" -- direnv exec . jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd | tr \"/\" -).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=''' && zellij action write 29 25
pwd >> /tmp/rjh pwd >> /tmp/rjh
zellij action write 29 25 zellij action write 29 25
zellij action write 17
cat | just send cat | just send
} }
send_to_jupyter send_to_jupyter

View file

@ -1,4 +1,9 @@
{...}: { {
config,
lib,
pkgs,
...
}: {
programs.hyfetch = { programs.hyfetch = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,4 +1,5 @@
{ {
lib,
pkgs, pkgs,
inputs, inputs,
... ...

View file

@ -1,4 +1,11 @@
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
programs.zoxide = { programs.zoxide = {
enable = true; enable = true;
}; };

View file

@ -9,7 +9,3 @@ test:
update: update:
nix flake update nix flake update
clean:
sudo nix-collect-garbage
sudo nix-store --optimise

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
services.pihole = { services.pihole = {
enable = true; enable = true;
hostConfig = { hostConfig = {

View file

@ -1,6 +1,7 @@
# This is your system's configuration file. # This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) # Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{ {
inputs,
outputs, outputs,
lib, lib,
config, config,
@ -60,7 +61,7 @@
tpm2-tss tpm2-tss
virtualgl virtualgl
vulkan-tools vulkan-tools
# waydroid waydroid
waypipe waypipe
wayland-utils wayland-utils
xwaylandvideobridge xwaylandvideobridge

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
./firefox ./firefox
]; ];

View file

@ -4,6 +4,7 @@
inputs, inputs,
outputs, outputs,
lib, lib,
config,
pkgs, pkgs,
... ...
}: { }: {

View file

@ -4,6 +4,7 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View file

@ -3,6 +3,8 @@
{ {
inputs, inputs,
outputs, outputs,
lib,
config,
pkgs, pkgs,
... ...
}: { }: {
@ -82,7 +84,7 @@
}; };
}; };
# virtualisation.waydroid.enable = false; virtualisation.waydroid.enable = true;
networking.hostName = "GLaDOS"; networking.hostName = "GLaDOS";
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

View file

@ -4,6 +4,7 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View file

@ -2,7 +2,9 @@
inputs, inputs,
outputs, outputs,
lib, lib,
config,
pkgs, pkgs,
nixpkgs-stable,
... ...
}: { }: {
imports = [ imports = [

View file

@ -2,7 +2,9 @@
inputs, inputs,
outputs, outputs,
lib, lib,
config,
pkgs, pkgs,
nixpkgs-stable,
... ...
}: { }: {
imports = [ imports = [

View file

@ -2,7 +2,9 @@
inputs, inputs,
outputs, outputs,
lib, lib,
config,
pkgs, pkgs,
nixpkgs-stable,
... ...
}: { }: {
imports = [ imports = [

View file

@ -1,5 +1,7 @@
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View file

@ -1,4 +1,11 @@
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
services.udev.extraRules = '' services.udev.extraRules = ''
KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="add", RUN+="${pkgs.systemd}/bin/systemctl start --no-block external-drive-mount@%k.service"
KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service" KERNEL=="sd[a-z]|sd[a-z][0-9]", ACTION=="remove", RUN+="${pkgs.systemd}/bin/systemctl stop --no-block external-drive-mount@%k.service"

View file

@ -2,6 +2,7 @@
inputs, inputs,
outputs, outputs,
lib, lib,
config,
pkgs, pkgs,
... ...
}: { }: {

View file

@ -4,6 +4,7 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View file

@ -1,4 +1,8 @@
{pkgs, ...}: { {
config,
pkgs,
...
}: {
boot.kernelPatches = [ boot.kernelPatches = [
rec { rec {
name = "compat_uts_machine"; name = "compat_uts_machine";

View file

@ -2,7 +2,9 @@
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ {
config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# You can import other home-manager modules here # You can import other home-manager modules here
imports = [ imports = [
./package-configs ./package-configs

View file

@ -1,4 +1,7 @@
{ {
inputs,
outputs,
lib,
config, config,
pkgs, pkgs,
... ...

View file

@ -1,4 +1,8 @@
{config, ...}: { {
config,
pkgs,
...
}: {
users.users.aria2.group = "aria2"; users.users.aria2.group = "aria2";
users.groups.aria2 = {}; users.groups.aria2 = {};
users.users.aria2.isSystemUser = true; users.users.aria2.isSystemUser = true;

View file

@ -1,4 +1,10 @@
{config, ...}: { {
inputs,
outputs,
config,
pkgs,
...
}: {
users.users.aria2.group = "aria2"; users.users.aria2.group = "aria2";
users.groups.aria2 = {}; users.groups.aria2 = {};
users.users.aria2.isSystemUser = true; users.users.aria2.isSystemUser = true;

View file

@ -1,4 +1,10 @@
{pkgs, ...}: { {
config,
pkgs,
inputs,
lib,
...
}: {
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts = { virtualHosts = {

View file

@ -2,6 +2,7 @@
config, config,
pkgs, pkgs,
inputs, inputs,
lib,
... ...
}: let }: let
# You'll need to edit these values # You'll need to edit these values

View file

@ -1,4 +1,8 @@
{config, ...}: { {
config,
pkgs,
...
}: {
sops.secrets."coturn-auth-secret".mode = "0440"; sops.secrets."coturn-auth-secret".mode = "0440";
sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name; sops.secrets."coturn-auth-secret".owner = config.users.users.turnserver.name;
users.users.nginx.extraGroups = ["turnserver"]; users.users.nginx.extraGroups = ["turnserver"];

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
./grafana ./grafana
#./loki #./loki

View file

@ -1,4 +1,8 @@
{config, ...}: { {
config,
pkgs,
...
}: {
# grafana configuration # grafana configuration
services.grafana = { services.grafana = {
enable = true; enable = true;

View file

@ -1,4 +1,8 @@
{...}: { {
config,
pkgs,
...
}: {
services.loki = { services.loki = {
enable = true; enable = true;
configFile = ./loki.yaml; configFile = ./loki.yaml;

View file

@ -1,4 +1,8 @@
{...}: { {
config,
pkgs,
...
}: {
services.prometheus = { services.prometheus = {
enable = true; enable = true;
port = 9001; port = 9001;

View file

@ -1,4 +1,11 @@
{config, ...}: { {
inputs,
lib,
config,
pkgs,
user,
...
}: {
sops.secrets."grafana-telegraf-key".mode = "0440"; sops.secrets."grafana-telegraf-key".mode = "0440";
sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name; sops.secrets."grafana-telegraf-key".owner = config.users.users.telegraf.name;
services.telegraf = { services.telegraf = {

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [ imports = [
./conduit ./conduit
./forgejo ./forgejo

View file

@ -1,4 +1,11 @@
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = []; imports = [];
#sops.secrets."mailpassunhash".mode = "0440"; #sops.secrets."mailpassunhash".mode = "0440";

View file

@ -1,4 +1,11 @@
{pkgs, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
users.users.gotosocial.extraGroups = ["virtualMail"]; users.users.gotosocial.extraGroups = ["virtualMail"];
services.nginx = { services.nginx = {

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
users.users.jellyfin.extraGroups = ["nextcloud" "aria2"]; users.users.jellyfin.extraGroups = ["nextcloud" "aria2"];
services.nginx = { services.nginx = {

View file

@ -1,4 +1,11 @@
{config, ...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
sops.secrets."mailpass".mode = "0440"; sops.secrets."mailpass".mode = "0440";
sops.secrets."mailpass".owner = config.users.users.virtualMail.name; sops.secrets."mailpass".owner = config.users.users.virtualMail.name;

View file

@ -1,4 +1,8 @@
{...}: { {
config,
pkgs,
...
}: {
users.users = { users.users = {
ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"]; ombi.extraGroups = ["radarr" "sonarr" "aria2" "nextcloud"];
}; };

View file

@ -1,4 +1,10 @@
{pkgs, ...}: { {
config,
pkgs,
inputs,
lib,
...
}: {
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts = { virtualHosts = {

View file

@ -1,4 +1,8 @@
{pkgs, ...}: { {
config,
pkgs,
...
}: {
services.postgresql = { services.postgresql = {
# https://nixos.org/manual/nixos/stable/#module-postgresql # https://nixos.org/manual/nixos/stable/#module-postgresql
package = pkgs.postgresql_16; package = pkgs.postgresql_16;

View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: { }: {
# TODO: Figure out how to create packages for some plugins for roundcube! # TODO: Figure out how to create packages for some plugins for roundcube!

View file

@ -1,8 +1,10 @@
{ {
inputs, inputs,
outputs,
lib, lib,
config, config,
pkgs, pkgs,
pkgs-edge,
... ...
}: { }: {
imports = [ imports = [

View file

@ -1,4 +1,11 @@
{...}: { {
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

View file

@ -1,5 +1,8 @@
{ {
inputs,
outputs, outputs,
lib,
config,
pkgs, pkgs,
pkgs-edge, pkgs-edge,
... ...

View file

@ -1,5 +1,10 @@
{ {
lib,
stdenv,
system,
pkgs, pkgs,
util-linux,
jq,
writeShellApplication, writeShellApplication,
}: }:
writeShellApplication writeShellApplication

View file

@ -1,4 +1,6 @@
{ {
lib,
stdenv,
direnv, direnv,
writeShellApplication, writeShellApplication,
}: }:

View file

@ -1,4 +1,6 @@
{ {
lib,
stdenv,
direnv, direnv,
writeShellApplication, writeShellApplication,
}: }:

View file

@ -1,4 +1,6 @@
{ {
lib,
stdenv,
git, git,
gum, gum,
writeShellApplication, writeShellApplication,

View file

@ -1,4 +1,8 @@
{writeShellApplication}: {
lib,
stdenv,
writeShellApplication,
}:
writeShellApplication writeShellApplication
{ {
name = "install-nix"; name = "install-nix";

View file

@ -1,4 +1,8 @@
{writeShellApplication}: {
lib,
stdenv,
writeShellApplication,
}:
writeShellApplication writeShellApplication
{ {
name = "rebuild-no-inhibit"; name = "rebuild-no-inhibit";

View file

@ -1,4 +1,8 @@
{writeShellApplication}: {
lib,
stdenv,
writeShellApplication,
}:
writeShellApplication writeShellApplication
{ {
name = "rebuild"; name = "rebuild";

View file

@ -1,4 +1,8 @@
{writeShellApplication}: {
lib,
stdenv,
writeShellApplication,
}:
writeShellApplication writeShellApplication
{ {
name = "restart"; name = "restart";

View file

@ -1,4 +1,8 @@
{writeShellApplication}: {
lib,
stdenv,
writeShellApplication,
}:
writeShellApplication writeShellApplication
{ {
name = "update"; name = "update";

View file

@ -1,4 +1,8 @@
{writeShellApplication}: {
lib,
stdenv,
writeShellApplication,
}:
writeShellApplication writeShellApplication
{ {
name = "upgrade"; name = "upgrade";