diff --git a/modules/base-client.nix b/modules/base-client.nix
index 936e426..6537f92 100755
--- a/modules/base-client.nix
+++ b/modules/base-client.nix
@@ -1,5 +1,4 @@
{
- config,
pkgs,
lib,
...
@@ -20,8 +19,6 @@
};
};
- i18n.defaultLocale = "en_US.UTF-8";
-
systemd = {
sleep.extraConfig = ''
AllowSuspend=no
@@ -35,14 +32,14 @@
# - gui utils
gnome-console
- cinnamon.nemo
+ nemo
feh
udisks
gparted
arandr
#discord-development
discord
- gnome.gnome-screenshot
+ gnome-screenshot
];
fonts.packages = with pkgs; [
@@ -50,26 +47,6 @@
cozette
];
- systemd.coredump.extraConfig = lib.mkDefault ''
- Storage=none
- '';
- nix = {
- settings = {
- experimental-features = [
- "nix-command"
- "flakes"
- ];
- auto-optimise-store = true;
- };
- };
- nixpkgs = {
- config.allowUnfree = true;
- };
- security = {
- polkit.enable = true;
- sudo.wheelNeedsPassword = false;
- };
-
systemd.network.wait-online.enable = false;
boot.initrd.systemd.network.wait-online.enable = false;
diff --git a/modules/base-secrets.nix b/modules/base-secrets.nix
index 90fdd21..9616e36 100755
--- a/modules/base-secrets.nix
+++ b/modules/base-secrets.nix
@@ -1,10 +1,5 @@
{ path }:
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ ... }:
{
sops = {
defaultSopsFile = path;
diff --git a/modules/base-server.nix b/modules/base-server.nix
index f5d33af..9e248e4 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -17,30 +17,11 @@
environment.variables.BROWSER = "echo";
- nix.settings.trusted-users = [
- "root"
- "@wheel"
- ];
-
time.timeZone = lib.mkDefault "UTC";
systemd = {
- # Given that our systems are headless, emergency mode is useless.
- # We prefer the system to attempt to continue booting so
- # that we can hopefully still access it remotely.
enableEmergencyMode = false;
-
- # For more detail, see:
- # https://0pointer.de/blog/projects/watchdog.html
watchdog = {
- # systemd will send a signal to the hardware watchdog at half
- # the interval defined here, so every 10s.
- # If the hardware watchdog does not get a signal for 20s,
- # it will forcefully reboot the system.
runtimeTime = "20s";
- # Forcefully reboot if the final stage of the reboot
- # hangs without progress for more than 30s.
- # For more info, see:
- # https://utcc.utoronto.ca/~cks/space/blog/linux/SystemdShutdownWatchdog
rebootTime = "30s";
};
@@ -50,16 +31,8 @@
'';
};
- systemd.services.NetworkManager-wait-online.enable = false;
- systemd.network.wait-online.enable = false;
- # systemd.services.systemd-networkd.stopIfChanged = false;
- # systemd.services.systemd-resolved.stopIfChanged = false;
- nix.settings.max-free = lib.mkDefault (1000 * 1000 * 1000);
- nix.settings.min-free = lib.mkDefault (128 * 1000 * 1000);
-
- nix.daemonCPUSchedPolicy = lib.mkDefault "batch";
- nix.daemonIOSchedClass = lib.mkDefault "idle";
- nix.daemonIOSchedPriority = lib.mkDefault 7;
+ #systemd.services.NetworkManager-wait-online.enable = false;
+ #systemd.network.wait-online.enable = false;
# My servers always use /dev/vda as boot disk...
boot = {
@@ -107,7 +80,6 @@
hardware.enableAllFirmware = false;
hardware.enableRedistributableFirmware = false;
- i18n.defaultLocale = "en_US.UTF-8";
services = {
prometheus = {
exporters = {
diff --git a/modules/base.nix b/modules/base.nix
index 6597a97..bb122a8 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, lib, ... }:
{
imports = [
@@ -148,7 +143,10 @@
"flakes"
];
auto-optimise-store = true;
- trusted-users = [ "@wheel" ];
+ trusted-users = [
+ "@wheel"
+ "root"
+ ];
};
};
nixpkgs = {
diff --git a/modules/extra-substituters.nix b/modules/extra-substituters.nix
index 31b5c4f..35efcb7 100644
--- a/modules/extra-substituters.nix
+++ b/modules/extra-substituters.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ ... }:
{
nix.settings.trusted-substituters = [
diff --git a/modules/packages/discord-screenaudio.nix b/modules/packages/discord-screenaudio.nix
deleted file mode 100644
index 2829381..0000000
--- a/modules/packages/discord-screenaudio.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- lib,
- stdenv,
- fetchFromGitHub,
- cmake,
- wrapQtAppsHook,
- pkg-config,
- qtbase,
- qtwebengine,
- knotifications,
- kxmlgui,
- kglobalaccel,
- pipewire,
- xdg-desktop-portal,
-}:
-
-stdenv.mkDerivation rec {
- pname = "discord-screenaudio";
- version = "1.9.0";
-
- src = fetchFromGitHub {
- owner = "maltejur";
- repo = pname;
- rev = "v${version}";
- sha256 = "sha256-PPP/+7x0dcQHowB7hUZu85LK/G+ohrPeRB0vv6e3PBg=";
- fetchSubmodules = true;
- };
-
- cmakeFlags = [
- "-DPipeWire_INCLUDE_DIRS=${pipewire.dev}/include/pipewire-0.3"
- "-DSpa_INCLUDE_DIRS=${pipewire.dev}/include/spa-0.2"
- ];
-
- nativeBuildInputs = [
- cmake
- pkg-config
- wrapQtAppsHook
- ];
-
- buildInputs = [
- qtbase
- qtwebengine
- knotifications
- kxmlgui
- kglobalaccel
- pipewire
- pipewire.pulse
- xdg-desktop-portal
- ];
-
- meta = with lib; {
- homepage = "https://github.com/maltejur/discord-screenaudio";
- description = "A custom discord client that supports streaming with audio on Linux";
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ michaelBelsanti ];
- };
-}
diff --git a/modules/software-templates/dotnet.client.nix b/modules/software-templates/dotnet.client.nix
index ab8d812..fa0082b 100644
--- a/modules/software-templates/dotnet.client.nix
+++ b/modules/software-templates/dotnet.client.nix
@@ -1,12 +1,7 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, ... }:
{
- imports = [ ./dotnet.nix ];
+ #imports = [ ./dotnet.nix ];
environment.systemPackages = with pkgs; [
#`jetbrains.rider
(jetbrains.plugins.addPlugins jetbrains.rider [ "github-copilot" ])
diff --git a/modules/software-templates/dotnet.nix b/modules/software-templates/dotnet.nix
index be9ab4d..edbcca3 100644
--- a/modules/software-templates/dotnet.nix
+++ b/modules/software-templates/dotnet.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ (callPackage ../packages/dotnet-pack.nix { inherit pkgs; }) ];
diff --git a/modules/software-templates/profilers.nix b/modules/software-templates/profilers.nix
index 99090da..4381193 100644
--- a/modules/software-templates/profilers.nix
+++ b/modules/software-templates/profilers.nix
@@ -1,10 +1,4 @@
-{
- config,
- lib,
- pkgs,
- home-manager,
- ...
-}:
+{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
diff --git a/modules/users/Alice.nix b/modules/users/Alice.nix
index 465754a..b3a3cb8 100755
--- a/modules/users/Alice.nix
+++ b/modules/users/Alice.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
imports = [ groups/BugMine-contrib.nix ];
diff --git a/modules/users/Rory.client.nix b/modules/users/Rory.client.nix
index 29c7188..a9a3925 100755
--- a/modules/users/Rory.client.nix
+++ b/modules/users/Rory.client.nix
@@ -1,10 +1,4 @@
-{
- config,
- lib,
- pkgs,
- home-manager,
- ...
-}:
+{ lib, pkgs, ... }:
{
programs = {
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 2556c1c..a1007fc 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -1,10 +1,4 @@
-{
- config,
- lib,
- pkgs,
- home-manager,
- ...
-}:
+{ lib, pkgs, ... }:
{
users.users.Rory = {
diff --git a/modules/users/chris.nix b/modules/users/chris.nix
index 3ab5d98..9df69a8 100755
--- a/modules/users/chris.nix
+++ b/modules/users/chris.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
@@ -7,7 +7,7 @@
extraGroups = [ "wheel" ];
packages = with pkgs; [
nano
- nodejs-slim
+ #nodejs-slim
];
#initialPassword = "password";
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd9U0+wKjBG3Q9Qg249xJY+ybYeRV9/VMPjuwKvFBEI" ];
diff --git a/modules/users/db2k.nix b/modules/users/db2k.nix
index 65457a4..8bc43e2 100755
--- a/modules/users/db2k.nix
+++ b/modules/users/db2k.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
{
users.groups.db2k = { };
diff --git a/modules/users/groups/BugMine-contrib.nix b/modules/users/groups/BugMine-contrib.nix
index 3b3ce07..d165962 100644
--- a/modules/users/groups/BugMine-contrib.nix
+++ b/modules/users/groups/BugMine-contrib.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
{
users.groups.BugMine-contrib = { };
diff --git a/modules/users/ks.nix b/modules/users/ks.nix
index 1039fd1..0e2d36c 100755
--- a/modules/users/ks.nix
+++ b/modules/users/ks.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- home-manager,
- ...
-}:
+{ ... }:
{
@@ -13,7 +8,6 @@
"wheel"
"ocp"
];
- packages = with pkgs; [ ];
#initialPassword = "password";
openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPUDh1WPUF6mPQ1E38ozUjY/DZhEbwZL37eZ51DgpuLo ks" ];
};
|
