mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nixfmt

Browse Source
This commit is contained in:
mjallen18
2025-07-24 11:06:08 -05:00
parent f05972d6ae
commit 3d213c8769
164 changed files with 1777 additions and 1257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
checks/pre-commit-hooks/default.nix
View File

@@ -1,6 +1,7 @@
{ {
inputs, inputs,
pkgs, pkgs,
lib,
... ...
}: }:
let let
@@ -11,9 +12,9 @@ pre-commit-hooks-nix.lib.${pkgs.system}.run {
hooks = { hooks = {
pre-commit-hook-ensure-sops.enable = true; pre-commit-hook-ensure-sops.enable = true;
treefmt = { treefmt = {
enable = true; enable = lib.mkForce true;
settings.fail-on-change = false; settings.fail-on-change = lib.mkForce false;
packageOverrides.treefmt = inputs.treefmt-nix.lib.mkWrapper pkgs ../../treefmt.nix; packageOverrides.treefmt = inputs.treefmt-nix.lib.mkWrapper pkgs ../../treefmt.nix;
}; };
}; };
} }

319
flake.nix
View File

@@ -6,8 +6,8 @@
# The name "snowfall-lib" is required due to how Snowfall Lib processes your # The name "snowfall-lib" is required due to how Snowfall Lib processes your
# flake's inputs. # flake's inputs.
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
@@ -18,7 +18,7 @@
}; };
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2"; lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@@ -84,179 +84,180 @@
}; };
# We will handle this in the next section. # We will handle this in the next section.
outputs = inputs: outputs =
inputs.snowfall-lib.mkFlake { inputs:
# You must provide our flake inputs to Snowfall Lib. inputs.snowfall-lib.mkFlake {
inherit inputs; # You must provide our flake inputs to Snowfall Lib.
inherit inputs;
# The `src` must be the root of the flake. See configuration # The `src` must be the root of the flake. See configuration
# in the next section for information on how you can move your # in the next section for information on how you can move your
# Nix files to a separate directory. # Nix files to a separate directory.
src = ./.; src = ./.;
# Add a module to a specific host. # Add a module to a specific host.
systems = { systems = {
# common modules # common modules
modules.nixos = with inputs; [ modules.nixos = with inputs; [
authentik-nix.nixosModules.default authentik-nix.nixosModules.default
chaotic.nixosModules.default chaotic.nixosModules.default
crowdsec.nixosModules.crowdsec crowdsec.nixosModules.crowdsec
crowdsec.nixosModules.crowdsec-firewall-bouncer crowdsec.nixosModules.crowdsec-firewall-bouncer
disko.nixosModules.disko disko.nixosModules.disko
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
];
# common darwin modules
modules.darwin = with inputs; [
nix-homebrew.darwinModules.nix-homebrew
home-manager.darwinModules.home-manager
];
# Host config
hosts = {
# ######################################################
# Desktop #
# ######################################################
desktop = {
modules = with inputs; [
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc
];
};
# ######################################################
# NAS #
# ######################################################
nas = {
modules = with inputs; [
nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-hidpi
home-manager.nixosModules.home-manager
];
# overlays = with inputs; [ crowdsec.overlays.default ];
};
# ######################################################
# Steamdeck #
# ######################################################
steamdeck = {
modules = with inputs; [
disko.nixosModules.disko
jovian.nixosModules.jovian
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc
];
};
# ######################################################
# NUC #
# ######################################################
nuc = {
modules = with inputs; [
disko.nixosModules.disko
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc
];
};
# ######################################################
# Pi4 #
# ######################################################
pi4 = {
modules = with inputs; [
disko.nixosModules.disko
nixos-raspberrypi.nixosModules.raspberry-pi-4.base
nixos-raspberrypi.nixosModules.raspberry-pi-4.display-vc4
nixos-raspberrypi.lib.inject-overlays
];
};
# ######################################################
# Pi5 #
# ######################################################
pi5 = {
modules = with inputs; [
disko.nixosModules.disko
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4
nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth
nixos-raspberrypi.lib.inject-overlays
];
};
# ######################################################
# Mac #
# ######################################################
macbook-pro-nixos = {
modules = with inputs; [
nixos-apple-silicon.nixosModules.default
];
};
};
overlays = with inputs; [ nix-vscode-extensions.overlays.default ];
homes = {
modules = with inputs; [
nix-index-database.homeModules.nix-index
sops-nix.homeManagerModules.sops
]; ];
overlays = with inputs; [ # common darwin modules
nix-vscode-extensions.overlays.default modules.darwin = with inputs; [
nix-homebrew.darwinModules.nix-homebrew
home-manager.darwinModules.home-manager
]; ];
users = { # Host config
# "matt@desktop" = { hosts = {
# modules = with inputs; [ # ######################################################
# sops-nix.homeManagerModules.sops # Desktop #
# ]; # ######################################################
# }; desktop = {
"deck@steamdeck" = {
modules = with inputs; [ modules = with inputs; [
steam-rom-manager.homeManagerModules.default nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc
];
};
# ######################################################
# NAS #
# ######################################################
nas = {
modules = with inputs; [
nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-hidpi
home-manager.nixosModules.home-manager
];
# overlays = with inputs; [ crowdsec.overlays.default ];
};
# ######################################################
# Steamdeck #
# ######################################################
steamdeck = {
modules = with inputs; [
disko.nixosModules.disko
jovian.nixosModules.jovian
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc
];
};
# ######################################################
# NUC #
# ######################################################
nuc = {
modules = with inputs; [
disko.nixosModules.disko
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-cpu-amd-pstate
nixos-hardware.nixosModules.common-cpu-amd-zenpower
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-pc
];
};
# ######################################################
# Pi4 #
# ######################################################
pi4 = {
modules = with inputs; [
disko.nixosModules.disko
nixos-raspberrypi.nixosModules.raspberry-pi-4.base
nixos-raspberrypi.nixosModules.raspberry-pi-4.display-vc4
nixos-raspberrypi.lib.inject-overlays
];
};
# ######################################################
# Pi5 #
# ######################################################
pi5 = {
modules = with inputs; [
disko.nixosModules.disko
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
nixos-raspberrypi.nixosModules.raspberry-pi-5.display-vc4
nixos-raspberrypi.nixosModules.raspberry-pi-5.bluetooth
nixos-raspberrypi.lib.inject-overlays
];
};
# ######################################################
# Mac #
# ######################################################
macbook-pro-nixos = {
modules = with inputs; [
nixos-apple-silicon.nixosModules.default
]; ];
}; };
}; };
overlays = with inputs; [ nix-vscode-extensions.overlays.default ];
homes = {
modules = with inputs; [
nix-index-database.homeModules.nix-index
sops-nix.homeManagerModules.sops
];
overlays = with inputs; [
nix-vscode-extensions.overlays.default
];
users = {
# "matt@desktop" = {
# modules = with inputs; [
# sops-nix.homeManagerModules.sops
# ];
# };
"deck@steamdeck" = {
modules = with inputs; [
steam-rom-manager.homeManagerModules.default
];
};
};
};
}; };
};
# Configure Snowfall Lib, all of these settings are optional. # Configure Snowfall Lib, all of these settings are optional.
snowfall = { snowfall = {
# Choose a namespace to use for your flake's packages, library, # Choose a namespace to use for your flake's packages, library,
# and overlays. # and overlays.
namespace = "mjallen"; namespace = "mjallen";
# Add flake metadata that can be processed by tools like Snowfall Frost. # Add flake metadata that can be processed by tools like Snowfall Frost.
meta = { meta = {
# A slug to use in documentation when displaying things like file paths. # A slug to use in documentation when displaying things like file paths.
name = "mjallen"; name = "mjallen";
# A title to show for your flake, typically the name. # A title to show for your flake, typically the name.
title = "mjallen Flake"; title = "mjallen Flake";
};
};
outputs-builder = channels: {
formatter = inputs.treefmt-nix.lib.mkWrapper channels.nixpkgs ./treefmt.nix;
}; };
}; };
}
outputs-builder = channels: {
formatter = inputs.treefmt-nix.lib.mkWrapper channels.nixpkgs ./treefmt.nix;
};
};
}

7
homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
View File

@@ -1,4 +1,9 @@
{ lib, pkgs, home, ... }: {
lib,
pkgs,
home,
...
}:
let let
shellAliases = { shellAliases = {
update-switch = "darwin-rebuild switch --flake ~/nix-config"; update-switch = "darwin-rebuild switch --flake ~/nix-config";

5
homes/aarch64-linux/matt@macbook-pro-nixos/default.nix
View File

@@ -23,7 +23,7 @@ in
home.stateVersion = "23.11"; home.stateVersion = "23.11";
mjallen = { mjallen = {
desktop.hyprland = { desktop.hyprland = {
enable = true; enable = true;
primaryDisplay = "eDP-1"; primaryDisplay = "eDP-1";
@@ -41,7 +41,6 @@ in
"name:steam, monitor:${display.input}, default:false, special, class:(.*[Ss]team.*)" "name:steam, monitor:${display.input}, default:false, special, class:(.*[Ss]team.*)"
]; ];
windowRule = [ windowRule = [
"size 2160 3356, tag:horizonrdp" "size 2160 3356, tag:horizonrdp"
]; ];
@@ -95,7 +94,7 @@ in
tooltip = false; tooltip = false;
exec = "waybar-hass --get_light light.living_room_lights"; exec = "waybar-hass --get_light light.living_room_lights";
interval = "once"; interval = "once";
format = "{text}";#"󱉓"; format = "{text}"; # "󱉓";
on-click = "waybar-hass --toggle_light light.living_room_lights"; on-click = "waybar-hass --toggle_light light.living_room_lights";
return-type = "json"; return-type = "json";
}; };

64
homes/aarch64-linux/matt@pi4/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, ... }: { lib, ... }:
let let
shellAliases = { shellAliases = {
ll = "ls -alh"; ll = "ls -alh";
@@ -19,40 +19,40 @@ in
home.username = "matt"; home.username = "matt";
sops = { sops = {
age.keyFile = "/home/matt/.config/sops/age/keys.txt"; age.keyFile = "/home/matt/.config/sops/age/keys.txt";
defaultSopsFile = "/etc/nixos/secrets/secrets.yaml"; defaultSopsFile = "/etc/nixos/secrets/secrets.yaml";
validateSopsFiles = false; validateSopsFiles = false;
secrets = { secrets = {
"ssh-keys-public/pi4" = { "ssh-keys-public/pi4" = {
path = "/home/matt/.ssh/id_ed25519.pub"; path = "/home/matt/.ssh/id_ed25519.pub";
mode = "0644"; mode = "0644";
}; };
"ssh-keys-private/pi4" = { "ssh-keys-private/pi4" = {
path = "/home/matt/.ssh/id_ed25519"; path = "/home/matt/.ssh/id_ed25519";
mode = "0600"; mode = "0600";
}; };
# "ssh-keys-public/desktop-nixos" = { # "ssh-keys-public/desktop-nixos" = {
# path = "/home/matt/.ssh/authorized_keys"; # path = "/home/matt/.ssh/authorized_keys";
# mode = "0600"; # mode = "0600";
# }; # };
# "ssh-keys-public/desktop-nixos-root" = { # "ssh-keys-public/desktop-nixos-root" = {
# path = "/home/matt/.ssh/authorized_keys2"; # path = "/home/matt/.ssh/authorized_keys2";
# mode = "0600"; # mode = "0600";
# }; # };
# "ssh-keys-public/desktop-windows" = { # "ssh-keys-public/desktop-windows" = {
# path = "/home/matt/.ssh/authorized_keys3"; # path = "/home/matt/.ssh/authorized_keys3";
# mode = "0600"; # mode = "0600";
# }; # };
# "ssh-keys-public/macbook-macos" = { # "ssh-keys-public/macbook-macos" = {
# path = "/home/matt/.ssh/authorized_keys4"; # path = "/home/matt/.ssh/authorized_keys4";
# mode = "0600"; # mode = "0600";
# }; # };
}; };
}; };
programs = { programs = {
mangohud.enable = lib.mkForce true; mangohud.enable = lib.mkForce true;

8
homes/aarch64-linux/matt@pi5/default.nix
View File

@@ -1,4 +1,10 @@
{ pkgs, lib, config, namespace, ... }: {
pkgs,
lib,
config,
namespace,
...
}:
let let
shellAliases = { shellAliases = {
update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3"; update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.3";

2
homes/aarch64-linux/root@pi4/default.nix
View File

@@ -15,4 +15,4 @@ in
programs = { programs = {
zsh.shellAliases = shellAliases; zsh.shellAliases = shellAliases;
}; };
} }

2
homes/x86_64-linux/admin@nuc/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs,... }: { pkgs, ... }:
let let
shellAliases = { shellAliases = {
update-boot = "sudo nixos-rebuild boot --max-jobs 10"; update-boot = "sudo nixos-rebuild boot --max-jobs 10";

18
homes/x86_64-linux/deck@steamdeck/default.nix
View File

@@ -30,13 +30,13 @@ in
steam-rom-manager = { steam-rom-manager = {
enable = true; enable = true;
steamUsername = "mjallen18"; steamUsername = "mjallen18";
# Optional: override default paths if needed # Optional: override default paths if needed
environmentVariables = { environmentVariables = {
romsDirectory = "/home/deck/Emulation/roms"; romsDirectory = "/home/deck/Emulation/roms";
steamDirectory = "/home/deck/.local/share/Steam"; steamDirectory = "/home/deck/.local/share/Steam";
}; };
emulators = { emulators = {
ryujinx.enable = true; ryujinx.enable = true;
@@ -44,13 +44,21 @@ in
enable = true; enable = true;
package = pkgs.dolphin-emu; package = pkgs.dolphin-emu;
romFolder = "gc"; romFolder = "gc";
fileTypes = [ ".iso" ".ISO" ".gcm" ".GCM" ".ciso" ".CISO" "rvz" ]; fileTypes = [
".iso"
".ISO"
".gcm"
".GCM"
".ciso"
".CISO"
"rvz"
];
extraArgs = "-b -e \"\${filePath}\""; extraArgs = "-b -e \"\${filePath}\"";
}; };
pcsx2.enable = true; pcsx2.enable = true;
mgba.enable = true; mgba.enable = true;
"Non-SRM Shortcuts" = { "Non-SRM Shortcuts" = {
enable = true; enable = true;
parserType = "Non-SRM Shortcuts"; parserType = "Non-SRM Shortcuts";

2
homes/x86_64-linux/root@nuc/default.nix
View File

@@ -14,4 +14,4 @@ in
programs = { programs = {
zsh.shellAliases = shellAliases; zsh.shellAliases = shellAliases;
}; };
} }

9
modules/home/desktop/gnome/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.mjallen.desktop.gnome; cfg = config.mjallen.desktop.gnome;
in in
@@ -66,4 +71,4 @@ in
}; };
}; };
}; };
} }

2
modules/home/desktop/gnome/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.mjallen.desktop.gnome = { options.mjallen.desktop.gnome = {
enable = mkEnableOption "enable gnome settings"; enable = mkEnableOption "enable gnome settings";
}; };
} }

37
modules/home/desktop/hyprland/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
cfg = config.mjallen.desktop.hyprland; cfg = config.mjallen.desktop.hyprland;
@@ -6,7 +11,7 @@ let
in in
{ {
imports = [ imports = [
./options.nix ./options.nix
./packages.nix ./packages.nix
./theme.nix ./theme.nix
./variables.nix ./variables.nix
@@ -21,7 +26,7 @@ in
programs = { programs = {
vscode.profiles.default.userSettings."window"."titleBarStyle" = "custom"; vscode.profiles.default.userSettings."window"."titleBarStyle" = "custom";
}; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
@@ -151,7 +156,7 @@ in
render = { render = {
cm_fs_passthrough = 1; cm_fs_passthrough = 1;
}; };
misc = { misc = {
vrr = 1; vrr = 1;
}; };
@@ -231,7 +236,7 @@ in
"float, class:(.*nm-connection-editor.*)" "float, class:(.*nm-connection-editor.*)"
"move onscreen cursor 0% 0%, class:(.*nm-connection-editor.*)" "move onscreen cursor 0% 0%, class:(.*nm-connection-editor.*)"
"float, title:(Media viewer)" "float, title:(Media viewer)"
"float, class:(it.mijorus.smile),title:(Smile)" "float, class:(it.mijorus.smile),title:(Smile)"
"float, class:(.blueman-manager-wrapped)$,title:(Bluetooth Devices)" "float, class:(.blueman-manager-wrapped)$,title:(Bluetooth Devices)"
@@ -326,7 +331,7 @@ in
# NOT recommended as it crashed a few times, once it's stabilized I'll make it the default # NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
send_cancel = "0"; send_cancel = "0";
}; };
hyprgrass-bind = [ hyprgrass-bind = [
# swipe left from right edge # swipe left from right edge
", edge:r:l, workspace, +1" ", edge:r:l, workspace, +1"
@@ -345,7 +350,7 @@ in
", swipe:3:ld, exec, foot" ", swipe:3:ld, exec, foot"
# tap with 3 fingers # tap with 3 fingers
", tap:3, exec, foot" ", tap:3, exec, foot"
# longpress can trigger mouse binds: # longpress can trigger mouse binds:
", longpress:2, movewindow" ", longpress:2, movewindow"
@@ -390,14 +395,16 @@ in
}; };
}; };
extraConfig = '' extraConfig =
exec-once = dbus-update-activation-environment --systemd --all ''
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd --all
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = xhost +SI:localuser:root exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec-once = nwg-look -a exec-once = xhost +SI:localuser:root
exec-once = nwg-dock-hyprland -d exec-once = nwg-look -a
'' + cfg.extraConfig or ''''; exec-once = nwg-dock-hyprland -d
''
+ cfg.extraConfig or '''';
}; };
}; };
} }

56
modules/home/desktop/hyprland/options.nix
View File

@@ -45,31 +45,31 @@ with lib;
wallpaper = mkOption { wallpaper = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = []; default = [ ];
description = "list of hyprland wallpaper configs"; description = "list of hyprland wallpaper configs";
}; };
monitor = mkOption { monitor = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = []; default = [ ];
description = "list of hyprland monitor configs"; description = "list of hyprland monitor configs";
}; };
monitorv2 = mkOption { monitorv2 = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = []; default = [ ];
description = "list of hyprland monitorv2 configs"; description = "list of hyprland monitorv2 configs";
}; };
workspace = mkOption { workspace = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = []; default = [ ];
description = "list of hyprland workspace definitions"; description = "list of hyprland workspace definitions";
}; };
windowRule = mkOption { windowRule = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = []; default = [ ];
description = "list of hyprland window rules"; description = "list of hyprland window rules";
}; };
@@ -79,12 +79,12 @@ with lib;
description = "any extra options"; description = "any extra options";
}; };
iconThemeName = mkOption { iconThemeName = mkOption {
type = types.str; type = types.str;
default = "Colloid-Dark"; default = "Colloid-Dark";
}; };
gtkThemeName = mkOption { gtkThemeName = mkOption {
type = types.str; type = types.str;
default = "Colloid-Dark"; default = "Colloid-Dark";
}; };
@@ -92,14 +92,38 @@ with lib;
defaultApps = mkOption { defaultApps = mkOption {
type = types.submodule { type = types.submodule {
options = { options = {
browser = mkOption { type = types.package; default = pkgs.firefox; }; browser = mkOption {
editor = mkOption { type = types.package; default = pkgs.micro; }; type = types.package;
fileExplorer = mkOption { type = types.package; default = pkgs.nemo; }; default = pkgs.firefox;
visual = mkOption { type = types.package; default = pkgs.vscodium; }; };
terminal = mkOption { type = types.package; default = pkgs.kitty; }; editor = mkOption {
office = mkOption { type = types.package; default = pkgs.onlyoffice-bin_latest; }; type = types.package;
video = mkOption { type = types.package; default = pkgs.vlc; }; default = pkgs.micro;
imageViewer = mkOption { type = types.package; default = pkgs.nomacs; }; };
fileExplorer = mkOption {
type = types.package;
default = pkgs.nemo;
};
visual = mkOption {
type = types.package;
default = pkgs.vscodium;
};
terminal = mkOption {
type = types.package;
default = pkgs.kitty;
};
office = mkOption {
type = types.package;
default = pkgs.onlyoffice-bin_latest;
};
video = mkOption {
type = types.package;
default = pkgs.vlc;
};
imageViewer = mkOption {
type = types.package;
default = pkgs.nomacs;
};
}; };
}; };
description = "Default applications used across the system."; description = "Default applications used across the system.";
@@ -120,4 +144,4 @@ with lib;
}; };
}; };
}; };
} }

9
modules/home/desktop/hyprland/packages.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
cfg = config.mjallen.desktop.hyprland; cfg = config.mjallen.desktop.hyprland;
@@ -64,4 +69,4 @@ in
xwayland xwayland
]; ];
}; };
} }

7
modules/home/desktop/hyprland/services/hypridle/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
let let
cfg = config.${namespace}.desktop.hyprland; cfg = config.${namespace}.desktop.hyprland;
in in

77
modules/home/desktop/hyprland/services/hyprlock/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
let let
cfg = config.${namespace}.desktop.hyprland; cfg = config.${namespace}.desktop.hyprland;
in in
@@ -7,41 +12,41 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.hyprlock = { programs.hyprlock = {
enable = true; enable = true;
settings = { settings = {
background = [ background = [
{ {
monitor = ""; monitor = "";
path = cfg.wallpaper; # supports png, jpg, webp (no animations, though) path = cfg.wallpaper; # supports png, jpg, webp (no animations, though)
color = "rgba(25, 20, 20, 1.0)"; color = "rgba(25, 20, 20, 1.0)";
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
blur_passes = "3"; # 0 disables blurring blur_passes = "3"; # 0 disables blurring
blur_size = "7"; blur_size = "7";
noise = "0.0117"; noise = "0.0117";
contrast = "0.8916"; contrast = "0.8916";
brightness = "0.8172"; brightness = "0.8172";
vibrancy = "0.1696"; vibrancy = "0.1696";
vibrancy_darkness = "0.0"; vibrancy_darkness = "0.0";
} }
]; ];
input-field = [ input-field = [
{ {
size = "200, 50"; size = "200, 50";
position = "0, -80"; position = "0, -80";
monitor = cfg.primaryDisplay; monitor = cfg.primaryDisplay;
dots_center = true; dots_center = true;
fade_on_empty = true; fade_on_empty = true;
font_color = "rgb(202, 211, 245)"; font_color = "rgb(202, 211, 245)";
inner_color = "rgb(91, 96, 120)"; inner_color = "rgb(91, 96, 120)";
outer_color = "rgb(24, 25, 38)"; outer_color = "rgb(24, 25, 38)";
bothlock_color = -1; bothlock_color = -1;
outline_thickness = 5; outline_thickness = 5;
placeholder_text = ''<span foreground="##cad3f5">Password...</span>''; placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
shadow_passes = 2; shadow_passes = 2;
} }
]; ];
};
}; };
};
}; };
} }

9
modules/home/desktop/hyprland/services/hyprpaper/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
let let
cfg = config.${namespace}.desktop.hyprland; cfg = config.${namespace}.desktop.hyprland;
in in
@@ -15,4 +20,4 @@ in
}; };
}; };
}; };
} }

17
modules/home/desktop/hyprland/theme.nix
View File

@@ -1,12 +1,17 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
cfg = config.mjallen.desktop.hyprland; cfg = config.mjallen.desktop.hyprland;
themeSize = "compact"; # [ "standard" "compact" ] themeSize = "compact"; # [ "standard" "compact" ]
themeAccent = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeAccent = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ]
themeVariant = "nord"; # [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ] themeVariant = "nord"; # [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ]
themeColor = "dark"; # [ "standard" "light" "dark" ] themeColor = "dark"; # [ "standard" "light" "dark" ]
iconThemeVariant = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] iconThemeVariant = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ]
iconScheme = "nord"; # [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ] iconScheme = "nord"; # [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ]
@@ -95,4 +100,4 @@ in
}; };
}; };
}; };
} }

56
modules/home/desktop/hyprland/variables.nix
View File

@@ -6,34 +6,34 @@ in
{ {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.sessionVariables = { home.sessionVariables = {
BROWSER = "${cfg.defaultApps.browser.pname}"; BROWSER = "${cfg.defaultApps.browser.pname}";
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";
EDITOR = "${cfg.defaultApps.editor.pname}"; EDITOR = "${cfg.defaultApps.editor.pname}";
VISUAL = "${cfg.defaultApps.visual.pname}"; VISUAL = "${cfg.defaultApps.visual.pname}";
ICON_THEME = cfg.iconThemeName; ICON_THEME = cfg.iconThemeName;
GTK_CSD = "0"; GTK_CSD = "0";
GTK_THEME = cfg.gtkThemeName; GTK_THEME = cfg.gtkThemeName;
GTK_USE_PORTAL = "1"; GTK_USE_PORTAL = "1";
HYPRCURSOR_THEME = config.home.pointerCursor.name; HYPRCURSOR_THEME = config.home.pointerCursor.name;
HYPRCURSOR_SIZE = config.home.pointerCursor.size; HYPRCURSOR_SIZE = config.home.pointerCursor.size;
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1"; NIXOS_XDG_OPEN_USE_PORTAL = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_AUTO_SCREEN_SCALE_FACTOR = "1";
QT_QPA_PLATFORM = "wayland-egl"; QT_QPA_PLATFORM = "wayland-egl";
QT_QPA_PLATFORMTHEME = "gtk3"; QT_QPA_PLATFORMTHEME = "gtk3";
QT_SCALE_FACTOR = "1"; QT_SCALE_FACTOR = "1";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland"; SDL_VIDEODRIVER = "wayland";
TERMINAL = "${cfg.defaultApps.terminal.pname}"; TERMINAL = "${cfg.defaultApps.terminal.pname}";
XCURSOR_THEME = config.home.pointerCursor.name; XCURSOR_THEME = config.home.pointerCursor.name;
XCURSOR_SIZE = config.home.pointerCursor.size; XCURSOR_SIZE = config.home.pointerCursor.size;
XDG_CACHE_HOME = "\${HOME}/.cache"; XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config"; XDG_CONFIG_HOME = "\${HOME}/.config";
XDG_CURRENT_DESKTOP = "Hyprland"; XDG_CURRENT_DESKTOP = "Hyprland";
XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_DATA_HOME = "\${HOME}/.local/share";
XDG_SESSION_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";
}; };
}; };
} }

2
modules/home/desktop/theme/nord.nix
View File

@@ -59,4 +59,4 @@
border-radius: 1rem 0rem 0rem 1rem; border-radius: 1rem 0rem 0rem 1rem;
margin-left: 0.5rem; margin-left: 0.5rem;
''; '';
} }

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

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
home = { home = {
enableNixpkgsReleaseCheck = lib.mkDefault false; enableNixpkgsReleaseCheck = lib.mkDefault false;

2
modules/home/programs/btop/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.mjallen.programs.btop = { options.mjallen.programs.btop = {
enable = mkEnableOption "enable btop"; enable = mkEnableOption "enable btop";
}; };
} }

96
modules/home/programs/code/default.nix
View File

@@ -1,4 +1,10 @@
{ config, lib, pkgs, system, ... }: {
config,
lib,
pkgs,
system,
...
}:
let let
isArm = "aarch64-linux" == system; isArm = "aarch64-linux" == system;
open-remote-ssh = pkgs.vscode-utils.buildVscodeExtension { open-remote-ssh = pkgs.vscode-utils.buildVscodeExtension {
@@ -27,44 +33,48 @@ in
default = { default = {
enableUpdateCheck = false; enableUpdateCheck = false;
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
extensions = with pkgs; [ extensions =
vscode-extensions.arrterian.nix-env-selector with pkgs;
vscode-extensions.bbenoist.nix [
vscode-extensions.brettm12345.nixfmt-vscode vscode-extensions.arrterian.nix-env-selector
vscode-extensions.cweijan.vscode-database-client2 vscode-extensions.bbenoist.nix
vscode-extensions.dendron.dendron-markdown-preview-enhanced vscode-extensions.brettm12345.nixfmt-vscode
vscode-extensions.jnoortheen.nix-ide vscode-extensions.cweijan.vscode-database-client2
vscode-extensions.mkhl.direnv vscode-extensions.dendron.dendron-markdown-preview-enhanced
vscode-extensions.ms-python.debugpy vscode-extensions.jnoortheen.nix-ide
vscode-extensions.ms-python.pylint vscode-extensions.mkhl.direnv
vscode-extensions.ms-python.python vscode-extensions.ms-python.debugpy
# vscode-extensions.ms-python.vscode-pylance vscode-extensions.ms-python.pylint
vscode-extensions.redhat.vscode-yaml vscode-extensions.ms-python.python
vscode-extensions.yy0931.vscode-sqlite3-editor # vscode-extensions.ms-python.vscode-pylance
vscode-extensions.redhat.vscode-yaml
vscode-extensions.yy0931.vscode-sqlite3-editor
# open-remote-ssh # open-remote-ssh
# nix-vscode-extensions.open-vsx.jeanp413.open-remote-ssh # nix-vscode-extensions.open-vsx.jeanp413.open-remote-ssh
# open-vsx.jeanp413.open-remote-ssh # open-vsx.jeanp413.open-remote-ssh
] ++ ( if !isArm then x86_only else [ ] ) ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ ]
{ ++ (if !isArm then x86_only else [ ])
name = "copilot-mcp"; ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
publisher = "automatalabs"; {
version = "0.0.49"; name = "copilot-mcp";
sha256 = "sha256-+G2OQl5SCN7bh7MzGdYiRclIZefBE7lWnGg1kNpCvnA="; publisher = "automatalabs";
} version = "0.0.49";
{ sha256 = "sha256-+G2OQl5SCN7bh7MzGdYiRclIZefBE7lWnGg1kNpCvnA=";
name = "mcp-server-runner"; }
publisher = "zebradev"; {
version = "0.1.0"; name = "mcp-server-runner";
sha256 = "sha256-StydVt3VzQUSS/pYp76jnIwtZlEj8gWAGzOARs93J+E="; publisher = "zebradev";
} version = "0.1.0";
{ sha256 = "sha256-StydVt3VzQUSS/pYp76jnIwtZlEj8gWAGzOARs93J+E=";
name = "claude-dev"; }
publisher = "saoudrizwan"; {
version = "3.17.9"; name = "claude-dev";
sha256 = "sha256-y3bFtMe5vZrO3DFb31KDvkzjD2jM76wK89mKhgJXC70="; publisher = "saoudrizwan";
} version = "3.17.9";
]; sha256 = "sha256-y3bFtMe5vZrO3DFb31KDvkzjD2jM76wK89mKhgJXC70=";
}
];
userSettings = { userSettings = {
@@ -79,7 +89,7 @@ in
"confirmDelete" = false; "confirmDelete" = false;
"confirmDragAndDrop" = false; "confirmDragAndDrop" = false;
}; };
"git" = { "git" = {
"confirmSync" = false; "confirmSync" = false;
"enableSmartCommit" = true; "enableSmartCommit" = true;
@@ -110,10 +120,12 @@ in
# You can write arbitary Nix expressions here, to produce valid "options" declaration result. # You can write arbitary Nix expressions here, to produce valid "options" declaration result.
# Tip: for flake-based configuration, utilize `builtins.getFlake` # Tip: for flake-based configuration, utilize `builtins.getFlake`
"nixos" = { "nixos" = {
"expr" = "(builtins.getFlake \"${config.home.homeDirectory}/nix-config\").nixosConfigurations.<name>.options"; "expr" =
"(builtins.getFlake \"${config.home.homeDirectory}/nix-config\").nixosConfigurations.<name>.options";
}; };
"home-manager" = { "home-manager" = {
"expr" = "(builtins.getFlake \"${config.home.homeDirectory}/nix-config\").homeConfigurations.<name>.options"; "expr" =
"(builtins.getFlake \"${config.home.homeDirectory}/nix-config\").homeConfigurations.<name>.options";
}; };
# # Tip: use ${workspaceFolder} variable to define path # # Tip: use ${workspaceFolder} variable to define path
# "nix-darwin" = { # "nix-darwin" = {
@@ -149,4 +161,4 @@ in
enableZshIntegration = true; enableZshIntegration = true;
}; };
}; };
} }

2
modules/home/programs/git/default.nix
View File

@@ -18,4 +18,4 @@ in
userEmail = "matt.l.jallen@gmail.com"; userEmail = "matt.l.jallen@gmail.com";
aliases = gitAliases; aliases = gitAliases;
}; };
} }

32
modules/home/programs/kitty/default.nix
View File

@@ -29,33 +29,33 @@ in
background_opacity = "0.85"; background_opacity = "0.85";
# The basic colors # The basic colors
foreground = nord.snowStorm.nord6; foreground = nord.snowStorm.nord6;
background = nord.polarNight.nord0; background = nord.polarNight.nord0;
selection_foreground = nord.polarNight.nord0; selection_foreground = nord.polarNight.nord0;
selection_background = nord.aurora.nord15; selection_background = nord.aurora.nord15;
# Cursor colors # Cursor colors
cursor = nord.aurora.nord15; cursor = nord.aurora.nord15;
cursor_text_color = nord.polarNight.nord0; cursor_text_color = nord.polarNight.nord0;
# URL underline color when hovering with mouse # URL underline color when hovering with mouse
url_color = nord.aurora.nord15; url_color = nord.aurora.nord15;
# Kitty window border colors # Kitty window border colors
active_border_color = nord.frost.nord10; active_border_color = nord.frost.nord10;
inactive_border_color = nord.polarNight.nord1; inactive_border_color = nord.polarNight.nord1;
bell_border_color = nord.aurora.nord13; bell_border_color = nord.aurora.nord13;
# OS Window titlebar colors # OS Window titlebar colors
wayland_titlebar_color = nord.polarNight.nord0; wayland_titlebar_color = nord.polarNight.nord0;
macos_titlebar_color = nord.polarNight.nord0; macos_titlebar_color = nord.polarNight.nord0;
# Tab bar colors # Tab bar colors
active_tab_foreground = nord.polarNight.nord3; active_tab_foreground = nord.polarNight.nord3;
active_tab_background = nord.aurora.nord15; active_tab_background = nord.aurora.nord15;
inactive_tab_foreground = nord.snowStorm.nord6; inactive_tab_foreground = nord.snowStorm.nord6;
inactive_tab_background = nord.polarNight.nord1; inactive_tab_background = nord.polarNight.nord1;
tab_bar_background = nord.polarNight.nord3; tab_bar_background = nord.polarNight.nord3;
# Colors for marks (marked text in the terminal) # Colors for marks (marked text in the terminal)
mark1_foreground = nord.polarNight.nord0; mark1_foreground = nord.polarNight.nord0;
@@ -86,11 +86,11 @@ in
color11 = nord.aurora.nord13; color11 = nord.aurora.nord13;
# blue # blue
color4 = nord.frost.nord10; color4 = nord.frost.nord10;
color12 = nord.frost.nord10; color12 = nord.frost.nord10;
# magenta # magenta
color5 = nord.aurora.nord15; color5 = nord.aurora.nord15;
color13 = nord.aurora.nord15; color13 = nord.aurora.nord15;
# cyan # cyan
@@ -98,7 +98,7 @@ in
color14 = nord.frost.nord8; color14 = nord.frost.nord8;
# white # white
color7 = nord.snowStorm.nord5; color7 = nord.snowStorm.nord5;
color15 = nord.snowStorm.nord4; color15 = nord.snowStorm.nord4;
}; };
}; };

2
modules/home/programs/kitty/options.nix
View File

@@ -24,4 +24,4 @@ with lib;
default = import ../../desktop/theme/nord.nix; default = import ../../desktop/theme/nord.nix;
}; };
}; };
} }

5
modules/home/programs/librewolf/default.nix
View File

@@ -36,7 +36,8 @@
"browser.newtabpage.activity-stream.topSitesRows" = 3; # Set number of rows for top sites on new tab page "browser.newtabpage.activity-stream.topSitesRows" = 3; # Set number of rows for top sites on new tab page
"layout.css.light-dark.enabled" = true; # Enable light/dark theme support "layout.css.light-dark.enabled" = true; # Enable light/dark theme support
"extensions.activeThemeID" = "default-theme@mozilla.org"; # Set active theme "extensions.activeThemeID" = "default-theme@mozilla.org"; # Set active theme
"extensions.webextensions.uuids" = "{\"formautofill@mozilla.org\" =\"851c83b7-26d5-449c-8cc9-d8951a0ce78d\",\"pictureinpicture@mozilla.org\" =\"42fa2650-5134-4bef-bafa-b73f9ae51bad\",\"screenshots@mozilla.org\" =\"efd2b692-43c4-433a-aea5-0cb79f8312d4\",\"webcompat-reporter@mozilla.org\" =\"c43a6be2-fb56-4253-b384-ce8e09a89999\",\"webcompat@mozilla.org\" =\"e25fd1bb-7c53-413f-9528-bb922c322a56\",\"default-theme@mozilla.org\" =\"610b67c3-9145-46f7-814f-d8ee2cc8edff\",\"addons-search-detection@mozilla.com\:\"caedb3ca-5cf5-4e23-a251-d742f23e6fc8\",\"uBlock0@raymondhill.net\" =\"7e7d9fd9-12bf-42d3-9c7c-9ffd05420ec7\",\"78272b6fa58f4a1abaac99321d503a20@proton.me\" =\"7242a067-06d8-430b-94a3-00d264cdd57b\",\"addon@darkreader.org\" =\"2f02b112-6acd-4bdc-af2c-1432eb527339\",\"jid1-xUfzOsOFlzSOXg@jetpack\" =\"d0c72046-9903-4118-8160-a028840bf928\",\"chrome-gnome-shell@gnome.org\" =\"a1ab53e6-b765-4f25-8349-383cc04682a0\",\"user-agent-switcher@ninetailed.ninja\" =\"259d07cc-bb32-4ed5-b90f-6d73abdeb7bb\",\"firefoxdav@icloud.com\" =\"110e6e2c-18f8-461d-9f26-b8f04482b6f1\",\"ciscowebexstart1@cisco.com\" =\"a4062240-e73a-4353-bddb-d608d84881f7\",\"{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}\" =\"9164e437-812b-4a07-8dfd-2fd73b39329b\",\"{036a55b4-5e72-4d05-a06c-cba2dfcc134a}\" =\"648fc678-a6fb-47cd-9792-fb9520678c17\",\"{446900e4-71c2-419f-a6a7-df9c091e268b}\" =\"f0b43422-070e-466e-85c9-6543f209f075\",\"jid1-MnnxcxisBPnSXQ@jetpack\" =\"4c448202-c843-4cae-b5c3-d11f2da58fa3\",\"soundfixer@unrelenting.technology\" =\"59b35eb8-1c85-4919-a905-80d120993ddc\",\"floccus@handmadeideas.org\" =\"8ad2956c-8091-41af-a689-7d2108f5958d\",\"{79b9dbcf-cc5a-4cda-89ef-c4ab097eb074}\" =\"c2a223a7-32e0-4726-9f20-17236702b1f5\",\"linkgopher@oooninja.com\" =\"a257858c-0dce-415b-b123-6222876cf843\"}"; "extensions.webextensions.uuids" =
"{\"formautofill@mozilla.org\" =\"851c83b7-26d5-449c-8cc9-d8951a0ce78d\",\"pictureinpicture@mozilla.org\" =\"42fa2650-5134-4bef-bafa-b73f9ae51bad\",\"screenshots@mozilla.org\" =\"efd2b692-43c4-433a-aea5-0cb79f8312d4\",\"webcompat-reporter@mozilla.org\" =\"c43a6be2-fb56-4253-b384-ce8e09a89999\",\"webcompat@mozilla.org\" =\"e25fd1bb-7c53-413f-9528-bb922c322a56\",\"default-theme@mozilla.org\" =\"610b67c3-9145-46f7-814f-d8ee2cc8edff\",\"addons-search-detection@mozilla.com\:\"caedb3ca-5cf5-4e23-a251-d742f23e6fc8\",\"uBlock0@raymondhill.net\" =\"7e7d9fd9-12bf-42d3-9c7c-9ffd05420ec7\",\"78272b6fa58f4a1abaac99321d503a20@proton.me\" =\"7242a067-06d8-430b-94a3-00d264cdd57b\",\"addon@darkreader.org\" =\"2f02b112-6acd-4bdc-af2c-1432eb527339\",\"jid1-xUfzOsOFlzSOXg@jetpack\" =\"d0c72046-9903-4118-8160-a028840bf928\",\"chrome-gnome-shell@gnome.org\" =\"a1ab53e6-b765-4f25-8349-383cc04682a0\",\"user-agent-switcher@ninetailed.ninja\" =\"259d07cc-bb32-4ed5-b90f-6d73abdeb7bb\",\"firefoxdav@icloud.com\" =\"110e6e2c-18f8-461d-9f26-b8f04482b6f1\",\"ciscowebexstart1@cisco.com\" =\"a4062240-e73a-4353-bddb-d608d84881f7\",\"{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}\" =\"9164e437-812b-4a07-8dfd-2fd73b39329b\",\"{036a55b4-5e72-4d05-a06c-cba2dfcc134a}\" =\"648fc678-a6fb-47cd-9792-fb9520678c17\",\"{446900e4-71c2-419f-a6a7-df9c091e268b}\" =\"f0b43422-070e-466e-85c9-6543f209f075\",\"jid1-MnnxcxisBPnSXQ@jetpack\" =\"4c448202-c843-4cae-b5c3-d11f2da58fa3\",\"soundfixer@unrelenting.technology\" =\"59b35eb8-1c85-4919-a905-80d120993ddc\",\"floccus@handmadeideas.org\" =\"8ad2956c-8091-41af-a689-7d2108f5958d\",\"{79b9dbcf-cc5a-4cda-89ef-c4ab097eb074}\" =\"c2a223a7-32e0-4726-9f20-17236702b1f5\",\"linkgopher@oooninja.com\" =\"a257858c-0dce-415b-b123-6222876cf843\"}";
}; };
}; };
} }

2
modules/home/programs/mako/options.nix
View File

@@ -9,4 +9,4 @@ with lib;
default = "DejaVu Sans"; default = "DejaVu Sans";
}; };
}; };
} }

9
modules/home/programs/nwg-dock/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
cfg = config.mjallen.programs.nwg-dock; cfg = config.mjallen.programs.nwg-dock;
@@ -9,7 +14,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ nwg-dock-hyprland ]; home.packages = with pkgs; [ nwg-dock-hyprland ];
home.file = { home.file = {
".config/nwg-dock-hyprland/drawer.css".text = '' ".config/nwg-dock-hyprland/drawer.css".text = ''
window { window {

2
modules/home/programs/nwg-dock/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.mjallen.programs.nwg-dock = { options.mjallen.programs.nwg-dock = {
enable = mkEnableOption "enable nwg-dock"; enable = mkEnableOption "enable nwg-dock";
}; };
} }

71
modules/home/programs/nwg-drawer/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
cfg = config.mjallen.programs.nwg-drawer; cfg = config.mjallen.programs.nwg-drawer;
@@ -9,44 +14,44 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ nwg-drawer ]; home.packages = with pkgs; [ nwg-drawer ];
home.file = { home.file = {
".config/nwg-drawer/drawer.css".text = '' ".config/nwg-drawer/drawer.css".text = ''
window { window {
background-color: ${nord.polarNight.nord0}bf; background-color: ${nord.polarNight.nord0}bf;
color: ${nord.snowStorm.nord5}00 color: ${nord.snowStorm.nord5}00
} }
/* search entry */ /* search entry */
entry { entry {
background-color: ${nord.polarNight.nord1}0f background-color: ${nord.polarNight.nord1}0f
} }
button, image { button, image {
background: none; background: none;
border: none border: none
} }
button:hover { button:hover {
background-color: ${nord.frost.nord10}1a background-color: ${nord.frost.nord10}1a
} }
/* in case you wanted to give category buttons a different look */ /* in case you wanted to give category buttons a different look */
#category-button { #category-button {
margin: 0 10px 0 10px margin: 0 10px 0 10px
} }
#pinned-box { #pinned-box {
padding-bottom: 5px; padding-bottom: 5px;
border-bottom: 1px dotted ${nord.polarNight.nord3} border-bottom: 1px dotted ${nord.polarNight.nord3}
} }
#files-box { #files-box {
padding: 5px; padding: 5px;
border: 1px dotted ${nord.polarNight.nord3}; border: 1px dotted ${nord.polarNight.nord3};
border-radius: 15px border-radius: 15px
} }
''; '';
}; };
}; };
} }

2
modules/home/programs/nwg-drawer/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.mjallen.programs.nwg-drawer = { options.mjallen.programs.nwg-drawer = {
enable = mkEnableOption "enable nwg-drawer"; enable = mkEnableOption "enable nwg-drawer";
}; };
} }

20
modules/home/programs/nwg-panel/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, ... }: { config, lib, ... }:
with lib; with lib;
let let
cfg = config.mjallen.programs.nwg-panel; cfg = config.mjallen.programs.nwg-panel;
@@ -12,15 +12,15 @@ in
''; '';
".config/nwg-panel/preferred-apps.json".text = '' ".config/nwg-panel/preferred-apps.json".text = ''
{ {
"\\.pdf$": "${cfg.defaultApps.browser.pname}", "\\.pdf$": "${cfg.defaultApps.browser.pname}",
"\\.svg$": "inkscape", "\\.svg$": "inkscape",
"\\.(jpg|png|tiff|gif)$": "${cfg.defaultApps.imageViewer.pname}", "\\.(jpg|png|tiff|gif)$": "${cfg.defaultApps.imageViewer.pname}",
"\\.(mp3|ogg|flac|wav|wma)$": "audacious", "\\.(mp3|ogg|flac|wav|wma)$": "audacious",
"\\.(avi|mp4|mkv|mov|wav)$": "${cfg.defaultApps.video.pname}", "\\.(avi|mp4|mkv|mov|wav)$": "${cfg.defaultApps.video.pname}",
"\\.(doc|docx|xls|xlsx)$": "${cfg.defaultApps.office.pname}" "\\.(doc|docx|xls|xlsx)$": "${cfg.defaultApps.office.pname}"
} }
''; '';
}; };
}; };
} }

42
modules/home/programs/nwg-panel/options.nix
View File

@@ -7,17 +7,41 @@ with lib;
defaultApps = mkOption { defaultApps = mkOption {
type = types.submodule { type = types.submodule {
options = { options = {
browser = mkOption { type = types.package; default = pkgs.firefox; }; browser = mkOption {
editor = mkOption { type = types.package; default = pkgs.micro; }; type = types.package;
fileExplorer = mkOption { type = types.package; default = pkgs.nemo; }; default = pkgs.firefox;
visual = mkOption { type = types.package; default = pkgs.vscodium; }; };
terminal = mkOption { type = types.package; default = pkgs.kitty; }; editor = mkOption {
office = mkOption { type = types.package; default = pkgs.onlyoffice-bin_latest; }; type = types.package;
video = mkOption { type = types.package; default = pkgs.vlc; }; default = pkgs.micro;
imageViewer = mkOption { type = types.package; default = pkgs.gnome-photos; }; };
fileExplorer = mkOption {
type = types.package;
default = pkgs.nemo;
};
visual = mkOption {
type = types.package;
default = pkgs.vscodium;
};
terminal = mkOption {
type = types.package;
default = pkgs.kitty;
};
office = mkOption {
type = types.package;
default = pkgs.onlyoffice-bin_latest;
};
video = mkOption {
type = types.package;
default = pkgs.vlc;
};
imageViewer = mkOption {
type = types.package;
default = pkgs.gnome-photos;
};
}; };
}; };
description = "Default applications used across the system."; description = "Default applications used across the system.";
}; };
}; };
} }

2
modules/home/programs/onlyoffice/default.nix
View File

@@ -11,4 +11,4 @@ in
maximized = true; maximized = true;
}; };
}; };
} }

418
modules/home/programs/waybar/default.nix
View File

@@ -33,7 +33,7 @@ let
''; '';
in in
{ {
imports = [ imports = [
./options.nix ./options.nix
./scripts/hass.nix ./scripts/hass.nix
./scripts/weather.nix ./scripts/weather.nix
@@ -91,7 +91,7 @@ in
critical-threshold = 110; critical-threshold = 110;
format-critical = "{temperatureC}°C "; format-critical = "{temperatureC}°C ";
format = "{temperatureC}°C {icon}"; format = "{temperatureC}°C {icon}";
format-icons = [ format-icons = [
"" # fa-temperature-empty "" # fa-temperature-empty
"" # fa-temperature-quarter "" # fa-temperature-quarter
"" # fa-temperature-half "" # fa-temperature-half
@@ -106,7 +106,7 @@ in
critical-threshold = 110; critical-threshold = 110;
format-critical = "{temperatureC}°C "; format-critical = "{temperatureC}°C ";
format = "{temperatureC}°C {icon}"; format = "{temperatureC}°C {icon}";
format-icons = [ format-icons = [
"" # fa-temperature-empty "" # fa-temperature-empty
"" # fa-temperature-quarter "" # fa-temperature-quarter
"" # fa-temperature-half "" # fa-temperature-half
@@ -193,7 +193,7 @@ in
connected = "󰂱"; connected = "󰂱";
}; };
}; };
network = { network = {
interface = cfg.networkInterface; interface = cfg.networkInterface;
on-click = "nm-connection-editor"; on-click = "nm-connection-editor";
@@ -234,10 +234,10 @@ in
calendar = { calendar = {
mode = "month"; mode = "month";
format = { format = {
months = "<span color='${nord.frost.nord9}'><b>{}</b></span>"; months = "<span color='${nord.frost.nord9}'><b>{}</b></span>";
days = "<span color='${nord.frost.nord10}'><b>{}</b></span>"; days = "<span color='${nord.frost.nord10}'><b>{}</b></span>";
weekdays = "<span color='${nord.frost.nord8}'><b>{}</b></span>"; weekdays = "<span color='${nord.frost.nord8}'><b>{}</b></span>";
today = "<span color='${nord.aurora.nord14}'><b><u>{}</u></b></span>"; today = "<span color='${nord.aurora.nord14}'><b><u>{}</u></b></span>";
}; };
}; };
}; };
@@ -247,8 +247,8 @@ in
interval = 60; interval = 60;
# statuses: 'Charging', 'Discharging' # statuses: 'Charging', 'Discharging'
states = { states = {
warning = 30; warning = 30;
critical = 15; critical = 15;
}; };
format = "{capacity}% {icon}"; format = "{capacity}% {icon}";
format-icons = { format-icons = {
@@ -296,239 +296,241 @@ in
# * { font-size: 13px; } # * { font-size: 13px; }
# window.eDP-1 * { font-size: 10px; } # window.eDP-1 * { font-size: 10px; }
style = '' style =
.blink_me { ''
animation: blinker 1s linear infinite; .blink_me {
} animation: blinker 1s linear infinite;
@keyframes blinker {
50% {
color: ${nord.aurora.nord11};
} }
}
* {
font-family:
Jetbrains Mono Nerd Font,
monospace;
font-size: 14px;
min-height: 0;
}
#waybar { @keyframes blinker {
background: transparent; 50% {
color: ${nord.snowStorm.nord6}; color: ${nord.aurora.nord11};
margin: 5px 5px; }
} }
#workspaces { * {
background-color: ${nord.polarNight.nord0}; font-family:
${defaultBorderRadius} Jetbrains Mono Nerd Font,
${defaultOpacity} monospace;
${defaultCenterOptions} font-size: 14px;
margin-left: 0.6rem; min-height: 0;
} }
#workspaces button { #waybar {
color: ${nord.frost.nord10}; background: transparent;
${defaultBorderRadius} color: ${nord.snowStorm.nord6};
padding: 0.4rem; margin: 5px 5px;
} }
#workspaces button.active { #workspaces {
color: ${nord.frost.nord8}; background-color: ${nord.polarNight.nord0};
${defaultBorderRadius} ${defaultBorderRadius}
} ${defaultOpacity}
${defaultCenterOptions}
margin-left: 0.6rem;
}
#workspaces button:hover { #workspaces button {
color: ${nord.frost.nord7}; color: ${nord.frost.nord10};
${defaultBorderRadius} ${defaultBorderRadius}
} padding: 0.4rem;
}
#workspaces button.focused { #workspaces button.active {
color: ${nord.snowStorm.nord6}; color: ${nord.frost.nord8};
background: ${nord.aurora.nord13}; ${defaultBorderRadius}
${defaultBorderRadius} }
}
#workspaces button.urgent { #workspaces button:hover {
color: ${nord.polarNight.nord0}; color: ${nord.frost.nord7};
background: ${nord.snowStorm.nord6}; ${defaultBorderRadius}
${defaultBorderRadius} }
}
#tooltip { #workspaces button.focused {
background: ${nord.polarNight.nord0}; color: ${nord.snowStorm.nord6};
border-color: ${nord.polarNight.nord0}; background: ${nord.aurora.nord13};
${defaultBorderRadius} ${defaultBorderRadius}
border-width: 1rem; }
border-style: solid;
}
#window { #workspaces button.urgent {
color: ${nord.aurora.nord15}; color: ${nord.polarNight.nord0};
background-color: ${nord.polarNight.nord0}; background: ${nord.snowStorm.nord6};
${defaultOpacity} ${defaultBorderRadius}
${defaultBorderRadius} }
${defaultCenterOptions}
margin-left: 4rem;
margin-right: 400rem;
}
/* make window module transparent when no windows present */ #tooltip {
#window.empty { background: ${nord.polarNight.nord0};
background-color: transparent; border-color: ${nord.polarNight.nord0};
} ${defaultBorderRadius}
border-width: 1rem;
border-style: solid;
}
#custom-weather { #window {
color: ${nord.frost.nord10}; color: ${nord.aurora.nord15};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${borderRight} ${defaultBorderRadius}
} ${defaultCenterOptions}
margin-left: 4rem;
margin-right: 400rem;
}
#battery { /* make window module transparent when no windows present */
color: ${nord.aurora.nord15}; #window.empty {
background-color: ${nord.polarNight.nord0}; background-color: transparent;
${defaultOpacity} }
${defaultCenterOptions}
border-radius: 0;
min-width: 3rem;
}
#clock { #custom-weather {
color: ${nord.frost.nord9}; color: ${nord.frost.nord10};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${borderLeft} ${borderRight}
} }
/* ------------- */ #battery {
color: ${nord.aurora.nord15};
background-color: ${nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
min-width: 3rem;
}
#idle_inhibitor { #clock {
color: ${nord.frost.nord10}; color: ${nord.frost.nord9};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${borderRight} ${borderLeft}
padding-right: 1rem; }
}
#idle_inhibitor:hover { /* ------------- */
background: ${nord.polarNight.nord3};
}
#network { #idle_inhibitor {
color: ${nord.aurora.nord15}; color: ${nord.frost.nord10};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${defaultCenterOptions} ${borderRight}
border-radius: 0; padding-right: 1rem;
padding-right: 15px; }
}
#network:hover { #idle_inhibitor:hover {
background: ${nord.polarNight.nord3}; background: ${nord.polarNight.nord3};
} }
#bluetooth { #network {
color: ${nord.frost.nord9}; color: ${nord.aurora.nord15};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${defaultCenterOptions} ${defaultCenterOptions}
border-radius: 0; border-radius: 0;
} padding-right: 15px;
}
#bluetooth:hover { #network:hover {
background: ${nord.polarNight.nord3}; background: ${nord.polarNight.nord3};
} }
#wireplumber.source { #bluetooth {
color: ${nord.frost.nord8}; color: ${nord.frost.nord9};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${defaultCenterOptions} ${defaultCenterOptions}
border-radius: 0; border-radius: 0;
} }
#wireplumber.source.muted { #bluetooth:hover {
animation-name: blinker; background: ${nord.polarNight.nord3};
animation-duration: 2s; }
animation-timing-function: linear;
animation-iteration-count: infinite;
padding-right: 1rem;
}
#wireplumber.source:hover { #wireplumber.source {
background: ${nord.polarNight.nord3}; color: ${nord.frost.nord8};
} background-color: ${nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#wireplumber.sink { #wireplumber.source.muted {
color: ${nord.frost.nord7}; animation-name: blinker;
background-color: ${nord.polarNight.nord0}; animation-duration: 2s;
${defaultOpacity} animation-timing-function: linear;
${defaultCenterOptions} animation-iteration-count: infinite;
border-radius: 0; padding-right: 1rem;
} }
#wireplumber.sink.muted { #wireplumber.source:hover {
animation-name: blinker; background: ${nord.polarNight.nord3};
animation-duration: 5s; }
animation-timing-function: linear;
animation-iteration-count: infinite;
}
#wireplumber.sink:hover { #wireplumber.sink {
background: ${nord.polarNight.nord3}; color: ${nord.frost.nord7};
} background-color: ${nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#keyboard-state.numlock { #wireplumber.sink.muted {
color: ${nord.frost.nord8}; animation-name: blinker;
background-color: ${nord.polarNight.nord0}; animation-duration: 5s;
${defaultOpacity} animation-timing-function: linear;
${defaultCenterOptions} animation-iteration-count: infinite;
border-radius: 0; }
}
#keyboard-state.capslock { #wireplumber.sink:hover {
color: ${nord.frost.nord9}; background: ${nord.polarNight.nord3};
background-color: ${nord.polarNight.nord0}; }
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#temperature.gpu { #keyboard-state.numlock {
color: ${nord.frost.nord10}; color: ${nord.frost.nord8};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${defaultCenterOptions} ${defaultCenterOptions}
border-radius: 0; border-radius: 0;
} }
#temperature.gpu:hover { #keyboard-state.capslock {
background: ${nord.polarNight.nord3}; color: ${nord.frost.nord9};
} background-color: ${nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#temperature { #temperature.gpu {
color: ${nord.frost.nord9}; color: ${nord.frost.nord10};
background-color: ${nord.polarNight.nord0}; background-color: ${nord.polarNight.nord0};
${defaultOpacity} ${defaultOpacity}
${defaultCenterOptions} ${defaultCenterOptions}
border-radius: 0 border-radius: 0;
} }
/* ------------- */ #temperature.gpu:hover {
background: ${nord.polarNight.nord3};
}
#tray { #temperature {
background-color: ${nord.polarNight.nord0}; color: ${nord.frost.nord9};
${defaultOpacity} background-color: ${nord.polarNight.nord0};
${defaultCenterOptions} ${defaultOpacity}
${defaultBorderRadius} ${defaultCenterOptions}
margin-right: 0.6rem; border-radius: 0
} }
/* ------------- */ /* ------------- */
'' + cfg.extraModulesStyle or '''';
#tray {
background-color: ${nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
${defaultBorderRadius}
margin-right: 0.6rem;
}
/* ------------- */
''
+ cfg.extraModulesStyle or '''';
}; };
}; };
} }

4
modules/home/programs/waybar/options.nix
View File

@@ -42,7 +42,7 @@ in
modules-right = mkOption { modules-right = mkOption {
type = with types; listOf str; type = with types; listOf str;
default = []; default = [ ];
}; };
networkInterface = mkOption { networkInterface = mkOption {
@@ -92,4 +92,4 @@ in
# default = { }; # default = { };
# }; # };
}; };
} }

8
modules/home/programs/waybar/scripts/hass.nix
View File

@@ -1,4 +1,10 @@
{ config, lib, namespace, pkgs, ... }: {
config,
lib,
namespace,
pkgs,
...
}:
let let
cfg = config.mjallen.programs.waybar; cfg = config.mjallen.programs.waybar;

7
modules/home/programs/waybar/scripts/weather.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.mjallen.programs.waybar; cfg = config.mjallen.programs.waybar;

4
modules/home/programs/wlogout/default.nix
View File

@@ -5,7 +5,7 @@ let
nord = import ../../desktop/theme/nord.nix; nord = import ../../desktop/theme/nord.nix;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.wlogout = { programs.wlogout = {
enable = false; enable = false;
@@ -101,4 +101,4 @@ in
''; '';
}; };
}; };
} }

2
modules/home/programs/wlogout/options.nix
View File

@@ -9,4 +9,4 @@ with lib;
default = "Deja Vu Sans"; default = "Deja Vu Sans";
}; };
}; };
} }

2
modules/home/programs/wofi/options.nix
View File

@@ -9,4 +9,4 @@ with lib;
default = "Deja Vu Sans"; default = "Deja Vu Sans";
}; };
}; };
} }

2
modules/home/programs/zsh/default.nix
View File

@@ -26,4 +26,4 @@ in
# fi # fi
# ''; # '';
}; };
} }

9
modules/home/sops/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
let let
cfg = config.mjallen.sops; cfg = config.mjallen.sops;
@@ -25,4 +30,4 @@ in
}; };
}; };
}; };
} }

2
modules/home/sops/options.nix
View File

@@ -9,4 +9,4 @@ with lib;
default = null; default = null;
}; };
}; };
} }

4
modules/home/user/default.nix
View File

@@ -34,7 +34,7 @@ in
default = "Austin Horstman"; default = "Austin Horstman";
description = "The full name of the user."; description = "The full name of the user.";
}; };
home = mkOption { home = mkOption {
type = (types.nullOr types.str); type = (types.nullOr types.str);
default = home-directory; default = home-directory;
description = "The user's home directory."; description = "The user's home directory.";
@@ -154,4 +154,4 @@ in
}; };
} }
]); ]);
} }

14
modules/nixos/actual/default.nix
View File

@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
with lib; with lib;
let let
cfg = config.nas-apps.actual; cfg = config.nas-apps.actual;
@@ -24,7 +29,8 @@ in
}; };
}; };
config = { lib, ... }: config =
{ lib, ... }:
{ {
services.actual = { services.actual = {
enable = true; enable = true;
@@ -63,13 +69,13 @@ in
''; '';
systemd.services = { systemd.services = {
actual = { actual = {
environment.ACTUAL_CONFIG_PATH = lib.mkForce "${dataDir}/config.json"; environment.ACTUAL_CONFIG_PATH = lib.mkForce "${dataDir}/config.json";
serviceConfig = { serviceConfig = {
ExecStart = lib.mkForce "${pkgs.actual-server}/bin/actual-server --config ${dataDir}/config.json"; ExecStart = lib.mkForce "${pkgs.actual-server}/bin/actual-server --config ${dataDir}/config.json";
WorkingDirectory = lib.mkForce dataDir; WorkingDirectory = lib.mkForce dataDir;
StateDirectory = lib.mkForce dataDir; StateDirectory = lib.mkForce dataDir;
StateDirectoryMode = lib.mkForce 0700; StateDirectoryMode = lib.mkForce 700;
DynamicUser = lib.mkForce false; DynamicUser = lib.mkForce false;
ProtectSystem = lib.mkForce null; ProtectSystem = lib.mkForce null;
}; };

2
modules/nixos/amd/default.nix
View File

@@ -6,7 +6,7 @@
}: }:
let let
cfg = config.share.hardware.amd; cfg = config.share.hardware.amd;
pkgsVersion = pkgs;#.unstable; pkgsVersion = pkgs; # .unstable;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];

2
modules/nixos/appimage/default.nix
View File

@@ -11,4 +11,4 @@
magicOrExtension = "\\x7fELF....AI\\x02"; magicOrExtension = "\\x7fELF....AI\\x02";
}; };
}; };
} }

28
modules/nixos/arrs/default.nix
View File

@@ -40,9 +40,11 @@ in
{ {
nixpkgs.config = { nixpkgs.config = {
allowUnfree = lib.mkForce true; allowUnfree = lib.mkForce true;
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ allowUnfreePredicate =
"unrar" pkg:
]; builtins.elem (lib.getName pkg) [
"unrar"
];
}; };
# Enable radarr service # Enable radarr service
@@ -207,7 +209,7 @@ in
}; };
networking = { networking = {
nat = { nat = {
forwardPorts = [ forwardPorts = [
{ {
destination = "${cfg.localAddress}:${toString cfg.radarr.port}"; destination = "${cfg.localAddress}:${toString cfg.radarr.port}";
@@ -232,8 +234,22 @@ in
]; ];
}; };
firewall = { firewall = {
allowedTCPPorts = [ cfg.radarr.port cfg.sonarr.port cfg.sabnzbd.port 8080 cfg.deluge.port cfg.jackett.port ]; allowedTCPPorts = [
allowedUDPPorts = [ cfg.radarr.port cfg.sonarr.port cfg.sabnzbd.port 8080 cfg.deluge.port cfg.jackett.port ]; cfg.radarr.port
cfg.sonarr.port
cfg.sabnzbd.port
8080
cfg.deluge.port
cfg.jackett.port
];
allowedUDPPorts = [
cfg.radarr.port
cfg.sonarr.port
cfg.sabnzbd.port
8080
cfg.deluge.port
cfg.jackett.port
];
}; };
}; };
}; };

11
modules/nixos/boot/default.nix
View File

@@ -1,4 +1,9 @@
{ pkgs, system, lib, ... }: {
pkgs,
system,
lib,
...
}:
let let
isArm = ("aarch64-linux" == system); isArm = ("aarch64-linux" == system);
in in
@@ -14,7 +19,7 @@ in
mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
openBinary = true; openBinary = true;
interpreter = "${pkgs.box64}/bin/box64"; interpreter = "${pkgs.box64}/bin/box64";
preserveArgvZero = true; preserveArgvZero = true;
matchCredentials = true; matchCredentials = true;
fixBinary = false; fixBinary = false;
}; };
@@ -22,4 +27,4 @@ in
}; };
zramSwap.enable = true; zramSwap.enable = true;
} }

9
modules/nixos/boot/lanzaboote/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.bootloader.lanzaboote; cfg = config.${namespace}.bootloader.lanzaboote;
@@ -15,4 +20,4 @@ in
configurationLimit = cfg.configLimit; configurationLimit = cfg.configLimit;
}; };
}; };
} }

2
modules/nixos/boot/lanzaboote/options.nix
View File

@@ -9,4 +9,4 @@ with lib;
default = 10; default = 10;
}; };
}; };
} }

2
modules/nixos/boot/plymouth/default.nix
View File

@@ -3,4 +3,4 @@
boot.plymouth = { boot.plymouth = {
enable = true; enable = true;
}; };
} }

63
modules/nixos/crowdsec/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
with lib; with lib;
let let
cfg = config.nas-apps.crowdsec; cfg = config.nas-apps.crowdsec;
@@ -7,23 +12,25 @@ in
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services = { services = {
crowdsec = let crowdsec =
yaml = (pkgs.formats.yaml {}).generate; let
acquisitions_file = yaml "acquisitions.yaml" { yaml = (pkgs.formats.yaml { }).generate;
source = "journalctl"; acquisitions_file = yaml "acquisitions.yaml" {
journalctl_filter = ["_SYSTEMD_UNIT=sshd.service"]; source = "journalctl";
labels.type = "syslog"; journalctl_filter = [ "_SYSTEMD_UNIT=sshd.service" ];
}; labels.type = "syslog";
in { };
enable = true; in
enrollKeyFile = "${cfg.dataDir}/enroll.key"; {
settings = { enable = true;
crowdsec_service.acquisition_path = acquisitions_file; enrollKeyFile = "${cfg.dataDir}/enroll.key";
api.server = { settings = {
listen_uri = "0.0.0.0:${toString cfg.port}"; crowdsec_service.acquisition_path = acquisitions_file;
api.server = {
listen_uri = "0.0.0.0:${toString cfg.port}";
};
}; };
}; };
};
crowdsec-firewall-bouncer = { crowdsec-firewall-bouncer = {
enable = true; enable = true;
@@ -35,17 +42,19 @@ in
}; };
systemd.services.crowdsec.serviceConfig = { systemd.services.crowdsec.serviceConfig = {
ExecStartPre = let ExecStartPre =
script = pkgs.writeScriptBin "register-bouncer" '' let
#!${pkgs.runtimeShell} script = pkgs.writeScriptBin "register-bouncer" ''
set -eu #!${pkgs.runtimeShell}
set -o pipefail set -eu
set -o pipefail
if ! cscli bouncers list | grep -q "nas-bouncer"; then if ! cscli bouncers list | grep -q "nas-bouncer"; then
cscli bouncers add "nas-bouncer" --key "${cfg.apiKey}" cscli bouncers add "nas-bouncer" --key "${cfg.apiKey}"
fi fi
''; '';
in ["${script}/bin/register-bouncer"]; in
[ "${script}/bin/register-bouncer" ];
}; };
networking = { networking = {
@@ -55,4 +64,4 @@ in
}; };
}; };
}; };
} }

7
modules/nixos/desktop/cosmic/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
let let
cfg = config.${namespace}.desktop.cosmic; cfg = config.${namespace}.desktop.cosmic;
in in

2
modules/nixos/desktop/cosmic/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.desktop.cosmic = { options.${namespace}.desktop.cosmic = {
enable = mkEnableOption "enable cosmic settings"; enable = mkEnableOption "enable cosmic settings";
}; };
} }

12
modules/nixos/desktop/gnome/default.nix
View File

@@ -1,4 +1,10 @@
{ config, lib, pkgs, namespace, ... }: {
config,
lib,
pkgs,
namespace,
...
}:
let let
cfg = config.${namespace}.desktop.gnome; cfg = config.${namespace}.desktop.gnome;
in in
@@ -17,7 +23,7 @@ in
gnome.gnome-remote-desktop.enable = true; gnome.gnome-remote-desktop.enable = true;
}; };
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
programs = { programs = {
@@ -27,4 +33,4 @@ in
}; };
}; };
}; };
} }

23
modules/nixos/desktop/hyprland/default.nix
View File

@@ -1,4 +1,10 @@
{ config, pkgs, lib, namespace, ... }: {
config,
pkgs,
lib,
namespace,
...
}:
let let
cfg = config.${namespace}.desktop.hyprland; cfg = config.${namespace}.desktop.hyprland;
@@ -26,7 +32,10 @@ in
imports = [ ../../../home/desktop/hyprland/options.nix ]; imports = [ ../../../home/desktop/hyprland/options.nix ];
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ bing-wallpaper pkgs.jq ]; environment.systemPackages = [
bing-wallpaper
pkgs.jq
];
services = { services = {
displayManager = { displayManager = {
@@ -66,7 +75,7 @@ in
xwayland.enable = true; xwayland.enable = true;
portalPackage = lib.mkDefault pkgs.xdg-desktop-portal-hyprland; portalPackage = lib.mkDefault pkgs.xdg-desktop-portal-hyprland;
}; };
nm-applet.enable = true; nm-applet.enable = true;
}; };
@@ -121,18 +130,18 @@ in
reload-bing-wallpaper = { reload-bing-wallpaper = {
description = "Timer for reload-bing-wallpaper"; description = "Timer for reload-bing-wallpaper";
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
# Timer configuration # Timer configuration
timerConfig = { timerConfig = {
OnCalendar = "daily"; # Check every day OnCalendar = "daily"; # Check every day
Persistent = true; # Run immediately if last run was missed Persistent = true; # Run immediately if last run was missed
Unit = "reload-bing-wallpaper.service"; Unit = "reload-bing-wallpaper.service";
}; };
}; };
}; };
}; };
extraConfig = '' extraConfig = ''
DefaultTimeoutStopSec=10s DefaultTimeoutStopSec=10s
''; '';
}; };

10
modules/nixos/desktop/hyprland/settings.nix
View File

@@ -1,10 +1,10 @@
{ pkgs, ... }: { pkgs, ... }:
let let
nord = import ./theme.nix; nord = import ./theme.nix;
themeSize = "compact"; # [ "standard" "compact" ] themeSize = "compact"; # [ "standard" "compact" ]
themeAccent = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeAccent = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ]
themeVariant = "nord"; # [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ] themeVariant = "nord"; # [ "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" "black" "rimless" "normal" "float" ]
themeColor = "dark"; # [ "standard" "light" "dark" ] themeColor = "dark"; # [ "standard" "light" "dark" ]
iconThemeVariant = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] iconThemeVariant = "all"; # [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ]
iconScheme = "nord"; # [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ] iconScheme = "nord"; # [ "default" "nord" "dracula" "gruvbox" "everforest" "catppuccin" "all" ]
@@ -105,4 +105,4 @@ in
}; };
theme = nord; theme = nord;
} }

7
modules/nixos/disko/aarch64-linux/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, system, ... }: {
config,
lib,
system,
...
}:
let let
isArm = builtins.match "aarch64*" system != null; isArm = builtins.match "aarch64*" system != null;
rootDisk = "/dev/nvme0n1"; rootDisk = "/dev/nvme0n1";

2
modules/nixos/disko/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.hardware.disko = { options.${namespace}.hardware.disko = {
enable = mkEnableOption "enable disko"; enable = mkEnableOption "enable disko";
}; };
} }

8
modules/nixos/disko/x86_64-linux/default.nix
View File

@@ -1,4 +1,10 @@
{ config, lib, system, namespace, ... }: {
config,
lib,
system,
namespace,
...
}:
let let
cfg = config.${namespace}.hardware.disko; cfg = config.${namespace}.hardware.disko;
isArm = builtins.match "aarch64*" system != null; isArm = builtins.match "aarch64*" system != null;

15
modules/nixos/fonts/default.nix
View File

@@ -1,11 +1,14 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
fonts.packages = with pkgs; [ fonts.packages =
font-awesome with pkgs;
noto-fonts [
noto-fonts-color-emoji font-awesome
meslo-lgs-nf noto-fonts
] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); noto-fonts-color-emoji
meslo-lgs-nf
]
++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fonts.fontconfig.defaultFonts = { fonts.fontconfig.defaultFonts = {
emoji = [ emoji = [

11
modules/nixos/gaming/default.nix
View File

@@ -1,7 +1,12 @@
{ lib, config, pkgs, ... }: {
lib,
config,
pkgs,
...
}:
let let
cfg = config.share.gaming; cfg = config.share.gaming;
pkgsVersion = pkgs; #.unstable; pkgsVersion = pkgs; # .unstable;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
@@ -17,7 +22,7 @@ in
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
# Open ports in the firewall for Source Dedicated Server # Open ports in the firewall for Source Dedicated Server
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
extraCompatPackages = with pkgsVersion; [ proton-ge-bin]; extraCompatPackages = with pkgsVersion; [ proton-ge-bin ];
gamescopeSession = { gamescopeSession = {
enable = true; enable = true;
args = [ args = [

18
modules/nixos/gitea/default.nix
View File

@@ -34,7 +34,8 @@ in
}; };
}; };
config = { lib, ... }: config =
{ lib, ... }:
{ {
services.gitea = { services.gitea = {
enable = true; enable = true;
@@ -71,7 +72,10 @@ in
networking = { networking = {
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ cfg.httpPort cfg.sshPort ]; allowedTCPPorts = [
cfg.httpPort
cfg.sshPort
];
}; };
# Use systemd-resolved inside the container # Use systemd-resolved inside the container
# Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686 # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
@@ -122,8 +126,14 @@ in
]; ];
}; };
firewall = { firewall = {
allowedTCPPorts = [ cfg.httpPort cfg.sshPort ]; allowedTCPPorts = [
allowedUDPPorts = [ cfg.httpPort cfg.sshPort ]; cfg.httpPort
cfg.sshPort
];
allowedUDPPorts = [
cfg.httpPort
cfg.sshPort
];
}; };
}; };
}; };

2
modules/nixos/hardware/btrfs/default.nix
View File

@@ -11,4 +11,4 @@
"/home" "/home"
]; ];
}; };
} }

2
modules/nixos/hardware/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, system, ... }: { lib, system, ... }:
let let
isArm = "aarch64-linux" == system; isArm = "aarch64-linux" == system;
in in
{ {
hardware = { hardware = {

27
modules/nixos/home/default.nix
View File

@@ -45,21 +45,26 @@ in
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
# Pass inputs so external modules can access them # Pass inputs so external modules can access them
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs; inherit inputs;
}; };
# Make ALL external HM modules available globally
sharedModules = with inputs; [
sops-nix.homeManagerModules.sops
# Add any other external HM modules here
] ++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ]);
users.${config.${namespace}.user.name} = lib.mkAliasDefinitions options.${namespace}.home.extraOptions; # Make ALL external HM modules available globally
sharedModules =
with inputs;
[
sops-nix.homeManagerModules.sops
# Add any other external HM modules here
]
++ (if (!isArm) then with inputs; [ steam-rom-manager.homeManagerModules.default ] else [ ]);
users.${config.${namespace}.user.name} =
lib.mkAliasDefinitions
options.${namespace}.home.extraOptions;
# users.admin = lib.mkAliasDefinitions options.${namespace}.home.extraOptions; # users.admin = lib.mkAliasDefinitions options.${namespace}.home.extraOptions;
verbose = true; verbose = true;
}; };
}; };
} }

235
modules/nixos/homeassistant/default.nix
View File

@@ -1,9 +1,15 @@
{ config, lib, pkgs, namespace, ... }: {
config,
lib,
pkgs,
namespace,
...
}:
let let
cfg = config.${namespace}.services.home-assistant; cfg = config.${namespace}.services.home-assistant;
mosquittoPort = 1883; mosquittoPort = 1883;
zigbee2mqttPort = 8080; zigbee2mqttPort = 8080;
# In configuration.nix or a separate file # In configuration.nix or a separate file
python-steam = pkgs.python3Packages.buildPythonPackage rec { python-steam = pkgs.python3Packages.buildPythonPackage rec {
pname = "steam"; pname = "steam";
@@ -74,7 +80,7 @@ in
"wyoming" "wyoming"
"zha" "zha"
]; ];
customComponents = with pkgs.home-assistant-custom-components; [ customComponents = with pkgs.home-assistant-custom-components; [
# nixpkgs # nixpkgs
auth-header auth-header
@@ -106,113 +112,114 @@ in
zigbee2mqtt-networkmap zigbee2mqtt-networkmap
]; ];
# use postgresql instead of sqlite # use postgresql instead of sqlite
extraPackages = ps: with ps; [ extraPackages =
# Core functionality ps: with ps; [
aiohttp # Core functionality
aiodns aiohttp
paho-mqtt aiodns
pillow paho-mqtt
pytz pillow
pyyaml pytz
sqlalchemy pyyaml
sqlalchemy
# Discovery & networking
zeroconf
netdisco
ifaddr
ssdp
# Device protocols
pyserial # Serial communications
bluepy # Bluetooth LE
# Smart home ecosystems
mutagen # Media file metadata
pysonos # Sonos
pywemo # Belkin WeMo
python-miio # Xiaomi devices
python-kasa # TP-Link
# Sensors & monitoring
meteocalc # Weather calculations
speedtest-cli # Internet speed
# Visualization & UI
matplotlib # Graphing
# Security
bcrypt
cryptography
pyjwt
# Media
ha-ffmpeg # Camera streams
# Specialized integrations
python-matter-server # Matter protocol
# System integrations
psutil # System monitoring
psycopg2
numpy
hassil
pyturbojpeg
paho-mqtt
pychromecast
pyatv
python-otbr-api
brother
pyipp
govee-ble
adguardhome
nextcord
aiogithubapi
jellyfin-apiclient-python
pylitterbot
dateparser
aionut
nextcloudmonitor
ollama
pynecil
aiopyarr
pysabnzbd
getmac
zigpy
bellows # For Zigbee EmberZNet-based adapters
zigpy-xbee # For XBee adapters
zigpy-deconz # For ConBee/RaspBee adapters
pyicloud # iCloud
pyatv # Apple TV
opencv-python
face-recognition
ibeacon-ble
gehomesdk
onedrive-personal-sdk
python-roborock
python-steam
apple-weatherkit
samsungctl # Discovery & networking
samsungtvws zeroconf
netdisco
ifaddr
ssdp
aiohomekit # Device protocols
pyserial # Serial communications
bluepy # Bluetooth LE
# Smart home ecosystems
mutagen # Media file metadata
pysonos # Sonos
pywemo # Belkin WeMo
python-miio # Xiaomi devices
python-kasa # TP-Link
# Sensors & monitoring
meteocalc # Weather calculations
speedtest-cli # Internet speed
# Visualization & UI
matplotlib # Graphing
# Security
bcrypt
cryptography
pyjwt
# Media
ha-ffmpeg # Camera streams
# Specialized integrations
python-matter-server # Matter protocol
# System integrations
psutil # System monitoring
psycopg2
numpy
hassil
pyturbojpeg
paho-mqtt
pychromecast
pyatv
python-otbr-api
brother
pyipp
govee-ble
adguardhome
nextcord
aiogithubapi
jellyfin-apiclient-python
pylitterbot
dateparser
aionut
nextcloudmonitor
ollama
pynecil
aiopyarr
pysabnzbd
getmac
zigpy
bellows # For Zigbee EmberZNet-based adapters
zigpy-xbee # For XBee adapters
zigpy-deconz # For ConBee/RaspBee adapters
pyicloud # iCloud
pyatv # Apple TV
opencv-python
face-recognition
ibeacon-ble
gehomesdk
onedrive-personal-sdk
python-roborock
python-steam
apple-weatherkit
samsungctl
samsungtvws
aiohomekit
icmplib
aioelectricitymaps
wyoming
pysmartthings
wakeonlan
ephem
];
icmplib
aioelectricitymaps
wyoming
pysmartthings
wakeonlan
ephem
];
config = { config = {
# Includes dependencies for a basic setup # Includes dependencies for a basic setup
# https://www.home-assistant.io/integrations/default_config/ # https://www.home-assistant.io/integrations/default_config/
default_config = {}; default_config = { };
cloud = false; cloud = false;
frontend = { frontend = {
themes = "!include_dir_merge_named themes"; themes = "!include_dir_merge_named themes";
}; };
@@ -262,10 +269,12 @@ in
postgresql = { postgresql = {
enable = true; enable = true;
ensureDatabases = [ "hass" ]; ensureDatabases = [ "hass" ];
ensureUsers = [{ ensureUsers = [
name = "hass"; {
ensureDBOwnership = true; name = "hass";
}]; ensureDBOwnership = true;
}
];
}; };
# Enable and configure Mosquitto MQTT broker # Enable and configure Mosquitto MQTT broker
@@ -303,7 +312,7 @@ in
permit_join = true; permit_join = true;
# Web interface # Web interface
frontend = { frontend = {
port = zigbee2mqttPort; # Choose an available port port = zigbee2mqttPort; # Choose an available port
}; };
# MQTT configuration # MQTT configuration
mqtt = { mqtt = {
@@ -380,24 +389,24 @@ in
}; };
# Enable required hardware support for the Zigbee adapter # Enable required hardware support for the Zigbee adapter
hardware.bluetooth.enable = true; # Some adapters use Bluetooth hardware.bluetooth.enable = true; # Some adapters use Bluetooth
# Ensure proper permissions for Zigbee USB devices # Ensure proper permissions for Zigbee USB devices
# services.udev.extraRules = '' # services.udev.extraRules = ''
# # For CC2531, CC2530, CC1352P-2, CC2538 and similar adapters # # For CC2531, CC2530, CC1352P-2, CC2538 and similar adapters
# SUBSYSTEM=="tty", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="16a8", SYMLINK+="zigbee", MODE="0666" # SUBSYSTEM=="tty", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="16a8", SYMLINK+="zigbee", MODE="0666"
# SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", SYMLINK+="zigbee", MODE="0666" # SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", SYMLINK+="zigbee", MODE="0666"
# # For ConBee/RaspBee by Dresden Elektronik # # For ConBee/RaspBee by Dresden Elektronik
# SUBSYSTEM=="tty", ATTRS{idVendor}=="1cf1", ATTRS{idProduct}=="0030", SYMLINK+="zigbee", MODE="0666" # SUBSYSTEM=="tty", ATTRS{idVendor}=="1cf1", ATTRS{idProduct}=="0030", SYMLINK+="zigbee", MODE="0666"
# # For Electrolama zig-a-zig-ah (zzh!) # # For Electrolama zig-a-zig-ah (zzh!)
# SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", SYMLINK+="zigbee", MODE="0666" # SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", SYMLINK+="zigbee", MODE="0666"
# ''; # '';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
mosquitto # MQTT command-line tools mosquitto # MQTT command-line tools
usbutils # For lsusb to help identify your adapter usbutils # For lsusb to help identify your adapter
]; ];
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [

2
modules/nixos/homeassistant/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.home-assistant = { options.${namespace}.services.home-assistant = {
enable = mkEnableOption "enable home-assistant"; enable = mkEnableOption "enable home-assistant";
}; };
} }

9
modules/nixos/immich/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.immich; cfg = config.${namespace}.services.immich;
@@ -8,7 +13,7 @@ let
dbPassword = config.sops.secrets."jallen-nas/immich/db-password".path; dbPassword = config.sops.secrets."jallen-nas/immich/db-password".path;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
# Enable immich service # Enable immich service

2
modules/nixos/immich/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.immich = { options.${namespace}.services.immich = {
enable = mkEnableOption "enable immich"; enable = mkEnableOption "enable immich";
}; };
} }

9
modules/nixos/jellyfin/default.nix
View File

@@ -1,10 +1,15 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.jellyfin; cfg = config.${namespace}.services.jellyfin;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.jellyfin = { services.jellyfin = {

2
modules/nixos/jellyfin/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.jellyfin = { options.${namespace}.services.jellyfin = {
enable = mkEnableOption "enable jellyfin"; enable = mkEnableOption "enable jellyfin";
}; };
} }

9
modules/nixos/jellyseerr/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.jellyseerr; cfg = config.${namespace}.services.jellyseerr;
@@ -7,7 +12,7 @@ let
dataDir = "/var/lib/private/jellyseerr"; dataDir = "/var/lib/private/jellyseerr";
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
containers.jellyseerr = { containers.jellyseerr = {

2
modules/nixos/jellyseerr/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.jellyseerr = { options.${namespace}.services.jellyseerr = {
enable = mkEnableOption "enable jellyseerr"; enable = mkEnableOption "enable jellyseerr";
}; };
} }

13
modules/nixos/lubelogger/default.nix
View File

@@ -1,17 +1,22 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.lubelogger; cfg = config.${namespace}.services.lubelogger;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
virtualisation.oci-containers.containers.lubelogger = { virtualisation.oci-containers.containers.lubelogger = {
autoStart = true; autoStart = true;
image = "ghcr.io/hargata/lubelogger"; image = "ghcr.io/hargata/lubelogger";
ports = [ "6754:8080" ]; ports = [ "6754:8080" ];
volumes = [ volumes = [
"/media/nas/ssd/nix-app-data/lubelogger:/App/data" "/media/nas/ssd/nix-app-data/lubelogger:/App/data"
"/media/nas/ssd/nix-app-data/lubelogger/keys:/root/.aspnet/DataProtection-Keys" "/media/nas/ssd/nix-app-data/lubelogger/keys:/root/.aspnet/DataProtection-Keys"
]; ];
@@ -25,4 +30,4 @@ in
}; };
}; };
}; };
} }

2
modules/nixos/lubelogger/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.lubelogger = { options.${namespace}.services.lubelogger = {
enable = mkEnableOption "enable lubelogger"; enable = mkEnableOption "enable lubelogger";
}; };
} }

12
modules/nixos/network/default.nix
View File

@@ -10,7 +10,7 @@ let
in in
{ {
options.${namespace}.network = with types; { options.${namespace}.network = with types; {
hostName = lib.mkOption { hostName = lib.mkOption {
type = str; type = str;
default = "nixos"; default = "nixos";
description = "The hostname of the system."; description = "The hostname of the system.";
@@ -56,8 +56,8 @@ in
id = "Joey's Jungle 6G"; id = "Joey's Jungle 6G";
type = "wifi"; type = "wifi";
}; };
ipv4 = if (cfg.ipv4.method == "auto") ipv4 =
then if (cfg.ipv4.method == "auto") then
{ {
method = "auto"; method = "auto";
} }
@@ -87,8 +87,8 @@ in
id = "Joey's Jungle 5G"; id = "Joey's Jungle 5G";
type = "wifi"; type = "wifi";
}; };
ipv4 = if (cfg.ipv4.method == "auto") ipv4 =
then if (cfg.ipv4.method == "auto") then
{ {
method = "auto"; method = "auto";
} }
@@ -126,4 +126,4 @@ in
}; };
}; };
}; };
} }

27
modules/nixos/nextcloud/default.nix
View File

@@ -1,11 +1,17 @@
{ config, lib, pkgs, namespace, ... }: {
config,
lib,
pkgs,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.nextcloud; cfg = config.${namespace}.services.nextcloud;
adminpass = config.sops.secrets."jallen-nas/nextcloud/adminpassword".path; adminpass = config.sops.secrets."jallen-nas/nextcloud/adminpassword".path;
secretsFile = config.sops.secrets."jallen-nas/nextcloud/smtp_settings".path; secretsFile = config.sops.secrets."jallen-nas/nextcloud/smtp_settings".path;
jwtSecretFile = config.sops.secrets."jallen-nas/onlyoffice-key".path; jwtSecretFile = config.sops.secrets."jallen-nas/onlyoffice-key".path;
nextcloudUserId = config.users.users.nix-apps.uid; nextcloudUserId = config.users.users.nix-apps.uid;
nextcloudGroupId = config.users.groups.jallen-nas.gid; nextcloudGroupId = config.users.groups.jallen-nas.gid;
hostAddress = "10.0.1.3"; hostAddress = "10.0.1.3";
@@ -15,7 +21,7 @@ let
onlyofficePortExt = 9943; onlyofficePortExt = 9943;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
containers.nextcloud = { containers.nextcloud = {
@@ -33,7 +39,7 @@ in
isReadOnly = true; isReadOnly = true;
mountPoint = "/run/secrets/jallen-nas/nextcloud"; mountPoint = "/run/secrets/jallen-nas/nextcloud";
}; };
secrets2 = { secrets2 = {
hostPath = "/run/secrets/jallen-nas/onlyoffice-key"; hostPath = "/run/secrets/jallen-nas/onlyoffice-key";
isReadOnly = true; isReadOnly = true;
@@ -60,12 +66,17 @@ in
}; };
config = config =
{ pkgs, lib, namespace, ... }: {
pkgs,
lib,
namespace,
...
}:
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
networking.extraHosts = '' networking.extraHosts = ''
${hostAddress} host.containers protonmail-bridge ${hostAddress} host.containers protonmail-bridge
''; '';
services = { services = {
nextcloud = { nextcloud = {

2
modules/nixos/nextcloud/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.nextcloud = { options.${namespace}.services.nextcloud = {
enable = mkEnableOption "enable nextcloud"; enable = mkEnableOption "enable nextcloud";
}; };
} }

2
modules/nixos/nix/default.nix
View File

@@ -33,4 +33,4 @@
]; ];
}; };
}; };
} }

16
modules/nixos/nvidia/default.nix
View File

@@ -15,11 +15,11 @@ in
hardware = { hardware = {
# Nvidia # Nvidia
nvidia = { nvidia = {
package = package =
if cfg.enableBeta then if cfg.enableBeta then
config.boot.kernelPackages.nvidiaPackages.beta config.boot.kernelPackages.nvidiaPackages.beta
else else
config.boot.kernelPackages.nvidiaPackages.latest; config.boot.kernelPackages.nvidiaPackages.latest;
# Modesetting is required. # Modesetting is required.
modesetting.enable = true; modesetting.enable = true;
@@ -33,9 +33,9 @@ in
# Use the NVidia open source kernel module (not to be confused with the # Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver). # independent third-party "nouveau" open source driver).
# Support is limited to the Turing and later architectures. Full list of # Support is limited to the Turing and later architectures. Full list of
# supported GPUs is at: # supported GPUs is at:
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
# Only available from driver 515.43.04+ # Only available from driver 515.43.04+
# Currently alpha-quality/buggy, so false is currently the recommended setting. # Currently alpha-quality/buggy, so false is currently the recommended setting.
open = cfg.enableOpen; open = cfg.enableOpen;

16
modules/nixos/ollama/default.nix
View File

@@ -1,13 +1,19 @@
{ config, lib, pkgs, namespace, ... }: {
config,
lib,
pkgs,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.ollama; cfg = config.${namespace}.services.ollama;
llamaPackage = pkgs.llama-cpp.overrideAttrs (old: { llamaPackage = pkgs.llama-cpp.overrideAttrs (old: {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ggml-org"; owner = "ggml-org";
repo = "llama.cpp"; repo = "llama.cpp";
rev = "b4920"; rev = "b4920";
sha256 = "sha256-SnQIeY74JpAPRMxWcpklDH5D4CQvAgi0GYx5+ECk2J4="; sha256 = "sha256-SnQIeY74JpAPRMxWcpklDH5D4CQvAgi0GYx5+ECk2J4=";
}; };
# Optionally override other attributes if you need to # Optionally override other attributes if you need to
@@ -16,7 +22,7 @@ let
}); });
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.ollama = { services.ollama = {

2
modules/nixos/ollama/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.ollama = { options.${namespace}.services.ollama = {
enable = mkEnableOption "enable ollama"; enable = mkEnableOption "enable ollama";
}; };
} }

9
modules/nixos/paperless/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.paperless; cfg = config.${namespace}.services.paperless;
@@ -10,7 +15,7 @@ let
paperlessPkg = pkgs.paperless-ngx; paperlessPkg = pkgs.paperless-ngx;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
containers.paperless = { containers.paperless = {

2
modules/nixos/paperless/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.paperless = { options.${namespace}.services.paperless = {
enable = mkEnableOption "enable paperless"; enable = mkEnableOption "enable paperless";
}; };
} }

2
modules/nixos/programs/default.nix
View File

@@ -75,4 +75,4 @@
nixd nixd
]; ];
}; };
} }

2
modules/nixos/security/default.nix
View File

@@ -28,4 +28,4 @@
]; ];
}; };
}; };
} }

4
modules/nixos/services/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
services = { services = {
kmscon = { kmscon = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
hwRender = true; hwRender = true;
@@ -30,7 +30,7 @@
# Enable Avahi for .local hostname resolution # Enable Avahi for .local hostname resolution
avahi = { avahi = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
nssmdns4 = lib.mkDefault true; # For modern systems, use nssmdns4 instead of nssmdns nssmdns4 = lib.mkDefault true; # For modern systems, use nssmdns4 instead of nssmdns
openFirewall = lib.mkDefault true; openFirewall = lib.mkDefault true;
publish = { publish = {
enable = lib.mkDefault true; enable = lib.mkDefault true;

2
modules/nixos/shell/default.nix
View File

@@ -12,4 +12,4 @@
enableZshIntegration = lib.mkDefault true; enableZshIntegration = lib.mkDefault true;
}; };
}; };
} }

95
modules/nixos/traefik/default.nix
View File

@@ -1,4 +1,9 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.traefik; cfg = config.${namespace}.services.traefik;
@@ -45,10 +50,10 @@ let
metricsPort = 8082; metricsPort = 8082;
forwardPorts = [ forwardPorts = [
httpPort httpPort
httpsPort httpsPort
traefikPort traefikPort
metricsPort metricsPort
]; ];
# misc # misc
@@ -57,7 +62,7 @@ let
authentikAddress = "http://${serverIp}:9000/outpost.goauthentik.io/auth/traefik"; authentikAddress = "http://${serverIp}:9000/outpost.goauthentik.io/auth/traefik";
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
sops = { sops = {
@@ -76,7 +81,9 @@ in
"traefik.env" = { "traefik.env" = {
content = '' content = ''
CLOUDFLARE_DNS_API_TOKEN = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-dns-api-token"} CLOUDFLARE_DNS_API_TOKEN = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-dns-api-token"}
CLOUDFLARE_ZONE_API_TOKEN = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-zone-api-token"} CLOUDFLARE_ZONE_API_TOKEN = ${
config.sops.placeholder."jallen-nas/traefik/cloudflare-zone-api-token"
}
CLOUDFLARE_API_KEY = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-api-key"} CLOUDFLARE_API_KEY = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-api-key"}
CLOUDFLARE_EMAIL = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-email"} CLOUDFLARE_EMAIL = ${config.sops.placeholder."jallen-nas/traefik/cloudflare-email"}
''; '';
@@ -95,7 +102,7 @@ in
services.traefik = { services.traefik = {
enable = true; enable = true;
dataDir = dataDir; dataDir = dataDir;
group = "jallen-nas";#group; group = "jallen-nas"; # group;
environmentFiles = [ "${config.services.traefik.dataDir}/traefik.env" ]; # todo: sops environmentFiles = [ "${config.services.traefik.dataDir}/traefik.env" ]; # todo: sops
staticConfigOptions = { staticConfigOptions = {
@@ -129,7 +136,12 @@ in
entryPoint = "metrics"; entryPoint = "metrics";
addEntryPointsLabels = true; addEntryPointsLabels = true;
addServicesLabels = true; addServicesLabels = true;
buckets = [0.1 0.3 1.2 5.0]; # Response time buckets buckets = [
0.1
0.3
1.2
5.0
]; # Response time buckets
}; };
}; };
@@ -215,8 +227,7 @@ in
}; };
}; };
}; };
internal-ipallowlist = internal-ipallowlist = {
{
ipAllowList = { ipAllowList = {
sourceRange = [ sourceRange = [
"127.0.0.1/32" "127.0.0.1/32"
@@ -305,7 +316,10 @@ in
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "HostRegexp(`{subdomain:[a-z]+}.mjallen.dev`) && PathPrefix(`/outpost.goauthentik.io/`)"; rule = "HostRegexp(`{subdomain:[a-z]+}.mjallen.dev`) && PathPrefix(`/outpost.goauthentik.io/`)";
service = "auth"; service = "auth";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
priority = 15; priority = 15;
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
@@ -314,21 +328,30 @@ in
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`actual.${domain}`)"; rule = "Host(`actual.${domain}`)";
service = "actual"; service = "actual";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
authentik = { authentik = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`authentik.${domain}`)"; rule = "Host(`authentik.${domain}`)";
service = "authentik"; service = "authentik";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
cache = { cache = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`cache.${domain}`)"; rule = "Host(`cache.${domain}`)";
service = "cache"; service = "cache";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
priority = 10; priority = 10;
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
@@ -336,21 +359,31 @@ in
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`cloud.${domain}`)"; rule = "Host(`cloud.${domain}`)";
service = "cloud"; service = "cloud";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
gitea = { gitea = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`gitea.${domain}`)"; rule = "Host(`gitea.${domain}`)";
service = "gitea"; service = "gitea";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
hass = { hass = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`hass.${domain}`)"; rule = "Host(`hass.${domain}`)";
service = "hass"; service = "hass";
middlewares = [ "crowdsec" "whitelist-geoblock" "authentik" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
"authentik"
];
priority = 10; priority = 10;
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
@@ -358,35 +391,51 @@ in
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`immich.${domain}`)"; rule = "Host(`immich.${domain}`)";
service = "immich"; service = "immich";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
jellyfin = { jellyfin = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`jellyfin.${domain}`)"; rule = "Host(`jellyfin.${domain}`)";
service = "jellyfin"; service = "jellyfin";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
jellyseerr = { jellyseerr = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`jellyseerr.${domain}`)"; rule = "Host(`jellyseerr.${domain}`)";
service = "jellyseerr"; service = "jellyseerr";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
lubelogger = { lubelogger = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`lubelogger.${domain}`)"; rule = "Host(`lubelogger.${domain}`)";
service = "lubelogger"; service = "lubelogger";
middlewares = [ "crowdsec" "whitelist-geoblock" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
onlyoffice = { onlyoffice = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`office.${domain}`)"; rule = "Host(`office.${domain}`)";
service = "onlyoffice"; service = "onlyoffice";
middlewares = [ "crowdsec" "whitelist-geoblock" "onlyoffice-websocket" ]; middlewares = [
"crowdsec"
"whitelist-geoblock"
"onlyoffice-websocket"
];
tls.certResolver = "letsencrypt"; tls.certResolver = "letsencrypt";
}; };
}; };

2
modules/nixos/traefik/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.traefik = { options.${namespace}.services.traefik = {
enable = mkEnableOption "enable traefik"; enable = mkEnableOption "enable traefik";
}; };
} }

4
modules/nixos/user/default.nix
View File

@@ -11,7 +11,7 @@ let
in in
{ {
options.${namespace}.user = with types; { options.${namespace}.user = with types; {
email = lib.mkOption { email = lib.mkOption {
type = str; type = str;
default = "jalle008@proton.me"; default = "jalle008@proton.me";
description = "The email of the user."; description = "The email of the user.";
@@ -74,4 +74,4 @@ in
hashedPasswordFile = cfg.passwordFile; hashedPasswordFile = cfg.passwordFile;
} // cfg.extraOptions; } // cfg.extraOptions;
}; };
} }

11
modules/nixos/wyoming/default.nix
View File

@@ -1,10 +1,15 @@
{ config, lib, namespace, ... }: {
config,
lib,
namespace,
...
}:
with lib; with lib;
let let
cfg = config.${namespace}.services.wyoming; cfg = config.${namespace}.services.wyoming;
in in
{ {
imports = [ ./options.nix ]; imports = [ ./options.nix ];
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.wyoming = { services.wyoming = {
@@ -24,4 +29,4 @@ in
}; };
}; };
}; };
} }

2
modules/nixos/wyoming/options.nix
View File

@@ -4,4 +4,4 @@ with lib;
options.${namespace}.services.wyoming = { options.${namespace}.services.wyoming = {
enable = mkEnableOption "enable wyoming"; enable = mkEnableOption "enable wyoming";
}; };
} }

2
overlays/unstable/default.nix
View File

@@ -4,4 +4,4 @@ final: _prev: {
system = final.system; system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
} }

2
overlays/waybar/default.nix
View File

@@ -1,6 +1,6 @@
{ ... }: { ... }:
final: prev: { final: prev: {
waybar = prev.waybar.overrideAttrs (old: { waybar = prev.waybar.overrideAttrs (old: {
mesonFlags = (old.mesonFlags or []) ++ [ "-Dexperimental=true" ]; mesonFlags = (old.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ];
}); });
} }

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