forked from pub-solar/os
Compare commits
No commits in common. "a4bebfef297f2bde65bd13bd119ec6d50ee8367d" and "7ccefe060165fbe4bdf3a57275f1198ee3aa51a8" have entirely different histories.
a4bebfef29
...
7ccefe0601
|
|
@ -1,4 +1,2 @@
|
|||
# Formatted code using treefmt and alejandra
|
||||
73bf158392a427d188b7aad36244b94506f57a15
|
||||
# nixfmt-rfc-style
|
||||
03e5a0ffdaab9b1331ab95ca3e730aaec1d7c151
|
||||
|
|
|
|||
23
default.nix
23
default.nix
|
|
@ -8,17 +8,28 @@ let
|
|||
"x86_64-linux"
|
||||
];
|
||||
|
||||
filterSystems = lib.filterAttrs (system: _: lib.elem system ciSystems);
|
||||
filterSystems =
|
||||
lib.filterAttrs
|
||||
(system: _: lib.elem system ciSystems);
|
||||
|
||||
recurseIntoAttrsRecursive = lib.mapAttrs (
|
||||
_: v: if lib.isAttrs v then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v) else v
|
||||
_: v:
|
||||
if lib.isAttrs v
|
||||
then recurseIntoAttrsRecursive (lib.recurseIntoAttrs v)
|
||||
else v
|
||||
);
|
||||
|
||||
systemOutputs = lib.filterAttrs (
|
||||
systemOutputs =
|
||||
lib.filterAttrs
|
||||
(
|
||||
name: set:
|
||||
lib.isAttrs set && lib.any (system: set ? ${system} && name != "legacyPackages") ciSystems
|
||||
) default.outputs;
|
||||
lib.isAttrs set
|
||||
&& lib.any
|
||||
(system: set ? ${system} && name != "legacyPackages")
|
||||
ciSystems
|
||||
)
|
||||
default.outputs;
|
||||
|
||||
ciDrvs = lib.mapAttrs (_: system: filterSystems system) systemOutputs;
|
||||
in
|
||||
(recurseIntoAttrsRecursive ciDrvs) // { shell = import ./shell.nix; }
|
||||
(recurseIntoAttrsRecursive ciDrvs) // {shell = import ./shell.nix;}
|
||||
|
|
|
|||
30
flake.nix
30
flake.nix
|
|
@ -53,8 +53,7 @@
|
|||
wayland-pipewire-idle-inhibit.inputs.flake-parts.follows = "flake-parts";
|
||||
};
|
||||
|
||||
outputs =
|
||||
inputs@{ self, ... }:
|
||||
outputs = inputs@{ self, ...}:
|
||||
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
|
|
@ -72,19 +71,14 @@
|
|||
./overlays
|
||||
];
|
||||
|
||||
perSystem =
|
||||
args@{
|
||||
system,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
perSystem = args@{ system, pkgs, config, ... }: {
|
||||
_module.args = {
|
||||
inherit inputs;
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [ inputs.agenix.overlays.default ];
|
||||
overlays = [
|
||||
inputs.agenix.overlays.default
|
||||
];
|
||||
};
|
||||
unstable = import inputs.unstable { inherit system; };
|
||||
master = import inputs.master { inherit system; };
|
||||
|
|
@ -92,18 +86,17 @@
|
|||
|
||||
devShells.default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
deploy-rs
|
||||
nixpkgs-fmt
|
||||
agenix
|
||||
cachix
|
||||
deploy-rs
|
||||
nixd
|
||||
nixos-generators
|
||||
nvfetcher
|
||||
|
||||
editorconfig-checker
|
||||
nodePackages.prettier
|
||||
nvfetcher
|
||||
shellcheck
|
||||
shfmt
|
||||
treefmt
|
||||
nixos-generators
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -130,10 +123,7 @@
|
|||
powder = {
|
||||
hostname = "80.71.153.194";
|
||||
sshUser = "root";
|
||||
profilesOrder = [
|
||||
"system"
|
||||
"direnv"
|
||||
];
|
||||
profilesOrder = ["system" "direnv"];
|
||||
profiles.direnv = {
|
||||
user = "pub-solar";
|
||||
path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ suites, ... }:
|
||||
{
|
||||
{suites, ...}: {
|
||||
### root password is empty by default ###
|
||||
### default password: pub-solar, optional: add your SSH keys
|
||||
imports = suites.iso;
|
||||
imports =
|
||||
suites.iso;
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
};
|
||||
fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
|
|
|
|||
|
|
@ -10,16 +10,15 @@ let
|
|||
|
||||
# Gets hostname of host to be bundled inside iso
|
||||
# Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11
|
||||
getFqdn =
|
||||
config:
|
||||
let
|
||||
getFqdn = config: let
|
||||
net = config.networking;
|
||||
fqdn =
|
||||
if (net ? domain) && (net.domain != null) then "${net.hostName}.${net.domain}" else net.hostName;
|
||||
if (net ? domain) && (net.domain != null)
|
||||
then "${net.hostName}.${net.domain}"
|
||||
else net.hostName;
|
||||
in
|
||||
fqdn;
|
||||
in
|
||||
{
|
||||
in {
|
||||
# build with: `nix build ".#nixosConfigurations.bootstrap.config.system.build.isoImage"`
|
||||
imports = [
|
||||
# profiles.networking
|
||||
|
|
@ -34,9 +33,7 @@ in
|
|||
boot.loader.systemd-boot.enable = true;
|
||||
|
||||
# will be overridden by the bootstrapIso instrumentation
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
};
|
||||
fileSystems."/" = {device = "/dev/disk/by-label/nixos";};
|
||||
|
||||
system.nixos.label = "PubSolarOS-" + config.system.nixos.version;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
withSystem,
|
||||
self,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{ withSystem, self, inputs, ...}:
|
||||
{
|
||||
flake = {
|
||||
nixosConfigurations = {
|
||||
|
|
@ -96,12 +91,7 @@
|
|||
self.nixosModules.graphical
|
||||
self.nixosModules.audio
|
||||
self.nixosModules.bluetooth
|
||||
(
|
||||
{ ... }:
|
||||
{
|
||||
pub-solar.graphical.wayland.software-renderer.enable = true;
|
||||
}
|
||||
)
|
||||
({ ... }: { pub-solar.graphical.wayland.software-renderer.enable = true; })
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./dumpyourvms.nix
|
||||
./hardware-configuration.nix
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
in
|
||||
{
|
||||
in {
|
||||
pub-solar = {
|
||||
terminal-life.full = true;
|
||||
core.hibernation = {
|
||||
|
|
@ -24,19 +23,13 @@ in
|
|||
# Explicitly set amdgpu support in place of radeon
|
||||
# Source: https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/amd/southern-islands/default.nix
|
||||
# Try again after https://lists.freedesktop.org/archives/amd-gfx/2023-March/090096.html lands
|
||||
boot.kernelParams = [
|
||||
"acpi_backlight=video"
|
||||
"hid_apple.fnmode=2"
|
||||
"intel_pstate=passive"
|
||||
"radeon.si_support=0"
|
||||
"amdgpu.si_support=1"
|
||||
];
|
||||
boot.kernelParams = ["acpi_backlight=video" "hid_apple.fnmode=2" "intel_pstate=passive" "radeon.si_support=0" "amdgpu.si_support=1"];
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# Fix for Error switching console mode to 1: unsupported on startup
|
||||
boot.loader.systemd-boot.consoleMode = lib.mkForce "0";
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
|
||||
systemd.sleep.extraConfig = ''
|
||||
HibernateMode=shutdown
|
||||
|
|
@ -46,8 +39,8 @@ in
|
|||
cpu.intel.updateMicrocode = true;
|
||||
facetimehd.enable = true;
|
||||
opengl = {
|
||||
extraPackages = with pkgs; [ intel-vaapi-driver ]; # i7-4870HQ older hardware like haswell (crystall well)
|
||||
extraPackages32 = with pkgs.pkgsi686Linux; [ intel-vaapi-driver ];
|
||||
extraPackages = with pkgs; [intel-vaapi-driver]; # i7-4870HQ older hardware like haswell (crystall well)
|
||||
extraPackages32 = with pkgs.pkgsi686Linux; [intel-vaapi-driver];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -73,15 +66,15 @@ in
|
|||
#programs.droidcam.enable = true;
|
||||
#services.mozillavpn.enable = true;
|
||||
|
||||
security.pki.certificateFiles = [ ./consul-agent-ca.pem ];
|
||||
security.pki.certificateFiles = [./consul-agent-ca.pem];
|
||||
|
||||
# Power off dedicated GPU, use only integrated Intel GPU to save battery
|
||||
# https://github.com/NixOS/nixpkgs/pull/33915
|
||||
# https://ubuntuforums.org/showthread.php?t=2409856
|
||||
systemd.services."amd-hybrid-graphics-power-save" = {
|
||||
path = [ pkgs.bash ];
|
||||
path = [pkgs.bash];
|
||||
description = "Power Off dedicated AMD Card to reduce power usage";
|
||||
requires = [ "sys-kernel-debug.mount" ];
|
||||
requires = ["sys-kernel-debug.mount"];
|
||||
enable = true;
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
|
|
@ -89,14 +82,14 @@ in
|
|||
ExecStart = "${pkgs.bash}/bin/sh -c 'sleep 7 && if grep --quiet 'IGD:+' /sys/kernel/debug/vgaswitcheroo/switch; then echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch; fi'";
|
||||
ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch'";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wantedBy = ["multi-user.target"];
|
||||
};
|
||||
|
||||
# Increase console font size for HiDPI display
|
||||
console = {
|
||||
earlySetup = true;
|
||||
font = lib.mkForce "ter-i32b";
|
||||
packages = [ pkgs.terminus_font ];
|
||||
packages = [pkgs.terminus_font];
|
||||
};
|
||||
|
||||
# Thunderbolt tools
|
||||
|
|
@ -120,22 +113,24 @@ in
|
|||
# to be powered on.
|
||||
powerUpCommands = lib.mkBefore (
|
||||
"${pkgs.kmod}/bin/modprobe brcmfmac"
|
||||
+ lib.optionalString (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2") " brcmfmac_wcc"
|
||||
+ lib.optionalString
|
||||
(lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2") " brcmfmac_wcc"
|
||||
);
|
||||
powerDownCommands = lib.mkBefore (
|
||||
lib.optionalString (lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2") "${pkgs.kmod}/bin/rmmod brcmfmac_wcc\n"
|
||||
lib.optionalString
|
||||
(lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.2")
|
||||
"${pkgs.kmod}/bin/rmmod brcmfmac_wcc\n"
|
||||
+ ''
|
||||
${pkgs.kmod}/bin/rmmod brcmfmac
|
||||
${pkgs.systemd}/bin/systemctl stop amd-hybrid-graphics-power-save.service
|
||||
''
|
||||
);
|
||||
resumeCommands =
|
||||
if config.systemd.services."amd-hybrid-graphics-power-save".enable == true then
|
||||
''
|
||||
if config.systemd.services."amd-hybrid-graphics-power-save".enable == true
|
||||
then ''
|
||||
${pkgs.systemd}/bin/systemctl start amd-hybrid-graphics-power-save.service
|
||||
''
|
||||
else
|
||||
"";
|
||||
else "";
|
||||
};
|
||||
|
||||
# Change lid switch behaviour
|
||||
|
|
@ -155,16 +150,11 @@ in
|
|||
services.udev.extraRules =
|
||||
# Disable XHC1 wakeup signal to avoid resume getting triggered some time
|
||||
# after suspend. Reboot required for this to take effect.
|
||||
lib.optionalString (lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13")
|
||||
lib.optionalString
|
||||
(lib.versionAtLeast config.boot.kernelPackages.kernel.version "3.13")
|
||||
''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"'';
|
||||
|
||||
home-manager =
|
||||
pkgs.lib.setAttrByPath
|
||||
[
|
||||
"users"
|
||||
psCfg.user.name
|
||||
]
|
||||
{
|
||||
home-manager = pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
|
||||
# Custom device sway configs
|
||||
xdg.configFile = {
|
||||
"sway/config.d/10-applications.conf".source = ./.config/sway/config.d/applications.conf;
|
||||
|
|
@ -176,7 +166,7 @@ in
|
|||
};
|
||||
|
||||
# WLAN frequency compliance (e.g. check for radar with DFS)
|
||||
hardware.firmware = with pkgs; [ wireless-regdb ];
|
||||
hardware.firmware = with pkgs; [wireless-regdb];
|
||||
boot.extraModprobeConfig = ''
|
||||
options cfg80211 ieee80211_regdom="DE"
|
||||
|
||||
|
|
|
|||
|
|
@ -7,23 +7,16 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
#(modulesPath + "/hardware/network/broadcom-43xx.nix")
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/17bbb016-d27c-47da-8805-58c6395891e8";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
systemd.services.wg-quick-wg5.serviceConfig.Type = lib.mkForce "simple";
|
||||
systemd.services.wg-quick-wg5.serviceConfig.Restart = "on-failure";
|
||||
|
|
@ -12,61 +16,48 @@
|
|||
#];
|
||||
|
||||
hosts = {
|
||||
"10.0.0.42" = [
|
||||
"nomad.service.consul"
|
||||
"nomad.service.cgn-1.consul"
|
||||
];
|
||||
"10.0.0.66" = [ "consul.service.cgn-1.consul" ];
|
||||
"10.0.1.9" = [ "consul.service.lev-1.consul" ];
|
||||
"10.0.0.70" = [
|
||||
"vault.service.consul"
|
||||
"vault.service.cgn-1.consul"
|
||||
];
|
||||
"10.0.0.200" = [ "headnode.cgn-1" ];
|
||||
"10.0.0.201" = [ "cn01.cgn-1" ];
|
||||
"10.0.0.202" = [ "cn02.cgn-1" ];
|
||||
"10.0.0.205" = [ "cn05.cgn-1" ];
|
||||
"10.0.0.206" = [ "cn06.cgn-1" ];
|
||||
"10.0.0.207" = [ "cn07.cgn-1" ];
|
||||
"10.0.0.208" = [ "cn08.cgn-1" ];
|
||||
"10.0.1.200" = [ "headnode.lev-1" ];
|
||||
"10.0.1.201" = [ "cn01.lev-1" ];
|
||||
"10.0.1.202" = [ "cn02.lev-1" ];
|
||||
"10.0.1.203" = [ "cn03.lev-1" ];
|
||||
"10.0.1.204" = [ "cn04.lev-1" ];
|
||||
"10.0.1.205" = [ "cn05.lev-1" ];
|
||||
"10.0.1.206" = [ "cn00.lev-1" ];
|
||||
"10.0.1.207" = [ "cn06.lev-1" ];
|
||||
"10.0.1.208" = [ "cn07.lev-1" ];
|
||||
"10.101.64.10" = [ "wifi.bahn.de" ];
|
||||
"80.71.153.29" = [ "eu-central.manta.greenbaum.cloud" ];
|
||||
"85.88.23.37" = [ "git.greenbaum.cloud" ];
|
||||
"10.0.1.17" = [ "drone.greenbaum.cloud" ];
|
||||
"10.0.1.2" = [ "lev-1.adminui.greenbaum.cloud" ];
|
||||
"80.71.153.10" = [ "lev-1.api.greenbaum.cloud" ];
|
||||
"80.71.153.12" = [ "lev-1.docker.greenbaum.cloud" ];
|
||||
"80.71.153.56" = [ "lev-1.monitor.greenbaum.cloud" ];
|
||||
"192.168.13.25" = [
|
||||
"ryzensun.local"
|
||||
"cloudapi.coal-1.mnx.io"
|
||||
];
|
||||
"10.0.0.42" = ["nomad.service.consul" "nomad.service.cgn-1.consul"];
|
||||
"10.0.0.66" = ["consul.service.cgn-1.consul"];
|
||||
"10.0.1.9" = ["consul.service.lev-1.consul"];
|
||||
"10.0.0.70" = ["vault.service.consul" "vault.service.cgn-1.consul"];
|
||||
"10.0.0.200" = ["headnode.cgn-1"];
|
||||
"10.0.0.201" = ["cn01.cgn-1"];
|
||||
"10.0.0.202" = ["cn02.cgn-1"];
|
||||
"10.0.0.205" = ["cn05.cgn-1"];
|
||||
"10.0.0.206" = ["cn06.cgn-1"];
|
||||
"10.0.0.207" = ["cn07.cgn-1"];
|
||||
"10.0.0.208" = ["cn08.cgn-1"];
|
||||
"10.0.1.200" = ["headnode.lev-1"];
|
||||
"10.0.1.201" = ["cn01.lev-1"];
|
||||
"10.0.1.202" = ["cn02.lev-1"];
|
||||
"10.0.1.203" = ["cn03.lev-1"];
|
||||
"10.0.1.204" = ["cn04.lev-1"];
|
||||
"10.0.1.205" = ["cn05.lev-1"];
|
||||
"10.0.1.206" = ["cn00.lev-1"];
|
||||
"10.0.1.207" = ["cn06.lev-1"];
|
||||
"10.0.1.208" = ["cn07.lev-1"];
|
||||
"10.101.64.10" = ["wifi.bahn.de"];
|
||||
"80.71.153.29" = ["eu-central.manta.greenbaum.cloud"];
|
||||
"85.88.23.37" = ["git.greenbaum.cloud"];
|
||||
"10.0.1.17" = ["drone.greenbaum.cloud"];
|
||||
"10.0.1.2" = ["lev-1.adminui.greenbaum.cloud"];
|
||||
"80.71.153.10" = ["lev-1.api.greenbaum.cloud"];
|
||||
"80.71.153.12" = ["lev-1.docker.greenbaum.cloud"];
|
||||
"80.71.153.56" = ["lev-1.monitor.greenbaum.cloud"];
|
||||
"192.168.13.25" = ["ryzensun.local" "cloudapi.coal-1.mnx.io"];
|
||||
};
|
||||
|
||||
wireguard.enable = true;
|
||||
wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
autostart = false;
|
||||
address = [ "10.8.8.6/32" ];
|
||||
address = ["10.8.8.6/32"];
|
||||
privateKeyFile = "/etc/wireguard/wg0.privatekey";
|
||||
|
||||
peers = [
|
||||
{
|
||||
publicKey = "l0DJLicCrcrixNP6zAWTXNSEaNM2jML253BXEZ1KpiU=";
|
||||
allowedIPs = [
|
||||
"10.8.8.16/32"
|
||||
"10.0.0.0/24"
|
||||
"10.88.88.0/24"
|
||||
];
|
||||
allowedIPs = ["10.8.8.16/32" "10.0.0.0/24" "10.88.88.0/24"];
|
||||
endpoint = "85.88.23.16:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
|
|
@ -74,13 +65,13 @@
|
|||
};
|
||||
wg1 = {
|
||||
autostart = false;
|
||||
address = [ "192.168.188.203/24" ];
|
||||
address = ["192.168.188.203/24"];
|
||||
privateKeyFile = "/etc/wireguard/wg1.privatekey";
|
||||
|
||||
peers = [
|
||||
{
|
||||
publicKey = "iZkgeA/mFxBRclCa5SJYdqffClly/uho5krebcUloCY=";
|
||||
allowedIPs = [ "192.168.188.0/24" ];
|
||||
allowedIPs = ["192.168.188.0/24"];
|
||||
presharedKeyFile = "/etc/wireguard/wg1.presharedkey";
|
||||
#endpoint = "85.214.70.91:50163";
|
||||
#endpoint = "7gwzft61sc8txc4r.myfritz.net:50163";
|
||||
|
|
@ -90,24 +81,21 @@
|
|||
];
|
||||
};
|
||||
wg2 = {
|
||||
address = [ "10.6.6.4/32" ];
|
||||
address = ["10.6.6.4/32"];
|
||||
privateKeyFile = "/etc/wireguard/wg2.privatekey";
|
||||
|
||||
peers = [
|
||||
{
|
||||
publicKey = "nYMmaCIW8lZ7SokivN8HXxYDch+SS1G7ab1SC9meDAw=";
|
||||
presharedKeyFile = "/etc/wireguard/wg2.presharedkey";
|
||||
allowedIPs = [
|
||||
"10.6.6.1/32"
|
||||
"10.1.1.0/24"
|
||||
];
|
||||
allowedIPs = ["10.6.6.1/32" "10.1.1.0/24"];
|
||||
endpoint = "85.88.23.127:51820";
|
||||
persistentKeepalive = 16;
|
||||
}
|
||||
];
|
||||
};
|
||||
wg3 = {
|
||||
address = [ "10.11.11.2/32" ];
|
||||
address = ["10.11.11.2/32"];
|
||||
privateKeyFile = "/etc/wireguard/wg3.privatekey";
|
||||
mtu = 1300;
|
||||
|
||||
|
|
@ -115,18 +103,14 @@
|
|||
{
|
||||
publicKey = "7RRgfZSneqAtAHBeI6+aaYLqz9e1jikg/lIK8mhW928=";
|
||||
presharedKeyFile = "/etc/wireguard/wg3.presharedkey";
|
||||
allowedIPs = [
|
||||
"10.11.11.0/24"
|
||||
"192.168.1.0/24"
|
||||
"10.0.1.0/24"
|
||||
];
|
||||
allowedIPs = ["10.11.11.0/24" "192.168.1.0/24" "10.0.1.0/24"];
|
||||
endpoint = "80.71.153.1:51820";
|
||||
persistentKeepalive = 16;
|
||||
}
|
||||
];
|
||||
};
|
||||
wg4 = {
|
||||
address = [ "fdaa:1:3234:a7b:16a9:0:a:202/120" ];
|
||||
address = ["fdaa:1:3234:a7b:16a9:0:a:202/120"];
|
||||
privateKeyFile = "/etc/wireguard/wg4.privatekey";
|
||||
postUp = "resolvectl dns wg4 fdaa:1:3234::3; resolvectl domain wg4 ~internal";
|
||||
preDown = "resolvectl revert wg4";
|
||||
|
|
@ -137,7 +121,7 @@
|
|||
peers = [
|
||||
{
|
||||
publicKey = "yUyg63j5+17YeJ7gRhxoQuF6rvdX0JF59M6skytJFTQ=";
|
||||
allowedIPs = [ "fdaa:1:3234::/48" ];
|
||||
allowedIPs = ["fdaa:1:3234::/48"];
|
||||
#endpoint = "ams1.gateway.6pn.dev:51820";
|
||||
endpoint = "176.58.93.206:51820";
|
||||
persistentKeepalive = 15;
|
||||
|
|
@ -146,7 +130,7 @@
|
|||
};
|
||||
wg5 = {
|
||||
autostart = false;
|
||||
address = [ "192.168.13.201/24" ];
|
||||
address = ["192.168.13.201/24"];
|
||||
privateKeyFile = "/etc/wireguard/wg5.privatekey";
|
||||
postUp = "resolvectl dnsovertls wg5 no; resolvectl dns wg5 192.168.13.1; resolvectl domain wg5 ~fritz.box";
|
||||
preDown = "resolvectl revert wg5";
|
||||
|
|
@ -163,52 +147,33 @@
|
|||
];
|
||||
};
|
||||
wg6 = {
|
||||
address = [
|
||||
"10.7.6.201/32"
|
||||
"fd00:fae:fae:fae:fae:201::/96"
|
||||
];
|
||||
address = ["10.7.6.201/32" "fd00:fae:fae:fae:fae:201::/96"];
|
||||
privateKeyFile = "/etc/wireguard/wg6.privatekey";
|
||||
|
||||
peers = [
|
||||
{
|
||||
# nachtigall.pub.solar
|
||||
{ # nachtigall.pub.solar
|
||||
publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
|
||||
allowedIPs = [
|
||||
"10.7.6.1/32"
|
||||
"fd00:fae:fae:fae:fae:1::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ];
|
||||
#endpoint = "138.201.80.102:51820";
|
||||
endpoint = "[2a01:4f8:172:1c25::1]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# flora-6.pub.solar
|
||||
{ # flora-6.pub.solar
|
||||
publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
|
||||
allowedIPs = [
|
||||
"10.7.6.2/32"
|
||||
"fd00:fae:fae:fae:fae:2::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ];
|
||||
endpoint = "80.71.153.210:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# metronom.pub.solar
|
||||
{ # metronom.pub.solar
|
||||
publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
|
||||
allowedIPs = [
|
||||
"10.7.6.3/32"
|
||||
"fd00:fae:fae:fae:fae:3::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.3/32" "fd00:fae:fae:fae:fae:3::/96" ];
|
||||
endpoint = "49.13.236.167:51820";
|
||||
#endpoint = "[2a01:4f8:c2c:7082::]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# tankstelle.pub.solar
|
||||
{ # tankstelle.pub.solar
|
||||
publicKey = "iRTlY1lB7nPXf2eXzX8ZZDkfMmXyGjff5/joccbP8Cg=";
|
||||
allowedIPs = [
|
||||
"10.7.6.4/32"
|
||||
"fd00:fae:fae:fae:fae:4::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.4/32" "fd00:fae:fae:fae:fae:4::/96" ];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2001:4d88:1ffa:26::5]:51820";
|
||||
persistentKeepalive = 15;
|
||||
|
|
@ -218,10 +183,7 @@
|
|||
# mozillavpn
|
||||
moz0 = {
|
||||
autostart = false;
|
||||
address = [
|
||||
"10.142.131.196/32"
|
||||
"fc00:bbbb:bbbb:bb01:d:0:e:83c4/128"
|
||||
];
|
||||
address = ["10.142.131.196/32" "fc00:bbbb:bbbb:bb01:d:0:e:83c4/128"];
|
||||
privateKeyFile = "/etc/wireguard/moz0.privatekey";
|
||||
#postUp = "resolvectl dns wg4 fdaa:1:3234::3; resolvectl domain wg4 ~internal";
|
||||
#preDown = "resolvectl revert wg4";
|
||||
|
|
@ -232,10 +194,7 @@
|
|||
peers = [
|
||||
{
|
||||
publicKey = "ku1NYeOAGbY65YL/JKZhrqVzDJKXQiVj9USXbfkOBA0=";
|
||||
allowedIPs = [
|
||||
"0.0.0.0/0"
|
||||
"::/0"
|
||||
];
|
||||
allowedIPs = ["0.0.0.0/0" "::/0"];
|
||||
endpoint = "185.254.75.3:36294";
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
imports = [
|
||||
./paperless.nix
|
||||
./invoiceplane.nix
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
config = {
|
||||
pub-solar.core.disk-encryption-active = false;
|
||||
|
||||
|
|
@ -12,7 +11,7 @@
|
|||
"/" = {
|
||||
device = "/dev/disk/by-label/NIXOS_SD";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" ];
|
||||
options = ["noatime"];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -24,7 +23,9 @@
|
|||
allowSFTP = true;
|
||||
};
|
||||
|
||||
boot.kernelParams = [ "boot.shell_on_fail=1" ];
|
||||
boot.kernelParams = [
|
||||
"boot.shell_on_fail=1"
|
||||
];
|
||||
|
||||
# Would decrease closure size, but currenly broken (cairo)
|
||||
#environment.noXlibs = true;
|
||||
|
|
@ -37,11 +38,8 @@
|
|||
settings = {
|
||||
auto-optimise-store = true;
|
||||
sandbox = true;
|
||||
allowed-users = [ "@wheel" ];
|
||||
trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
allowed-users = ["@wheel"];
|
||||
trusted-users = ["root" "@wheel"];
|
||||
};
|
||||
|
||||
extraOptions = ''
|
||||
|
|
|
|||
|
|
@ -4,15 +4,13 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
backupDir = "/var/lib/invoiceplane/backup";
|
||||
in
|
||||
{
|
||||
in {
|
||||
security.acme.certs = {
|
||||
"billing.faenix.eu" = { };
|
||||
"billing.faenix.eu" = {};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
|
|
@ -27,9 +25,7 @@ in
|
|||
sites."billing.faenix.eu" = {
|
||||
enable = true;
|
||||
|
||||
invoiceTemplates = [
|
||||
flake.self.inputs.invoiceplane-template.packages.${pkgs.system}.invoiceplane-template
|
||||
];
|
||||
invoiceTemplates = [ flake.self.inputs.invoiceplane-template.packages.${pkgs.system}.invoiceplane-template ];
|
||||
|
||||
settings = {
|
||||
IP_URL = "https://billing.faenix.eu";
|
||||
|
|
@ -53,7 +49,9 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [ "d '${backupDir}' 0700 root root - -" ];
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${backupDir}' 0700 root root - -"
|
||||
];
|
||||
|
||||
#services.restic.backups = {
|
||||
# invoiceplane = {
|
||||
|
|
|
|||
|
|
@ -13,8 +13,7 @@ let
|
|||
backupDir = "${xdg.dataHome}/PaperlessBackup";
|
||||
consumptionDir = "/home/${psCfg.user.name}/.local/share/scandir";
|
||||
|
||||
in
|
||||
{
|
||||
in {
|
||||
services.paperless = {
|
||||
enable = true;
|
||||
user = psCfg.user.name;
|
||||
|
|
@ -44,7 +43,7 @@ in
|
|||
};
|
||||
|
||||
security.acme.certs = {
|
||||
"paperless.faenix.eu" = { };
|
||||
"paperless.faenix.eu" = {};
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
|
|
@ -82,10 +81,7 @@ in
|
|||
# };
|
||||
#};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /home/${psCfg.user.name}/.local 0700 ${psCfg.user.name} users - -"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
pub-solar.core.disk-encryption-active = false;
|
||||
isoImage.squashfsCompression = "gzip -Xcompression-level 1";
|
||||
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports = [ ./powder.nix ];
|
||||
{...}: {
|
||||
imports = [
|
||||
./powder.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,20 +7,13 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ];
|
||||
}: {
|
||||
imports = [];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ahci"
|
||||
"virtio_pci"
|
||||
"xhci_pci"
|
||||
"sr_mod"
|
||||
"virtio_blk"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.availableKernelModules = ["ahci" "virtio_pci" "xhci_pci" "sr_mod" "virtio_blk"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
|
|
@ -42,7 +35,7 @@
|
|||
];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
|
||||
networking.useDHCP = lib.mkDefault false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@
|
|||
pkgs,
|
||||
profiles,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{ ... }: {
|
||||
imports = [
|
||||
./ryzensun.nix
|
||||
./hardware-configuration.nix
|
||||
|
|
|
|||
|
|
@ -7,21 +7,15 @@
|
|||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" "sr_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/bad2e49e-c8e7-4516-a6f8-77db999d12b0";
|
||||
|
|
@ -35,5 +29,5 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
swapDevices = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,32 +1,26 @@
|
|||
{
|
||||
networking = {
|
||||
hosts = {
|
||||
"10.0.0.42" = [
|
||||
"nomad.service.consul"
|
||||
"nomad.service.cgn-1.consul"
|
||||
];
|
||||
"10.0.0.66" = [ "consul.service.cgn-1.consul" ];
|
||||
"10.0.1.9" = [ "consul.service.lev-1.consul" ];
|
||||
"10.0.0.70" = [
|
||||
"vault.service.consul"
|
||||
"vault.service.cgn-1.consul"
|
||||
];
|
||||
"10.0.0.200" = [ "headnode.cgn-1" ];
|
||||
"10.0.0.201" = [ "cn01.cgn-1" ];
|
||||
"10.0.0.202" = [ "cn02.cgn-1" ];
|
||||
"10.0.0.205" = [ "cn05.cgn-1" ];
|
||||
"10.0.0.206" = [ "cn06.cgn-1" ];
|
||||
"10.0.0.207" = [ "cn07.cgn-1" ];
|
||||
"10.0.0.208" = [ "cn08.cgn-1" ];
|
||||
"10.0.1.200" = [ "headnode.lev-1" ];
|
||||
"10.0.1.201" = [ "cn01.lev-1" ];
|
||||
"10.0.1.202" = [ "cn02.lev-1" ];
|
||||
"10.0.1.203" = [ "cn03.lev-1" ];
|
||||
"10.0.1.204" = [ "cn04.lev-1" ];
|
||||
"10.0.1.205" = [ "cn05.lev-1" ];
|
||||
"10.0.1.206" = [ "cn00.lev-1" ];
|
||||
"10.0.1.207" = [ "cn06.lev-1" ];
|
||||
"10.0.1.208" = [ "cn07.lev-1" ];
|
||||
"10.0.0.42" = ["nomad.service.consul" "nomad.service.cgn-1.consul"];
|
||||
"10.0.0.66" = ["consul.service.cgn-1.consul"];
|
||||
"10.0.1.9" = ["consul.service.lev-1.consul"];
|
||||
"10.0.0.70" = ["vault.service.consul" "vault.service.cgn-1.consul"];
|
||||
"10.0.0.200" = ["headnode.cgn-1"];
|
||||
"10.0.0.201" = ["cn01.cgn-1"];
|
||||
"10.0.0.202" = ["cn02.cgn-1"];
|
||||
"10.0.0.205" = ["cn05.cgn-1"];
|
||||
"10.0.0.206" = ["cn06.cgn-1"];
|
||||
"10.0.0.207" = ["cn07.cgn-1"];
|
||||
"10.0.0.208" = ["cn08.cgn-1"];
|
||||
"10.0.1.200" = ["headnode.lev-1"];
|
||||
"10.0.1.201" = ["cn01.lev-1"];
|
||||
"10.0.1.202" = ["cn02.lev-1"];
|
||||
"10.0.1.203" = ["cn03.lev-1"];
|
||||
"10.0.1.204" = ["cn04.lev-1"];
|
||||
"10.0.1.205" = ["cn05.lev-1"];
|
||||
"10.0.1.206" = ["cn00.lev-1"];
|
||||
"10.0.1.207" = ["cn06.lev-1"];
|
||||
"10.0.1.208" = ["cn07.lev-1"];
|
||||
};
|
||||
|
||||
interfaces.enp4s0.wakeOnLan.enable = true;
|
||||
|
|
@ -34,24 +28,20 @@
|
|||
wireguard.enable = true;
|
||||
wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = [ "10.8.8.7/32" ];
|
||||
address = ["10.8.8.7/32"];
|
||||
privateKeyFile = "/etc/wireguard/wg0.privatekey";
|
||||
|
||||
peers = [
|
||||
{
|
||||
publicKey = "l0DJLicCrcrixNP6zAWTXNSEaNM2jML253BXEZ1KpiU=";
|
||||
allowedIPs = [
|
||||
"10.8.8.16/32"
|
||||
"10.0.0.0/24"
|
||||
"10.88.88.0/24"
|
||||
];
|
||||
allowedIPs = ["10.8.8.16/32" "10.0.0.0/24" "10.88.88.0/24"];
|
||||
endpoint = "85.88.23.16:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
wg1 = {
|
||||
address = [ "10.11.11.6/32" ];
|
||||
address = ["10.11.11.6/32"];
|
||||
privateKeyFile = "/etc/wireguard/wg1.privatekey";
|
||||
mtu = 1300;
|
||||
|
||||
|
|
@ -59,60 +49,40 @@
|
|||
{
|
||||
publicKey = "7RRgfZSneqAtAHBeI6+aaYLqz9e1jikg/lIK8mhW928=";
|
||||
presharedKeyFile = "/etc/wireguard/wg1.presharedkey";
|
||||
allowedIPs = [
|
||||
"10.11.11.0/24"
|
||||
"192.168.1.0/24"
|
||||
"10.0.1.0/24"
|
||||
];
|
||||
allowedIPs = ["10.11.11.0/24" "192.168.1.0/24" "10.0.1.0/24"];
|
||||
endpoint = "80.71.153.1:51820";
|
||||
#persistentKeepalive = 16;
|
||||
}
|
||||
];
|
||||
};
|
||||
wg2 = {
|
||||
address = [ "10.7.6.204/32" ];
|
||||
address = ["10.7.6.204/32"];
|
||||
privateKeyFile = "/etc/wireguard/wg2.privatekey";
|
||||
|
||||
peers = [
|
||||
{
|
||||
# nachtigall.pub.solar
|
||||
{ # nachtigall.pub.solar
|
||||
publicKey = "qzNywKY9RvqTnDO8eLik75/SHveaSk9OObilDzv+xkk=";
|
||||
allowedIPs = [
|
||||
"10.7.6.1/32"
|
||||
"fd00:fae:fae:fae:fae:1::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.1/32" "fd00:fae:fae:fae:fae:1::/96" ];
|
||||
#endpoint = "138.201.80.102:51820";
|
||||
endpoint = "[2a01:4f8:172:1c25::1]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# flora-6.pub.solar
|
||||
{ # flora-6.pub.solar
|
||||
publicKey = "jtSR5G2P/nm9s8WrVc26Xc/SQLupRxyXE+5eIeqlsTU=";
|
||||
allowedIPs = [
|
||||
"10.7.6.2/32"
|
||||
"fd00:fae:fae:fae:fae:2::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.2/32" "fd00:fae:fae:fae:fae:2::/96" ];
|
||||
endpoint = "80.71.153.210:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# metronom.pub.solar
|
||||
{ # metronom.pub.solar
|
||||
publicKey = "zOSYGO7MfnOOUnzaTcWiKRQM0qqxR3JQrwx/gtEtHmo=";
|
||||
allowedIPs = [
|
||||
"10.7.6.3/32"
|
||||
"fd00:fae:fae:fae:fae:3::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.3/32" "fd00:fae:fae:fae:fae:3::/96" ];
|
||||
endpoint = "49.13.236.167:51820";
|
||||
#endpoint = "[2a01:4f8:c2c:7082::]:51820";
|
||||
persistentKeepalive = 15;
|
||||
}
|
||||
{
|
||||
# tankstelle.pub.solar
|
||||
{ # tankstelle.pub.solar
|
||||
publicKey = "iRTlY1lB7nPXf2eXzX8ZZDkfMmXyGjff5/joccbP8Cg=";
|
||||
allowedIPs = [
|
||||
"10.7.6.4/32"
|
||||
"fd00:fae:fae:fae:fae:4::/96"
|
||||
];
|
||||
allowedIPs = [ "10.7.6.4/32" "fd00:fae:fae:fae:fae:4::/96" ];
|
||||
#endpoint = "80.244.242.5:51820";
|
||||
endpoint = "[2001:4d88:1ffa:26::5]:51820";
|
||||
persistentKeepalive = 15;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
in
|
||||
{
|
||||
in {
|
||||
config = {
|
||||
age.secrets.docker-ci-runner-secrets = {
|
||||
file = "${flake.self}/secrets/docker-ci-runner-secrets.age";
|
||||
|
|
@ -27,7 +26,7 @@ in
|
|||
# runnerVarsFile = config.age.secrets.docker-ci-runner-secrets.path;
|
||||
#};
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
|
||||
# Required for WakeOnLan
|
||||
boot.initrd = {
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
let
|
||||
lock = builtins.fromJSON (
|
||||
builtins.readFile builtins.path {
|
||||
lock = builtins.fromJSON (builtins.readFile builtins.path {
|
||||
path = ../../flake.lock;
|
||||
name = "lockPath";
|
||||
}
|
||||
);
|
||||
});
|
||||
flake =
|
||||
import
|
||||
(fetchTarball {
|
||||
(
|
||||
fetchTarball {
|
||||
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
||||
})
|
||||
}
|
||||
)
|
||||
{
|
||||
src = builtins.path {
|
||||
path = ../../.;
|
||||
|
|
@ -18,4 +18,4 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
flake
|
||||
flake
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
let
|
||||
{...}: let
|
||||
inherit (default.inputs.nixos) lib;
|
||||
|
||||
host = configs.${hostname} or configs.PubSolarOS;
|
||||
|
|
@ -7,4 +6,4 @@ let
|
|||
default = (import ../.).defaultNix;
|
||||
hostname = lib.fileContents /etc/hostname;
|
||||
in
|
||||
host
|
||||
host
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
{ lib, inputs, ... }:
|
||||
{
|
||||
{ lib, inputs, ... }: {
|
||||
# Configuration common to all Linux systems
|
||||
flake = {
|
||||
lib =
|
||||
let
|
||||
callLibs = file: import file { inherit lib; };
|
||||
in
|
||||
rec {
|
||||
lib = let
|
||||
callLibs = file: import file {inherit lib;};
|
||||
in rec {
|
||||
## Define your own library functions here!
|
||||
#id = x: x;
|
||||
## Or in files, containing functions that take {lib}
|
||||
|
|
@ -15,6 +12,7 @@
|
|||
|
||||
deploy = import ./deploy.nix { inherit inputs lib; };
|
||||
addLocalHostname = callLibs ./add-local-hostname.nix;
|
||||
recursiveMerge = callLibs ./recursive-merge.nix;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/*
|
||||
The contents of this file are adapted from digga
|
||||
https://github.com/divnix/digga
|
||||
|
||||
Licensed under the MIT license
|
||||
*/
|
||||
* The contents of this file are adapted from digga
|
||||
* https://github.com/divnix/digga
|
||||
*
|
||||
* Licensed under the MIT license
|
||||
*/
|
||||
|
||||
{ lib, inputs }:
|
||||
let
|
||||
|
|
@ -15,8 +15,7 @@ let
|
|||
if (net ? domain) && (net.domain != null) then "${net.hostName}.${net.domain}" else net.hostName;
|
||||
in
|
||||
fqdn;
|
||||
in
|
||||
{
|
||||
in {
|
||||
mkDeployNodes =
|
||||
systemConfigurations: extraConfig:
|
||||
/*
|
||||
|
|
@ -49,7 +48,7 @@ in
|
|||
```
|
||||
*
|
||||
*/
|
||||
lib.recursiveUpdate (lib.mapAttrs (_: c: {
|
||||
lib.recursiveUpdate (lib.mapAttrs ( _: c: {
|
||||
hostname = getFqdn c;
|
||||
profiles.system =
|
||||
let
|
||||
|
|
|
|||
16
lib/recursive-merge.nix
Normal file
16
lib/recursive-merge.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ lib }:
|
||||
attrList:
|
||||
let
|
||||
f = attrPath:
|
||||
zipAttrsWith (
|
||||
n: values:
|
||||
if tail values == []
|
||||
then head values
|
||||
else if all isList values
|
||||
then unique (concatLists values)
|
||||
else if all isAttrs values
|
||||
then f (attrPath ++ [n]) values
|
||||
else last values
|
||||
);
|
||||
in
|
||||
f [] attrList;
|
||||
|
|
@ -4,8 +4,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
age.secrets."hosting-de-acme-secrets" = {
|
||||
file = "${flake.self}/secrets/hosting-de-acme-secrets.age";
|
||||
mode = "400";
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.adb.enable = true;
|
||||
|
||||
users.users."${psCfg.user.name}" = {
|
||||
extraGroups = [ "adbusers" ];
|
||||
extraGroups = ["adbusers"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,9 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
users.users."${psCfg.user.name}" = {
|
||||
extraGroups = [ "dialout" ];
|
||||
extraGroups = ["dialout"];
|
||||
packages = with pkgs; [
|
||||
arduino
|
||||
arduino-cli
|
||||
|
|
|
|||
|
|
@ -7,10 +7,9 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
in
|
||||
{
|
||||
in {
|
||||
users.users."${psCfg.user.name}" = {
|
||||
extraGroups = [ "audio" ];
|
||||
extraGroups = ["audio"];
|
||||
packages = with pkgs; [
|
||||
# easyeffects, e.g. for microphone noise filtering
|
||||
easyeffects
|
||||
|
|
@ -43,10 +42,7 @@ in
|
|||
"context.properties" = {
|
||||
default = {
|
||||
"clock.rate" = 48000; # Pipewire default
|
||||
"clock.allowed-rates" = [
|
||||
44100
|
||||
48000
|
||||
];
|
||||
"clock.allowed-rates" = [ 44100 48000 ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,14 +3,15 @@
|
|||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
# Disable bluetooth on startup to save battery
|
||||
powerOnBoot = false;
|
||||
# Disable useless SIM Access Profile plugin
|
||||
disabledPlugins = [ "sap" ];
|
||||
disabledPlugins = [
|
||||
"sap"
|
||||
];
|
||||
settings = {
|
||||
General = {
|
||||
# Enables experimental features and interfaces.
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
}:
|
||||
let
|
||||
cfg = config.pub-solar.core;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.pub-solar.core.disk-encryption-active = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = true;
|
||||
|
|
@ -30,7 +29,7 @@ in
|
|||
kernelPackages = lib.mkDefault pkgs.linuxPackages_6_6;
|
||||
|
||||
# Support ntfs drives
|
||||
supportedFilesystems = [ "ntfs" ];
|
||||
supportedFilesystems = ["ntfs"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.pub-solar.core;
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
imports = [
|
||||
./boot.nix
|
||||
./hibernation.nix
|
||||
|
|
@ -29,7 +32,7 @@ in
|
|||
|
||||
# Remove the complete default environment of packages like
|
||||
# nano, perl and rsync
|
||||
environment.defaultPackages = lib.mkForce [ ];
|
||||
environment.defaultPackages = lib.mkForce [];
|
||||
|
||||
# fileSystems."/".options = [ "noexec" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
let
|
||||
cfg = config.pub-solar.core.hibernation;
|
||||
inherit (lib) mkOption types mkIf;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.pub-solar.core.hibernation = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -32,9 +31,7 @@ in
|
|||
config = {
|
||||
boot = mkIf cfg.enable {
|
||||
resumeDevice = mkIf (cfg.resumeDevice != null) cfg.resumeDevice;
|
||||
kernelParams = mkIf (cfg.resumeOffset != null) [
|
||||
"resume_offset=${builtins.toString cfg.resumeOffset}"
|
||||
];
|
||||
kernelParams = mkIf (cfg.resumeOffset != null) ["resume_offset=${builtins.toString cfg.resumeOffset}"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
# disable NetworkManager and systemd-networkd -wait-online by default
|
||||
systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
|
||||
systemd.services.systemd-networkd-wait-online.enable = lib.mkDefault false;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
cfg = config.pub-solar.core;
|
||||
in
|
||||
{
|
||||
in {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Core unix utility packages
|
||||
coreutils-full
|
||||
|
|
|
|||
|
|
@ -6,15 +6,16 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||
services.dbus.packages = [ pkgs.gcr ];
|
||||
in {
|
||||
services.udev.packages = [pkgs.yubikey-personalization];
|
||||
services.dbus.packages = [pkgs.gcr];
|
||||
services.pcscd.enable = true;
|
||||
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [ libsecret ];
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [
|
||||
libsecret
|
||||
];
|
||||
|
||||
home-manager.users."${psCfg.user.name}" = {
|
||||
systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
pkgs: {
|
||||
Unit = {
|
||||
Description = "Legacy polkit authentication agent for GNOME";
|
||||
Documentation = [ "https://gitlab.freedesktop.org/polkit/polkit/" ];
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
Documentation = ["https://gitlab.freedesktop.org/polkit/polkit/"];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,12 +22,7 @@ let
|
|||
cache=${dataDir}/ddclient.cache
|
||||
foreground=yes
|
||||
login=${cfg.username}
|
||||
password=${
|
||||
if cfg.protocol == "nsupdate" then
|
||||
"/run/${RuntimeDirectory}/ddclient.key"
|
||||
else
|
||||
"@password_placeholder@"
|
||||
}
|
||||
password=${if cfg.protocol == "nsupdate" then "/run/${RuntimeDirectory}/ddclient.key" else "@password_placeholder@"}
|
||||
protocol=${cfg.protocol}
|
||||
${lib.optionalString (cfg.script != "") "script=${cfg.script}"}
|
||||
${lib.optionalString (cfg.server != "") "server=${cfg.server}"}
|
||||
|
|
@ -43,60 +38,26 @@ let
|
|||
|
||||
preStart = ''
|
||||
install --mode=600 --owner=$USER ${configFile} /run/${RuntimeDirectory}/ddclient.conf
|
||||
${lib.optionalString (cfg.configFile == null) (
|
||||
if (cfg.protocol == "nsupdate") then
|
||||
''
|
||||
${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then ''
|
||||
install --mode=600 --owner=$USER ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key
|
||||
''
|
||||
else if (cfg.passwordFile != null) then
|
||||
''
|
||||
'' else if (cfg.passwordFile != null) then ''
|
||||
"${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "${cfg.passwordFile}" "/run/${RuntimeDirectory}/ddclient.conf"
|
||||
''
|
||||
else
|
||||
''
|
||||
'' else ''
|
||||
sed -i '/^password=@password_placeholder@$/d' /run/${RuntimeDirectory}/ddclient.conf
|
||||
''
|
||||
)}
|
||||
'')}
|
||||
'';
|
||||
in
|
||||
with lib;
|
||||
{
|
||||
disabledModules = [ "services/networking/ddclient.nix" ];
|
||||
in with lib; {
|
||||
disabledModules = [
|
||||
"services/networking/ddclient.nix"
|
||||
];
|
||||
|
||||
imports = [
|
||||
(mkChangedOptionModule
|
||||
[
|
||||
"services"
|
||||
"ddclient"
|
||||
"domain"
|
||||
]
|
||||
[
|
||||
"services"
|
||||
"ddclient"
|
||||
"domains"
|
||||
]
|
||||
(
|
||||
config:
|
||||
let
|
||||
value = getAttrFromPath [
|
||||
"services"
|
||||
"ddclient"
|
||||
"domain"
|
||||
] config;
|
||||
in
|
||||
if value != "" then [ value ] else [ ]
|
||||
)
|
||||
)
|
||||
(mkRemovedOptionModule [
|
||||
"services"
|
||||
"ddclient"
|
||||
"homeDir"
|
||||
] "")
|
||||
(mkRemovedOptionModule [
|
||||
"services"
|
||||
"ddclient"
|
||||
"password"
|
||||
] "Use services.ddclient.passwordFile instead.")
|
||||
(mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
|
||||
(config:
|
||||
let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
|
||||
in if value != "" then [ value ] else []))
|
||||
(mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
|
||||
(mkRemovedOptionModule [ "services" "ddclient" "password" ] "Use services.ddclient.passwordFile instead.")
|
||||
];
|
||||
|
||||
###### interface
|
||||
|
|
@ -130,9 +91,7 @@ with lib;
|
|||
|
||||
username = mkOption {
|
||||
# For `nsupdate` username contains the path to the nsupdate executable
|
||||
default = lib.optionalString (
|
||||
config.services.ddclient.protocol == "nsupdate"
|
||||
) "${pkgs.bind.dnsutils}/bin/nsupdate";
|
||||
default = lib.optionalString (config.services.ddclient.protocol == "nsupdate") "${pkgs.bind.dnsutils}/bin/nsupdate";
|
||||
defaultText = "";
|
||||
type = str;
|
||||
description = lib.mdDoc ''
|
||||
|
|
@ -253,6 +212,7 @@ with lib;
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.services.ddclient.enable {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ self, inputs, ... }:
|
||||
{
|
||||
self,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
flake = {
|
||||
nixosModules = rec {
|
||||
acme = import ./acme;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [
|
||||
ungoogled-chromium
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,14 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
users.users."${psCfg.user.name}" = {
|
||||
extraGroups = [ "docker" ];
|
||||
extraGroups = ["docker"];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [ docker-compose ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
docker-compose
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [
|
||||
w3m
|
||||
urlscan
|
||||
|
|
@ -38,23 +37,17 @@ in
|
|||
macro index <f5> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/admins@pub.solar.muttrc<enter><change-folder>!<enter>'
|
||||
macro index <f6> '<sync-mailbox><enter-command>source $XDG_CONFIG_HOME/mutt/crew@pub.solar.muttrc<enter><change-folder>!<enter>'
|
||||
'';
|
||||
xdg.configFile."mutt/hello@benjaminbaedorf.eu.muttrc".source =
|
||||
./.config/mutt + "/hello@benjaminbaedorf.eu.muttrc";
|
||||
xdg.configFile."mutt/benjamin.baedorf@rwth-aachen.de.muttrc".source =
|
||||
./.config/mutt + "/benjamin.baedorf@rwth-aachen.de.muttrc";
|
||||
xdg.configFile."mutt/hello@benjaminbaedorf.eu.signature".source =
|
||||
./.config/mutt + "/hello@benjaminbaedorf.eu.signature";
|
||||
xdg.configFile."mutt/hello@benjaminbaedorf.eu.muttrc".source = ./.config/mutt + "/hello@benjaminbaedorf.eu.muttrc";
|
||||
xdg.configFile."mutt/benjamin.baedorf@rwth-aachen.de.muttrc".source = ./.config/mutt + "/benjamin.baedorf@rwth-aachen.de.muttrc";
|
||||
xdg.configFile."mutt/hello@benjaminbaedorf.eu.signature".source = ./.config/mutt + "/hello@benjaminbaedorf.eu.signature";
|
||||
xdg.configFile."mutt/byb@miom.space.muttrc".source = ./.config/mutt + "/byb@miom.space.muttrc";
|
||||
xdg.configFile."mutt/byb@miom.space.signature".source =
|
||||
./.config/mutt + "/byb@miom.space.signature";
|
||||
xdg.configFile."mutt/byb@miom.space.signature".source = ./.config/mutt + "/byb@miom.space.signature";
|
||||
xdg.configFile."mutt/mail@b12f.io.muttrc".source = ./.config/mutt + "/mail@b12f.io.muttrc";
|
||||
xdg.configFile."mutt/mail@b12f.io.signature".source = ./.config/mutt + "/mail@b12f.io.signature";
|
||||
xdg.configFile."mutt/admins@pub.solar.muttrc".source = ./.config/mutt + "/admins@pub.solar.muttrc";
|
||||
xdg.configFile."mutt/admins@pub.solar.signature".source =
|
||||
./.config/mutt + "/admins@pub.solar.signature";
|
||||
xdg.configFile."mutt/admins@pub.solar.signature".source = ./.config/mutt + "/admins@pub.solar.signature";
|
||||
xdg.configFile."mutt/crew@pub.solar.muttrc".source = ./.config/mutt + "/crew@pub.solar.muttrc";
|
||||
xdg.configFile."mutt/crew@pub.solar.signature".source =
|
||||
./.config/mutt + "/crew@pub.solar.signature";
|
||||
xdg.configFile."mutt/crew@pub.solar.signature".source = ./.config/mutt + "/crew@pub.solar.signature";
|
||||
xdg.configFile."offlineimap/config".source = ./.config/offlineimap/config;
|
||||
xdg.configFile."msmtp/config".source = ./.config/msmtp/config;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,10 +6,11 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.steam.enable = true;
|
||||
nixpkgs.config.packageOverrides = pkgs: { steam = pkgs.steam.override { }; };
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
steam = pkgs.steam.override {};
|
||||
};
|
||||
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [
|
||||
playonlinux
|
||||
|
|
|
|||
|
|
@ -6,16 +6,20 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
tomlFormat = pkgs.formats.toml { };
|
||||
tomlFormat = pkgs.formats.toml {};
|
||||
sessionVariables = {
|
||||
WLR_RENDERER = if psCfg.graphical.wayland.software-renderer.enable then "pixman" else "gles2";
|
||||
WLR_RENDERER =
|
||||
if psCfg.graphical.wayland.software-renderer.enable
|
||||
then "pixman"
|
||||
else "gles2";
|
||||
# Fix KeepassXC rendering issue
|
||||
# https://github.com/void-linux/void-packages/issues/23517
|
||||
QT_AUTO_SCREEN_SCALE_FACTOR = "0";
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [ ./sway ];
|
||||
in {
|
||||
imports = [
|
||||
./sway
|
||||
];
|
||||
|
||||
options.pub-solar.graphical = {
|
||||
wayland.software-renderer.enable = lib.mkOption {
|
||||
|
|
@ -59,7 +63,7 @@ in
|
|||
style = "gtk2";
|
||||
};
|
||||
|
||||
services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ];
|
||||
services.udev.packages = with pkgs; [gnome3.gnome-settings-daemon];
|
||||
# Enable Sushi, a quick previewer for nautilus
|
||||
services.gnome.sushi.enable = true;
|
||||
# Enable GVfs, a userspace virtual filesystem
|
||||
|
|
@ -75,8 +79,8 @@ in
|
|||
enableDefaultPackages = true;
|
||||
fontconfig.enable = true;
|
||||
fontconfig.defaultFonts = {
|
||||
monospace = [ "DejaVu Sans Mono for Powerline" ];
|
||||
sansSerif = [ "DejaVu Sans" ];
|
||||
monospace = ["DejaVu Sans Mono for Powerline"];
|
||||
sansSerif = ["DejaVu Sans"];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
pkgs: {
|
||||
Unit = {
|
||||
Description = "Network Manager applet";
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
# ConditionEnvironment requires systemd v247 to work correctly
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet --sm-disable --indicator";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,17 @@
|
|||
{ pkgs, psCfg, ... }:
|
||||
{
|
||||
pkgs,
|
||||
psCfg,
|
||||
...
|
||||
}:
|
||||
''
|
||||
# Set shut down, restart and locking features
|
||||
''
|
||||
+ (
|
||||
if psCfg.core.hibernation.enable then
|
||||
''
|
||||
if psCfg.core.hibernation.enable
|
||||
then ''
|
||||
set $mode_system (e)xit, (h)ibernate, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
|
||||
''
|
||||
else
|
||||
''
|
||||
else ''
|
||||
set $mode_system (e)xit, (l)ock, (s)uspend, (r)eboot, (Shift+s)hutdown
|
||||
''
|
||||
)
|
||||
|
|
@ -19,12 +22,11 @@
|
|||
bindsym e exec swaymsg exit, mode "default"
|
||||
''
|
||||
+ (
|
||||
if psCfg.core.hibernation.enable then
|
||||
''
|
||||
if psCfg.core.hibernation.enable
|
||||
then ''
|
||||
bindsym h exec systemctl hibernate, mode "default"
|
||||
''
|
||||
else
|
||||
""
|
||||
else ""
|
||||
)
|
||||
+ ''
|
||||
bindsym l exec ${pkgs.swaylock-bg}/bin/swaylock-bg, mode "default"
|
||||
|
|
@ -35,5 +37,5 @@
|
|||
# exit system mode: "Enter" or "Escape"
|
||||
bindsym Return mode "default"
|
||||
bindsym Escape mode "default"
|
||||
}
|
||||
}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
''
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: ''
|
||||
# Default config for sway
|
||||
#
|
||||
# Copy this to ~/.config/sway/config and edit it to your liking.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ psCfg, pkgs }:
|
||||
"
|
||||
{
|
||||
psCfg,
|
||||
pkgs,
|
||||
}: "
|
||||
address=0.0.0.0
|
||||
enable_auth=true
|
||||
username=${psCfg.user.name}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
inherit (lib) mkIf mkOption types;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.pub-solar.graphical = {
|
||||
v4l2loopback.enable = mkOption {
|
||||
type = types.bool;
|
||||
|
|
@ -20,8 +19,8 @@ in
|
|||
|
||||
config = {
|
||||
boot = mkIf psCfg.graphical.v4l2loopback.enable {
|
||||
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||
kernelModules = [ "v4l2loopback" ];
|
||||
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
|
||||
kernelModules = ["v4l2loopback"];
|
||||
extraModprobeConfig = ''
|
||||
options v4l2loopback exclusive_caps=1 devices=3
|
||||
'';
|
||||
|
|
@ -45,7 +44,7 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
|
||||
extraPortals = with pkgs; [xdg-desktop-portal-gtk];
|
||||
};
|
||||
|
||||
services.pipewire.enable = true;
|
||||
|
|
@ -81,7 +80,9 @@ in
|
|||
];
|
||||
|
||||
home-manager.users."${psCfg.user.name}" = {
|
||||
imports = [ flake.self.inputs.wayland-pipewire-idle-inhibit.homeModules.default ];
|
||||
imports = [
|
||||
flake.self.inputs.wayland-pipewire-idle-inhibit.homeModules.default
|
||||
];
|
||||
|
||||
services.wayland-pipewire-idle-inhibit = {
|
||||
enable = true;
|
||||
|
|
@ -105,20 +106,18 @@ in
|
|||
#programs.waybar.systemd.enable = true;
|
||||
|
||||
systemd.user.services.swaynotificationcenter = import ./swaynotificationcenter.service.nix pkgs;
|
||||
systemd.user.services.sway = import ./sway.service.nix { inherit pkgs psCfg; };
|
||||
systemd.user.services.swayidle = import ./swayidle.service.nix { inherit pkgs psCfg; };
|
||||
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix { inherit pkgs psCfg; };
|
||||
systemd.user.services.waybar = import ./waybar.service.nix { inherit pkgs psCfg; };
|
||||
systemd.user.targets.sway-session = import ./sway-session.target.nix { inherit pkgs psCfg; };
|
||||
systemd.user.services.sway = import ./sway.service.nix {inherit pkgs psCfg;};
|
||||
systemd.user.services.swayidle = import ./swayidle.service.nix {inherit pkgs psCfg;};
|
||||
systemd.user.services.xsettingsd = import ./xsettingsd.service.nix {inherit pkgs psCfg;};
|
||||
systemd.user.services.waybar = import ./waybar.service.nix {inherit pkgs psCfg;};
|
||||
systemd.user.targets.sway-session = import ./sway-session.target.nix {inherit pkgs psCfg;};
|
||||
|
||||
xdg.configFile."sway/config".text = import ./config/config.nix { inherit config pkgs; };
|
||||
xdg.configFile."sway/config".text = import ./config/config.nix {inherit config pkgs;};
|
||||
xdg.configFile."sway/config.d/colorscheme.conf".source = ./config/config.d/colorscheme.conf;
|
||||
xdg.configFile."sway/config.d/theme.conf".source = ./config/config.d/theme.conf;
|
||||
xdg.configFile."sway/config.d/gaps.conf".source = ./config/config.d/gaps.conf;
|
||||
xdg.configFile."sway/config.d/custom-keybindings.conf".source = ./config/config.d/custom-keybindings.conf;
|
||||
xdg.configFile."sway/config.d/mode_system.conf".text =
|
||||
import ./config/config.d/mode_system.conf.nix
|
||||
{ inherit pkgs psCfg; };
|
||||
xdg.configFile."sway/config.d/mode_system.conf".text = import ./config/config.d/mode_system.conf.nix {inherit pkgs psCfg;};
|
||||
xdg.configFile."sway/config.d/applications.conf".source = ./config/config.d/applications.conf;
|
||||
xdg.configFile."sway/config.d/systemd.conf".source = ./config/config.d/systemd.conf;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "set color temperature of display according to time of day";
|
||||
Documentation = [ "man:gammastep(1)" ];
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
Documentation = ["man:gammastep(1)"];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
# ConditionEnvironment requires systemd v247 to work correctly
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.gammastep}/bin/gammastep -l geoclue2 -m wayland -v";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "Actions gestures on your touchpad using libinput";
|
||||
Documentation = [ "https://github.com/bulletmark/libinput-gestures" ];
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
Documentation = ["https://github.com/bulletmark/libinput-gestures"];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
|
|
@ -14,6 +13,6 @@
|
|||
TimeoutStopSec = "10";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "Lightweight Wayland notification daemon";
|
||||
Documentation = [ "man:mako(1)" ];
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
Documentation = ["man:mako(1)"];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
Service = {
|
||||
Type = "dbus";
|
||||
|
|
@ -14,6 +13,6 @@
|
|||
ExecReload = "${pkgs.mako}/bin/makoctl reload";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "sway compositor session";
|
||||
Documentation = [ "man:systemd.special(7)" ];
|
||||
BindsTo = [ "graphical-session.target" ];
|
||||
Wants = [ "graphical-session-pre.target" ];
|
||||
After = [ "graphical-session-pre.target" ];
|
||||
Documentation = ["man:systemd.special(7)"];
|
||||
BindsTo = ["graphical-session.target"];
|
||||
Wants = ["graphical-session-pre.target"];
|
||||
After = ["graphical-session-pre.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "sway - SirCmpwn's Wayland window manager";
|
||||
Documentation = [ "man:sway(5)" ];
|
||||
BindsTo = [ "graphical-session.target" ];
|
||||
Wants = [ "graphical-session-pre.target" ];
|
||||
After = [ "graphical-session-pre.target" ];
|
||||
Documentation = ["man:sway(5)"];
|
||||
BindsTo = ["graphical-session.target"];
|
||||
Wants = ["graphical-session-pre.target"];
|
||||
After = ["graphical-session-pre.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
{ pkgs, psCfg, ... }:
|
||||
{
|
||||
pkgs,
|
||||
psCfg,
|
||||
...
|
||||
}: {
|
||||
Unit = {
|
||||
Description = "Idle manager for Wayland";
|
||||
Documentation = [ "man:swayidle(1)" ];
|
||||
BindsTo = [ "graphical-session.target" ];
|
||||
Wants = [ "graphical-session-pre.target" ];
|
||||
After = [ "graphical-session-pre.target" ];
|
||||
Documentation = ["man:swayidle(1)"];
|
||||
BindsTo = ["graphical-session.target"];
|
||||
Wants = ["graphical-session-pre.target"];
|
||||
After = ["graphical-session-pre.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
|
|
@ -18,6 +21,6 @@
|
|||
'';
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ pkgs: {
|
|||
Unit = {
|
||||
Description = "Swaync notification daemon";
|
||||
Documentation = "https://github.com/ErikReider/SwayNotificationCenter";
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
Requisite = [ "graphical-session.target" ];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
Requisite = ["graphical-session.target"];
|
||||
# ConditionEnvironment requires systemd v247 to work correctly
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
Service = {
|
||||
Type = "dbus";
|
||||
|
|
@ -16,6 +16,6 @@ pkgs: {
|
|||
Restart = "on-failure";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "Highly customizable Wayland bar for Sway and Wlroots based compositors.";
|
||||
Documentation = "https://github.com/Alexays/Waybar/wiki/";
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [
|
||||
"sway-session.target"
|
||||
"network-online.target"
|
||||
];
|
||||
Wants = [
|
||||
"graphical-session-pre.target"
|
||||
"network-online.target"
|
||||
"blueman-applet.service"
|
||||
];
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target" "network-online.target"];
|
||||
Wants = ["graphical-session-pre.target" "network-online.target" "blueman-applet.service"];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
|
||||
Service = {
|
||||
|
|
@ -24,6 +16,6 @@
|
|||
};
|
||||
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "X Settings Daemon";
|
||||
Documentation = [ "https://github.com/derat/xsettingsd/wiki/Installation" ];
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
Documentation = ["https://github.com/derat/xsettingsd/wiki/Installation"];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
# ConditionEnvironment requires systemd v247 to work correctly
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
|
|
@ -14,6 +13,6 @@
|
|||
ExecStop = "/run/current-system/sw/bin/env pkill xsettingsd";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
Unit = {
|
||||
Description = "ydotool - Generic command-line automation tool (no X!)";
|
||||
Documentation = [ "https://github.com/ReimuNotMoe/ydotool" ];
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
After = [ "sway-session.target" ];
|
||||
Documentation = ["https://github.com/ReimuNotMoe/ydotool"];
|
||||
BindsTo = ["sway-session.target"];
|
||||
After = ["sway-session.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
|
|
@ -14,6 +13,6 @@
|
|||
TimeoutStopSec = "10";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ config, ... }:
|
||||
{
|
||||
{config, ...}: {
|
||||
home-manager.sharedModules = [
|
||||
{
|
||||
home.sessionVariables = {
|
||||
inherit (config.environment.sessionVariables) NIX_PATH;
|
||||
};
|
||||
xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;
|
||||
xdg.configFile."nix/registry.json".text =
|
||||
config.environment.etc."nix/registry.json".text;
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
|
|
@ -29,17 +24,14 @@ let
|
|||
mkOption
|
||||
nameValuePair
|
||||
optionalString
|
||||
types
|
||||
;
|
||||
types;
|
||||
|
||||
cfg = config.services.invoiceplane;
|
||||
eachSite = cfg.sites;
|
||||
user = "invoiceplane";
|
||||
webserver = config.services.${cfg.webserver};
|
||||
|
||||
invoiceplane-config =
|
||||
hostName: cfg:
|
||||
pkgs.writeText "ipconfig.php" ''
|
||||
invoiceplane-config = hostName: cfg: pkgs.writeText "ipconfig.php" ''
|
||||
IP_URL=http://${hostName}
|
||||
ENABLE_DEBUG=false
|
||||
DISABLE_SETUP=false
|
||||
|
|
@ -47,11 +39,7 @@ let
|
|||
DB_HOSTNAME=${cfg.database.host}
|
||||
DB_USERNAME=${cfg.database.user}
|
||||
# NOTE: file_get_contents adds newline at the end of returned string
|
||||
DB_PASSWORD=${
|
||||
optionalString (
|
||||
cfg.database.passwordFile != null
|
||||
) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"
|
||||
}
|
||||
DB_PASSWORD=${optionalString (cfg.database.passwordFile != null) "trim(file_get_contents('${cfg.database.passwordFile}'), \"\\r\\n\")"}
|
||||
DB_DATABASE=${cfg.database.name}
|
||||
DB_PORT=${toString cfg.database.port}
|
||||
SESS_EXPIRATION=864000
|
||||
|
|
@ -63,30 +51,20 @@ let
|
|||
REMOVE_INDEXPHP=true
|
||||
'';
|
||||
|
||||
mkPhpValue =
|
||||
v:
|
||||
if isString v then
|
||||
escapeShellArg v
|
||||
mkPhpValue = v:
|
||||
if isString v then escapeShellArg v
|
||||
# NOTE: If any value contains a , (comma) this will not get escaped
|
||||
else if isList v && any lib.strings.isCoercibleToString v then
|
||||
escapeShellArg (concatMapStringsSep "," toString v)
|
||||
else if isInt v then
|
||||
toString v
|
||||
else if isBool v then
|
||||
boolToString v
|
||||
else
|
||||
abort "The Invoiceplane config value ${lib.generators.toPretty { } v} can not be encoded.";
|
||||
else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v)
|
||||
else if isInt v then toString v
|
||||
else if isBool v then boolToString v
|
||||
else abort "The Invoiceplane config value ${lib.generators.toPretty {} v} can not be encoded."
|
||||
;
|
||||
|
||||
extraConfig =
|
||||
hostName: cfg:
|
||||
let
|
||||
extraConfig = hostName: cfg: let
|
||||
settings = mapAttrsToList (k: v: "${k}=${mkPhpValue v}") cfg.settings;
|
||||
in
|
||||
pkgs.writeText "extraConfig.php" (concatStringsSep "\n" settings);
|
||||
in pkgs.writeText "extraConfig.php" (concatStringsSep "\n" settings);
|
||||
|
||||
pkg =
|
||||
hostName: cfg:
|
||||
pkgs.stdenv.mkDerivation rec {
|
||||
pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec {
|
||||
pname = "invoiceplane-${hostName}";
|
||||
version = src.version;
|
||||
src = pkgs.invoiceplane;
|
||||
|
|
@ -114,14 +92,11 @@ let
|
|||
ln -s ${extraConfig hostName cfg} $out/extraConfig.php
|
||||
|
||||
# symlink additional templates
|
||||
${concatMapStringsSep "\n" (
|
||||
template: "cp -r ${template}/. $out/application/views/invoice_templates/pdf/"
|
||||
) cfg.invoiceTemplates}
|
||||
${concatMapStringsSep "\n" (template: "cp -r ${template}/. $out/application/views/invoice_templates/pdf/") cfg.invoiceTemplates}
|
||||
'';
|
||||
};
|
||||
|
||||
siteOpts =
|
||||
{ name, ... }:
|
||||
siteOpts = { name, ... }:
|
||||
{
|
||||
options = {
|
||||
|
||||
|
|
@ -181,7 +156,7 @@ let
|
|||
|
||||
invoiceTemplates = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = [ ];
|
||||
default = [];
|
||||
description = ''
|
||||
List of path(s) to respective template(s) which are copied from the 'invoice_templates/pdf' directory.
|
||||
|
||||
|
|
@ -212,13 +187,7 @@ let
|
|||
};
|
||||
|
||||
poolConfig = mkOption {
|
||||
type =
|
||||
with types;
|
||||
attrsOf (oneOf [
|
||||
str
|
||||
int
|
||||
bool
|
||||
]);
|
||||
type = with types; attrsOf (oneOf [ str int bool ]);
|
||||
default = {
|
||||
"pm" = "dynamic";
|
||||
"pm.max_children" = 32;
|
||||
|
|
@ -235,7 +204,7 @@ let
|
|||
|
||||
settings = mkOption {
|
||||
type = types.attrsOf types.anything;
|
||||
default = { };
|
||||
default = {};
|
||||
description = ''
|
||||
Structural InvoicePlane configuration. Refer to
|
||||
<https://github.com/InvoicePlane/InvoicePlane/blob/master/ipconfig.php.example>
|
||||
|
|
@ -272,7 +241,9 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
disabledModules = [ "services/web-apps/invoiceplane.nix" ];
|
||||
disabledModules = [
|
||||
"services/web-apps/invoiceplane.nix"
|
||||
];
|
||||
|
||||
# interface
|
||||
options = {
|
||||
|
|
@ -281,15 +252,12 @@ in
|
|||
|
||||
options.sites = mkOption {
|
||||
type = types.attrsOf (types.submodule siteOpts);
|
||||
default = { };
|
||||
default = {};
|
||||
description = "Specification of one or more WordPress sites to serve";
|
||||
};
|
||||
|
||||
options.webserver = mkOption {
|
||||
type = types.enum [
|
||||
"caddy"
|
||||
"nginx"
|
||||
];
|
||||
type = types.enum [ "caddy" "nginx" ];
|
||||
default = "caddy";
|
||||
example = "nginx";
|
||||
description = ''
|
||||
|
|
@ -297,66 +265,57 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
default = {};
|
||||
description = "InvoicePlane configuration.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
# implementation
|
||||
config = mkIf (eachSite != { }) (mkMerge [
|
||||
{
|
||||
config = mkIf (eachSite != {}) (mkMerge [{
|
||||
|
||||
assertions = flatten (
|
||||
mapAttrsToList (hostName: cfg: [
|
||||
{
|
||||
assertion = cfg.database.createLocally -> cfg.database.user == user;
|
||||
assertions = flatten (mapAttrsToList (hostName: cfg: [
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.user == user;
|
||||
message = ''services.invoiceplane.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
|
||||
message = ''services.invoiceplane.sites."${hostName}".database.passwordFile cannot be specified if services.invoiceplane.sites."${hostName}".database.createLocally is set to true.'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.cron.enable -> cfg.cron.key != null;
|
||||
{ assertion = cfg.cron.enable -> cfg.cron.key != null;
|
||||
message = ''services.invoiceplane.sites."${hostName}".cron.key must be set in order to use cron service.'';
|
||||
}
|
||||
]) eachSite
|
||||
);
|
||||
]) eachSite);
|
||||
|
||||
services.mysql = mkIf (any (v: v.database.createLocally) (attrValues eachSite)) {
|
||||
enable = true;
|
||||
package = mkDefault pkgs.mariadb;
|
||||
ensureDatabases = mapAttrsToList (hostName: cfg: cfg.database.name) eachSite;
|
||||
ensureUsers = mapAttrsToList (hostName: cfg: {
|
||||
name = cfg.database.user;
|
||||
ensurePermissions = {
|
||||
"${cfg.database.name}.*" = "ALL PRIVILEGES";
|
||||
};
|
||||
}) eachSite;
|
||||
ensureUsers = mapAttrsToList (hostName: cfg:
|
||||
{ name = cfg.database.user;
|
||||
ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; };
|
||||
}
|
||||
) eachSite;
|
||||
};
|
||||
|
||||
services.phpfpm = {
|
||||
phpPackage = pkgs.php81;
|
||||
pools = mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair "invoiceplane-${hostName}" {
|
||||
pools = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "invoiceplane-${hostName}" {
|
||||
inherit user;
|
||||
group = webserver.group;
|
||||
settings = {
|
||||
"listen.owner" = webserver.user;
|
||||
"listen.group" = webserver.group;
|
||||
} // cfg.poolConfig;
|
||||
})
|
||||
) eachSite;
|
||||
}
|
||||
)) eachSite;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
|
||||
systemd.tmpfiles.rules = flatten (
|
||||
mapAttrsToList (hostName: cfg: [
|
||||
systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [
|
||||
"d ${cfg.stateDir} 0750 ${user} ${webserver.group} - -"
|
||||
"f ${cfg.stateDir}/ipconfig.php 0750 ${user} ${webserver.group} - -"
|
||||
"d ${cfg.stateDir}/logs 0750 ${user} ${webserver.group} - -"
|
||||
|
|
@ -366,20 +325,18 @@ in
|
|||
"d ${cfg.stateDir}/uploads/temp 0750 ${user} ${webserver.group} - -"
|
||||
"d ${cfg.stateDir}/uploads/temp/mpdf 0750 ${user} ${webserver.group} - -"
|
||||
"d ${cfg.stateDir}/tmp 0750 ${user} ${webserver.group} - -"
|
||||
]) eachSite
|
||||
);
|
||||
]) eachSite);
|
||||
|
||||
systemd.services.invoiceplane-config = {
|
||||
serviceConfig.Type = "oneshot";
|
||||
script = concatStrings (
|
||||
mapAttrsToList (hostName: cfg: ''
|
||||
script = concatStrings (mapAttrsToList (hostName: cfg:
|
||||
''
|
||||
mkdir -p ${cfg.stateDir}/logs \
|
||||
${cfg.stateDir}/uploads
|
||||
if ! grep -q IP_URL "${cfg.stateDir}/ipconfig.php"; then
|
||||
cp "${invoiceplane-config hostName cfg}" "${cfg.stateDir}/ipconfig.php"
|
||||
fi
|
||||
'') eachSite
|
||||
);
|
||||
'') eachSite);
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
|
|
@ -393,57 +350,50 @@ in
|
|||
|
||||
# Cron service implementation
|
||||
|
||||
systemd.timers = mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair "invoiceplane-cron-${hostName}" (
|
||||
mkIf cfg.cron.enable {
|
||||
systemd.timers = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnBootSec = "5m";
|
||||
OnUnitActiveSec = "5m";
|
||||
Unit = "invoiceplane-cron-${hostName}.service";
|
||||
};
|
||||
}
|
||||
))
|
||||
) eachSite;
|
||||
})
|
||||
)) eachSite;
|
||||
|
||||
systemd.services = mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair "invoiceplane-cron-${hostName}" (
|
||||
mkIf cfg.cron.enable {
|
||||
systemd.services =
|
||||
mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "invoiceplane-cron-${hostName}" (mkIf cfg.cron.enable {
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = user;
|
||||
ExecStart = "${pkgs.curl}/bin/curl --header 'Host: ${hostName}' http://localhost/invoices/cron/recur/${cfg.cron.key}";
|
||||
};
|
||||
}
|
||||
))
|
||||
) eachSite;
|
||||
})
|
||||
)) eachSite;
|
||||
|
||||
}
|
||||
|
||||
(mkIf (cfg.webserver == "caddy") {
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts = mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair "http://${hostName}" {
|
||||
virtualHosts = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair "http://${hostName}" {
|
||||
extraConfig = ''
|
||||
root * ${pkg hostName cfg}
|
||||
file_server
|
||||
php_fastcgi unix/${config.services.phpfpm.pools."invoiceplane-${hostName}".socket}
|
||||
'';
|
||||
})
|
||||
) eachSite;
|
||||
}
|
||||
)) eachSite;
|
||||
};
|
||||
})
|
||||
|
||||
(mkIf (cfg.webserver == "nginx") {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts = mapAttrs' (
|
||||
hostName: cfg:
|
||||
(nameValuePair hostName {
|
||||
virtualHosts = mapAttrs' (hostName: cfg: (
|
||||
nameValuePair hostName {
|
||||
root = pkg hostName cfg;
|
||||
extraConfig = ''
|
||||
index index.php index.html index.htm;
|
||||
|
|
@ -472,8 +422,8 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
})
|
||||
) eachSite;
|
||||
}
|
||||
)) eachSite;
|
||||
};
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
home-manager.users."${psCfg.user.name}" = {
|
||||
systemd.user.services.nextcloud-client = import ./nextcloud.service.nix pkgs;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
pkgs: {
|
||||
Unit = {
|
||||
Description = "Nextcloud Client";
|
||||
BindsTo = [ "sway-session.target" ];
|
||||
Wants = [ "graphical-session-pre.target" ];
|
||||
After = [ "graphical-session-pre.target" ];
|
||||
BindsTo = ["sway-session.target"];
|
||||
Wants = ["graphical-session-pre.target"];
|
||||
After = ["graphical-session-pre.target"];
|
||||
# ConditionEnvironment requires systemd v247 to work correctly
|
||||
ConditionEnvironment = [ "WAYLAND_DISPLAY" ];
|
||||
ConditionEnvironment = ["WAYLAND_DISPLAY"];
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
|
|
@ -15,6 +15,6 @@ pkgs: {
|
|||
Restart = "on-failure";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "sway-session.target" ];
|
||||
WantedBy = ["sway-session.target"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,8 @@
|
|||
lib,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
{
|
||||
nixpkgs.config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (lib.getName pkg) [
|
||||
}: {
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"1password"
|
||||
"1password-cli"
|
||||
"brscan5"
|
||||
|
|
@ -22,7 +19,7 @@
|
|||
];
|
||||
|
||||
system.activationScripts.diff-closures = {
|
||||
text = ''
|
||||
text =''
|
||||
if [[ -e /run/current-system ]]; then
|
||||
${config.nix.package}/bin/nix store diff-closures \
|
||||
/run/current-system "$systemConfig" \
|
||||
|
|
@ -45,22 +42,24 @@
|
|||
system.flake = flake.self;
|
||||
};
|
||||
|
||||
|
||||
settings = {
|
||||
# Improve nix store disk usage
|
||||
auto-optimise-store = true;
|
||||
# Prevents impurities in builds
|
||||
sandbox = true;
|
||||
# Give root and @wheel special privileges with nix
|
||||
trusted-users = [
|
||||
"root"
|
||||
"@wheel"
|
||||
];
|
||||
trusted-users = ["root" "@wheel"];
|
||||
# Allow only group wheel to connect to the nix daemon
|
||||
allowed-users = [ "@wheel" ];
|
||||
allowed-users = ["@wheel"];
|
||||
|
||||
substituters = [ "https://pub-solar.cachix.org/" ];
|
||||
substituters = [
|
||||
"https://pub-solar.cachix.org/"
|
||||
];
|
||||
|
||||
trusted-public-keys = [ "pub-solar.cachix.org-1:ZicXIxKgdxMtgSJECWR8iihZxHRvu8ObL4n2cuBmtos=" ];
|
||||
trusted-public-keys = [
|
||||
"pub-solar.cachix.org-1:ZicXIxKgdxMtgSJECWR8iihZxHRvu8ObL4n2cuBmtos="
|
||||
];
|
||||
};
|
||||
|
||||
# Generally useful nix option defaults
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
programs.evince.enable = true;
|
||||
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
services.avahi.enable = true;
|
||||
services.avahi.ipv6 = true;
|
||||
services.avahi.nssmdns4 = true;
|
||||
|
|
@ -17,7 +16,7 @@ in
|
|||
|
||||
services.printing.enable = true;
|
||||
services.printing.browsing = true;
|
||||
services.printing.listenAddresses = [ "localhost:631" ];
|
||||
services.printing.listenAddresses = ["localhost:631"];
|
||||
services.printing.defaultShared = lib.mkDefault false;
|
||||
|
||||
services.printing.drivers = [
|
||||
|
|
@ -31,13 +30,10 @@ in
|
|||
};
|
||||
|
||||
users.users."${psCfg.user.name}" = {
|
||||
extraGroups = [
|
||||
"lp"
|
||||
"scanner"
|
||||
];
|
||||
extraGroups = ["lp" "scanner"];
|
||||
};
|
||||
|
||||
networking.hosts = flake.self.lib.addLocalHostname [ "cups.local" ];
|
||||
networking.hosts = flake.self.lib.addLocalHostname ["cups.local"];
|
||||
|
||||
# Allow port 8612, used by sane-pixma(5) for scanner detection
|
||||
networking.firewall.allowedTCPPorts = [ 8612 ];
|
||||
|
|
|
|||
|
|
@ -3,28 +3,19 @@
|
|||
flake,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
in
|
||||
{
|
||||
in {
|
||||
enable = true;
|
||||
|
||||
historyControl = [
|
||||
"ignoredups"
|
||||
"ignorespace"
|
||||
];
|
||||
historyControl = ["ignoredups" "ignorespace"];
|
||||
historyFileSize = 300000;
|
||||
|
||||
# Run when initializing a login shell
|
||||
profileExtra =
|
||||
if config.programs.sway.enable then
|
||||
''
|
||||
profileExtra = if config.programs.sway.enable then ''
|
||||
[ "$(tty)" = "/dev/tty1" ] && exec systemd-cat --identifier=sway ${pkgs.sway}/bin/sway
|
||||
''
|
||||
else
|
||||
"";
|
||||
'' else "";
|
||||
|
||||
# Run when initializing an interactive shell
|
||||
initExtra = ''
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
cfg = config.pub-solar.terminal-life;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.pub-solar.terminal-life = {
|
||||
full = lib.mkOption {
|
||||
description = ''
|
||||
|
|
@ -27,9 +26,7 @@ in
|
|||
# until https://github.com/nix-community/nix-index/pull/227 is merged
|
||||
programs.nix-index.enableBashIntegration = false;
|
||||
|
||||
users.users."${psCfg.user.name}".packages =
|
||||
with pkgs;
|
||||
[
|
||||
users.users."${psCfg.user.name}".packages = with pkgs; [
|
||||
asciinema
|
||||
bat
|
||||
blesh
|
||||
|
|
@ -38,16 +35,17 @@ in
|
|||
fd
|
||||
jump
|
||||
(nnn.overrideAttrs (o: {
|
||||
patches = (o.patches or [ ]) ++ [ ./nnn/0001-feat-use-wasd-keybindings-for-jkli.patch ];
|
||||
patches =
|
||||
(o.patches or [])
|
||||
++ [
|
||||
./nnn/0001-feat-use-wasd-keybindings-for-jkli.patch
|
||||
];
|
||||
}))
|
||||
powerline
|
||||
ripgrep
|
||||
screen
|
||||
watson
|
||||
]
|
||||
++ (
|
||||
if cfg.full then
|
||||
[
|
||||
] ++ (if cfg.full then [
|
||||
binutils
|
||||
jq
|
||||
|
||||
|
|
@ -60,10 +58,7 @@ in
|
|||
nixpkgs-review
|
||||
nix-update
|
||||
nix-search-cli
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
);
|
||||
] else []);
|
||||
|
||||
# Get completion for system packages
|
||||
# https://nix-community.github.io/home-manager/options.xhtml#opt-programs.bash.enableCompletion
|
||||
|
|
@ -116,7 +111,7 @@ in
|
|||
xdg.dataFile."nvim/json-schemas/caddy_schema.json".source = .local/share/nvim/json-schemas/caddy_schema.json;
|
||||
xdg.dataFile."nvim/templates/.keep".text = "";
|
||||
|
||||
programs.git = import ./git { };
|
||||
programs.git = import ./git {};
|
||||
xdg.configFile."git/config".text = import ./.config/git/config.nix {
|
||||
inherit config;
|
||||
inherit pkgs;
|
||||
|
|
@ -130,7 +125,7 @@ in
|
|||
inherit pkgs;
|
||||
};
|
||||
|
||||
programs.direnv = import ./direnv { };
|
||||
programs.direnv = import ./direnv {};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
enable = true;
|
||||
defaultCommand = "fd --hidden --type f --exclude .git";
|
||||
defaultOptions = [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,11 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
psCfg = config.pub-solar;
|
||||
cfg = config.pub-solar.terminal-life;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
in
|
||||
{
|
||||
in {
|
||||
enable = true;
|
||||
|
||||
viAlias = true;
|
||||
|
|
@ -27,7 +25,7 @@ in
|
|||
# ansible-language-server
|
||||
# clang-tools
|
||||
# gopls
|
||||
nodePackages.bash-language-server
|
||||
# nodePackages.bash-language-server
|
||||
# nodePackages.svelte-language-server
|
||||
# nodePackages.typescript
|
||||
# nodePackages.typescript-language-server
|
||||
|
|
@ -37,18 +35,18 @@ in
|
|||
# lua-language-server
|
||||
# cmake-language-server
|
||||
# vim-language-server
|
||||
yaml-language-server
|
||||
nodePackages.dockerfile-language-server-nodejs
|
||||
docker-compose-language-service
|
||||
# yaml-language-server
|
||||
# python3Packages.python-lsp-server
|
||||
# nodePackages.dockerfile-language-server-nodejs
|
||||
# docker-compose-language-service
|
||||
# rust-analyzer
|
||||
# cargo
|
||||
# solargraph
|
||||
# terraform-ls
|
||||
# python3Full
|
||||
];
|
||||
|
||||
plugins =
|
||||
with pkgs.vimPlugins;
|
||||
[
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
# The status bar in the bottom of the screen with the mode indication and file location
|
||||
vim-airline
|
||||
|
||||
|
|
@ -101,10 +99,7 @@ in
|
|||
|
||||
# Work with tags files
|
||||
vim-gutentags
|
||||
]
|
||||
++ (
|
||||
if cfg.full then
|
||||
[
|
||||
] ++ (if cfg.full then [
|
||||
nvim-treesitter.withAllGrammars
|
||||
|
||||
# Dependencies for nvim-lspconfig
|
||||
|
|
@ -125,13 +120,9 @@ in
|
|||
|
||||
# JSON schemas
|
||||
SchemaStore-nvim
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
);
|
||||
] else []);
|
||||
|
||||
extraConfig = builtins.concatStringsSep "\n" (
|
||||
[
|
||||
extraConfig = builtins.concatStringsSep "\n" ([
|
||||
''
|
||||
" Persistent undo
|
||||
set undofile
|
||||
|
|
@ -145,15 +136,8 @@ in
|
|||
(builtins.readFile ./clipboard.vim)
|
||||
(builtins.readFile ./ui.vim)
|
||||
(builtins.readFile ./lastplace.lua)
|
||||
]
|
||||
++ (
|
||||
if cfg.full then
|
||||
[
|
||||
] ++ (if cfg.full then [
|
||||
(builtins.readFile ./lsp.vim)
|
||||
(builtins.readFile ./cmp.vim)
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
)
|
||||
);
|
||||
] else []));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
psCfg = config.pub-solar;
|
||||
inherit (lib) mkIf mkOption types;
|
||||
in
|
||||
{
|
||||
imports = [ ./home.nix ];
|
||||
imports = [
|
||||
./home.nix
|
||||
];
|
||||
|
||||
options.pub-solar = {
|
||||
user = {
|
||||
|
|
@ -36,7 +37,7 @@ in
|
|||
publicKeys = mkOption {
|
||||
description = "User SSH public keys";
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
default = [];
|
||||
};
|
||||
fullName = mkOption {
|
||||
description = "User full name";
|
||||
|
|
@ -73,18 +74,24 @@ in
|
|||
"wheel"
|
||||
];
|
||||
shell = pkgs.bash;
|
||||
initialHashedPassword = if psCfg.user.password != null then psCfg.user.password else "";
|
||||
openssh.authorizedKeys.keys = if psCfg.user.publicKeys != null then psCfg.user.publicKeys else [ ];
|
||||
initialHashedPassword =
|
||||
if psCfg.user.password != null
|
||||
then psCfg.user.password
|
||||
else "";
|
||||
openssh.authorizedKeys.keys =
|
||||
if psCfg.user.publicKeys != null
|
||||
then psCfg.user.publicKeys
|
||||
else [];
|
||||
};
|
||||
};
|
||||
|
||||
security.sudo.extraRules = mkIf psCfg.user.passwordlessSudo [
|
||||
{
|
||||
users = [ "${psCfg.user.name}" ];
|
||||
users = ["${psCfg.user.name}"];
|
||||
commands = [
|
||||
{
|
||||
command = "ALL";
|
||||
options = [ "NOPASSWD" ];
|
||||
options = ["NOPASSWD"];
|
||||
}
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,10 @@
|
|||
let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
in
|
||||
{
|
||||
imports = [ ./session-variables.nix ];
|
||||
in {
|
||||
imports = [
|
||||
./session-variables.nix
|
||||
];
|
||||
|
||||
home-manager.users."${psCfg.user.name}" = {
|
||||
# Let Home Manager install and manage itself.
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
{
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"application/octet-stream" = [ "firefox.desktop" ];
|
||||
"application/pdf" = [ "org.gnome.Evince.desktop" ];
|
||||
"application/x-bittorrent" = [ "deluge.desktop" ];
|
||||
"application/x-extension-htm" = [ "firefox.desktop" ];
|
||||
"application/x-extension-html" = [ "firefox.desktop" ];
|
||||
"application/x-extension-shtml" = [ "firefox.desktop" ];
|
||||
"application/x-extension-xhtml" = [ "firefox.desktop" ];
|
||||
"application/x-extension-xht" = [ "firefox.desktop" ];
|
||||
"application/xhtml+xml" = [ "firefox.desktop" ];
|
||||
"image/jpeg" = [ "org.gnome.eog.desktop" ];
|
||||
"image/png" = [ "org.gnome.eog.desktop" ];
|
||||
"message/rfc822" = [ "userapp-Thunderbird.desktop" ];
|
||||
"text/html" = [ "firefox.desktop" ];
|
||||
"text/plain" = [ "firefox.desktop" ];
|
||||
"video/mp4" = [ "vlc.desktop" ];
|
||||
"x-scheme-handler/chrome" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/ftp" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/http" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/https" = [ "firefox.desktop" ];
|
||||
"x-scheme-handler/mailto" = [ "userapp-Thunderbird.desktop" ];
|
||||
"x-scheme-handler/msteams" = [ "teams.desktop" ];
|
||||
"x-scheme-handler/tg" = [ "userapp-Telegram Desktop-JBKFU0.desktop" ];
|
||||
"application/octet-stream" = ["firefox.desktop"];
|
||||
"application/pdf" = ["org.gnome.Evince.desktop"];
|
||||
"application/x-bittorrent" = ["deluge.desktop"];
|
||||
"application/x-extension-htm" = ["firefox.desktop"];
|
||||
"application/x-extension-html" = ["firefox.desktop"];
|
||||
"application/x-extension-shtml" = ["firefox.desktop"];
|
||||
"application/x-extension-xhtml" = ["firefox.desktop"];
|
||||
"application/x-extension-xht" = ["firefox.desktop"];
|
||||
"application/xhtml+xml" = ["firefox.desktop"];
|
||||
"image/jpeg" = ["org.gnome.eog.desktop"];
|
||||
"image/png" = ["org.gnome.eog.desktop"];
|
||||
"message/rfc822" = ["userapp-Thunderbird.desktop"];
|
||||
"text/html" = ["firefox.desktop"];
|
||||
"text/plain" = ["firefox.desktop"];
|
||||
"video/mp4" = ["vlc.desktop"];
|
||||
"x-scheme-handler/chrome" = ["firefox.desktop"];
|
||||
"x-scheme-handler/ftp" = ["firefox.desktop"];
|
||||
"x-scheme-handler/http" = ["firefox.desktop"];
|
||||
"x-scheme-handler/https" = ["firefox.desktop"];
|
||||
"x-scheme-handler/mailto" = ["userapp-Thunderbird.desktop"];
|
||||
"x-scheme-handler/msteams" = ["teams.desktop"];
|
||||
"x-scheme-handler/tg" = ["userapp-Telegram Desktop-JBKFU0.desktop"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
}: let
|
||||
psCfg = config.pub-solar;
|
||||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
variables = {
|
||||
|
|
@ -85,8 +84,7 @@ let
|
|||
FZF_DEFAULT_OPTS = lib.mkForce "--color=bg+:#2d2a2e,bg:#1a181a,spinner:#ef9062,hl:#7accd7 --color=fg:#d3d1d4,header:#7accd7,info:#e5c463,pointer:#ef9062 --color=marker:#ef9062,fg+:#d3d1d4,prompt:#e5c463,hl+:#7accd7";
|
||||
|
||||
# nnn theme colors
|
||||
NNN_FCOLORS =
|
||||
let
|
||||
NNN_FCOLORS = let
|
||||
BLK = "04";
|
||||
CHR = "04";
|
||||
DIR = "04";
|
||||
|
|
@ -102,8 +100,7 @@ let
|
|||
in
|
||||
BLK + CHR + DIR + EXE + REG + HARDLINK + SYMLINK + MISSING + ORPHAN + FIFO + SOCK + OTHER;
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
environment.variables = variables;
|
||||
|
||||
home-manager.users."${psCfg.user.name}" = {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,7 @@
|
|||
}:
|
||||
let
|
||||
psCfg = config.pub-solar;
|
||||
in
|
||||
{
|
||||
in {
|
||||
boot.kernelParams = [
|
||||
"amd_iommu=on"
|
||||
"intel_iommu=on"
|
||||
|
|
@ -19,7 +18,7 @@ in
|
|||
qemu.ovmf.enable = true;
|
||||
};
|
||||
users.users."${psCfg.user.name}" = {
|
||||
extraGroups = [ "libvirtd" ];
|
||||
extraGroups = ["libvirtd"];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
@ -38,10 +37,12 @@ in
|
|||
|
||||
home-manager.users."${psCfg.user.name}" = {
|
||||
xdg.dataFile."libvirt/.keep".text = "# this file is here to generate the directory";
|
||||
home.packages = [ pkgs.obs-studio-plugins.looking-glass-obs ];
|
||||
home.packages = [pkgs.obs-studio-plugins.looking-glass-obs];
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 ${psCfg.user.name} kvm" ];
|
||||
systemd.tmpfiles.rules = [
|
||||
"f /dev/shm/looking-glass 0660 ${psCfg.user.name} kvm"
|
||||
];
|
||||
#networking.bridges.virbr1.interfaces = [];
|
||||
#networking.interfaces.virbr1 = {
|
||||
# ipv4.addresses = [
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@ let
|
|||
psCfg = config.pub-solar;
|
||||
cfg = config.pub-solar.wireguard-client;
|
||||
inherit (lib) mkOption types;
|
||||
in
|
||||
{
|
||||
in {
|
||||
options.pub-solar.wireguard-client = {
|
||||
ownIPs = mkOption {
|
||||
description = ''
|
||||
|
|
@ -27,7 +26,7 @@ in
|
|||
};
|
||||
|
||||
config = {
|
||||
networking.firewall.allowedUDPPorts = [ 51899 ];
|
||||
networking.firewall.allowedUDPPorts = [51899];
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
|
|
|
|||
|
|
@ -3,14 +3,18 @@ final: prev: {
|
|||
inherit (prev.sources.blesh-nvfetcher) version src;
|
||||
|
||||
dontBuild = false;
|
||||
buildInputs = [ prev.gitMinimal ];
|
||||
buildInputs = [
|
||||
prev.gitMinimal
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace GNUmakefile \
|
||||
--replace "git submodule update --init --recursive" ""
|
||||
'';
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
installFlags = [
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
source $stdenv/setup
|
||||
|
|
|
|||
|
|
@ -3,22 +3,16 @@
|
|||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
flake = {
|
||||
nixosModules = rec {
|
||||
overlays = (
|
||||
{ ... }:
|
||||
{
|
||||
overlays = ({ ... }: {
|
||||
nixpkgs.overlays = [
|
||||
(
|
||||
final: prev:
|
||||
(final: prev:
|
||||
let
|
||||
unstable = import inputs.unstable {
|
||||
system = prev.system;
|
||||
config.allowUnfreePredicate =
|
||||
pkg:
|
||||
builtins.elem (prev.lib.getName pkg) [
|
||||
config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
|
||||
"1password"
|
||||
"1password-cli"
|
||||
"slack"
|
||||
|
|
@ -29,8 +23,7 @@
|
|||
neovim-unwrapped = unstable.neovim-unwrapped;
|
||||
vimPlugins = unstable.vimPlugins;
|
||||
#vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
|
||||
}
|
||||
)
|
||||
})
|
||||
(import ../pkgs)
|
||||
(import ./blesh.nix)
|
||||
(import ./mdbook-multilang.nix inputs)
|
||||
|
|
@ -38,8 +31,7 @@
|
|||
(import ./prr.nix)
|
||||
(import ./neovim-plugins.nix)
|
||||
];
|
||||
}
|
||||
);
|
||||
});
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,12 +11,10 @@ inputs: final: prev: {
|
|||
sha256 = "sha256-gJnQKHssO2ChiT4d037Lncd7hiOa5uh756p8TzPzbgQ=";
|
||||
};
|
||||
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (
|
||||
prev.lib.const {
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
|
||||
name = "${pname}-vendor.tar.gz";
|
||||
inherit src;
|
||||
outputHash = "sha256-QCEyl5FZqECYYb5eRm8mn+R6owt+CLQwCq/AMMPygE0=";
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
final: prev: {
|
||||
vimPlugins = prev.vimPlugins // {
|
||||
vimPlugins =
|
||||
prev.vimPlugins
|
||||
// {
|
||||
instant-nvim-nvfetcher = prev.vimUtils.buildVimPlugin {
|
||||
inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,13 +9,11 @@ final: prev: {
|
|||
};
|
||||
version = "unstable-2024-06-12";
|
||||
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (
|
||||
prev.lib.const {
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
|
||||
name = "${pname}-vendor.tar.gz";
|
||||
inherit src;
|
||||
outputHash = "sha256-pZCGeZK5AJrxcrqXC5NZhGDda+90rRdWXy00CYD8SYY=";
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace etc/command-not-found.* \
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@ final: prev: {
|
|||
meta = with prev.lib; {
|
||||
homepage = "https://github.com/TritonDataCenter/prr";
|
||||
description = "Tooling to assist with GitHub pull requests";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ teutat3s ];
|
||||
platforms = ["x86_64-linux"];
|
||||
maintainers = with maintainers; [teutat3s];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
self:
|
||||
with self;
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cockroachdb";
|
||||
version = "22.2.7";
|
||||
|
||||
|
|
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
|
|||
url = "https://binaries.cockroachdb.com/cockroach-v${version}.linux-amd64.tgz";
|
||||
sha256 = "sha256-do426BaZdPqXcc/aQnRAgVTBCJ/OiNbSuCpwVTM2m0I=";
|
||||
};
|
||||
buildInputs = [ stdenv.cc.cc ];
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
buildInputs = [stdenv.cc.cc];
|
||||
nativeBuildInputs = [autoPatchelfHook];
|
||||
|
||||
installPhase = ''
|
||||
install -D -m755 cockroach $out/bin/cockroach
|
||||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
homepage = "https://www.cockroachlabs.com";
|
||||
description = "A scalable, survivable, strongly-consistent SQL database";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = ["x86_64-linux"];
|
||||
maintainers = [ lib.maintainers.mic92 ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
final: prev: with prev; {
|
||||
final: prev:
|
||||
with prev; {
|
||||
# keep sources this first
|
||||
sources = callPackage (import ./_sources/generated.nix) { };
|
||||
sources = callPackage (import ./_sources/generated.nix) {};
|
||||
# then, call packages with `final.callPackage`
|
||||
gpu-switch = writeShellScriptBin "gpu-switch" (import ./gpu-switch.nix final);
|
||||
import-gtk-settings = writeShellScriptBin "import-gtk-settings" (
|
||||
import ./import-gtk-settings.nix final
|
||||
);
|
||||
import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
|
||||
lgcl = writeShellScriptBin "lgcl" (import ./lgcl.nix final);
|
||||
mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
|
||||
mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
|
||||
|
|
@ -19,9 +18,7 @@ final: prev: with prev; {
|
|||
swaylock-bg = writeShellScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
|
||||
toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
|
||||
wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
|
||||
drone-docker-runner = writeShellScriptBin "drone-docker-runner" (
|
||||
import ./drone-docker-runner.nix final
|
||||
);
|
||||
drone-docker-runner = writeShellScriptBin "drone-docker-runner" (import ./drone-docker-runner.nix final);
|
||||
record-screen = writeShellScriptBin "record-screen" (import ./record-screen.nix final);
|
||||
cockroach-bin = import ./cockroach.nix final;
|
||||
prison-break = import ./prison-break.nix final;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
case $1 in
|
||||
start)
|
||||
${self.docker}/bin/docker run --detach \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
# Copyright (c) 2014-2015 Bruno Bierbaumer, Andreas Heider
|
||||
|
||||
readonly sysfs_efi_vars='/sys/firmware/efi/efivars'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
# usage: import-gsettings <gsettings key>:<settings.ini key> <gsettings key>:<settings.ini key> ...
|
||||
|
||||
expression=""
|
||||
|
|
|
|||
|
|
@ -1,13 +1,8 @@
|
|||
self:
|
||||
with self;
|
||||
let
|
||||
with self; let
|
||||
looking-glass-client = self.looking-glass-client.overrideAttrs (old: {
|
||||
meta.platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
meta.platforms = ["x86_64-linux" "aarch64-linux"];
|
||||
});
|
||||
in
|
||||
''
|
||||
in ''
|
||||
${looking-glass-client}/bin/looking-glass-client -f /dev/shm/looking-glass input:ignoreWindowsKeys=yes input:grabKeyboardOnFocus=no
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
mkdir -p $XDG_CACHE_HOME/log
|
||||
|
||||
LOGFILE=$XDG_CACHE_HOME/log/mailto.log
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
self:
|
||||
with self;
|
||||
let
|
||||
with self; let
|
||||
websocket-client = python3.pkgs.buildPythonPackage rec {
|
||||
pname = "websocket-client";
|
||||
version = "1.2.1";
|
||||
|
|
@ -11,7 +10,7 @@ let
|
|||
};
|
||||
};
|
||||
in
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "Mopidy-Jellyfin";
|
||||
version = "1.0.2";
|
||||
doCheck = false;
|
||||
|
|
@ -27,4 +26,4 @@ python3.pkgs.buildPythonPackage rec {
|
|||
inherit pname version;
|
||||
sha256 = "sha256-5XimIIQSpvNyQbSOFtSTkA0jhA0V68BbyQEQNnov+0g=";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
exec ${alacritty}/bin/alacritty --class mu_vimpc --option dimensions.columns=120 --option dimensions.lines=80 -e vimpc -- "$@"
|
||||
''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
#
|
||||
# ack recursively through notes
|
||||
#
|
||||
|
|
|
|||
|
|
@ -27,13 +27,15 @@ python3.pkgs.buildPythonPackage {
|
|||
rev = "15079bb094d37eeba92e17abfb98523076c5800c";
|
||||
sha256 = "sha256-MDzAmeJ6wsTm5+unIsYAZmErVN4sEAfih3YwbXkVIPg=";
|
||||
};
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs;[
|
||||
docopt
|
||||
requests
|
||||
beautifulsoup4
|
||||
notify2
|
||||
straight-plugin
|
||||
];
|
||||
patches = [ ./prison-break-url.patch ];
|
||||
patches = [
|
||||
./prison-break-url.patch
|
||||
];
|
||||
checkInputs = [ python3.pkgs.black ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
self:
|
||||
with self;
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "psos-docs";
|
||||
version = "0.0.1";
|
||||
buildInputs = [
|
||||
|
|
@ -10,10 +10,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = ../docs/..; # wut
|
||||
|
||||
phases = [
|
||||
"buildPhase"
|
||||
"installPhase"
|
||||
];
|
||||
phases = ["buildPhase" "installPhase"];
|
||||
|
||||
buildPhase = ''
|
||||
cp -r $src/doc ./doc
|
||||
|
|
@ -27,4 +24,4 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/lib/
|
||||
cp -r doc/book $out/lib/html
|
||||
'';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
case $1 in
|
||||
rebuild)
|
||||
shift;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
mkdir -p "$HOME/Videos/Screenrecordings"
|
||||
GEOMETRY="$(slurp -d -b \#ffffff11)"
|
||||
RESOLUTION="$(echo $GEOMETRY | awk '{print $2}')"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
case $1 in
|
||||
d)
|
||||
shift;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
self: with self; ''
|
||||
self:
|
||||
with self; ''
|
||||
echo "$@"
|
||||
DUPLEX=,Duplex
|
||||
removeempty="true"
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue