mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
nixfmt changes
This commit is contained in:
parent
92c371e3f6
commit
3897ba30d8
SSH key fingerprint:
SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
37 changed files with 131 additions and 131 deletions
|
|
@ -43,7 +43,7 @@ _:
|
|||
|
||||
inherit (pkgs.wineWowPackages) unstableFull;
|
||||
inherit (pkgs.libsForQt5) kdenlive;
|
||||
librewolf = pkgs.librewolf.override {cfg.speechSynthesisSupport = false;};
|
||||
librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; };
|
||||
};
|
||||
etc = {
|
||||
"jdks/17".source = "${pkgs.openjdk17}/bin";
|
||||
|
|
@ -65,7 +65,7 @@ _:
|
|||
useDefaultShell = true;
|
||||
uid = 1000;
|
||||
isNormalUser = true;
|
||||
extraGroups = ["audio"];
|
||||
extraGroups = [ "audio" ];
|
||||
initialHashedPassword = "";
|
||||
};
|
||||
"root" = {
|
||||
|
|
@ -88,7 +88,7 @@ _:
|
|||
modesetting.enable = true;
|
||||
};
|
||||
services.xserver = {
|
||||
videoDrivers = ["nvidia"];
|
||||
videoDrivers = [ "nvidia" ];
|
||||
#disable DPMS
|
||||
monitorSection = ''
|
||||
Option "DPMS" "false"
|
||||
|
|
@ -110,7 +110,7 @@ _:
|
|||
"xhci_pci"
|
||||
"ahci"
|
||||
];
|
||||
kernelModules = ["kvm-amd"];
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
swapDevices = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{pkgs, config, ...}:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{nvim-flake, self, ...}:
|
||||
{pkgs, config, ...}:
|
||||
{ nvim-flake, self, ... }:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
local = {
|
||||
remoteBuild.isBuilder = true;
|
||||
|
|
@ -13,9 +13,9 @@
|
|||
enable = true;
|
||||
kmscon.enable = true;
|
||||
};
|
||||
allowedUnfree = ["nvidia-x11"];
|
||||
allowedUnfree = [ "nvidia-x11" ];
|
||||
};
|
||||
boot.binfmt.emulatedSystems = ["aarch64-linux"];
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.beta;
|
||||
nvidiaPersistenced = false;
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
enable = true;
|
||||
loadInNixShell = false;
|
||||
silent = true;
|
||||
nix-direnv.package = pkgs.nix-direnv.override {nix = config.nix.package;};
|
||||
nix-direnv.package = pkgs.nix-direnv.override { nix = config.nix.package; };
|
||||
};
|
||||
|
||||
nix.settings.system-features = [
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
;
|
||||
inherit (nvim-flake.packages) neovim;
|
||||
inherit (self.packages) lint nixfmt;
|
||||
librewolf = pkgs.librewolf.override {cfg.speechSynthesisSupport = false;};
|
||||
librewolf = pkgs.librewolf.override { cfg.speechSynthesisSupport = false; };
|
||||
};
|
||||
etc = {
|
||||
"jdks/17".source = "${pkgs.openjdk17}/bin";
|
||||
|
|
@ -101,16 +101,16 @@
|
|||
networks = {
|
||||
"enp11s0" = {
|
||||
name = "enp11s0";
|
||||
bridge = ["br0"];
|
||||
bridge = [ "br0" ];
|
||||
linkConfig.RequiredForOnline = "enslaved";
|
||||
};
|
||||
"br0" = {
|
||||
name = "br0";
|
||||
address = ["192.168.1.4/24"];
|
||||
gateway = ["192.168.1.1"];
|
||||
dns = ["192.168.1.1"];
|
||||
address = [ "192.168.1.4/24" ];
|
||||
gateway = [ "192.168.1.1" ];
|
||||
dns = [ "192.168.1.1" ];
|
||||
DHCP = "no";
|
||||
bridgeConfig = {};
|
||||
bridgeConfig = { };
|
||||
linkConfig = {
|
||||
MACAddress = "D8:5E:D3:E5:47:90";
|
||||
RequiredForOnline = "routable";
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
};
|
||||
};
|
||||
boot = {
|
||||
kernelModules = ["amdgpu"];
|
||||
kernelModules = [ "amdgpu" ];
|
||||
initrd = {
|
||||
availableKernelModules = [
|
||||
"nvme"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
_:
|
||||
{config, pkgs, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
sops.secrets.cloudflare = {};
|
||||
sops.secrets.cloudflare = { };
|
||||
|
||||
systemd.services.ddns = {
|
||||
reloadIfChanged = false;
|
||||
|
|
@ -11,9 +11,9 @@ _:
|
|||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
wantedBy = ["multi-user.target"];
|
||||
wants = ["network-online.target"];
|
||||
after = ["network-online.target"];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
startAt = "*:0/30";
|
||||
|
||||
serviceConfig = {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
_:
|
||||
{config, ...}:
|
||||
{ config, ... }:
|
||||
{
|
||||
users.users = {
|
||||
${config.services.gitea.user} = {
|
||||
openssh.authorizedKeys.keys = [config.local.keys.gerg_gerg-desktop];
|
||||
extraGroups = ["postgres"];
|
||||
openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ];
|
||||
extraGroups = [ "postgres" ];
|
||||
};
|
||||
${config.services.nginx.user}.extraGroups = [config.services.gitea.group];
|
||||
${config.services.nginx.user}.extraGroups = [ config.services.gitea.group ];
|
||||
};
|
||||
services.gitea = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{self, ...}:
|
||||
{lib, ...}:
|
||||
{ self, ... }:
|
||||
{ lib, ... }:
|
||||
{
|
||||
# I manually switch this sometimes
|
||||
config = lib.mkIf false {
|
||||
networking.firewall.allowedTCPPorts = [25565];
|
||||
networking.firewall.allowedTCPPorts = [ 25565 ];
|
||||
|
||||
users.users.minecraft = {
|
||||
description = "Minecraft server service user";
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
isSystemUser = true;
|
||||
group = "minecraft";
|
||||
};
|
||||
users.groups.minecraft = {};
|
||||
users.groups.minecraft = { };
|
||||
|
||||
systemd.sockets.minecraft-server = {
|
||||
bindsTo = ["minecraft-server.service"];
|
||||
bindsTo = [ "minecraft-server.service" ];
|
||||
socketConfig = {
|
||||
ListenFIFO = "/run/minecraft-server.stdin";
|
||||
SocketMode = "0660";
|
||||
|
|
@ -29,13 +29,13 @@
|
|||
systemd.services.minecraft-server = {
|
||||
enable = true;
|
||||
description = "Minecraft Server Service";
|
||||
wantedBy = ["multi-user.target"];
|
||||
requires = ["minecraft-server.socket"];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
requires = [ "minecraft-server.socket" ];
|
||||
after = [
|
||||
"network.target"
|
||||
"minecraft-server.socket"
|
||||
];
|
||||
path = [self.packages.papermc];
|
||||
path = [ self.packages.papermc ];
|
||||
script = ''
|
||||
minecraft-server \
|
||||
-Xms8G \
|
||||
|
|
@ -71,8 +71,8 @@
|
|||
StandardError = "journal";
|
||||
|
||||
# Hardening
|
||||
CapabilityBoundingSet = [""];
|
||||
DeviceAllow = [""];
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
LockPersonality = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ _:
|
|||
...
|
||||
}:
|
||||
{
|
||||
sops.secrets.minifluxenv = {};
|
||||
sops.secrets.minifluxenv = { };
|
||||
|
||||
systemd.services = {
|
||||
miniflux = {
|
||||
description = "Miniflux service";
|
||||
wantedBy = ["multi-user.target"];
|
||||
requires = ["miniflux-dbsetup.service"];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
requires = [ "miniflux-dbsetup.service" ];
|
||||
after = [
|
||||
"network.target"
|
||||
"postgresql.service"
|
||||
|
|
@ -26,8 +26,8 @@ _:
|
|||
RuntimeDirectoryMode = "0770";
|
||||
EnvironmentFile = config.sops.secrets.minifluxenv.path;
|
||||
# Hardening
|
||||
CapabilityBoundingSet = [""];
|
||||
DeviceAllow = [""];
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DeviceAllow = [ "" ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
PrivateDevices = true;
|
||||
|
|
@ -67,7 +67,7 @@ _:
|
|||
};
|
||||
miniflux-dbsetup = {
|
||||
description = "Miniflux database setup";
|
||||
requires = ["postgresql.service"];
|
||||
requires = [ "postgresql.service" ];
|
||||
after = [
|
||||
"network.target"
|
||||
"postgresql.service"
|
||||
|
|
@ -88,11 +88,11 @@ _:
|
|||
users = {
|
||||
miniflux = {
|
||||
group = "miniflux";
|
||||
extraGroups = ["postgres"];
|
||||
extraGroups = [ "postgres" ];
|
||||
isSystemUser = true;
|
||||
uid = 377;
|
||||
};
|
||||
${config.services.nginx.user}.extraGroups = ["miniflux"];
|
||||
${config.services.nginx.user}.extraGroups = [ "miniflux" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
_:
|
||||
{pkgs, config, ...}:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
sops.secrets.nextcloud.owner = "nextcloud";
|
||||
|
||||
users.users.nextcloud.extraGroups = ["postgres"];
|
||||
users.users.nextcloud.extraGroups = [ "postgres" ];
|
||||
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
package = pkgs.nextcloud27;
|
||||
package = pkgs.nextcloud28;
|
||||
datadir = "/persist/services/nextcloud";
|
||||
hostName = "next.gerg-l.com";
|
||||
autoUpdateApps.enable = false;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{config, lib, ...}:
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
sops.secrets =
|
||||
lib.genAttrs
|
||||
|
|
@ -34,7 +34,7 @@ _:
|
|||
forceSSL = true;
|
||||
sslCertificate = config.sops.secrets.nixfu_ssl_cert.path;
|
||||
sslCertificateKey = config.sops.secrets.nixfu_ssl_key.path;
|
||||
serverAliases = ["www.nix-fu.com"];
|
||||
serverAliases = [ "www.nix-fu.com" ];
|
||||
globalRedirect = "github.com/Gerg-L";
|
||||
};
|
||||
"search.gerg-l.com" = {
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ _:
|
|||
...
|
||||
}:
|
||||
{
|
||||
sops.secrets.discordenv = {};
|
||||
sops.secrets.discordenv = { };
|
||||
systemd.services.parrot = {
|
||||
enable = true;
|
||||
wantedBy = ["multi-user.target"];
|
||||
wants = ["network-online.target"];
|
||||
after = ["network-online.target"];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
after = [ "network-online.target" ];
|
||||
script = lib.getExe pkgs.parrot;
|
||||
serviceConfig = {
|
||||
EnvironmentFile = config.sops.secrets.discordenv.path;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{config, pkgs, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
_:
|
||||
{config, pkgs, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
sops.secrets.searxngenv = {};
|
||||
users.users.${config.services.nginx.user}.extraGroups = ["searx"];
|
||||
sops.secrets.searxngenv = { };
|
||||
users.users.${config.services.nginx.user}.extraGroups = [ "searx" ];
|
||||
services.searx = {
|
||||
enable = true;
|
||||
package = pkgs.searxng;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{spicetify-nix, ...}:
|
||||
{ spicetify-nix, ... }:
|
||||
let
|
||||
spicePkgs = spicetify-nix.legacyPackages;
|
||||
in
|
||||
{
|
||||
imports = [spicetify-nix.nixosModules.default];
|
||||
local.allowedUnfree = ["spotify"];
|
||||
imports = [ spicetify-nix.nixosModules.default ];
|
||||
local.allowedUnfree = [ "spotify" ];
|
||||
programs.spicetify = {
|
||||
enable = true;
|
||||
enabledExtensions = builtins.attrValues {
|
||||
|
|
|
|||
|
|
@ -54,13 +54,13 @@ let
|
|||
in
|
||||
{
|
||||
environment.etc = {
|
||||
"Xorg/1_mon.conf".source = pkgs.runCommand "1_mon.conf" {} (
|
||||
"Xorg/1_mon.conf".source = pkgs.runCommand "1_mon.conf" { } (
|
||||
xserverbase
|
||||
+ ''
|
||||
cat ${./1_mon.conf} >> $out
|
||||
''
|
||||
);
|
||||
"Xorg/2_mon.conf".source = pkgs.runCommand "2_mon.conf" {} (
|
||||
"Xorg/2_mon.conf".source = pkgs.runCommand "2_mon.conf" { } (
|
||||
xserverbase
|
||||
+ ''
|
||||
cat ${./2_mon.conf} >> $out
|
||||
|
|
@ -132,7 +132,7 @@ in
|
|||
"libvirtd"
|
||||
];
|
||||
|
||||
services.xserver.displayManager.xserverArgs = lib.mkAfter ["-config /etc/Xorg/active.conf"];
|
||||
services.xserver.displayManager.xserverArgs = lib.mkAfter [ "-config /etc/Xorg/active.conf" ];
|
||||
services.xserver.displayManager.sessionCommands = lib.mkBefore ''
|
||||
if ! [ -e "/etc/Xorg/ONE_MONITOR" ] ; then
|
||||
${lib.getExe cfg_monitors}
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ _:
|
|||
mode = "0644";
|
||||
};
|
||||
#make sure the sopskey is found
|
||||
sops.age.sshKeyPaths = lib.mkForce ["/persist/ssh/ssh_host_ed25519_key"];
|
||||
sops.age.sshKeyPaths = lib.mkForce [ "/persist/ssh/ssh_host_ed25519_key" ];
|
||||
fileSystems = {
|
||||
"/persist".neededForBoot = true;
|
||||
"/efi22".options = ["nofail"];
|
||||
"/efi0E".options = ["nofail"];
|
||||
"/efi22".options = [ "nofail" ];
|
||||
"/efi0E".options = [ "nofail" ];
|
||||
};
|
||||
|
||||
boot = {
|
||||
|
|
@ -32,22 +32,22 @@ _:
|
|||
};
|
||||
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
|
||||
#disable hibernate and set cache max
|
||||
kernelParams = ["zfs.zfs_arc_max=17179869184"];
|
||||
kernelParams = [ "zfs.zfs_arc_max=17179869184" ];
|
||||
initrd = {
|
||||
#module for multiple swap devices
|
||||
kernelModules = ["dm_mod"];
|
||||
kernelModules = [ "dm_mod" ];
|
||||
#keyboard module for zfs password
|
||||
availableKernelModules = ["hid_generic"];
|
||||
availableKernelModules = [ "hid_generic" ];
|
||||
systemd.services.rollback = {
|
||||
path = [pkgs.zfs];
|
||||
path = [ pkgs.zfs ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
unitConfig.DefaultDependencies = "no";
|
||||
wantedBy = ["initrd.target"];
|
||||
after = ["zfs-import.target"];
|
||||
before = ["sysroot.mount"];
|
||||
wantedBy = [ "initrd.target" ];
|
||||
after = [ "zfs-import.target" ];
|
||||
before = [ "sysroot.mount" ];
|
||||
script = ''
|
||||
zfs rollback -r rpool/root@empty
|
||||
zfs rollback -r rpool/var@empty
|
||||
|
|
@ -67,11 +67,11 @@ _:
|
|||
mirroredBoots = [
|
||||
{
|
||||
path = "/efi22";
|
||||
devices = ["nodev"];
|
||||
devices = [ "nodev" ];
|
||||
}
|
||||
{
|
||||
path = "/efi0E";
|
||||
devices = ["nodev"];
|
||||
devices = [ "nodev" ];
|
||||
}
|
||||
];
|
||||
splashImage = null;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{disko, nixos-generators, ...}:
|
||||
{ disko, nixos-generators, ... }:
|
||||
{
|
||||
lib,
|
||||
modulesPath,
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ _:
|
|||
chromium
|
||||
;
|
||||
};
|
||||
services.xserver.videoDrivers = ["intel"];
|
||||
services.xserver.videoDrivers = [ "intel" ];
|
||||
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ _:
|
|||
"sr_mod"
|
||||
"rtsx_usb_sdmmc"
|
||||
];
|
||||
kernelModules = ["kvm-intel"];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
};
|
||||
systemd.user.tmpfiles.users.media.rules = [
|
||||
"L+ %h/Desktop/chromium-browser.desktop - - - - ${pkgs.chromium}/share/applications/chromium-browser.desktop"
|
||||
|
|
|
|||
|
|
@ -55,20 +55,20 @@ rec {
|
|||
|
||||
gerg-utils =
|
||||
config: outputs:
|
||||
lib.foldAttrs lib.mergeAttrs {} (
|
||||
lib.foldAttrs lib.mergeAttrs { } (
|
||||
map
|
||||
(
|
||||
system:
|
||||
let
|
||||
pkgs =
|
||||
if config == {} then
|
||||
if config == { } then
|
||||
unstable.legacyPackages.${system}
|
||||
else
|
||||
import unstable {inherit system config;};
|
||||
import unstable { inherit system config; };
|
||||
in
|
||||
lib.mapAttrs (name: value: if needsSystem name then {${system} = value pkgs;} else value) outputs
|
||||
lib.mapAttrs (name: value: if needsSystem name then { ${system} = value pkgs; } else value) outputs
|
||||
)
|
||||
["x86_64-linux"]
|
||||
[ "x86_64-linux" ]
|
||||
);
|
||||
|
||||
mkHosts =
|
||||
|
|
@ -145,7 +145,7 @@ rec {
|
|||
in
|
||||
x.callPackage "${path}/${n}/package.nix" x.args
|
||||
else
|
||||
callPackage "${path}/${n}/package.nix" {}
|
||||
callPackage "${path}/${n}/package.nix" { }
|
||||
|
||||
))
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{suckless, self, ...}:
|
||||
{ suckless, self, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
config = lib.mkIf config.local.DE.dwm.enable {
|
||||
systemd.user.services = {
|
||||
sxhkd = {
|
||||
path = [pkgs.sxhkd];
|
||||
path = [ pkgs.sxhkd ];
|
||||
script = "sxhkd -c /etc/sxhkd/sxhkdrc";
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
};
|
||||
|
||||
picom = {
|
||||
path = [pkgs.picom];
|
||||
path = [ pkgs.picom ];
|
||||
script = "picom";
|
||||
serviceConfig = {
|
||||
Restart = "always";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ _:
|
|||
|
||||
config = lib.mkIf config.local.DE.gnome.enable {
|
||||
environment = {
|
||||
systemPackages = [pkgs.gnome.gnome-calculator];
|
||||
systemPackages = [ pkgs.gnome.gnome-calculator ];
|
||||
gnome.excludePackages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
gnome-photos
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ _:
|
|||
options.local.DE.xfce.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.local.DE.xfce.enable {
|
||||
environment.systemPackages = [pkgs.xfce.xfce4-whiskermenu-plugin];
|
||||
environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
desktopManager.xfce = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{config, lib, ...}:
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
options.local.DM = {
|
||||
autoLogin = lib.mkEnableOption "";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{self, ...}:
|
||||
{config, lib, ...}:
|
||||
{ self, ... }:
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
options.local.DM.lightdm.enable = lib.mkEnableOption "";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{pkgs, lib, ...}:
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
services.xserver = {
|
||||
tty = lib.mkDefault 1;
|
||||
|
|
@ -7,7 +7,7 @@ _:
|
|||
layout = "us";
|
||||
libinput.enable = true;
|
||||
xautolock.enable = false;
|
||||
excludePackages = [pkgs.xterm];
|
||||
excludePackages = [ pkgs.xterm ];
|
||||
desktopManager.xterm.enable = false;
|
||||
};
|
||||
#_file
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{self, ...}:
|
||||
{ self, ... }:
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
};
|
||||
};
|
||||
boot = {
|
||||
blacklistedKernelModules = ["pcspkr"];
|
||||
blacklistedKernelModules = [ "pcspkr" ];
|
||||
kernelParams = lib.mkBefore [
|
||||
"acpi_call"
|
||||
"pti=auto"
|
||||
|
|
@ -78,8 +78,8 @@
|
|||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
path = [pkgs.efibootmgr];
|
||||
wantedBy = ["default.target"];
|
||||
path = [ pkgs.efibootmgr ];
|
||||
wantedBy = [ "default.target" ];
|
||||
script = ''
|
||||
efibootmgr -t 0
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{config, lib, ...}:
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
options.local.remoteBuild = {
|
||||
enable = lib.mkEnableOption "";
|
||||
|
|
@ -13,8 +13,8 @@ _:
|
|||
keep-derivations = false;
|
||||
builders-use-substitutes = true;
|
||||
max-jobs = 0;
|
||||
substituters = ["ssh-ng://nix-ssh@gerg-desktop"];
|
||||
trusted-public-keys = ["gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8="];
|
||||
substituters = [ "ssh-ng://nix-ssh@gerg-desktop" ];
|
||||
trusted-public-keys = [ "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ];
|
||||
};
|
||||
distributedBuilds = true;
|
||||
buildMachines = [
|
||||
|
|
@ -40,7 +40,7 @@ _:
|
|||
};
|
||||
programs.ssh.knownHosts = {
|
||||
gerg-desktop = {
|
||||
extraHostNames = ["gerg-desktop.lan"];
|
||||
extraHostNames = [ "gerg-desktop.lan" ];
|
||||
publicKey = config.local.keys.root_gerg-desktop;
|
||||
};
|
||||
};
|
||||
|
|
@ -54,9 +54,9 @@ _:
|
|||
];
|
||||
in
|
||||
lib.mkIf config.local.remoteBuild.isBuilder {
|
||||
sops.secrets.store_key = {};
|
||||
sops.secrets.store_key = { };
|
||||
users = {
|
||||
groups.builder = {};
|
||||
groups.builder = { };
|
||||
users.builder = {
|
||||
createHome = false;
|
||||
isSystemUser = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
_:
|
||||
{config, lib, ...}:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.local.hardware;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
_:
|
||||
{lib, ...}:
|
||||
{ lib, ... }:
|
||||
{
|
||||
options.local.keys = lib.mkOption {};
|
||||
options.local.keys = lib.mkOption { };
|
||||
|
||||
config.local.keys = {
|
||||
gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ _:
|
|||
{
|
||||
options.local.allowedUnfree = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [];
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
config = {
|
||||
|
|
@ -39,7 +39,7 @@ _:
|
|||
programs.mtr.enable = true; # ping and traceroute
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
hostKeys = lib.mkForce [];
|
||||
hostKeys = lib.mkForce [ ];
|
||||
settings = {
|
||||
PermitRootLogin = lib.mkDefault "no";
|
||||
PasswordAuthentication = false;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
inputs:
|
||||
{lib, config, ...}:
|
||||
{ lib, config, ... }:
|
||||
{
|
||||
#
|
||||
# Flake registry and $NIX_PATH pinning
|
||||
#
|
||||
nix.registry = lib.pipe inputs [
|
||||
(lib.filterAttrs (_: lib.isType "flake"))
|
||||
(lib.mapAttrs (_: flake: {inherit flake;}))
|
||||
(x: x // {nixpkgs.flake = inputs.unstable;})
|
||||
(lib.mapAttrs (_: flake: { inherit flake; }))
|
||||
(x: x // { nixpkgs.flake = inputs.unstable; })
|
||||
];
|
||||
|
||||
environment.etc =
|
||||
|
|
@ -17,7 +17,7 @@ inputs:
|
|||
value.source = value.flake;
|
||||
})
|
||||
config.nix.registry;
|
||||
nix.nixPath = ["/etc/nix/path"];
|
||||
nix.nixPath = [ "/etc/nix/path" ];
|
||||
#
|
||||
# Ignore global registry
|
||||
#
|
||||
|
|
@ -52,8 +52,8 @@ inputs:
|
|||
# Use for testing
|
||||
#
|
||||
#allow-import-from-derivation = false;
|
||||
trusted-users = ["root"];
|
||||
allowed-users = ["@wheel"];
|
||||
trusted-users = [ "root" ];
|
||||
allowed-users = [ "@wheel" ];
|
||||
use-xdg-base-directories = true;
|
||||
auto-allocate-uids = true;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{fetch-rs, ...}:
|
||||
{ fetch-rs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
systemd.tmpfiles.rules = ["d /tmp/neovim-page 0777 root root - -"];
|
||||
systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ];
|
||||
environment = {
|
||||
systemPackages = builtins.attrValues {
|
||||
inherit (pkgs) page eza fzf;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{sops-nix, self, ...}:
|
||||
{ sops-nix, self, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
...
|
||||
}:
|
||||
{
|
||||
imports = [sops-nix.nixosModules.sops];
|
||||
imports = [ sops-nix.nixosModules.sops ];
|
||||
options.local.sops.disable = lib.mkEnableOption "";
|
||||
config = lib.mkIf (!config.local.sops.disable) {
|
||||
environment.systemPackages = [pkgs.sops];
|
||||
environment.systemPackages = [ pkgs.sops ];
|
||||
sops = {
|
||||
defaultSopsFile = "${self}/hosts/${config.networking.hostName}/secrets.yaml";
|
||||
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
};
|
||||
};
|
||||
#_file
|
||||
|
|
|
|||
|
|
@ -62,16 +62,16 @@ in
|
|||
fonts = {
|
||||
packages = [
|
||||
pkgs.overpass
|
||||
(pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
|
||||
(pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
||||
];
|
||||
enableDefaultPackages = false;
|
||||
fontDir.enable = true;
|
||||
fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = {
|
||||
serif = ["Overpass"];
|
||||
sansSerif = ["Overpass"];
|
||||
monospace = ["Overpass Mono"];
|
||||
serif = [ "Overpass" ];
|
||||
sansSerif = [ "Overpass" ];
|
||||
monospace = [ "Overpass Mono" ];
|
||||
};
|
||||
hinting.enable = true;
|
||||
antialias = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ inputs:
|
|||
let
|
||||
lib = import ./lib inputs;
|
||||
in
|
||||
lib.gerg-utils {} {
|
||||
lib.gerg-utils { } {
|
||||
inherit lib;
|
||||
nixosConfigurations = lib.mkHosts "x86_64-linux" [
|
||||
"gerg-desktop"
|
||||
|
|
@ -21,7 +21,7 @@ lib.gerg-utils {} {
|
|||
|
||||
formatter = pkgs: inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.lint;
|
||||
|
||||
devShells = pkgs: {default = pkgs.mkShell {packages = [pkgs.sops];};};
|
||||
devShells = pkgs: { default = pkgs.mkShell { packages = [ pkgs.sops ]; }; };
|
||||
|
||||
packages = lib.mkPackages ./packages;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ runCommand "images"
|
|||
url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/376ed4ba8dc2e611b7e8a62fdc680967ead5bd87/logo/nix-snowflake.svg";
|
||||
sha256 = "sha256-SCuQlSPB14GFTq4XvExJ0QEuK2VIbrd5YYKHLRG/q5I=";
|
||||
};
|
||||
buildInputs = [imagemagick];
|
||||
buildInputs = [ imagemagick ];
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{inputs, nixfmt}:
|
||||
{ inputs, nixfmt }:
|
||||
(nixfmt.overrideAttrs {
|
||||
version = "0.6.0-${inputs.nixfmt.shortRev}";
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [makeBinaryWrapper];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
dontUnpack = true;
|
||||
preferLocalBuild = true;
|
||||
|
|
@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation (
|
|||
meta = {
|
||||
description = "High-performance Minecraft Server";
|
||||
homepage = "https://papermc.io/";
|
||||
sourceProvenance = with lib.sourceTypes; [binaryBytecode];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.gpl3Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue