Reformat repository with Alejandra
This commit is contained in:
parent
b8f5793ac0
commit
783055b885
GPG Key ID:
6C4D545385D4925A
@ -1,4 +1,5 @@
|
||||
(import
|
||||
(
|
||||
import
|
||||
(
|
||||
let
|
||||
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
|
||||
@ -9,5 +10,6 @@
|
||||
sha256 = lock.nodes.${nodeName}.locked.narHash;
|
||||
}
|
||||
)
|
||||
{ src = ./.; }
|
||||
).defaultNix
|
||||
{src = ./.;}
|
||||
)
|
||||
.defaultNix
|
||||
|
||||
@ -1 +1 @@
|
||||
{ ... }: { }
|
||||
{...}: {}
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
{ ... }: {
|
||||
{...}: {
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./wm
|
||||
./nodm.nix
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
{ pkgs, lib, config, osConfig ? { }, options, nixpkgs, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osConfig ? {},
|
||||
options,
|
||||
nixpkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.nix;
|
||||
standalone = !(osConfig ? home-manager);
|
||||
in {
|
||||
|
||||
@ -1,18 +1,23 @@
|
||||
{ lib, pkgs, config, osConfig ? {}, options, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.common.nodm;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
osConfig ? {},
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.nodm;
|
||||
in {
|
||||
config = let
|
||||
hyprland="${config.wayland.windowManager.hyprland.finalPackage}/bin/Hyprland";
|
||||
tty="${pkgs.coreutils}/bin/tty";
|
||||
initCommands =
|
||||
''
|
||||
hyprland = "${config.wayland.windowManager.hyprland.finalPackage}/bin/Hyprland";
|
||||
tty = "${pkgs.coreutils}/bin/tty";
|
||||
initCommands = ''
|
||||
if [[ "$(${tty})" == "/dev/tty1" && -z "''${WAYLAND_DISPLAY:+x}" ]] ; then
|
||||
${hyprland}
|
||||
fi
|
||||
'';
|
||||
in lib.mkIf (cfg.enable && config.wayland.windowManager.hyprland.enable) {
|
||||
in
|
||||
lib.mkIf (cfg.enable && config.wayland.windowManager.hyprland.enable) {
|
||||
# auto start Hyprland on tty1
|
||||
programs.zsh.initExtra = initCommands;
|
||||
programs.bash.initExtra = initCommands;
|
||||
@ -22,7 +27,9 @@ in
|
||||
enable = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
description = "Whether to automatically start a desktop session on TTY1, behaving like a rudimentary display manager.";
|
||||
default = osConfig ? systemd
|
||||
default =
|
||||
osConfig
|
||||
? systemd
|
||||
&& config.nixfiles.meta.graphical
|
||||
&& (!(
|
||||
(osConfig.systemd.services.display-manager.enable or false)
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkOption mkEnableOption mkIf mkDefault;
|
||||
cfg = config.nixfiles.common.shell;
|
||||
|
||||
@ -8,10 +12,11 @@ let
|
||||
history | sed 's:^ \+[0-9]\+ \+::' | grep '^,' | cut -d' ' -f2- | sed 's:^\(-[^ ]\+ \?\)\+::g' | grep . | cut -d' ' -f1 | sort | uniq -c | sort -g
|
||||
}
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.common.shell = {
|
||||
enable = lib.mkEnableOption "" // {
|
||||
enable =
|
||||
lib.mkEnableOption ""
|
||||
// {
|
||||
description = "Whether to enable the nixfiles shell configuration.";
|
||||
};
|
||||
};
|
||||
@ -43,11 +48,13 @@ in
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = mkDefault true;
|
||||
initExtra = ''
|
||||
initExtra =
|
||||
''
|
||||
export HOME_MANAGER_MANAGED=true
|
||||
[[ -e ~/dotfiles/shell/.zshrc ]] && . ~/dotfiles/shell/.zshrc ]]
|
||||
unset HOME_MANAGER_MANAGED
|
||||
'' + common_functions "zsh";
|
||||
''
|
||||
+ common_functions "zsh";
|
||||
oh-my-zsh = {
|
||||
enable = mkDefault true;
|
||||
theme = "robbyrussell";
|
||||
@ -59,6 +66,5 @@ in
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,13 +1,20 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.theming;
|
||||
mkDefaultStylix = lib.mkOverride 999;
|
||||
|
||||
toCaps = s: with lib.strings; with builtins;
|
||||
(toUpper (substring 0 1 s)) + toLower (substring 1 ((stringLength s)-1) s);
|
||||
toCaps = s:
|
||||
with lib.strings;
|
||||
with builtins;
|
||||
(toUpper (substring 0 1 s)) + toLower (substring 1 ((stringLength s) - 1) s);
|
||||
inherit (lib.strings) toUpper toLower;
|
||||
|
||||
mkCtp = flavor: accent: with pkgs; {
|
||||
mkCtp = flavor: accent:
|
||||
with pkgs; {
|
||||
names = {
|
||||
cursors = "catppuccin-${toLower flavor}-${toLower accent}-cursors";
|
||||
icons = "Papirus-Dark";
|
||||
@ -21,9 +28,18 @@ let
|
||||
};
|
||||
packages = {
|
||||
cursors = catppuccin-cursors."${toLower flavor}${toCaps accent}";
|
||||
kvantum = catppuccin-kvantum.override { variant = toLower flavor; accent = toLower accent; };
|
||||
icons = catppuccin-papirus-folders.override { flavor = toLower flavor; accent = toLower accent; };
|
||||
gtk = catppuccin-gtk.override { variant = toLower flavor; accents = [ (toLower accent) ]; };
|
||||
kvantum = catppuccin-kvantum.override {
|
||||
variant = toLower flavor;
|
||||
accent = toLower accent;
|
||||
};
|
||||
icons = catppuccin-papirus-folders.override {
|
||||
flavor = toLower flavor;
|
||||
accent = toLower accent;
|
||||
};
|
||||
gtk = catppuccin-gtk.override {
|
||||
variant = toLower flavor;
|
||||
accents = [(toLower accent)];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -54,9 +70,11 @@ in {
|
||||
config = lib.mkIf cfg.enable {
|
||||
fonts.fontconfig.enable = lib.mkDefault true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
ubuntu_font_family
|
||||
] ++ lib.mapAttrsToList (k: v: v) ctp.packages;
|
||||
]
|
||||
++ lib.mapAttrsToList (k: v: v) ctp.packages;
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
|
||||
@ -1,17 +1,22 @@
|
||||
{ pkgs, lib, config, osConfig ? {}, options, ...}:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osConfig ? {},
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.wm;
|
||||
inherit (lib) mkDefault;
|
||||
mkOverrideEach = pri: lib.mapAttrs (_:v: lib.mkOverride pri v);
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.common.wm = {
|
||||
enable = lib.mkEnableOption "common window manager config";
|
||||
autostart = lib.mkOption {
|
||||
description = "List of window manager agnostic commnads to run at window manager startup";
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [ "steam -silent" ];
|
||||
default = [];
|
||||
example = ["steam -silent"];
|
||||
};
|
||||
};
|
||||
|
||||
@ -51,8 +56,14 @@ in
|
||||
nwg-displays
|
||||
|
||||
# very consistent (ok it's actually a little better now)
|
||||
(catppuccin-papirus-folders.override {accent = "mauve"; flavor = "mocha"; })
|
||||
(pkgs.catppuccin-kvantum.override {accent = "mauve"; variant = "mocha"; })
|
||||
(catppuccin-papirus-folders.override {
|
||||
accent = "mauve";
|
||||
flavor = "mocha";
|
||||
})
|
||||
(pkgs.catppuccin-kvantum.override {
|
||||
accent = "mauve";
|
||||
variant = "mocha";
|
||||
})
|
||||
catppuccin-cursors.mochaMauve
|
||||
|
||||
arc-theme
|
||||
@ -73,13 +84,13 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# File associations
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
defaultApplications = let
|
||||
defaultBrowser = [ "firefox.desktop" ];
|
||||
in mkOverrideEach 50 {
|
||||
defaultBrowser = ["firefox.desktop"];
|
||||
in
|
||||
mkOverrideEach 50 {
|
||||
"x-scheme-handler/https" = defaultBrowser;
|
||||
"x-scheme-handler/http" = defaultBrowser;
|
||||
"text/html" = defaultBrowser;
|
||||
|
||||
@ -1,12 +1,16 @@
|
||||
{ pkgs, config, lib, outputs, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
outputs,
|
||||
...
|
||||
}: let
|
||||
df = lib.mkDefault;
|
||||
mkxf = with lib; mapAttrs' (name: value: nameValuePair ("XF86" + name) (value));
|
||||
mkxf = with lib; mapAttrs' (name: value: nameValuePair ("XF86" + name) value);
|
||||
|
||||
# not rewriting this rn
|
||||
keysetting = "${outputs.packages.${pkgs.system}.wm-helpers}/bin/keysetting";
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.common.wm = {
|
||||
keybinds = lib.mkOption {
|
||||
description = ''
|
||||
|
||||
@ -1,10 +1,18 @@
|
||||
{ pkgs, config, lib, options, osConfig ? { }, nixpkgs, home-manager, inputs, ... }@args:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
options,
|
||||
osConfig ? {},
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
inputs,
|
||||
...
|
||||
} @ args: let
|
||||
isStandalone = osConfig ? home-manager;
|
||||
cfg = config.nixfiles;
|
||||
flakeType = cfg.lib.types.flake;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./common
|
||||
./package-sets
|
||||
@ -25,7 +33,7 @@ in
|
||||
|
||||
lib = lib.mkOption {
|
||||
description = "nixfiles library";
|
||||
default = (import ../lib/nixfiles) { inherit pkgs; };
|
||||
default = (import ../lib/nixfiles) {inherit pkgs;};
|
||||
readOnly = true;
|
||||
};
|
||||
|
||||
@ -53,13 +61,13 @@ in
|
||||
meta.graphical = lib.mkOption {
|
||||
description = "Whether to enable graphical home-manager applications";
|
||||
type = lib.types.bool;
|
||||
default = (osConfig ? services && osConfig.services.xserver.enable);
|
||||
default = osConfig ? services && osConfig.services.xserver.enable;
|
||||
example = true;
|
||||
};
|
||||
meta.wayland = lib.mkOption {
|
||||
description = "Whether to prefer wayland packages and configuration";
|
||||
type = lib.types.bool;
|
||||
default = (lib.hasAttrByPath [ "nixfiles" "meta" "wayland" ] osConfig) && osConfig.nixfiles.meta.wayland;
|
||||
default = (lib.hasAttrByPath ["nixfiles" "meta" "wayland"] osConfig) && osConfig.nixfiles.meta.wayland;
|
||||
example = true;
|
||||
};
|
||||
|
||||
|
||||
@ -1,10 +1,16 @@
|
||||
{ pkgs, lib, config, osConfig ? {}, inputs, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osConfig ? {},
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.communication;
|
||||
rustdesk-pkg = if (lib.strings.hasInfix "23.11" lib.version) then
|
||||
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.rustdesk-flutter
|
||||
else
|
||||
pkgs.rustdesk-flutter;
|
||||
rustdesk-pkg =
|
||||
if (lib.strings.hasInfix "23.11" lib.version)
|
||||
then inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.rustdesk-flutter
|
||||
else pkgs.rustdesk-flutter;
|
||||
|
||||
vesktop-ozone-cmd = let
|
||||
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
||||
@ -17,23 +23,21 @@ let
|
||||
done
|
||||
exec "$@"
|
||||
'';
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.packageSets.communication = {
|
||||
enable = lib.mkEnableOption "communication package set";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
xdg.desktopEntries.vesktop = lib.mkIf config.nixfiles.meta.graphical {
|
||||
categories= ["Network" "InstantMessaging" "Chat"];
|
||||
exec=vesktop-ozone-cmd + " %U";
|
||||
genericName="Internet Messenger";
|
||||
icon="vesktop";
|
||||
name="Vesktop";
|
||||
type="Application";
|
||||
categories = ["Network" "InstantMessaging" "Chat"];
|
||||
exec = vesktop-ozone-cmd + " %U";
|
||||
genericName = "Internet Messenger";
|
||||
icon = "vesktop";
|
||||
name = "Vesktop";
|
||||
type = "Application";
|
||||
settings = {
|
||||
StartupWMClass="Vesktop";
|
||||
Keywords="discord;vencord;electron;chat";
|
||||
StartupWMClass = "Vesktop";
|
||||
Keywords = "discord;vencord;electron;chat";
|
||||
};
|
||||
};
|
||||
|
||||
@ -41,7 +45,8 @@ in
|
||||
(waitNet + " " + vesktop-ozone-cmd + " --start-minimized")
|
||||
];
|
||||
|
||||
home.packages = with pkgs; lib.optionals config.nixfiles.meta.graphical [
|
||||
home.packages = with pkgs;
|
||||
lib.optionals config.nixfiles.meta.graphical [
|
||||
element-desktop
|
||||
telegram-desktop
|
||||
signal-desktop
|
||||
@ -50,7 +55,8 @@ in
|
||||
rustdesk-pkg
|
||||
tor-browser
|
||||
onionshare
|
||||
] ++ [
|
||||
]
|
||||
++ [
|
||||
irssi
|
||||
];
|
||||
};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./communication.nix
|
||||
./dev.nix
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
{ pkgs, lib, config, osConfig ? {}, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.packageSets.dev;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osConfig ? {},
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.dev;
|
||||
in {
|
||||
options.nixfiles.packageSets.dev = {
|
||||
enable = lib.mkEnableOption "development package set";
|
||||
};
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{ config, lib, pkgs, osConfig ? { }, ...}:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
osConfig ? {},
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.multimedia;
|
||||
inherit (lib) optionals mkEnableOption mkIf;
|
||||
default = osConfig ? nixfiles && osConfig.nixfiles.packageSets.multimedia.enable;
|
||||
mkOverrideEach = pri: lib.mapAttrs (_:v: lib.mkOverride pri v);
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.packageSets.multimedia = {
|
||||
enable = lib.mkOption {
|
||||
description = "Whether to enable multimedia packages";
|
||||
@ -16,7 +20,8 @@ in
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; optionals config.nixfiles.meta.graphical [
|
||||
home.packages = with pkgs;
|
||||
optionals config.nixfiles.meta.graphical [
|
||||
mpv
|
||||
gimp
|
||||
krita
|
||||
@ -27,7 +32,8 @@ in
|
||||
picard
|
||||
spicetify-cli
|
||||
(kodi.withPackages (_: [])) # this is required to get python libs
|
||||
] ++ [
|
||||
]
|
||||
++ [
|
||||
yt-dlp
|
||||
gallery-dl
|
||||
imagemagick
|
||||
@ -39,18 +45,18 @@ in
|
||||
xdg.mimeApps.defaultApplications = lib.mkMerge [
|
||||
# project files
|
||||
(mkOverrideEach 100 {
|
||||
"image/x-xcf" = [ "gimp.desktop" ];
|
||||
"image/x-compressed-xcf" = [ "gimp.desktop" ];
|
||||
"image/x-krita" = [ "krita.desktop" ];
|
||||
"application/x-audacity-project" = [ "audacity.desktop" ];
|
||||
"application/x-audacity-project+sqlite3" = [ "audacity.desktop" ];
|
||||
"image/svg+xml" = [ "org.inkscape.Inkscape.desktop" ];
|
||||
"image/svg+xml-compressed" = [ "org.inkscape.Inkscape.desktop" ];
|
||||
"image/x-xcf" = ["gimp.desktop"];
|
||||
"image/x-compressed-xcf" = ["gimp.desktop"];
|
||||
"image/x-krita" = ["krita.desktop"];
|
||||
"application/x-audacity-project" = ["audacity.desktop"];
|
||||
"application/x-audacity-project+sqlite3" = ["audacity.desktop"];
|
||||
"image/svg+xml" = ["org.inkscape.Inkscape.desktop"];
|
||||
"image/svg+xml-compressed" = ["org.inkscape.Inkscape.desktop"];
|
||||
})
|
||||
# general files
|
||||
(with pkgs; mkOverrideEach 150 (config.lib.xdg.mimeAssociations [ nomacs mpv ]))
|
||||
(with pkgs; mkOverrideEach 150 (config.lib.xdg.mimeAssociations [nomacs mpv]))
|
||||
# rest of the files
|
||||
(with pkgs; mkOverrideEach 200 (config.lib.xdg.mimeAssociations [ inkscape gimp audacity ]))
|
||||
(with pkgs; mkOverrideEach 200 (config.lib.xdg.mimeAssociations [inkscape gimp audacity]))
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.productivity;
|
||||
inherit (lib) optionals;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = with pkgs; optionals config.nixfiles.meta.graphical [
|
||||
home.packages = with pkgs;
|
||||
optionals config.nixfiles.meta.graphical [
|
||||
libreoffice-fresh
|
||||
obsidian
|
||||
anki
|
||||
@ -13,19 +17,20 @@ in
|
||||
# mapping/GIS
|
||||
qgis
|
||||
josm
|
||||
] ++ [
|
||||
]
|
||||
++ [
|
||||
pandoc
|
||||
];
|
||||
|
||||
xdg.desktopEntries.obsidian = lib.mkIf config.nixfiles.meta.graphical {
|
||||
categories = [ "Office" ];
|
||||
categories = ["Office"];
|
||||
comment = "Knowledge base";
|
||||
exec = let
|
||||
extraFlags = with lib.strings;
|
||||
optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
||||
in "env NIXOS_OZONE_WL=1 obsidian${extraFlags} %u";
|
||||
icon = "obsidian";
|
||||
mimeType = [ "x-scheme-handler/obsidian" ];
|
||||
mimeType = ["x-scheme-handler/obsidian"];
|
||||
name = "Obsidian";
|
||||
type = "Application";
|
||||
};
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
{ lib, pkgs, config, osConfig ? { }, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.profile.base;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
osConfig ? {},
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.profile.base;
|
||||
in {
|
||||
# imports = [
|
||||
# ./comma.nix
|
||||
# ];
|
||||
@ -31,7 +35,8 @@ in
|
||||
"${config.home.profileDirectory}/share/terminfo"
|
||||
"/usr/share/terminfo"
|
||||
];
|
||||
in builtins.concatStringsSep ":" terminfo-dirs;
|
||||
in
|
||||
builtins.concatStringsSep ":" terminfo-dirs;
|
||||
})
|
||||
];
|
||||
|
||||
@ -47,8 +52,9 @@ in
|
||||
# presense of ~/.gitconfig. git will read from both files, and `git config`
|
||||
# will not write to ~/.gitconfig when the managed config exists unless
|
||||
# ~/.gitconfig also exists
|
||||
home.activation.git-create-gitconfig = lib.mkIf config.programs.git.enable
|
||||
(lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
home.activation.git-create-gitconfig =
|
||||
lib.mkIf config.programs.git.enable
|
||||
(lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
_nixfiles_git_create_gitconfig () {
|
||||
if ! [[ -a "$HOME/.gitconfig" ]] ; then
|
||||
touch "$HOME/.gitconfig"
|
||||
@ -64,16 +70,18 @@ in
|
||||
# defaultTerminal =
|
||||
# if config.programs.kitty.enable then "kitty"
|
||||
# else null;
|
||||
|
||||
in {
|
||||
enable = lib.mkDefault true;
|
||||
settings = lib.mkMerge [{
|
||||
settings = lib.mkMerge [
|
||||
{
|
||||
use_preview_script = lib.mkDefault true;
|
||||
preview_files = lib.mkDefault true;
|
||||
} (lib.mkIf (!(isNull defaultTerminal)) {
|
||||
}
|
||||
(lib.mkIf (!(isNull defaultTerminal)) {
|
||||
preview_images = lib.mkDefault true;
|
||||
preview_images_method = lib.mkDefault defaultTerminal;
|
||||
})];
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
programs.keychain = {
|
||||
@ -83,7 +91,8 @@ in
|
||||
extraFlags = [
|
||||
"--quiet"
|
||||
"--systemd"
|
||||
"--inherit" "any-once"
|
||||
"--inherit"
|
||||
"any-once"
|
||||
"--noask"
|
||||
];
|
||||
};
|
||||
@ -100,7 +109,8 @@ in
|
||||
neofetch-hyfetch-shim = writeShellScriptBin "neofetch" ''
|
||||
exec "${pkgs.hyfetch}/bin/neowofetch" "$@"
|
||||
'';
|
||||
in [
|
||||
in
|
||||
[
|
||||
# nix stuff
|
||||
nvd
|
||||
nix-tree
|
||||
@ -165,7 +175,8 @@ in
|
||||
zoxide
|
||||
asciinema
|
||||
mtr
|
||||
] ++ builtins.map (x: lib.hiPrio x) [
|
||||
]
|
||||
++ builtins.map (x: lib.hiPrio x) [
|
||||
# terminfo (just the ones i'm likely to use)
|
||||
kitty.terminfo
|
||||
alacritty.terminfo
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./base.nix
|
||||
./pc.nix
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{ pkgs, config, osConfig ? {}, lib, ...}:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
osConfig ? {},
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.profile.pc;
|
||||
default = osConfig ? nixfiles && osConfig.nixfiles.profile.pc.enable;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.profile.pc.enable = lib.mkOption {
|
||||
description = "Whether to enable the personal computer profile";
|
||||
type = lib.types.bool;
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
{ lib, pkgs, config, inputs, ... } @args:
|
||||
let
|
||||
cfg = config.nixfiles.programs.comma;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
} @ args: let
|
||||
cfg = config.nixfiles.programs.comma;
|
||||
in {
|
||||
imports = [
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
];
|
||||
@ -13,7 +17,8 @@ in
|
||||
|
||||
config = {
|
||||
programs.nix-index.symlinkToCacheHome = lib.mkDefault cfg.enable;
|
||||
home.packages = with pkgs; lib.optionals cfg.enable [
|
||||
home.packages = with pkgs;
|
||||
lib.optionals cfg.enable [
|
||||
comma
|
||||
];
|
||||
};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./comma.nix
|
||||
./mopidy.nix
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.programs.dunst;
|
||||
mkd = lib.mkDefault;
|
||||
in {
|
||||
|
||||
@ -1,21 +1,25 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.services.hypridle;
|
||||
inherit (lib.types) str int;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.services.hypridle = {
|
||||
enable = lib.mkEnableOption "the hypridle configuration";
|
||||
timeouts = let
|
||||
mkTimeout = timeout: desc: lib.mkOption {
|
||||
mkTimeout = timeout: desc:
|
||||
lib.mkOption {
|
||||
description = "${desc}";
|
||||
type = int;
|
||||
default = timeout;
|
||||
};
|
||||
in {
|
||||
dpms = mkTimeout (300) "DPMS timeout";
|
||||
lock = mkTimeout (360) "Lock timeout";
|
||||
locked-dpms = mkTimeout (10) "DPMS timeout while locked";
|
||||
dpms = mkTimeout 300 "DPMS timeout";
|
||||
lock = mkTimeout 360 "Lock timeout";
|
||||
locked-dpms = mkTimeout 10 "DPMS timeout while locked";
|
||||
};
|
||||
commands = {
|
||||
dpms-off = lib.mkOption {
|
||||
@ -57,7 +61,6 @@ in
|
||||
lock-dpms = pkgs.writeShellScript "lock-dpms" ''
|
||||
${pkgs.procps}/bin/pgrep -x swaylock > /dev/null && "${dpms-wrapped}"
|
||||
'';
|
||||
|
||||
in [
|
||||
{
|
||||
timeout = cfg.timeouts.dpms;
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
{ lib, pkgs, config, outputs, osConfig ? {}, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.programs.mopidy;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
outputs,
|
||||
osConfig ? {},
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.programs.mopidy;
|
||||
in {
|
||||
options.nixfiles.programs.mopidy = {
|
||||
enable = lib.mkEnableOption "mopidy configuration";
|
||||
};
|
||||
@ -38,7 +43,7 @@ in
|
||||
];
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
(ncmpcpp.override { visualizerSupport = true; })
|
||||
(ncmpcpp.override {visualizerSupport = true;})
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.programs.neovim;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.programs.neovim;
|
||||
in {
|
||||
options.nixfiles.programs.neovim.enable = lib.mkEnableOption "the Neovim configuration";
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.neovim = {
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
# Configuration for root user.
|
||||
# TODO this file is sorta an exception to my repo organization, it should
|
||||
# probably be somewhere else.
|
||||
{ config, lib, pkgs, ... }@args:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
} @ args: {
|
||||
imports = [
|
||||
./.
|
||||
];
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./hyprland
|
||||
./plasma.nix
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
{ lib, pkgs, config, osConfig ? {}, outputs, inputs, ... }@args:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
osConfig ? {},
|
||||
outputs,
|
||||
inputs,
|
||||
...
|
||||
} @ args: let
|
||||
cfg = config.nixfiles.sessions.hyprland;
|
||||
mkd = lib.mkDefault;
|
||||
hyprland-pkg = config.wayland.windowManager.hyprland.finalPackage;
|
||||
@ -24,13 +31,15 @@ let
|
||||
lock-cmd = "${swaylock}";
|
||||
|
||||
mkKittyHdrop = name: command: let
|
||||
class = if builtins.isNull (builtins.match "[[:alnum:]_]+" name) then throw "mkKittyHdrop: window name should be an alphanumeric string" else "kitty-${name}";
|
||||
class =
|
||||
if builtins.isNull (builtins.match "[[:alnum:]_]+" name)
|
||||
then throw "mkKittyHdrop: window name should be an alphanumeric string"
|
||||
else "kitty-${name}";
|
||||
wrappedCommand = pkgs.writeShellScript "hdrop-${name}" ''
|
||||
exec bash -c ${lib.escapeShellArg command}
|
||||
'';
|
||||
in "hdrop -f -c ${class} 'kitty --class=${class} ${wrappedCommand}'";
|
||||
|
||||
|
||||
# lock-cmd = let
|
||||
# cmd = pkgs.writeShellScript "lock-script" ''
|
||||
# ${swayidle} -w timeout 10 '${hyprctl} dispatch dpms off' resume '${hyprctl} dispatch dpms on' &
|
||||
@ -48,7 +57,7 @@ let
|
||||
resume 'hyprctl dispatch dpms on'
|
||||
'';
|
||||
|
||||
hypr-dispatcher-package = pkgs.callPackage ./dispatcher { hyprland = hyprland-pkg; };
|
||||
hypr-dispatcher-package = pkgs.callPackage ./dispatcher {hyprland = hyprland-pkg;};
|
||||
hypr-dispatcher = "${hypr-dispatcher-package}/bin/hypr-dispatcher";
|
||||
|
||||
wallpaper-package = "${pkgs.nixfiles-assets}";
|
||||
@ -56,7 +65,8 @@ let
|
||||
wallpaper-cmd = "${swaybg} -i ${wallpaper-package}/share/wallpapers/${wallpaper}";
|
||||
|
||||
# https://github.com/flatpak/xdg-desktop-portal-gtk/issues/440#issuecomment-1900520919
|
||||
xdpg-workaround = pkgs.writeShellScript "xdg-desktop-portal-gtk-workaround"
|
||||
xdpg-workaround =
|
||||
pkgs.writeShellScript "xdg-desktop-portal-gtk-workaround"
|
||||
''
|
||||
${pkgs.coreutils}/bin/sleep 3
|
||||
${pkgs.systemd}/bin/systemctl --user import-environment PATH
|
||||
@ -65,19 +75,20 @@ let
|
||||
|
||||
bar-cmd = "${pkgs.waybar}/bin/waybar";
|
||||
# Hyprland workspace configuration
|
||||
mainWorkspaces = builtins.genList (x: x+1) (9 ++ [0]);
|
||||
mainWorkspaces = builtins.genList (x: x + 1) (9 ++ [0]);
|
||||
workspaceName = key: let
|
||||
inherit (builtins) hasAttr;
|
||||
keyNames = {
|
||||
"0" = "10";
|
||||
};
|
||||
in
|
||||
if hasAttr key keyNames then keyNames."${key}" else key;
|
||||
if hasAttr key keyNames
|
||||
then keyNames."${key}"
|
||||
else key;
|
||||
|
||||
inherit (outputs.packages.${pkgs.system}) wm-helpers;
|
||||
keysetting = "${wm-helpers}/bin/keysetting";
|
||||
in
|
||||
{
|
||||
in {
|
||||
# FIXME this is temporary just to get it working, need to make wm-common an
|
||||
# option first
|
||||
# imports = [
|
||||
@ -88,7 +99,10 @@ in
|
||||
enable = lib.mkOption {
|
||||
description = "Whether to enable hyprland.";
|
||||
type = lib.types.bool;
|
||||
default = if (builtins.hasAttr "home-manager" osConfig) then osConfig.nixfiles.sessions.hyprland.enable else false;
|
||||
default =
|
||||
if (builtins.hasAttr "home-manager" osConfig)
|
||||
then osConfig.nixfiles.sessions.hyprland.enable
|
||||
else false;
|
||||
example = true;
|
||||
};
|
||||
|
||||
@ -133,7 +147,6 @@ in
|
||||
enable = true;
|
||||
package = lib.mkIf (osConfig ? programs) (lib.mkDefault osConfig.programs.hyprland.package);
|
||||
settings = {
|
||||
|
||||
# enable debug logging
|
||||
debug.disable_logs = mkd false;
|
||||
|
||||
@ -150,8 +163,10 @@ in
|
||||
|
||||
exec-once = let
|
||||
wrapScope = cmd: "systemd-run --user --scope -- ${cmd}";
|
||||
in (lib.optional cfg.autolock lock-cmd) ++ (map wrapScope config.nixfiles.common.wm.autostart) ++
|
||||
[
|
||||
in
|
||||
(lib.optional cfg.autolock lock-cmd)
|
||||
++ (map wrapScope config.nixfiles.common.wm.autostart)
|
||||
++ [
|
||||
wallpaper-cmd
|
||||
notifydaemon
|
||||
polkit-agent
|
||||
@ -166,7 +181,6 @@ in
|
||||
# Some default env vars.
|
||||
# env = mkd "XCURSOR_SIZE,24";
|
||||
|
||||
|
||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||
input = {
|
||||
kb_layout = mkd "us";
|
||||
@ -263,7 +277,8 @@ in
|
||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
||||
|
||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
||||
bind = [
|
||||
bind =
|
||||
[
|
||||
"$mod, Q, exec, ${terminal}"
|
||||
"$mod, Return, exec, ${terminal}"
|
||||
"$mod, C, killactive, "
|
||||
@ -345,11 +360,13 @@ in
|
||||
# edit this file
|
||||
("$mod SHIFT, slash, exec, ${terminal} -e ${pkgs.neovim}/bin/nvim "
|
||||
+ lib.escapeShellArg (config.nixfiles.path + "/home/sessions/hyprland/default.nix"))
|
||||
] ++ lib.optional config.nixfiles.programs.mopidy.enable
|
||||
]
|
||||
++ lib.optional config.nixfiles.programs.mopidy.enable
|
||||
"$mod CTRL, n, exec, ${mkKittyHdrop "ncmpcpp" "ncmpcpp"}";
|
||||
|
||||
# repeat, ignore mods
|
||||
bindei = lib.mapAttrsToList (keysym: command: ",${keysym}, exec, ${command}") config.nixfiles.common.wm.finalKeybinds
|
||||
bindei =
|
||||
lib.mapAttrsToList (keysym: command: ",${keysym}, exec, ${command}") config.nixfiles.common.wm.finalKeybinds
|
||||
++ [
|
||||
];
|
||||
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
{ lib,
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
socat,
|
||||
coreutils,
|
||||
hyprland,
|
||||
makeShellWrapper }:
|
||||
let
|
||||
wrappedPath = lib.makeBinPath [ coreutils socat hyprland ];
|
||||
makeShellWrapper,
|
||||
}: let
|
||||
wrappedPath = lib.makeBinPath [coreutils socat hyprland];
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "hyprland-dispatcher";
|
||||
phases = [ "installPhase" ];
|
||||
nativeBuildInputs = [ makeShellWrapper ];
|
||||
phases = ["installPhase"];
|
||||
nativeBuildInputs = [makeShellWrapper];
|
||||
src = ./.;
|
||||
installPhase = ''
|
||||
install -Dm555 $src/dispatcher.sh $out/bin/hypr-dispatcher
|
||||
wrapProgramShell $out/bin/hypr-dispatcher --prefix PATH : "${wrappedPath}"
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{ pkgs, config, lib, osConfig ? {}, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
osConfig ? {},
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkOption mkEnableOption;
|
||||
cfg = config.nixfiles.sessions.plasma;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.sessions.plasma = {
|
||||
enable = lib.mkOption {
|
||||
description = "Whether to enable the Plasma session home configuration.";
|
||||
@ -13,10 +17,10 @@ in
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
# TODO make this a generic implementation
|
||||
home.packages = let
|
||||
startupScript = pkgs.writeShellScript "autostart-script"
|
||||
startupScript =
|
||||
pkgs.writeShellScript "autostart-script"
|
||||
(lib.concatStringsSep "\n"
|
||||
(builtins.map (x: "sh -c ${lib.escapeShellArg x} &") config.nixfiles.common.wm.autostart));
|
||||
|
||||
@ -30,6 +34,6 @@ in
|
||||
mkdir -p $out/etc/xdg/autostart
|
||||
ln -s "${desktopFilePkg}/share/applications/${name}.desktop" "$out/etc/xdg/autostart/"
|
||||
'';
|
||||
in [ autostartPkg ];
|
||||
in [autostartPkg];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
# Home Manager default nixfiles entrypoint. This serves as an alternative to
|
||||
# default.nix, which sets up some more appropriate options for home-manager
|
||||
{ inputs, pkgs, config, lib, ... }:
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./.
|
||||
inputs.stylix.homeManagerModules.stylix
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
{ pkgs, lib, config, inputs, ... }@args:
|
||||
{
|
||||
imports = [ ];
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
} @ args: {
|
||||
imports = [];
|
||||
config = {
|
||||
stylix = lib.mkMerge [
|
||||
{
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{ pkgs, config, lib, vars, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
vars,
|
||||
...
|
||||
}: {
|
||||
config = {
|
||||
networking.hostName = "nixos-wsl";
|
||||
|
||||
@ -26,7 +31,7 @@
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
description = "WSL startup workaround";
|
||||
wantedBy = [ "default.target" ];
|
||||
wantedBy = ["default.target"];
|
||||
};
|
||||
};
|
||||
|
||||
@ -42,10 +47,9 @@
|
||||
noto-fonts-cjk-sans
|
||||
];
|
||||
|
||||
|
||||
fileSystems."/mnt/wsl/instances/NixOS" = {
|
||||
device = "/";
|
||||
options = [ "bind" ];
|
||||
options = ["bind"];
|
||||
};
|
||||
|
||||
# standard disclaimer don't change this for any reason whatsoever
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{ pkgs, lib, config, osConfig ? {}, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
osConfig ? {},
|
||||
...
|
||||
}: {
|
||||
config = {
|
||||
nixfiles = {
|
||||
profile.base.enable = true;
|
||||
|
||||
@ -1,20 +1,22 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) escapeShellArg;
|
||||
secret = name: config.age.secrets."${name}".path;
|
||||
fs = config.fileSystems."/srv/mcserver";
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = {
|
||||
age.secrets.restic-rclone.file = ../../secrets/restic-rclone.age;
|
||||
age.secrets.restic-password.file = ../../secrets/restic-password.age;
|
||||
|
||||
systemd.services.restic-backups-system = {
|
||||
path = with pkgs; [ btrfs-progs ];
|
||||
path = with pkgs; [btrfs-progs];
|
||||
};
|
||||
|
||||
services.restic.backups.system = {
|
||||
|
||||
# create an atomic backup
|
||||
backupPrepareCommand = ''
|
||||
set -Eeuxo pipefail
|
||||
@ -47,7 +49,6 @@ in
|
||||
"--tag=auto"
|
||||
"--group-by=host,tag"
|
||||
];
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,15 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running `nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
# Encryption
|
||||
./luks.nix
|
||||
@ -20,32 +22,30 @@
|
||||
];
|
||||
|
||||
config = {
|
||||
|
||||
fileSystems = lib.mkMerge [
|
||||
{
|
||||
"/ntfs" = {
|
||||
fsType = "ntfs-3g";
|
||||
device = "/dev/disk/by-uuid/6AC23F0FC23EDF4F";
|
||||
options = [ "auto_cache" "nofail" ];
|
||||
options = ["auto_cache" "nofail"];
|
||||
};
|
||||
"/.btrfsroot" = {
|
||||
options = [ "subvol=/" ];
|
||||
options = ["subvol=/"];
|
||||
};
|
||||
}
|
||||
|
||||
(lib.genAttrs [ "/.btrfsroot" "/" "/home" "/nix" ] ( fs: {
|
||||
options = [ "compress=zstd" ];
|
||||
(lib.genAttrs ["/.btrfsroot" "/" "/home" "/nix"] (fs: {
|
||||
options = ["compress=zstd"];
|
||||
}))
|
||||
];
|
||||
|
||||
specialisation.hyprland.configuration = {
|
||||
system.nixos.tags = [ "Hyprland" ];
|
||||
system.nixos.tags = ["Hyprland"];
|
||||
nixfiles = {
|
||||
session = "hyprland";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
hardware.cpu.intel.updateMicrocode = true;
|
||||
|
||||
services.udev.extraRules = ''
|
||||
@ -62,7 +62,7 @@
|
||||
workarounds.nvidiaPrimary = true;
|
||||
programs.greetd = {
|
||||
settings = {
|
||||
randr = [ "--output" "HDMI-A-3" "--off" ];
|
||||
randr = ["--output" "HDMI-A-3" "--off"];
|
||||
autologin = false;
|
||||
autologinUser = "nullbite";
|
||||
autolock = false;
|
||||
@ -118,7 +118,6 @@
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
# see custom-hardware-configuration.nix
|
||||
|
||||
|
||||
# networking.hostName = "nixos"; # Define your hostname.
|
||||
networking.hostName = "nullbox";
|
||||
# Pick only one of the below networking options.
|
||||
@ -128,7 +127,6 @@
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/New_York";
|
||||
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
@ -142,6 +140,4 @@
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,72 +1,76 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = ["dm-snapshot"];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos/@root" ];
|
||||
options = ["subvol=nixos/@root"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos/@nix" ];
|
||||
options = ["subvol=nixos/@nix"];
|
||||
};
|
||||
|
||||
fileSystems."/.btrfsroot" =
|
||||
{ device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fileSystems."/.btrfsroot" = {
|
||||
device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
options = ["subvol=@home"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/F4D6-20B6";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/F4D6-20B6";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/srv/mcserver-old" =
|
||||
{ device = "/dev/disk/by-uuid/7204ff85-6404-4bd7-ba0d-3fb23a5cf52c";
|
||||
fileSystems."/srv/mcserver-old" = {
|
||||
device = "/dev/disk/by-uuid/7204ff85-6404-4bd7-ba0d-3fb23a5cf52c";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@mcserver" ];
|
||||
options = ["subvol=@mcserver"];
|
||||
};
|
||||
|
||||
fileSystems."/srv/mcserver-old/.snapshots" =
|
||||
{ device = "/dev/disk/by-uuid/7204ff85-6404-4bd7-ba0d-3fb23a5cf52c";
|
||||
fileSystems."/srv/mcserver-old/.snapshots" = {
|
||||
device = "/dev/disk/by-uuid/7204ff85-6404-4bd7-ba0d-3fb23a5cf52c";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=snapshots/@mcserver" ];
|
||||
options = ["subvol=snapshots/@mcserver"];
|
||||
};
|
||||
|
||||
fileSystems."/srv/mcserver" =
|
||||
{ device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fileSystems."/srv/mcserver" = {
|
||||
device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@mcserver" ];
|
||||
options = ["subvol=@mcserver"];
|
||||
};
|
||||
|
||||
fileSystems."/srv/mcserver/.snapshots" =
|
||||
{ device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fileSystems."/srv/mcserver/.snapshots" = {
|
||||
device = "/dev/disk/by-uuid/e36d1ab4-d18b-434e-80b5-0efca0652eb5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=snapshots/@mcserver" ];
|
||||
options = ["subvol=snapshots/@mcserver"];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/4b86cbd6-6fc5-47d4-9d44-35eec59cb785"; }
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/4b86cbd6-6fc5-47d4-9d44-35eec59cb785";}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ lib, pkgs, osConfig, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
osConfig,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
];
|
||||
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) escapeShellArg;
|
||||
# (wip) more configurable than old one, will be used by volatile btrfs module
|
||||
mkBtrfsInit = { volatileRoot ? "/volatile",
|
||||
mkBtrfsInit = {
|
||||
volatileRoot ? "/volatile",
|
||||
oldRoots ? "/old_roots",
|
||||
volume }:
|
||||
''
|
||||
volume,
|
||||
}: ''
|
||||
mkdir -p /btrfs_tmp
|
||||
mount ${escapeShellArg volume} /btrfs_tmp -o subvol=/
|
||||
|
||||
@ -34,7 +39,7 @@ in {
|
||||
neededForBoot = true;
|
||||
device = root_vol;
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/nixos/@persist" ];
|
||||
options = ["subvol=/nixos/@persist"];
|
||||
};
|
||||
|
||||
# TODO volatile btrfs module
|
||||
@ -47,7 +52,7 @@ in {
|
||||
fileSystems."/" = lib.mkForce {
|
||||
device = root_vol;
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/nixos/volatile" ];
|
||||
options = ["subvol=/nixos/volatile"];
|
||||
};
|
||||
|
||||
# agenix fix
|
||||
@ -74,15 +79,24 @@ in {
|
||||
# probably NEVER be excluded removed.
|
||||
"/var/lib/nixos/"
|
||||
# password files for user.user.<name>.hashedPasswordFile
|
||||
{ directory = "/etc/passfile"; mode = "0700"; }
|
||||
{
|
||||
directory = "/etc/passfile";
|
||||
mode = "0700";
|
||||
}
|
||||
|
||||
# persistent non-declarative config
|
||||
"/etc/nixos"
|
||||
"/etc/ssh"
|
||||
{ directory = "/etc/wireguard"; mode = "0700"; }
|
||||
{
|
||||
directory = "/etc/wireguard";
|
||||
mode = "0700";
|
||||
}
|
||||
|
||||
# let's keep the root home dir as well
|
||||
{ directory = "/root"; mode = "0700"; }
|
||||
{
|
||||
directory = "/root";
|
||||
mode = "0700";
|
||||
}
|
||||
|
||||
# system state
|
||||
"/etc/NetworkManager/system-connections"
|
||||
@ -93,14 +107,29 @@ in {
|
||||
"/var/lib/power-profiles-daemon"
|
||||
"/var/lib/systemd/rfkill"
|
||||
"/var/lib/systemd/timesync"
|
||||
{ directory = "/var/lib/tailscale"; mode = "0700"; }
|
||||
{
|
||||
directory = "/var/lib/tailscale";
|
||||
mode = "0700";
|
||||
}
|
||||
"/var/lib/unbound"
|
||||
"/var/db/sudo/lectured"
|
||||
|
||||
# remember login stuff
|
||||
{ directory = "/var/cache/tuigreet"; user = "greeter"; group = "greeter"; }
|
||||
{ directory = "/var/cache/regreet"; user = "greeter"; group = "greeter"; }
|
||||
{ directory = "/var/lib/regreet"; user = "greeter"; group = "greeter"; }
|
||||
{
|
||||
directory = "/var/cache/tuigreet";
|
||||
user = "greeter";
|
||||
group = "greeter";
|
||||
}
|
||||
{
|
||||
directory = "/var/cache/regreet";
|
||||
user = "greeter";
|
||||
group = "greeter";
|
||||
}
|
||||
{
|
||||
directory = "/var/lib/regreet";
|
||||
user = "greeter";
|
||||
group = "greeter";
|
||||
}
|
||||
];
|
||||
|
||||
files = [
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
usb = "903D-DF5B";
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
usb = "903D-DF5B";
|
||||
in {
|
||||
config = {
|
||||
# cryptsetup
|
||||
boot.initrd.kernelModules = ["uas" "usbcore" "usb_storage"];
|
||||
@ -16,7 +19,7 @@ in
|
||||
mount -n -t vfat -o ro `findfs UUID=${usb}` /key
|
||||
'';
|
||||
|
||||
device="/dev/disk/by-uuid/85b5f22e-0fa5-4f0d-8fba-f800a0b41671";
|
||||
device = "/dev/disk/by-uuid/85b5f22e-0fa5-4f0d-8fba-f800a0b41671";
|
||||
keyFile = "/key/image.png"; # yes it's literally an image file. bite me
|
||||
allowDiscards = true;
|
||||
fallbackToPassword = true;
|
||||
|
||||
@ -1,18 +1,21 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
cfg = config.services.minecraft-servers;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.services.minecraft-servers;
|
||||
in {
|
||||
config = {
|
||||
fileSystems = {
|
||||
"/srv/mcserver".options = [ "compress=zstd" "nofail" ];
|
||||
"/srv/mcserver/.snapshots".options = [ "compress=zstd" "nofail" ];
|
||||
"/srv/mcserver".options = ["compress=zstd" "nofail"];
|
||||
"/srv/mcserver/.snapshots".options = ["compress=zstd" "nofail"];
|
||||
};
|
||||
networking.firewall.trustedInterfaces = [ "wg0" ];
|
||||
networking.firewall.trustedInterfaces = ["wg0"];
|
||||
|
||||
users = {
|
||||
users = {
|
||||
nullbite.extraGroups = [ "minecraft" ];
|
||||
nullbite.extraGroups = ["minecraft"];
|
||||
};
|
||||
};
|
||||
|
||||
@ -45,7 +48,8 @@ in
|
||||
nulllite-staging = let
|
||||
commit = "b8c639a";
|
||||
packHash = "sha256-HTDVIkcBf0DyLbSCuU08/HnEQuesi3cmXXhB4y4lyko=";
|
||||
in pkgs.fetchPackwizModpack {
|
||||
in
|
||||
pkgs.fetchPackwizModpack {
|
||||
url = "https://gitea.protogen.io/nullbite/nulllite/raw/commit/${commit}/pack.toml";
|
||||
inherit packHash;
|
||||
};
|
||||
@ -55,8 +59,8 @@ in
|
||||
enable = true;
|
||||
autoStart = false;
|
||||
modpack = nulllite-staging;
|
||||
modpackSymlinks = [ "mods" ];
|
||||
modpackFiles = [ "config/" ];
|
||||
modpackSymlinks = ["mods"];
|
||||
modpackFiles = ["config/"];
|
||||
serverProperties.server-port = 25574;
|
||||
serverProperties.motd = "staging server";
|
||||
};
|
||||
@ -65,8 +69,8 @@ in
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
modpack = pkgs.modpacks.notlite;
|
||||
modpackSymlinks = [ "config/yosbr" "config/quilt-loader-overrides.json" "mods" ];
|
||||
modpackFiles = [ "kubejs/" ];
|
||||
modpackSymlinks = ["config/yosbr" "config/quilt-loader-overrides.json" "mods"];
|
||||
modpackFiles = ["kubejs/"];
|
||||
serverProperties = {
|
||||
motd = "owo what's this (nix notlite edition)";
|
||||
server-port = 25567;
|
||||
@ -76,11 +80,10 @@ in
|
||||
level-seed = "8555431723250870652";
|
||||
level-type = "bclib:normal";
|
||||
};
|
||||
|
||||
};
|
||||
minecraft-nixtest = let
|
||||
self = cfg.servers.minecraft-nixtest;
|
||||
package = pkgs.quiltServers.quilt-1_20_1.override { loaderVersion = "0.21.0"; };
|
||||
package = pkgs.quiltServers.quilt-1_20_1.override {loaderVersion = "0.21.0";};
|
||||
in {
|
||||
useRecommendedDefaults = true;
|
||||
enable = false;
|
||||
@ -92,8 +95,8 @@ in
|
||||
NullBite = "e24e8e0e-7540-4126-b737-90043155bcd4";
|
||||
Silveere = "468554f1-27cd-4ea1-9308-3dd14a9b1a12";
|
||||
};
|
||||
modpackSymlinks = [ "mods" ];
|
||||
modpackFiles = [ "config/" "kubejs/" ];
|
||||
modpackSymlinks = ["mods"];
|
||||
modpackFiles = ["config/" "kubejs/"];
|
||||
serverProperties = rec {
|
||||
motd = "owo what's this (nix edition)";
|
||||
server-port = 25568;
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
config = {
|
||||
networking.networkmanager.dns = "none";
|
||||
services.unbound.enable = true;
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
inherit (lib) types mkIf optionalString;
|
||||
inherit (builtins)
|
||||
inherit
|
||||
(builtins)
|
||||
isNull
|
||||
any
|
||||
all
|
||||
@ -20,22 +20,18 @@ let
|
||||
"regular"
|
||||
"basic"
|
||||
];
|
||||
getUpstreamFromInstance =
|
||||
instance:
|
||||
let
|
||||
getUpstreamFromInstance = instance: let
|
||||
inherit (config.services.authelia.instances.${instance}.settings) server;
|
||||
port = server.port or 9091;
|
||||
host = server.host or "127.0.0.1";
|
||||
|
||||
targetHost =
|
||||
if host == "0.0.0.0" then
|
||||
"127.0.0.1"
|
||||
else if lib.hasInfix ":" host then
|
||||
throw "TODO IPv6 not supported in Authelia server address (hard to parse, can't tell if it is [::])."
|
||||
else
|
||||
host;
|
||||
in
|
||||
"http://${targetHost}:${toString port}";
|
||||
if host == "0.0.0.0"
|
||||
then "127.0.0.1"
|
||||
else if lib.hasInfix ":" host
|
||||
then throw "TODO IPv6 not supported in Authelia server address (hard to parse, can't tell if it is [::])."
|
||||
else host;
|
||||
in "http://${targetHost}:${toString port}";
|
||||
|
||||
# use this when reverse proxying to authelia (and only authelia because i
|
||||
# like the nixos recommended proxy settings better)
|
||||
@ -116,9 +112,7 @@ let
|
||||
proxy_set_header X-Forwarded-URI $request_uri;
|
||||
'';
|
||||
|
||||
genAuthConfig =
|
||||
method:
|
||||
let
|
||||
genAuthConfig = method: let
|
||||
snippet_regular = ''
|
||||
## Configure the redirection when the authz failure occurs. Lines starting
|
||||
## with 'Modern Method' and 'Legacy Method' should be commented /
|
||||
@ -134,8 +128,7 @@ let
|
||||
## redirect to the $redirection_url.
|
||||
error_page 401 =302 $redirection_url;
|
||||
'';
|
||||
in
|
||||
''
|
||||
in ''
|
||||
## Send a subrequest to Authelia to verify if the user is authenticated and
|
||||
# has permission to access the resource.
|
||||
|
||||
@ -156,22 +149,21 @@ let
|
||||
|
||||
${optionalString (method == "regular") snippet_regular}
|
||||
'';
|
||||
genAuthConfigPkg =
|
||||
method: pkgs.writeText "authelia-authrequest-${method}.conf" (genAuthConfig method);
|
||||
in
|
||||
{
|
||||
genAuthConfigPkg = method: pkgs.writeText "authelia-authrequest-${method}.conf" (genAuthConfig method);
|
||||
in {
|
||||
# authelia
|
||||
options.services.nginx =
|
||||
let
|
||||
mkAttrsOfSubmoduleOpt = module: lib.mkOption { type = with types; attrsOf (submodule module); };
|
||||
options.services.nginx = let
|
||||
mkAttrsOfSubmoduleOpt = module: lib.mkOption {type = with types; attrsOf (submodule module);};
|
||||
|
||||
# make system config accessible from submodules
|
||||
systemConfig = config;
|
||||
|
||||
# submodule definitions
|
||||
vhostModule =
|
||||
{ name, config, ... }@attrs:
|
||||
{
|
||||
vhostModule = {
|
||||
name,
|
||||
config,
|
||||
...
|
||||
} @ attrs: {
|
||||
options = {
|
||||
locations = mkAttrsOfSubmoduleOpt (genLocationModule attrs);
|
||||
authelia = {
|
||||
@ -235,8 +227,7 @@ in
|
||||
forceSSL = lib.mkIf (!(isNull config.authelia.endpoint.upstream)) true;
|
||||
|
||||
# authelia nginx internal endpoints
|
||||
locations =
|
||||
let
|
||||
locations = let
|
||||
api = "${config.authelia.upstream}/api/authz/auth-request";
|
||||
in
|
||||
lib.mkMerge [
|
||||
@ -278,13 +269,13 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
genLocationModule =
|
||||
vhostAttrs:
|
||||
{ name, config, ... }:
|
||||
let
|
||||
genLocationModule = vhostAttrs: {
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
vhostConfig = vhostAttrs.config;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.authelia.method = lib.mkOption {
|
||||
description = ''
|
||||
Authelia authentication method to use for this location.
|
||||
@ -308,15 +299,12 @@ in
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
in {
|
||||
virtualHosts = mkAttrsOfSubmoduleOpt vhostModule;
|
||||
};
|
||||
|
||||
# TODO check if any vhosts have authelia configured
|
||||
config =
|
||||
let
|
||||
config = let
|
||||
# TODO later, there are only assertions here
|
||||
configured = any (
|
||||
vhost: (!(isNull vhost.authelia.upstream)) || (!(isNull vhost.authelia.endpoint.upstream))
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
secret = name: config.age.secrets."${name}".path;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
secret = name: config.age.secrets."${name}".path;
|
||||
in {
|
||||
config = {
|
||||
age.secrets.restic-rclone.file = ../../secrets/restic-rclone.age;
|
||||
age.secrets.restic-password.file = ../../secrets/restic-password.age;
|
||||
@ -38,7 +41,6 @@ in
|
||||
"--tag=auto"
|
||||
"--group-by=host,tag"
|
||||
];
|
||||
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./services.nix
|
||||
|
||||
@ -24,8 +26,9 @@
|
||||
"/opt/hassio"
|
||||
"/opt/hassio/.snapshots"
|
||||
];
|
||||
fn = (x: { options = [ "compress=zstd" "commit=300" "noatime" ];});
|
||||
in lib.genAttrs mounts fn;
|
||||
fn = x: {options = ["compress=zstd" "commit=300" "noatime"];};
|
||||
in
|
||||
lib.genAttrs mounts fn;
|
||||
|
||||
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
|
||||
boot.loader.grub.enable = false;
|
||||
@ -64,7 +67,7 @@
|
||||
"wg0"
|
||||
"tailscale0"
|
||||
];
|
||||
networking.firewall.allowedUDPPorts = [ 51820 ];
|
||||
networking.firewall.allowedUDPPorts = [51820];
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
@ -94,9 +97,6 @@
|
||||
# Enable the X11 windowing system.
|
||||
# services.xserver.enable = true;
|
||||
|
||||
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
# services.xserver.xkb.layout = "us";
|
||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
@ -126,7 +126,7 @@
|
||||
# };
|
||||
users.users.nullbite = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
extraGroups = ["wheel"];
|
||||
uid = 1000;
|
||||
};
|
||||
|
||||
@ -182,6 +182,4 @@
|
||||
#
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.services.gitea;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.services.gitea;
|
||||
in {
|
||||
config = {
|
||||
services.gitea = {
|
||||
enable = true;
|
||||
@ -32,19 +35,37 @@ in
|
||||
DEFAULT_THEME = "catppuccin-mocha-pink";
|
||||
THEMES = let
|
||||
ctpAttrs = {
|
||||
flavor = [ "latte" "frappe" "macchiato" "mocha" ];
|
||||
accent = [ "rosewater" "flamingo" "pink" "mauve"
|
||||
"red" "maroon" "peach" "yellow" "green" "teal"
|
||||
"sky" "sapphire" "blue" ];
|
||||
flavor = ["latte" "frappe" "macchiato" "mocha"];
|
||||
accent = [
|
||||
"rosewater"
|
||||
"flamingo"
|
||||
"pink"
|
||||
"mauve"
|
||||
"red"
|
||||
"maroon"
|
||||
"peach"
|
||||
"yellow"
|
||||
"green"
|
||||
"teal"
|
||||
"sky"
|
||||
"sapphire"
|
||||
"blue"
|
||||
];
|
||||
};
|
||||
ctpThemes = lib.mapCartesianProduct
|
||||
( { flavor, accent }: "catppuccin-${flavor}-${accent}" )
|
||||
ctpThemes =
|
||||
lib.mapCartesianProduct
|
||||
({
|
||||
flavor,
|
||||
accent,
|
||||
}: "catppuccin-${flavor}-${accent}")
|
||||
ctpAttrs;
|
||||
in lib.concatStringsSep "," ([
|
||||
in
|
||||
lib.concatStringsSep "," ([
|
||||
"gitea"
|
||||
"arc-green"
|
||||
"auto"
|
||||
] ++ ctpThemes);
|
||||
]
|
||||
++ ctpThemes);
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,74 +1,77 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/.btrfsroot" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/.btrfsroot" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/" ];
|
||||
options = ["subvol=/"];
|
||||
};
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos/@" ];
|
||||
options = ["subvol=nixos/@"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos/@nix" ];
|
||||
options = ["subvol=nixos/@nix"];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
options = ["subvol=@home"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/18e0dfd8-78bd-478d-9df8-1c28bc0b55df";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/18e0dfd8-78bd-478d-9df8-1c28bc0b55df";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/srv/syncthing" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/srv/syncthing" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/@syncthing" ];
|
||||
options = ["subvol=/@syncthing"];
|
||||
};
|
||||
|
||||
fileSystems."/srv/media" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/srv/media" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/@media" ];
|
||||
options = ["subvol=/@media"];
|
||||
};
|
||||
|
||||
fileSystems."/opt/hassio" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/opt/hassio" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/@hassio" ];
|
||||
options = ["subvol=/@hassio"];
|
||||
};
|
||||
|
||||
fileSystems."/opt/hassio/.snapshots" =
|
||||
{ device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fileSystems."/opt/hassio/.snapshots" = {
|
||||
device = "/dev/disk/by-uuid/112535b6-4318-4d26-812b-7baf0d65dae5";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=/snapshots/@hassio" ];
|
||||
options = ["subvol=/snapshots/@hassio"];
|
||||
};
|
||||
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/b8e046b3-28a2-47c5-b305-24be5be42eff"; }
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/b8e046b3-28a2-47c5-b305-24be5be42eff";}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
@ -81,4 +84,3 @@
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
{config, ...}: {
|
||||
config = {
|
||||
nixfiles.profile.base.enable = true;
|
||||
programs.keychain.enable = false;
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
in {
|
||||
config = {
|
||||
nixfiles.programs.syncthing.enable = true;
|
||||
|
||||
systemd.timers.gallery-dl = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
wantedBy = ["timers.target"];
|
||||
timerConfig = {
|
||||
OnBootSec = "5m";
|
||||
OnUnitActiveSec = "13";
|
||||
@ -13,7 +17,7 @@ in {
|
||||
};
|
||||
};
|
||||
systemd.services.gallery-dl = {
|
||||
path = with pkgs; [ bash coreutils findutils gallery-dl ];
|
||||
path = with pkgs; [bash coreutils findutils gallery-dl];
|
||||
serviceConfig = {
|
||||
# none of your fucking business
|
||||
# TODO move this into an agenix secret probably
|
||||
@ -24,14 +28,14 @@ in {
|
||||
};
|
||||
|
||||
systemd.timers.gallery-dl-dedup = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
wantedBy = ["timers.target"];
|
||||
timerConfig = {
|
||||
OnCalendar = "03:00";
|
||||
RandomizedDelaySec = "3h";
|
||||
};
|
||||
};
|
||||
systemd.services.gallery-dl-dedup = {
|
||||
path = with pkgs ; [ bash coreutils rmlint ];
|
||||
path = with pkgs; [bash coreutils rmlint];
|
||||
serviceConfig = {
|
||||
# likewise
|
||||
ExecStart = "/srv/gallery-dl-dedup.sh";
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.age) secrets;
|
||||
inherit (builtins) toString;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./gitea.nix
|
||||
./authelia.nix
|
||||
];
|
||||
config = {
|
||||
|
||||
age.secrets.cloudflaredns = {
|
||||
file = ../../secrets/cloudflare-dns.age;
|
||||
group = "secrets";
|
||||
@ -63,7 +65,7 @@ in
|
||||
};
|
||||
|
||||
users.groups.secrets = {};
|
||||
users.users.acme.extraGroups = [ "secrets" ];
|
||||
users.users.acme.extraGroups = ["secrets"];
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
@ -97,16 +99,18 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
users.users.nginx.extraGroups = [ "acme" ];
|
||||
users.users.nginx.extraGroups = ["acme"];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
80 443
|
||||
80
|
||||
443
|
||||
# this is needed for node to work for some reason
|
||||
8123
|
||||
];
|
||||
|
||||
users.groups.authelia-shared = { };
|
||||
services.authelia.instances = lib.mapAttrs (inst: opts: {
|
||||
users.groups.authelia-shared = {};
|
||||
services.authelia.instances =
|
||||
lib.mapAttrs (inst: opts: {
|
||||
enable = true;
|
||||
group = "authelia-shared";
|
||||
secrets = {
|
||||
@ -157,7 +161,7 @@ in
|
||||
|
||||
users.users."${config.services.authelia.instances.main.user}".extraGroups = let
|
||||
name = config.services.redis.servers.authelia.user;
|
||||
in [ name ];
|
||||
in [name];
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
@ -171,7 +175,13 @@ in
|
||||
|
||||
virtualHosts = let
|
||||
useACMEHost = "protogen.io";
|
||||
mkProxy = args@{ upstream ? "http://127.0.0.1:${builtins.toString args.port}", auth ? false, authelia ? false, extraConfig ? {}, ... }:
|
||||
mkProxy = args @ {
|
||||
upstream ? "http://127.0.0.1:${builtins.toString args.port}",
|
||||
auth ? false,
|
||||
authelia ? false,
|
||||
extraConfig ? {},
|
||||
...
|
||||
}:
|
||||
lib.mkMerge [
|
||||
{
|
||||
inherit useACMEHost;
|
||||
@ -199,14 +209,24 @@ in
|
||||
# };
|
||||
# };
|
||||
|
||||
mkAuthProxy = port: mkProxy { inherit port; authelia = true; };
|
||||
mkAuthProxy = port:
|
||||
mkProxy {
|
||||
inherit port;
|
||||
authelia = true;
|
||||
};
|
||||
|
||||
mkReverseProxy = port: mkProxy { inherit port; };
|
||||
in (lib.mapAttrs (domain: instance: { forceSSL = true; inherit useACMEHost; authelia.endpoint = { inherit instance; };}) {
|
||||
mkReverseProxy = port: mkProxy {inherit port;};
|
||||
in
|
||||
(lib.mapAttrs (domain: instance: {
|
||||
forceSSL = true;
|
||||
inherit useACMEHost;
|
||||
authelia.endpoint = {inherit instance;};
|
||||
}) {
|
||||
"auth.protogen.io" = "main";
|
||||
"auth.nbt.sh" = "main";
|
||||
"auth.proot.link" = "main";
|
||||
}) // {
|
||||
})
|
||||
// {
|
||||
"changedetection.protogen.io" = mkReverseProxy 5000;
|
||||
|
||||
# firefly
|
||||
@ -237,7 +257,11 @@ in
|
||||
"paper.protogen.io" = mkReverseProxy config.services.paperless.port;
|
||||
|
||||
# octoprint (proxy_addr is 10.10.1.8)
|
||||
"print.protogen.io" = lib.mkMerge [ (mkProxy { authelia = true; upstream = "http://10.10.1.8:80"; })
|
||||
"print.protogen.io" = lib.mkMerge [
|
||||
(mkProxy {
|
||||
authelia = true;
|
||||
upstream = "http://10.10.1.8:80";
|
||||
})
|
||||
{
|
||||
locations."/webcam" = {
|
||||
proxyPass = "http://10.10.1.8:80$request_uri";
|
||||
@ -245,14 +269,19 @@ in
|
||||
basicAuthFile = config.age.secrets.htpasswd-cam.path;
|
||||
authelia.method = null;
|
||||
};
|
||||
}];
|
||||
}
|
||||
];
|
||||
|
||||
# searx auth 8088 (none for /favicon.ico, /autocompleter, /opensearch.xml)
|
||||
"search.protogen.io".locations."/".return = "302 https://searx.protogen.io$request_uri";
|
||||
"searx.protogen.io" = let
|
||||
port = 8088;
|
||||
in mkProxy { authelia = true; inherit port; extraConfig = {
|
||||
locations = lib.genAttrs [ "/favicon.ico" "/autocompleter" "/opensearch.xml" ] (attr: {
|
||||
in
|
||||
mkProxy {
|
||||
authelia = true;
|
||||
inherit port;
|
||||
extraConfig = {
|
||||
locations = lib.genAttrs ["/favicon.ico" "/autocompleter" "/opensearch.xml"] (attr: {
|
||||
proxyPass = "http://localhost:${builtins.toString port}";
|
||||
proxyWebsockets = true;
|
||||
authelia.method = null;
|
||||
@ -260,11 +289,19 @@ in
|
||||
auth_basic off;
|
||||
'';
|
||||
});
|
||||
};};
|
||||
};
|
||||
};
|
||||
|
||||
# URL shortener
|
||||
"nbt.sh" = mkProxy { port = 8090; extraConfig.serverAliases = [ "proot.link" ]; };
|
||||
"admin.nbt.sh" = mkProxy { authelia = true; port = 8091; extraConfig.serverAliases = [ "admin.proot.link" ]; };
|
||||
"nbt.sh" = mkProxy {
|
||||
port = 8090;
|
||||
extraConfig.serverAliases = ["proot.link"];
|
||||
};
|
||||
"admin.nbt.sh" = mkProxy {
|
||||
authelia = true;
|
||||
port = 8091;
|
||||
extraConfig.serverAliases = ["admin.proot.link"];
|
||||
};
|
||||
|
||||
# uptime
|
||||
"uptime.protogen.io" = mkReverseProxy 3001;
|
||||
@ -302,7 +339,7 @@ in
|
||||
|
||||
# main site
|
||||
"protogen.io" = {
|
||||
serverAliases = [ "x.protogen.io" ];
|
||||
serverAliases = ["x.protogen.io"];
|
||||
useACMEHost = "protogen.io";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
@ -320,7 +357,7 @@ in
|
||||
locations."/" = {
|
||||
return = "302 https://protogen.io$request_uri";
|
||||
};
|
||||
serverAliases = [ "www.nullbite.com" "nullbite.dev" "www.nullbite.dev" "www.protogen.io" "nullbite.xyz" "www.nullbite.xyz" ];
|
||||
serverAliases = ["www.nullbite.com" "nullbite.dev" "www.nullbite.dev" "www.protogen.io" "nullbite.xyz" "www.nullbite.xyz"];
|
||||
};
|
||||
|
||||
# show blank page for unknown hosts
|
||||
@ -332,16 +369,14 @@ in
|
||||
return = "404";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
# https://gethomepage.dev
|
||||
services.homepage-dashboard = let
|
||||
entry = name: value: { "${name}" = value; };
|
||||
makeBookmark = name: {...}@attrs: entry name [ attrs ];
|
||||
makeBookmark' = name: icon: abbr: href: makeBookmark name ({ inherit abbr href; } // lib.optionalAttrs (icon != null) { inherit icon; });
|
||||
entry = name: value: {"${name}" = value;};
|
||||
makeBookmark = name: {...} @ attrs: entry name [attrs];
|
||||
makeBookmark' = name: icon: abbr: href: makeBookmark name ({inherit abbr href;} // lib.optionalAttrs (icon != null) {inherit icon;});
|
||||
in {
|
||||
enable = true;
|
||||
listenPort = 8089;
|
||||
@ -369,10 +404,12 @@ in
|
||||
];
|
||||
|
||||
services = let
|
||||
service = name: subdomain: icon: {...}@attrs: entry name ({
|
||||
service = name: subdomain: icon: {...} @ attrs:
|
||||
entry name ({
|
||||
href = "https://${subdomain}.protogen.io";
|
||||
inherit icon;
|
||||
} // attrs);
|
||||
}
|
||||
// attrs);
|
||||
basicService = name: subdomain: icon: service name subdomain icon {};
|
||||
in [
|
||||
(entry "unsorted" [
|
||||
@ -389,10 +426,14 @@ in
|
||||
(basicService "SearXNG" "searx" "searxng")
|
||||
(basicService "TheLounge" "lounge" "thelounge")
|
||||
(basicService "Paperless" "paper" "paperless-ngx")
|
||||
(entry "Shlink" { href = "https://admin.nbt.sh"; icon = "shlink"; })
|
||||
(entry "Shlink" {
|
||||
href = "https://admin.nbt.sh";
|
||||
icon = "shlink";
|
||||
})
|
||||
(basicService "Create Track Map" "trackmap" "")
|
||||
|
||||
((x: service x x x {
|
||||
((x:
|
||||
service x x x {
|
||||
widget = {
|
||||
};
|
||||
}) "changedetection")
|
||||
@ -443,7 +484,7 @@ in
|
||||
};
|
||||
|
||||
# needed for mDNS in Home Assistant
|
||||
networking.firewall.allowedUDPPorts = [ 5353 ];
|
||||
networking.firewall.allowedUDPPorts = [5353];
|
||||
|
||||
systemd.services.redlib.environment = {
|
||||
REDLIB_DEFAULT_SUBSCRIPTIONS = lib.pipe ./reddit-subscriptions.txt [
|
||||
@ -488,13 +529,12 @@ in
|
||||
PAPERLESS_URL = "https://paper.protogen.io";
|
||||
PAPERLESS_TIKA_ENABLED = true;
|
||||
PAPERLESS_TIKA_ENDPOINT = "http://localhost:${toString config.services.tika.port}";
|
||||
PAPERLESS_TIKA_GOTENBERG_ENDPOINT =
|
||||
"http://localhost:${toString config.services.gotenberg.port}";
|
||||
PAPERLESS_TIKA_GOTENBERG_ENDPOINT = "http://localhost:${toString config.services.gotenberg.port}";
|
||||
};
|
||||
};
|
||||
users.users."${config.services.paperless.user}".extraGroups = let
|
||||
name = config.services.redis.servers.paperless.group;
|
||||
in [ name ];
|
||||
in [name];
|
||||
|
||||
services.gotenberg = {
|
||||
enable = true;
|
||||
|
||||
@ -2,12 +2,15 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, vars, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
vars,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
|
||||
../../system # nixfiles modules
|
||||
@ -15,7 +18,6 @@
|
||||
./supergfxd.nix
|
||||
];
|
||||
|
||||
|
||||
config = {
|
||||
# nix.settings.experimental-features = ["nix-command" "flakes" ];
|
||||
|
||||
@ -26,18 +28,24 @@
|
||||
device = "/dev/disk/by-uuid/028A49020517BEA9";
|
||||
};
|
||||
"/.btrfsroot" = {
|
||||
options = [ "subvol=/" ];
|
||||
options = ["subvol=/"];
|
||||
};
|
||||
}
|
||||
|
||||
# Lanzaboote workaround (nix-community/lanzaboote#173)
|
||||
(lib.mkIf config.boot.lanzaboote.enable {
|
||||
"/efi/EFI/Linux" = { device = "/boot/EFI/Linux"; options = [ "bind" ]; };
|
||||
"/efi/EFI/nixos" = { device = "/boot/EFI/nixos"; options = [ "bind" ]; };
|
||||
"/efi/EFI/Linux" = {
|
||||
device = "/boot/EFI/Linux";
|
||||
options = ["bind"];
|
||||
};
|
||||
"/efi/EFI/nixos" = {
|
||||
device = "/boot/EFI/nixos";
|
||||
options = ["bind"];
|
||||
};
|
||||
})
|
||||
|
||||
(lib.genAttrs [ "/.btrfsroot" "/" "/home" "/nix" ] ( fs: {
|
||||
options = [ "compress=zstd" ];
|
||||
(lib.genAttrs ["/.btrfsroot" "/" "/home" "/nix"] (fs: {
|
||||
options = ["compress=zstd"];
|
||||
}))
|
||||
];
|
||||
|
||||
@ -51,7 +59,7 @@
|
||||
# };
|
||||
|
||||
specialisation.hyprland.configuration = {
|
||||
system.nixos.tags = [ "Hyprland" ];
|
||||
system.nixos.tags = ["Hyprland"];
|
||||
nixfiles.session = "hyprland";
|
||||
};
|
||||
|
||||
@ -91,21 +99,20 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
networking.hostName = "slab";
|
||||
|
||||
boot.initrd.systemd.enable = true;
|
||||
|
||||
boot.plymouth.enable = true;
|
||||
|
||||
boot.kernelParams = [ "quiet" ];
|
||||
boot.kernelParams = ["quiet"];
|
||||
# annoying ACPI bug
|
||||
boot.consoleLogLevel = 2;
|
||||
|
||||
# cryptsetup
|
||||
boot.initrd.luks.devices = {
|
||||
lvmroot = {
|
||||
device="/dev/disk/by-uuid/2872c0f0-e544-45f0-9b6c-ea022af7805a";
|
||||
device = "/dev/disk/by-uuid/2872c0f0-e544-45f0-9b6c-ea022af7805a";
|
||||
allowDiscards = true;
|
||||
fallbackToPassword = lib.mkIf (!config.boot.initrd.systemd.enable) true;
|
||||
preLVM = true;
|
||||
@ -138,7 +145,7 @@
|
||||
};
|
||||
|
||||
# GPS data from my phone
|
||||
services.gpsd.devices = lib.mkIf config.nixfiles.hardware.gps.enable [ "tcp://pixel.magpie-moth.ts.net:6000" ];
|
||||
services.gpsd.devices = lib.mkIf config.nixfiles.hardware.gps.enable ["tcp://pixel.magpie-moth.ts.net:6000"];
|
||||
|
||||
# systemd power/suspend configuration
|
||||
systemd.targets = lib.genAttrs ["suspend" "hybrid-sleep" "suspend-then-hibernate"] (_: {
|
||||
@ -164,7 +171,6 @@
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
# see custom-hardware-configuration.nix
|
||||
|
||||
|
||||
# networking.hostName = "nixos"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
@ -195,11 +201,9 @@
|
||||
# services.xserver.displayManager.sddm.enable = true;
|
||||
# services.xserver.desktopManager.plasma5.enable = true;
|
||||
|
||||
|
||||
# Enable flatpak
|
||||
# services.flatpak.enable = true;
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
# services.xserver.xkb.layout = "us";
|
||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
@ -219,7 +223,6 @@
|
||||
# jack.enable = true;
|
||||
# };
|
||||
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
@ -244,7 +247,6 @@
|
||||
# shell = pkgs.zsh;
|
||||
# };
|
||||
|
||||
|
||||
# shell config
|
||||
# programs.zsh.enable = true;
|
||||
# programs.fzf = {
|
||||
@ -296,7 +298,7 @@
|
||||
# }}}
|
||||
|
||||
# Open ports in the firewall.
|
||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
||||
networking.firewall.allowedTCPPorts = [22];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
@ -313,7 +315,5 @@
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "23.11"; # Did you read the comment?
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1,53 +1,57 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" "amdgpu" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usbhid" "sdhci_pci"];
|
||||
boot.initrd.kernelModules = ["dm-snapshot" "amdgpu"];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos/@" ];
|
||||
options = ["subvol=nixos/@"];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nixos/@nix" ];
|
||||
options = ["subvol=nixos/@nix"];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@home" ];
|
||||
options = ["subvol=@home"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/50D3-45F0";
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/50D3-45F0";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
fileSystems."/efi" =
|
||||
{ device = "/dev/disk/by-uuid/4E1B-8BEE";
|
||||
fileSystems."/efi" = {
|
||||
device = "/dev/disk/by-uuid/4E1B-8BEE";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/9360890a-4050-4326-bf5f-8fa2bdc6744a"; }
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/9360890a-4050-4326-bf5f-8fa2bdc6744a";}
|
||||
];
|
||||
fileSystems."/.btrfsroot" =
|
||||
{ device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fileSystems."/.btrfsroot" = {
|
||||
device = "/dev/disk/by-uuid/9c2a06d8-bff5-4587-95a6-e25495e9c4ec";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{ lib, pkgs, osConfig, config, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
osConfig,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../home
|
||||
];
|
||||
@ -9,7 +14,7 @@
|
||||
profile.base.enable = true;
|
||||
|
||||
common.wm.keybinds = {
|
||||
Launch1="playerctl play-pause"; # ROG key
|
||||
Launch1 = "playerctl play-pause"; # ROG key
|
||||
# Launch3="true"; # AURA fn key
|
||||
# Launch4="true"; # fan control fn key
|
||||
};
|
||||
@ -17,8 +22,8 @@
|
||||
home.stateVersion = "23.11";
|
||||
|
||||
# TODO mkif stylix.enable; danth/stylix#216
|
||||
home.pointerCursor = lib.mkIf (config.nixfiles.theming.enable && !config.stylix.enable) { size = 32; };
|
||||
stylix.cursor = { size = 32; };
|
||||
home.pointerCursor = lib.mkIf (config.nixfiles.theming.enable && !config.stylix.enable) {size = 32;};
|
||||
stylix.cursor = {size = 32;};
|
||||
|
||||
nixfiles.theming.catppuccin.themeDPI = "hdpi";
|
||||
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.supergfxd.enable = true;
|
||||
specialisation = {
|
||||
nvidia.configuration = {
|
||||
system.nixos.tags = [ "NVIDIA" ];
|
||||
system.nixos.tags = ["NVIDIA"];
|
||||
|
||||
nixfiles.supergfxd.profile = "Hybrid";
|
||||
|
||||
@ -30,7 +32,8 @@
|
||||
package = let
|
||||
stable = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
version = stable;
|
||||
in version;
|
||||
in
|
||||
version;
|
||||
|
||||
prime = {
|
||||
offload = {
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{ pkgs, lib, config, options, ... }@args:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
...
|
||||
} @ args: let
|
||||
gfx = {
|
||||
Integrated = {
|
||||
supergfxd = pkgs.writeText "supergfxd-integrated" ''
|
||||
@ -69,7 +74,8 @@ let
|
||||
isKeyInAttrset = let
|
||||
getKeys = attrset: lib.mapAttrsToList (name: _: name) attrset;
|
||||
isInList = key: list: lib.any (x: x == key) list;
|
||||
in key: attrset: isInList key (getKeys attrset);
|
||||
in
|
||||
key: attrset: isInList key (getKeys attrset);
|
||||
|
||||
inherit (lib) mkIf mkOption types;
|
||||
in {
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
inherit (pkgs) lib;
|
||||
in
|
||||
{
|
||||
mkServer = { modpack ? null, modpackSymlinks ? [], modpackFiles ? [], jvmOpts ? null, ...}@opts: let
|
||||
in {
|
||||
mkServer = {
|
||||
modpack ? null,
|
||||
modpackSymlinks ? [],
|
||||
modpackFiles ? [],
|
||||
jvmOpts ? null,
|
||||
...
|
||||
} @ opts: let
|
||||
# log4j exploit is bad and scary and i have no idea if this is still needed
|
||||
# but it's best to be on the safe side
|
||||
jvmOptsPatched = let
|
||||
requiredJvmOpts = "-Dlog4j2.formatMsgNoLookups=true";
|
||||
in if (!(builtins.isNull jvmOpts))
|
||||
in
|
||||
if (!(builtins.isNull jvmOpts))
|
||||
then requiredJvmOpts + " " + jvmOpts
|
||||
else requiredJvmOpts;
|
||||
|
||||
@ -17,14 +22,21 @@ in
|
||||
|
||||
serverPackage = let
|
||||
mcVersion = modpack.manifest.versions.minecraft;
|
||||
fixedVersion = lib.replaceStrings [ "." ] [ "_" ] mcVersion;
|
||||
fixedVersion = lib.replaceStrings ["."] ["_"] mcVersion;
|
||||
quiltVersion = modpack.manifest.versions.quilt or null;
|
||||
fabricVersion = modpack.manifest.versions.fabric or null;
|
||||
loader = if (!(builtins.isNull quiltVersion)) then "quilt" else "fabric";
|
||||
loaderVersion = if loader == "quilt" then quiltVersion else fabricVersion;
|
||||
in pkgs.minecraftServers."${loader}-${fixedVersion}".override { inherit loaderVersion; };
|
||||
|
||||
in lib.mkMerge [
|
||||
loader =
|
||||
if (!(builtins.isNull quiltVersion))
|
||||
then "quilt"
|
||||
else "fabric";
|
||||
loaderVersion =
|
||||
if loader == "quilt"
|
||||
then quiltVersion
|
||||
else fabricVersion;
|
||||
in
|
||||
pkgs.minecraftServers."${loader}-${fixedVersion}".override {inherit loaderVersion;};
|
||||
in
|
||||
lib.mkMerge [
|
||||
(lib.mkIf (!(builtins.isNull modpack)) {
|
||||
inherit symlinks files;
|
||||
package = lib.mkDefault serverPackage;
|
||||
@ -62,6 +74,6 @@ in
|
||||
difficulty = lib.mkDefault "hard";
|
||||
};
|
||||
}
|
||||
(builtins.removeAttrs opts [ "modpack" "modpackSymlinks" "modpackFiles" "jvmOpts" ])
|
||||
(builtins.removeAttrs opts ["modpack" "modpackSymlinks" "modpackFiles" "jvmOpts"])
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,2 +1 @@
|
||||
_:
|
||||
{}
|
||||
_: {}
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
{...}@moduleInputs:
|
||||
{
|
||||
{...} @ moduleInputs: {
|
||||
}
|
||||
|
||||
@ -12,7 +12,8 @@ in {
|
||||
./modpacks.nix
|
||||
];
|
||||
config.flake.overlays = {
|
||||
default = with cfg; composeManyExtensions [
|
||||
default = with cfg;
|
||||
composeManyExtensions [
|
||||
backports
|
||||
mitigations
|
||||
];
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
{ packages, system, ... }:
|
||||
let _packages = packages; in
|
||||
let
|
||||
packages = _packages.${system};
|
||||
mkApp = program: { type = "app"; inherit program; };
|
||||
in
|
||||
{
|
||||
packages,
|
||||
system,
|
||||
...
|
||||
}: let
|
||||
_packages = packages;
|
||||
in let
|
||||
packages = _packages.${system};
|
||||
mkApp = program: {
|
||||
type = "app";
|
||||
inherit program;
|
||||
};
|
||||
in {
|
||||
keysetting = mkApp "${packages.wm-helpers}/bin/keysetting";
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib,
|
||||
{
|
||||
lib,
|
||||
atool,
|
||||
makeBinaryWrapper,
|
||||
stdenvNoCC,
|
||||
@ -14,14 +15,14 @@
|
||||
p7zip,
|
||||
unrar,
|
||||
lha,
|
||||
unfree ? false }:
|
||||
let
|
||||
unfree ? false,
|
||||
}: let
|
||||
wrappedPath = lib.makeBinPath ([lzip plzip lzop xz zip unzip arj rpm cpio p7zip] ++ lib.optionals unfree [unrar lha]);
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "atool-wrapped";
|
||||
phases = [ "installPhase" ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
phases = ["installPhase"];
|
||||
nativeBuildInputs = [makeBinaryWrapper];
|
||||
src = ./.;
|
||||
installPhase = ''
|
||||
# symlinking them doesn't work for some reason so i have to build multiple
|
||||
@ -34,4 +35,4 @@ stdenvNoCC.mkDerivation {
|
||||
mkdir -p "$out/share"
|
||||
ln -s "${atool}/share/man" "$out/share/man"
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ pkgs ? import <nixpkgs> {} }:
|
||||
let
|
||||
{pkgs ? import <nixpkgs> {}}: let
|
||||
rofi-dmenu-wrapped = pkgs.writeShellScript "rofi-dmenu" ''
|
||||
exec "${pkgs.rofi-wayland}/bin/rofi" -dmenu "$@"
|
||||
'';
|
||||
in
|
||||
pkgs.mkShell {
|
||||
pkgs.mkShell {
|
||||
shellHook = ''
|
||||
export COMMA_PICKER="${rofi-dmenu-wrapped}"
|
||||
'';
|
||||
@ -13,4 +12,4 @@ pkgs.mkShell {
|
||||
libnotify
|
||||
comma
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
{ lib, buildNpmPackage, fetchFromGitHub }:
|
||||
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
buildNpmPackage rec {
|
||||
pname = "cross-seed";
|
||||
version = "6.11.0";
|
||||
|
||||
@ -1,17 +1,15 @@
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
{pkgs, ...}: let
|
||||
inherit (pkgs) callPackage callPackages;
|
||||
|
||||
mopidyPackages = callPackages ./mopidy {
|
||||
python = pkgs.python3;
|
||||
};
|
||||
in
|
||||
{
|
||||
inherit (mopidyPackages) mopidy-autoplay ;
|
||||
google-fonts = callPackage ./google-fonts { };
|
||||
wm-helpers = callPackage ./wm-helpers { };
|
||||
atool = callPackage ./atool-wrapped { };
|
||||
nixfiles-assets = callPackage ./nixfiles-assets { };
|
||||
redlib = callPackage ./redlib { };
|
||||
cross-seed = callPackage ./cross-seed { };
|
||||
in {
|
||||
inherit (mopidyPackages) mopidy-autoplay;
|
||||
google-fonts = callPackage ./google-fonts {};
|
||||
wm-helpers = callPackage ./wm-helpers {};
|
||||
atool = callPackage ./atool-wrapped {};
|
||||
nixfiles-assets = callPackage ./nixfiles-assets {};
|
||||
redlib = callPackage ./redlib {};
|
||||
cross-seed = callPackage ./cross-seed {};
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, fonts ? []
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
fonts ? [],
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "google-fonts";
|
||||
version = "unstable-2023-10-20";
|
||||
@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation {
|
||||
# Adobe Blank is split out in a separate output,
|
||||
# because it causes crashes with `libfontconfig`.
|
||||
# It has an absurd number of symbols
|
||||
outputs = [ "out" "adobeBlank" ];
|
||||
outputs = ["out" "adobeBlank"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
@ -45,26 +45,32 @@ stdenvNoCC.mkDerivation {
|
||||
# FamilyName.ttf. This installs all fonts if fonts is empty and otherwise
|
||||
# only the specified fonts by FamilyName.
|
||||
fonts = map (font: builtins.replaceStrings [" "] [""] font) fonts;
|
||||
installPhase = ''
|
||||
installPhase =
|
||||
''
|
||||
adobeBlankDest=$adobeBlank/share/fonts/truetype
|
||||
install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf
|
||||
rm -r ofl/adobeblank
|
||||
dest=$out/share/fonts/truetype
|
||||
'' + (if fonts == [] then ''
|
||||
''
|
||||
+ (
|
||||
if fonts == []
|
||||
then ''
|
||||
find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' +
|
||||
'' else ''
|
||||
''
|
||||
else ''
|
||||
for font in $fonts; do
|
||||
find . \( -name "$font-*.ttf" -o -name "$font[*.ttf" -o -name "$font.ttf" \) -exec install -m 444 -Dt $dest '{}' +
|
||||
done
|
||||
'');
|
||||
''
|
||||
);
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://fonts.google.com";
|
||||
description = "Font files available from Google Fonts";
|
||||
license = with licenses; [ asl20 ofl ufl ];
|
||||
license = with licenses; [asl20 ofl ufl];
|
||||
platforms = platforms.all;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ manveru ];
|
||||
sourceProvenance = [ sourceTypes.binaryBytecode ];
|
||||
maintainers = with maintainers; [manveru];
|
||||
sourceProvenance = [sourceTypes.binaryBytecode];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ nixpkgs ? <nixpkgs>, pkgs ? (import nixpkgs) { } }:
|
||||
let
|
||||
{
|
||||
nixpkgs ? <nixpkgs>,
|
||||
pkgs ? (import nixpkgs) {},
|
||||
}: let
|
||||
inherit (pkgs) callPackage fetchFromSourcehut fetchFromGitHub lib;
|
||||
inherit (lib) escapeShellArg;
|
||||
|
||||
lucem = pkgs.callPackage ./. { };
|
||||
lucem = pkgs.callPackage ./. {};
|
||||
|
||||
nim_lk_patched = pkgs.nim_lk.overrideAttrs (final: prev: {
|
||||
src = pkgs.fetchFromSourcehut {
|
||||
@ -16,7 +18,6 @@ let
|
||||
./nim_lk-rev-order-fix.patch
|
||||
];
|
||||
});
|
||||
|
||||
in
|
||||
pkgs.stdenvNoCC.mkDerivation {
|
||||
name = "lucem-lock.json";
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ lib, python3Packages, fetchPypi, mopidy }:
|
||||
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchPypi,
|
||||
mopidy,
|
||||
}:
|
||||
# based on mopidy/jellyfin.nix
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "mopidy-autoplay";
|
||||
@ -11,11 +15,11 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "sha256-E2Q+Cn2LWSbfoT/gFzUfChwl67Mv17uKmX2woFz/3YM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mopidy ];
|
||||
propagatedBuildInputs = [mopidy];
|
||||
|
||||
# no tests implemented
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "mopidy_autoplay" ];
|
||||
pythonImportsCheck = ["mopidy_autoplay"];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://codeberg.org/sph/mopidy-autoplay";
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
{ lib, newScope, python }:
|
||||
|
||||
{
|
||||
lib,
|
||||
newScope,
|
||||
python,
|
||||
}:
|
||||
# i have no idea what this is but there's some conflict if i don't do this
|
||||
# based on https://github.com/NixOS/nixpkgs/blob/77f0d2095a8271fdb6e0d08c90a7d93631fd2748/pkgs/applications/audio/mopidy/default.nix
|
||||
lib.makeScope newScope (self: with self; {
|
||||
lib.makeScope newScope (self:
|
||||
with self; {
|
||||
inherit python;
|
||||
pythonPackages = python.pkgs;
|
||||
|
||||
mopidy-autoplay = callPackage ./autoplay.nix { };
|
||||
})
|
||||
mopidy-autoplay = callPackage ./autoplay.nix {};
|
||||
})
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
{ lib, stdenvNoCC, fetchFromGitea }:
|
||||
let
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitea,
|
||||
}: let
|
||||
src = fetchFromGitea {
|
||||
domain = "gitea.protogen.io";
|
||||
owner = "nullbite";
|
||||
@ -10,11 +13,11 @@ let
|
||||
fetchLFS = true;
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "nixfiles-assets";
|
||||
version = src.rev;
|
||||
inherit src;
|
||||
phases = [ "installPhase" ];
|
||||
phases = ["installPhase"];
|
||||
installPhase = ''
|
||||
cd $src
|
||||
pwd
|
||||
@ -22,4 +25,4 @@ stdenvNoCC.mkDerivation {
|
||||
mkdir -p $out/share/
|
||||
cp -a wallpapers $out/share/
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, cacert
|
||||
, nixosTests
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, darwin
|
||||
, nix-update-script
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
cacert,
|
||||
nixosTests,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
darwin,
|
||||
nix-update-script,
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "redlib";
|
||||
@ -58,7 +59,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
env = {
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
GIT_HASH=src.rev;
|
||||
GIT_HASH = src.rev;
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
@ -67,7 +68,7 @@ rustPlatform.buildRustPackage rec {
|
||||
inherit (nixosTests) redlib;
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
|
||||
passthru.updateScript = nix-update-script {extraArgs = ["--version=branch=main"];};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/redlib-org/redlib/releases/tag/v${version}";
|
||||
@ -75,6 +76,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/redlib-org/redlib";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "redlib";
|
||||
maintainers = with lib.maintainers; [ soispha ];
|
||||
maintainers = with lib.maintainers; [soispha];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,12 @@
|
||||
{ pkgs, lib, cap-volume ? true, unmute ? true, ...}:
|
||||
let
|
||||
keysetting = pkgs.writeShellScriptBin "keysetting"
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
cap-volume ? true,
|
||||
unmute ? true,
|
||||
...
|
||||
}: let
|
||||
keysetting =
|
||||
pkgs.writeShellScriptBin "keysetting"
|
||||
''
|
||||
wpctl=${pkgs.wireplumber}/bin/wpctl
|
||||
notify_send=${pkgs.libnotify}/bin/notify-send
|
||||
@ -73,7 +79,7 @@ let
|
||||
esac
|
||||
'';
|
||||
in
|
||||
pkgs.symlinkJoin {
|
||||
pkgs.symlinkJoin {
|
||||
name = "wm-helpers";
|
||||
paths = keysetting;
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,22 +12,20 @@ let
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC0enlNbo1V5q0yq6n90gRPsNznoQ/KLEjeo1yOAUyJwPi35cw+b3p4DRN7T55DcSivKKE9Hyh6bpaQWFJSLyP5jAtDrYkuUfNx5GkgrquMwMvwzk3Z+h2/J/WgDyKQZXtm9LHYTgiW8jDU1lBiks39IqCAGrCTLAmAHSaJ39A4ZpJwu6zZ9sQqT22E/UpFm5MBezdZbm8V0G+beX+y3+pp8Kag7goGNY+rgTgx7REDz3jzZz3FBP+CxKoo1H8HHz78RDqBb8HKpVQYNQkwvIBeczKawRHIkJO2Mk+1mc6Ta6beA9+Uyf+puxco2xl6BOnDInvnhWJIRXOJuR5P8/YWprE1o4ixF2N95D2GlJ618V7faEovu/sNj8qIvfA66OF1gG+LOfNAl+u2+3V8ewATF493F0q04zhenoH1ZdrsACJfL8tK9Ev9056ImR6aSJ5BjqCk0tMmnLKTZ7q3R2LoKnB1r/TXe10OH7rx5BDAt4OmD8a5QS0RvVgK3O/iMW0="
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSAD3bCc9ZHGqU+HoCtp69uU3Px5bbVYYrHbLS3AS1Xku9rPKE/oUU/fz8/AZxp6dLuKhPjQjLzgbFjM0rK57fiOPqBnlw3eAiIymrlB03ALLV3y+GF2OhVf2rkcPkUxjK978dwS9bxgty6WzPAoSjNwilzgf2CcLcHyIzDwwzWCndM9jtpXbUbLhOH6CvsvygBD7j06wakLOorTS+cAFecUvaUkDr6gSu6zpM29DcFiq8T1VoWhBzwC/9IKnxV/XqaZBM3Em7NfPQIzYWcD9A5+Holj2I6jcTSd9xIdMhD4Miqm8IdojPkP2NuVfD9AMxn0ccwbROG/zliyXtcxRj8b3jEquBKuN+yGqF5hexmKlhHmHua9NwhsWnGWjOWWSaPtsp3WOM/fEc7cWpVWZ+W8V5LbdWEY3Ke52Cz35QbOSml09H/gIzsMxZbiZvkJB4PvWKf0FoyZ8ojJWIaGP1/LQdXNMWorqy7tWp3sAw3JcMsR0ezJ3YoI6Y6FOIdL0="
|
||||
];
|
||||
in
|
||||
{
|
||||
"cloudflare-dns.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"wireguard-rpi4.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"htpasswd.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"htpasswd-cam.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"authelia-users.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"authelia-storage.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"authelia-jwt.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"authelia-session.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"homepage.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"paperless-admin.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
in {
|
||||
"cloudflare-dns.age".publicKeys = [rpi4] ++ all-user;
|
||||
"wireguard-rpi4.age".publicKeys = [rpi4] ++ all-user;
|
||||
"htpasswd.age".publicKeys = [rpi4] ++ all-user;
|
||||
"htpasswd-cam.age".publicKeys = [rpi4] ++ all-user;
|
||||
"authelia-users.age".publicKeys = [rpi4] ++ all-user;
|
||||
"authelia-storage.age".publicKeys = [rpi4] ++ all-user;
|
||||
"authelia-jwt.age".publicKeys = [rpi4] ++ all-user;
|
||||
"authelia-session.age".publicKeys = [rpi4] ++ all-user;
|
||||
"homepage.age".publicKeys = [rpi4] ++ all-user;
|
||||
"paperless-admin.age".publicKeys = [rpi4] ++ all-user;
|
||||
|
||||
"restic-rclone.age".publicKeys = [ rpi4 nullbox slab ] ++ all-user;
|
||||
"restic-password.age".publicKeys = [ rpi4 nullbox slab ] ++ all-user;
|
||||
"restic-rclone.age".publicKeys = [rpi4 nullbox slab] ++ all-user;
|
||||
"restic-password.age".publicKeys = [rpi4 nullbox slab] ++ all-user;
|
||||
|
||||
"anki-user.age".publicKeys = [ rpi4 ] ++ all-user;
|
||||
"anki-user.age".publicKeys = [rpi4] ++ all-user;
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ pkgs, lib, config, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.cachix;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.cachix;
|
||||
in {
|
||||
options.nixfiles.cachix.enable = lib.mkOption {
|
||||
description = "Whether to enable the Cachix derivation cache";
|
||||
type = lib.types.bool;
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
{ config, lib, pkgs, options, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) types escapeShellArg;
|
||||
cfg = config.nixfiles.common.bootnext;
|
||||
bootNextScriptMain = pkgs.writeShellScript "bootnext-wrapped" ''
|
||||
set -Eeuxo pipefail
|
||||
|
||||
PATH=${lib.escapeShellArg (with pkgs; lib.makeBinPath [ gnugrep coreutils efibootmgr ])}
|
||||
PATH=${lib.escapeShellArg (with pkgs; lib.makeBinPath [gnugrep coreutils efibootmgr])}
|
||||
export PATH
|
||||
|
||||
function do_bootnext() {
|
||||
@ -19,9 +24,10 @@ let
|
||||
|
||||
case "$1" in
|
||||
${lib.concatStringsSep "\n" (
|
||||
lib.mapAttrsToList (name: value:
|
||||
" ${escapeShellArg name}) do_bootnext ${escapeShellArg value.efiPartUUID} ${escapeShellArg value.name} ;;"
|
||||
) cfg.entries
|
||||
lib.mapAttrsToList (
|
||||
name: value: " ${escapeShellArg name}) do_bootnext ${escapeShellArg value.efiPartUUID} ${escapeShellArg value.name} ;;"
|
||||
)
|
||||
cfg.entries
|
||||
)}
|
||||
*) echo "Boot entry \"$1\" not configured."; exit 1;;
|
||||
esac
|
||||
@ -49,18 +55,17 @@ let
|
||||
|
||||
bootnextDesktopEntries = pkgs.symlinkJoin {
|
||||
name = "bootnext-desktop-entries";
|
||||
paths = lib.mapAttrsToList (name: value: pkgs.makeDesktopItem {
|
||||
paths = lib.mapAttrsToList (name: value:
|
||||
pkgs.makeDesktopItem {
|
||||
name = "bootnext-reboot-${name}";
|
||||
desktopName = "Reboot into ${value.desktopEntry.name}";
|
||||
comment = "Select the entry defined by the `${name}` configuration in the bootnext script and then reboot.";
|
||||
icon = "${value.desktopEntry.icon}";
|
||||
keywords = [ "bootnext" "reboot" "${name}" "${value.desktopEntry.name}" ];
|
||||
keywords = ["bootnext" "reboot" "${name}" "${value.desktopEntry.name}"];
|
||||
exec = "${desktopWrapper} ${name}";
|
||||
}) (lib.filterAttrs (_: value: value.desktopEntry.enable) cfg.entries);
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
in {
|
||||
options = {
|
||||
nixfiles.common.bootnext = {
|
||||
enable = lib.mkOption {
|
||||
@ -71,17 +76,23 @@ in
|
||||
default = false;
|
||||
example = true;
|
||||
};
|
||||
enableDesktopEntries = lib.mkEnableOption "generation of bootnext Desktop entries" // { default = true; };
|
||||
enableDesktopEntries = lib.mkEnableOption "generation of bootnext Desktop entries" // {default = true;};
|
||||
entries = let
|
||||
entryModule = {name, config, ... }: {
|
||||
entryModule = {
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options = let
|
||||
uuidType = with types; lib.mkOptionType {
|
||||
uuidType = with types;
|
||||
lib.mkOptionType {
|
||||
name = "uuid";
|
||||
description = "UUID";
|
||||
descriptionClass = "noun";
|
||||
check = let
|
||||
uuidRegex = "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$";
|
||||
in x: str.check x && (builtins.match uuidRegex x) != null;
|
||||
in
|
||||
x: str.check x && (builtins.match uuidRegex x) != null;
|
||||
inherit (str) merge;
|
||||
};
|
||||
in {
|
||||
@ -116,7 +127,8 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
in lib.mkOption {
|
||||
in
|
||||
lib.mkOption {
|
||||
description = "bootnext entry";
|
||||
type = with types; attrsOf (submodule entryModule);
|
||||
};
|
||||
@ -124,14 +136,17 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = [ bootNextScript ] ++ lib.optional cfg.enableDesktopEntries bootnextDesktopEntries;
|
||||
environment.systemPackages = [bootNextScript] ++ lib.optional cfg.enableDesktopEntries bootnextDesktopEntries;
|
||||
|
||||
security.sudo.extraRules = lib.mkAfter [
|
||||
{
|
||||
commands = [
|
||||
{ command = "${bootNextScriptMain}"; options = [ "NOPASSWD" ]; }
|
||||
{
|
||||
command = "${bootNextScriptMain}";
|
||||
options = ["NOPASSWD"];
|
||||
}
|
||||
];
|
||||
groups = [ "wheel" ];
|
||||
groups = ["wheel"];
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.busybox;
|
||||
in {
|
||||
options.nixfiles.common.busybox.enable = lib.mkEnableOption "" // {
|
||||
options.nixfiles.common.busybox.enable =
|
||||
lib.mkEnableOption ""
|
||||
// {
|
||||
description = ''
|
||||
Whether to install Busybox into the system environment as a very low
|
||||
priority fallback for common commands. This should *never* override a
|
||||
@ -11,7 +17,8 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; lib.mkOrder 50 [
|
||||
environment.systemPackages = with pkgs;
|
||||
lib.mkOrder 50 [
|
||||
busybox
|
||||
];
|
||||
};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./me.nix
|
||||
./remote.nix
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
cfg = config.nixfiles.common.me;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.me;
|
||||
in {
|
||||
options.nixfiles.common.me = {
|
||||
enable = lib.mkEnableOption "my user account";
|
||||
};
|
||||
@ -12,7 +15,7 @@ in
|
||||
uid = 1000;
|
||||
group = "nullbite";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ] ++ lib.optional config.nixfiles.packageSets.fun.enable "input";
|
||||
extraGroups = ["wheel"] ++ lib.optional config.nixfiles.packageSets.fun.enable "input";
|
||||
packages = with pkgs; [
|
||||
keychain
|
||||
];
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
{ pkgs, lib, config, options, inputs, nixpkgs, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.common.nix;
|
||||
in
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
inputs,
|
||||
nixpkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.nix;
|
||||
in {
|
||||
options.nixfiles.common.nix = {
|
||||
enable = lib.mkEnableOption "common Nix configuration";
|
||||
registerNixpkgs = lib.mkOption {
|
||||
@ -11,7 +17,8 @@ in
|
||||
example = "true";
|
||||
description = "Whether to register the Nixpkgs revision used by Nixfiles to the system's flake registry and make it tye system's <nixpkgs> channel";
|
||||
};
|
||||
/* # TODO
|
||||
/*
|
||||
# TODO
|
||||
register = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = cfg.enable;
|
||||
@ -22,8 +29,7 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
( lib.mkIf cfg.registerNixpkgs {
|
||||
|
||||
(lib.mkIf cfg.registerNixpkgs {
|
||||
# this makes modern nix tools use the system's version of nixpkgs
|
||||
nix.registry = {
|
||||
# this keeps nixfiles-assets in the store so i can save some GitHub LFS
|
||||
@ -58,10 +64,9 @@ in
|
||||
# compatibility becasue once `, vkcube` couldn't find the correct opengl
|
||||
# driver or something (also it reduces the download size of temporary shell
|
||||
# closures)
|
||||
nix.nixPath = [ "nixpkgs=${nixpkgs}" ] ++ options.nix.nixPath.default;
|
||||
nix.nixPath = ["nixpkgs=${nixpkgs}"] ++ options.nix.nixPath.default;
|
||||
})
|
||||
( lib.mkIf cfg.enable {
|
||||
|
||||
(lib.mkIf cfg.enable {
|
||||
# direnv is a tool to automatically load shell environments upon entering
|
||||
# a directory. nix-direnv has an extensionn to keep nix shells in the
|
||||
# system's gcroots so shells can be used after a gc without rebuilding.
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.common.remoteAccess;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.common.remoteAccess;
|
||||
in {
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
@ -10,7 +13,6 @@ in
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
@ -27,5 +29,6 @@ in
|
||||
networking.wireguard.enable = true;
|
||||
};
|
||||
options = {
|
||||
nixfiles.common.remoteAccess.enable = lib.mkEnableOption "remote access options" ; };
|
||||
nixfiles.common.remoteAccess.enable = lib.mkEnableOption "remote access options";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{ pkgs, lib, config, options, ...}:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkDefault mkIf mkEnableOption;
|
||||
cfg = config.nixfiles.common.wm;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = mkIf cfg.enable {
|
||||
# Common options for standalone window managers; many of these (or
|
||||
# alternatives thereof) are pulled in by desktop environments.
|
||||
|
||||
@ -1,4 +1,14 @@
|
||||
{ pkgs, config, lib, options, nixpkgs, home-manager, inputs, utils, ... }@args:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
options,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
inputs,
|
||||
utils,
|
||||
...
|
||||
} @ args:
|
||||
# ^ all these args are yucky and non-portable, replace them with a module
|
||||
# called from the scope of the flake that brings relevant
|
||||
# inputs/outputs/overlays/etc into scope. this might even make nixfiles
|
||||
@ -6,8 +16,7 @@
|
||||
let
|
||||
cfg = config.nixfiles;
|
||||
flakeType = cfg.lib.types.flake;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./common
|
||||
./hardware
|
||||
@ -50,7 +59,7 @@ in
|
||||
|
||||
lib = lib.mkOption {
|
||||
description = "nixfiles library";
|
||||
default = (import ../lib/nixfiles) { inherit pkgs; };
|
||||
default = (import ../lib/nixfiles) {inherit pkgs;};
|
||||
readOnly = true;
|
||||
type = lib.types.attrs;
|
||||
};
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
environment = {
|
||||
enableDebugInfo = true;
|
||||
systemPackages = with pkgs; [
|
||||
|
||||
@ -1,23 +1,28 @@
|
||||
{ pkgs, config, lib, options, ... }:
|
||||
let
|
||||
|
||||
configForSystem = (system:
|
||||
let
|
||||
riscv = [ "riscv32-linux" "riscv64-linux" ];
|
||||
arm = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
|
||||
x86 = [ "i686-linux" "x86_64-linux" ];
|
||||
windows = [ "x86_64-windows" "i686-windows" ];
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
options,
|
||||
...
|
||||
}: let
|
||||
configForSystem = (
|
||||
system: let
|
||||
riscv = ["riscv32-linux" "riscv64-linux"];
|
||||
arm = ["armv6l-linux" "armv7l-linux" "aarch64-linux"];
|
||||
x86 = ["i686-linux" "x86_64-linux"];
|
||||
windows = ["x86_64-windows" "i686-windows"];
|
||||
systems = {
|
||||
x86_64-linux = riscv ++ arm;
|
||||
aarch64-linux = riscv;
|
||||
};
|
||||
in
|
||||
if (systems ? "${system}") then systems."${system}" else []
|
||||
if (systems ? "${system}")
|
||||
then systems."${system}"
|
||||
else []
|
||||
);
|
||||
emulatedSystems = configForSystem "${pkgs.system}";
|
||||
cfg = config.nixfiles.binfmt;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.binfmt = {
|
||||
enable = lib.mkOption {
|
||||
description = "Whether to configure default binfmt emulated systems for the current architecture";
|
||||
@ -29,7 +34,8 @@ in
|
||||
|
||||
config = let
|
||||
enable = cfg.enable && (builtins.length emulatedSystems) > 0;
|
||||
in lib.mkMerge [
|
||||
in
|
||||
lib.mkMerge [
|
||||
(lib.mkIf enable {
|
||||
boot.binfmt = {inherit emulatedSystems;};
|
||||
})
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
cfg = config.nixfiles.hardware.bluetooth;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.hardware.bluetooth;
|
||||
in {
|
||||
options.nixfiles.hardware.bluetooth = {
|
||||
enable = lib.mkEnableOption "Bluetooth";
|
||||
};
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./bluetooth.nix
|
||||
./nvidia.nix
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.hardware.gps;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.hardware.gps;
|
||||
in {
|
||||
options = {
|
||||
nixfiles.hardware.gps = {
|
||||
enable = lib.mkEnableOption "GPS configuration";
|
||||
@ -34,8 +37,8 @@ in
|
||||
socat
|
||||
];
|
||||
description = "gpsd to Geoclue2 GPS data bridge";
|
||||
before = [ "geoclue.service" ];
|
||||
wantedBy = [ "geoclue.service" "multi-user.target" ];
|
||||
before = ["geoclue.service"];
|
||||
wantedBy = ["geoclue.service" "multi-user.target"];
|
||||
serviceConfig = {
|
||||
RuntimeDirectory = "gpsd-nmea";
|
||||
ExecStart = pkgs.writeShellScript "gpsd-nmea-bridge" ''
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.hardware.nvidia;
|
||||
|
||||
rcu_patch = pkgs.fetchpatch {
|
||||
@ -24,10 +28,9 @@ let
|
||||
settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
|
||||
persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
|
||||
|
||||
patches = [ rcu_patch ];
|
||||
patches = [rcu_patch];
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
# imports = [
|
||||
# ../opengl.nix
|
||||
# ];
|
||||
@ -41,10 +44,9 @@ in
|
||||
|
||||
nixfiles.hardware.opengl.enable = true;
|
||||
|
||||
boot.kernelParams = [ "nvidia-drm.fbdev=1" ];
|
||||
boot.kernelParams = ["nvidia-drm.fbdev=1"];
|
||||
|
||||
hardware.nvidia = {
|
||||
|
||||
# Modesetting is required.
|
||||
modesetting.enable = lib.mkDefault true;
|
||||
|
||||
@ -71,7 +73,8 @@ in
|
||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||
package = let
|
||||
inherit (config.boot.kernelPackages.nvidiaPackages) production stable latest beta;
|
||||
in lib.mkDefault latest;
|
||||
in
|
||||
lib.mkDefault latest;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,24 +1,31 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
cfg = config.nixfiles.hardware.opengl;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.hardware.opengl;
|
||||
in {
|
||||
options.nixfiles.hardware.opengl.enable = lib.mkEnableOption "OpenGL configuration";
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = let
|
||||
offload-enabled = config.hardware.nvidia.prime.offload.enableOffloadCmd;
|
||||
glxinfo = lib.getExe' pkgs.glxinfo "glxinfo";
|
||||
auto-offload = pkgs.writeShellScriptBin "auto-offload" (
|
||||
(if offload-enabled then ''
|
||||
(
|
||||
if offload-enabled
|
||||
then ''
|
||||
if nvidia-offload ${glxinfo} > /dev/null 2>&1 ; then
|
||||
exec nvidia-offload "$@"
|
||||
fi
|
||||
'' else "")
|
||||
+
|
||||
''
|
||||
else ""
|
||||
)
|
||||
+ ''
|
||||
exec "$@"
|
||||
'');
|
||||
in [ auto-offload ];
|
||||
''
|
||||
);
|
||||
in [auto-offload];
|
||||
# Enable OpenGL
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{ config, lib, pkgs, inputs, ...}:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.hardware.sound;
|
||||
inherit (lib) optionals mkEnableOption mkIf mkDefault;
|
||||
in
|
||||
{
|
||||
in {
|
||||
# Enable sound.
|
||||
# sound.enable = true;
|
||||
# hardware.pulseaudio.enable = true;
|
||||
@ -18,7 +22,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkMerge [(mkIf cfg.enable {
|
||||
config = lib.mkMerge [
|
||||
(mkIf cfg.enable {
|
||||
security.rtkit.enable = mkDefault true;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
@ -37,20 +42,22 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
qpwgraph
|
||||
easyeffects
|
||||
] ++ optionals config.services.pipewire.pulse.enable [
|
||||
]
|
||||
++ optionals config.services.pipewire.pulse.enable [
|
||||
pavucontrol
|
||||
ncpamixer
|
||||
pulsemixer
|
||||
];
|
||||
})
|
||||
({
|
||||
{
|
||||
# use alsa-ucm-conf from unstable (fixes Scarlett Solo channels)
|
||||
nixpkgs.overlays = lib.optional cfg.useUnstableUcmConf (final: prev: {
|
||||
inherit (inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}) alsa-ucm-conf;
|
||||
});
|
||||
})
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,10 +1,19 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nix-minecraft.nixosModules.minecraft-servers
|
||||
];
|
||||
options.services.minecraft-servers.servers = let
|
||||
serverModule = { name, config, ... }: {
|
||||
serverModule = {
|
||||
name,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
options = {
|
||||
useRecommendedDefaults = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
@ -21,13 +30,13 @@
|
||||
modpackFiles = lib.mkOption {
|
||||
description = "List of files from modpack to copy into server directory";
|
||||
type = with lib.types; listOf str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
|
||||
modpackSymlinks = lib.mkOption {
|
||||
description = "List of files from modpack to symlink into server directory";
|
||||
type = with lib.types; listOf str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
};
|
||||
|
||||
@ -75,18 +84,26 @@
|
||||
inherit (config) modpack;
|
||||
|
||||
mcVersion = modpack.manifest.versions.minecraft;
|
||||
fixedVersion = lib.replaceStrings [ "." ] [ "_" ] mcVersion;
|
||||
fixedVersion = lib.replaceStrings ["."] ["_"] mcVersion;
|
||||
quiltVersion = modpack.manifest.versions.quilt or null;
|
||||
fabricVersion = modpack.manifest.versions.fabric or null;
|
||||
loader = if (!(builtins.isNull quiltVersion)) then "quilt" else "fabric";
|
||||
loaderVersion = if loader == "quilt" then quiltVersion else fabricVersion;
|
||||
loader =
|
||||
if (!(builtins.isNull quiltVersion))
|
||||
then "quilt"
|
||||
else "fabric";
|
||||
loaderVersion =
|
||||
if loader == "quilt"
|
||||
then quiltVersion
|
||||
else fabricVersion;
|
||||
|
||||
serverPackage = pkgs.minecraftServers."${loader}-${fixedVersion}".override { inherit loaderVersion; };
|
||||
in lib.mkDefault serverPackage;
|
||||
serverPackage = pkgs.minecraftServers."${loader}-${fixedVersion}".override {inherit loaderVersion;};
|
||||
in
|
||||
lib.mkDefault serverPackage;
|
||||
})
|
||||
];
|
||||
};
|
||||
in lib.mkOption {
|
||||
in
|
||||
lib.mkOption {
|
||||
type = with lib.types; attrsOf (submodule serverModule);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,11 @@
|
||||
{ pkgs, config, lib, inputs, nixpkgs, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
nixpkgs,
|
||||
...
|
||||
}: let
|
||||
p5 = config.services.xserver.desktopManager.plasma5.enable;
|
||||
p6 = config.services.desktopManager.plasma6.enable;
|
||||
|
||||
@ -7,8 +13,11 @@ let
|
||||
|
||||
# kernel update
|
||||
newKernelPackages = let
|
||||
pkgs-new = import inputs.nixpkgs-unstable { inherit (pkgs) system; config.allowUnfree = true; };
|
||||
in pkgs-new.linuxPackages_latest;
|
||||
in
|
||||
{
|
||||
pkgs-new = import inputs.nixpkgs-unstable {
|
||||
inherit (pkgs) system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
in
|
||||
pkgs-new.linuxPackages_latest;
|
||||
in {
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./gaming.nix
|
||||
./multimedia.nix
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
{ pkgs, config, lib, ...}:
|
||||
let
|
||||
cfg = config.nixfiles.packageSets.fun;
|
||||
in
|
||||
{
|
||||
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.fun;
|
||||
in {
|
||||
options.nixfiles.packageSets.fun = {
|
||||
enable = lib.mkEnableOption "fun package set";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
cowsay
|
||||
uwufetch
|
||||
fortune
|
||||
@ -18,9 +21,11 @@ in
|
||||
figlet
|
||||
aalib
|
||||
asciiquarium
|
||||
] ++ lib.optionals config.services.xserver.enable [
|
||||
]
|
||||
++ lib.optionals config.services.xserver.enable [
|
||||
oneko
|
||||
] ++ lib.optionals config.services.pipewire.enable [
|
||||
]
|
||||
++ lib.optionals config.services.pipewire.enable [
|
||||
bucklespring-libinput
|
||||
espeak
|
||||
];
|
||||
|
||||
@ -1,21 +1,26 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.packageSets.multimedia;
|
||||
inherit (lib) optional optionals mkEnableOption mkIf;
|
||||
nvidiaEnabled = (lib.elem "nvidia" config.services.xserver.videoDrivers);
|
||||
in
|
||||
{
|
||||
nvidiaEnabled = lib.elem "nvidia" config.services.xserver.videoDrivers;
|
||||
in {
|
||||
options.nixfiles.packageSets.multimedia = {
|
||||
enable = mkEnableOption "multimedia packages";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; optionals config.services.xserver.enable [
|
||||
environment.systemPackages = with pkgs;
|
||||
optionals config.services.xserver.enable [
|
||||
mpv
|
||||
gimp
|
||||
krita
|
||||
inkscape
|
||||
obs-studio
|
||||
] ++ [
|
||||
]
|
||||
++ [
|
||||
gallery-dl
|
||||
yt-dlp
|
||||
imagemagick
|
||||
|
||||
@ -1,8 +1,14 @@
|
||||
{ config, lib, pkgs, options, inputs, outputs, ...}@args:
|
||||
let
|
||||
cfg = config.nixfiles.profile.base;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
options,
|
||||
inputs,
|
||||
outputs,
|
||||
...
|
||||
} @ args: let
|
||||
cfg = config.nixfiles.profile.base;
|
||||
in {
|
||||
options.nixfiles.profile.base = {
|
||||
enable = lib.mkEnableOption "base config";
|
||||
};
|
||||
@ -10,7 +16,6 @@ in
|
||||
# to delete this
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf cfg.enable {
|
||||
|
||||
nixfiles.common = {
|
||||
# Enable my account
|
||||
me.enable = lib.mkDefault true;
|
||||
@ -30,7 +35,7 @@ in
|
||||
};
|
||||
|
||||
# Enable flakes
|
||||
nix.settings.experimental-features = ["nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
@ -124,7 +129,7 @@ in
|
||||
];
|
||||
|
||||
# Needed for Kvantum themes to be detected
|
||||
environment.pathsToLink = [ "/share/Kvantum" ];
|
||||
environment.pathsToLink = ["/share/Kvantum"];
|
||||
|
||||
# allow for more interactive authentication
|
||||
security.polkit.enable = lib.mkDefault true;
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{...}:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./base.nix
|
||||
./pc.nix
|
||||
|
||||
@ -1,10 +1,15 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.profile.pc;
|
||||
inherit (lib) mkDefault;
|
||||
in
|
||||
{
|
||||
options.nixfiles.profile.pc.enable = lib.mkEnableOption "minimal PC profile" // {
|
||||
in {
|
||||
options.nixfiles.profile.pc.enable =
|
||||
lib.mkEnableOption "minimal PC profile"
|
||||
// {
|
||||
description = ''
|
||||
Whether to enable the minimal PC profile. This profile configures basic
|
||||
system configuration for physical PCs, such as enabling sound and
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.profile.server;
|
||||
inherit (lib) mkEnableOption mkDefault;
|
||||
inherit (lib.types) bool int str;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.nixfiles.profile.server.enable = mkEnableOption "server profile";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.nixfiles.profile.workstation;
|
||||
inherit (lib) mkDefault;
|
||||
in
|
||||
{
|
||||
options.nixfiles.profile.workstation.enable = lib.mkEnableOption "workstation (featureful PC) profile" //
|
||||
{
|
||||
in {
|
||||
options.nixfiles.profile.workstation.enable =
|
||||
lib.mkEnableOption "workstation (featureful PC) profile"
|
||||
// {
|
||||
description = ''
|
||||
Whether to enable the workstation (featureful PC) profile. This profile
|
||||
enables the base PC profile, as well as installs and configures various
|
||||
@ -37,7 +41,7 @@ in
|
||||
nerd-fonts.fira-code
|
||||
font-awesome
|
||||
noto-fonts-cjk-sans
|
||||
(google-fonts.override { fonts = [ "NovaSquare" ];})
|
||||
(google-fonts.override {fonts = ["NovaSquare"];})
|
||||
];
|
||||
|
||||
# TODO this should be defined in home-manager or not at all probably
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
{ config, lib, pkgs, outputs, vars, ...}@args:
|
||||
let
|
||||
cfg = config.nixfiles.programs.adb;
|
||||
in
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
outputs,
|
||||
vars,
|
||||
...
|
||||
} @ args: let
|
||||
cfg = config.nixfiles.programs.adb;
|
||||
in {
|
||||
options.nixfiles.programs.adb = {
|
||||
enable = lib.mkEnableOption "adb configuration";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.adb.enable = true;
|
||||
users.users.${vars.username}.extraGroups = [ "adbusers" ];
|
||||
users.users.${vars.username}.extraGroups = ["adbusers"];
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user