diff --git a/Folder.DotSettings.user b/Folder.DotSettings.user
new file mode 100644
index 0000000..e9e707c
--- /dev/null
+++ b/Folder.DotSettings.user
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+ <s:String x:Key="/Default/CodeInspection/Highlighting/SweaWarningsMode/@EntryValue">ShowAndRun</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 9f6304d..8ef071c 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -143,12 +143,10 @@ args@{
# - Utilities
inkscape-with-extensions
- gimp # -with-plugins
+ gimp
# - Languages
- #dotnet-sdk_7
dotnet-sdk_8
- #(callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
#games
osu-lazer-bin
@@ -159,8 +157,8 @@ args@{
# extra packages
dmenu
- cinnamon.nemo
- gnome.file-roller
+ nemo
+ file-roller
firefox-bin
#ungoogled-chromium #needed for Rider in order to debug WASM
@@ -184,16 +182,13 @@ args@{
virt-viewer
# (dwarf-fortress-packages.dwarf-fortress-full.override { enableStoneSense = true; enableFPS = true; theme = dwarf-fortress-packages.themes.spacefox; })
+ mangohud
+ prismlauncher
];
programs.steam.enable = true;
programs.steam.gamescopeSession.enable = true;
- #environment.gnome.excludePackages = [
- # pkgs.orca
- # pkgs.gnome-tour
- # pkgs.gnome-user-docs
- #];
xdg = {
portal = {
@@ -230,15 +225,7 @@ args@{
enableDefaultPackages = lib.mkForce false;
enableGhostscriptFonts = lib.mkForce false;
};
- nix = {
- settings = {
- experimental-features = [
- "nix-command"
- "flakes"
- ];
- auto-optimise-store = true;
- };
- };
+
nixpkgs = {
config = {
allowUnfree = true;
diff --git a/host/Rory-desktop/printing.nix b/host/Rory-desktop/printing.nix
index 2480610..f25580f 100644
--- a/host/Rory-desktop/printing.nix
+++ b/host/Rory-desktop/printing.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, ... }:
{
imports = [ ];
diff --git a/host/Rory-devenv/configuration.nix b/host/Rory-devenv/configuration.nix
index f361ed1..85f38dd 100755
--- a/host/Rory-devenv/configuration.nix
+++ b/host/Rory-devenv/configuration.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ ... }:
{
imports = [
diff --git a/host/Rory-devenv/software.nix b/host/Rory-devenv/software.nix
index afcc751..f1cb896 100755
--- a/host/Rory-devenv/software.nix
+++ b/host/Rory-devenv/software.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, ... }:
{
imports = [ ../../modules/base-server.nix ];
@@ -69,7 +64,7 @@
kitty
feh
sshfs
- cinnamon.nemo
+ nemo
firefox-bin
udisks
gparted
diff --git a/host/Rory-fosscord/configuration.nix b/host/Rory-fosscord/configuration.nix
index ce93fc2..014f28a 100755
--- a/host/Rory-fosscord/configuration.nix
+++ b/host/Rory-fosscord/configuration.nix
@@ -1,10 +1,4 @@
-{
- config,
- pkgs,
- lib,
- discord-client-proxy,
- ...
-}:
+{ ... }:
{
imports = [
diff --git a/host/Rory-fosscord/software.nix b/host/Rory-fosscord/software.nix
index f58d211..ee1bc19 100755
--- a/host/Rory-fosscord/software.nix
+++ b/host/Rory-fosscord/software.nix
@@ -1,10 +1,4 @@
-{
- config,
- pkgs,
- lib,
- discord-client-proxy,
- ...
-}:
+{ discord-client-proxy, ... }:
{
imports = [
diff --git a/host/Rory-nginx/services/cgit.nix b/host/Rory-nginx/services/cgit.nix
index 5b80000..fb762d1 100644
--- a/host/Rory-nginx/services/cgit.nix
+++ b/host/Rory-nginx/services/cgit.nix
@@ -1,8 +1,4 @@
-{
- pkgs,
- lib,
- ...
-}:
+{ pkgs, lib, ... }:
let
base_cgit_config = {
diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
index 7e7c355..11d0be3 100755
--- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
+++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix
@@ -1,6 +1,4 @@
-{
- ...
-}:
+{ ... }:
{
imports = [
diff --git a/host/Rory-nginx/services/jitsi.nix b/host/Rory-nginx/services/jitsi.nix
index ff7a229..9fe8d73 100755
--- a/host/Rory-nginx/services/jitsi.nix
+++ b/host/Rory-nginx/services/jitsi.nix
@@ -1,6 +1,4 @@
-{
- ...
-}:
+{ ... }:
{
services.jitsi-videobridge.openFirewall = true;
diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix
index 9f48e6d..66d4648 100755
--- a/host/Rory-nginx/services/matrix/draupnir.nix
+++ b/host/Rory-nginx/services/matrix/draupnir.nix
@@ -21,6 +21,7 @@
autojoinOnlyIfManager = true; # Let's not open ourselves up to DoS attacks
automaticallyRedactForReasons = [ "*" ]; # I always want autoredact
fasterMembershipChecks = true;
+ roomStateBackingStore.enabled = true;
backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit
pollReports = false; # this is a single person homeserver... let's save ourself the work
diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix
index 968a14a..b13c38a 100755
--- a/host/Rory-nginx/services/matrix/root.nix
+++ b/host/Rory-nginx/services/matrix/root.nix
@@ -1,10 +1,4 @@
-{
- config,
- pkgs,
- lib,
- botcore-v4,
- ...
-}:
+{ ... }:
{
imports = [
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index d210fb1..4e36577 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ config, pkgs, ... }:
let
serveDir = config: {
enableACME = if config ? ssl then config.ssl else true;
diff --git a/host/Rory-nginx/services/ollama.nix b/host/Rory-nginx/services/ollama.nix
index 954fe99..c9709da 100755
--- a/host/Rory-nginx/services/ollama.nix
+++ b/host/Rory-nginx/services/ollama.nix
@@ -1,6 +1,4 @@
-{
- ...
-}:
+{ ... }:
{
# systemd.tmpfiles.rules = [ "d /data/ollama 0750 ostgres postgres" ];
diff --git a/host/Rory-nginx/services/postgres.nix b/host/Rory-nginx/services/postgres.nix
index fbe33b7..68b822b 100755
--- a/host/Rory-nginx/services/postgres.nix
+++ b/host/Rory-nginx/services/postgres.nix
@@ -1,7 +1,4 @@
-{
- pkgs,
- ...
-}:
+{ pkgs, ... }:
{
systemd.tmpfiles.rules = [ "d /mnt/postgres/data 0750 postgres postgres" ];
diff --git a/host/Rory-portable/configuration.nix b/host/Rory-portable/configuration.nix
index ebfe899..e278e17 100644
--- a/host/Rory-portable/configuration.nix
+++ b/host/Rory-portable/configuration.nix
@@ -1,5 +1,4 @@
{
- config,
pkgs,
lib,
nhekoSrc,
@@ -9,19 +8,8 @@
{
imports = [
- # base imports
../../modules/base-client.nix
../../modules/packages/vim.nix
- # ../../modules/environments/home.nix
- #../../modules/software-templates/profilers.nix
- #./postgres.nix
- #./nginx.nix
-
- # hardware-specific imports
- #./optional/hardware-specific/amd.nix
-
- #./printing.nix
- ./ollama.nix
];
boot = {
@@ -80,7 +68,6 @@
services.power-profiles-daemon.enable = true;
time.timeZone = "Europe/Brussels";
- i18n.defaultLocale = "en_US.UTF-8";
services = {
libinput.touchpad.naturalScrolling = true;
@@ -123,21 +110,6 @@
sound.enable = true;
- users.users = {
- Rory = {
- isNormalUser = true;
- extraGroups = [ "wheel" ];
- packages = with pkgs; [
- #gimp-with-plugins
-
- #xterm
- #gnomeExtensions.vitals
- #gnomeExtensions.runcat
- ];
- initialPassword = "password";
- };
- };
-
environment.systemPackages = with pkgs; [
libreoffice
qt6.qtwayland
@@ -165,8 +137,8 @@
# - Languages
#dotnet-sdk_7
- #dotnet-sdk_8
- (callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
+ dotnet-sdk_8
+ #(callPackage ../../modules/packages/dotnet-pack.nix { inherit pkgs; })
#games
osu-lazer-bin
@@ -176,8 +148,8 @@
# extra packages
dmenu
- cinnamon.nemo
- gnome.file-roller
+ nemo
+ file-roller
firefox-bin
ungoogled-chromium # needed for Rider in order to debug WASM
@@ -237,37 +209,14 @@
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
noto-fonts-monochrome-emoji
];
- fontconfig.defaultFonts.monospace = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
- fontconfig.defaultFonts.sansSerif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
- fontconfig.defaultFonts.serif = with pkgs; [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
- fontconfig.defaultFonts.emoji = with pkgs; [ "freefont" ];
+ fontconfig.defaultFonts.monospace = [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+ fontconfig.defaultFonts.sansSerif = [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+ fontconfig.defaultFonts.serif = [ "JetBrainsMonoNL Nerd Font,JetBrainsMonoNL NF:style=Regular" ];
+ fontconfig.defaultFonts.emoji = [ "freefont" ];
enableDefaultPackages = lib.mkForce false;
enableGhostscriptFonts = lib.mkForce false;
};
- nix = {
- settings = {
- experimental-features = [
- "nix-command"
- "flakes"
- ];
- auto-optimise-store = true;
- };
- };
- nixpkgs = {
- config = {
- allowUnfree = true;
- permittedInsecurePackages = [ "electron-25.9.0" ];
- };
- };
- security = {
- polkit.enable = true;
- sudo.wheelNeedsPassword = false;
- };
-
- hardware = {
- pulseaudio.enable = false;
- };
programs.dconf.enable = true;
environment.etc."resolv.conf".text = ''
nameserver 8.8.8.8
diff --git a/host/Rory-portable/mariadb.nix b/host/Rory-portable/mariadb.nix
deleted file mode 100644
index 758cb3d..0000000
--- a/host/Rory-portable/mariadb.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
-
-{
- services.mysql = {
- enable = true;
- package = pkgs.mariadb;
- };
-
-}
diff --git a/host/Rory-portable/nginx.nix b/host/Rory-portable/nginx.nix
deleted file mode 100644
index 31ec0ea..0000000
--- a/host/Rory-portable/nginx.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
-
-{
- services = {
- nginx = {
- enable = true;
- #package = pkgs.nginxQuic;
- recommendedProxySettings = true;
- #recommendedTlsSettings = true;
- recommendedZstdSettings = true;
- recommendedGzipSettings = true;
- recommendedBrotliSettings = true;
- recommendedOptimisation = true;
- #defaultMimeTypes = ../../../../modules/packages/nginx/mime.types;
- appendConfig = ''
- worker_processes 16;
- '';
- eventsConfig = ''
- #use kqueue;
- worker_connections 512;
- '';
- appendHttpConfig = ''
- #sendfile on;
- disable_symlinks off;
- '';
- additionalModules = with pkgs.nginxModules; [ moreheaders ];
- virtualHosts = {
- "discord.localhost" = import ./nginx/discord.localhost.nix { inherit pkgs; };
-
- };
- };
- };
- systemd.services.nginx.serviceConfig = {
- LimitNOFILE = 5000000;
- };
-
-}
diff --git a/host/Rory-portable/nginx/discord.localhost.nix b/host/Rory-portable/nginx/discord.localhost.nix
deleted file mode 100755
index b40e13c..0000000
--- a/host/Rory-portable/nginx/discord.localhost.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-
-{
- root = "/www/discord";
- addSSL = true;
- enableACME = false;
-
- # We don't care about certificates around here...
- sslCertificate = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.cert.pem";
- sslCertificateKey = "${pkgs.path}/nixos/tests/common/acme/server/acme.test.key.pem";
-
- extraConfig = ''
- autoindex on;
- more_set_headers 'Access-Control-Allow-Origin: *';
- more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
- more_set_headers 'Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
- more_set_headers 'Access-Control-Expose-Headers: Content-Length,Content-Range';
- more_set_headers 'Access-Control-Allow-Credentials: true';
- '';
-
- locations = {
- "/" = {
- index = "index.html";
- extraConfig = ''
- more_set_headers 'Access-Control-Allow-Origin: *';
- more_set_headers 'Access-Control-Allow-Methods: *';
- more_set_headers 'Access-Control-Allow-Headers: *';
- more_set_headers 'Access-Control-Expose-Headers: *';
- more_set_headers 'Access-Control-Max-Age' 1728000;
-
- # default to /index.html if file not found
- try_files $uri $uri/ /index.html;
- '';
- };
- };
-}
diff --git a/host/Rory-portable/ollama.nix b/host/Rory-portable/ollama.nix
deleted file mode 100755
index 0c72b85..0000000
--- a/host/Rory-portable/ollama.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
-
-{
- services.ollama = {
- enable = true;
- home = "/data/ollama/home";
- models = "/data/ollama/home/models";
- environmentVariables = {
- OLLAMA_LLM_LIBRARY = "cpu_avx2";
- };
- writablePaths = [ "/data/ollama/home" ];
- #listenAddress = "0.0.0.0:11434";
- host = "0.0.0.0";
- port = 11434;
- sandbox = false;
- };
-}
diff --git a/host/Rory-portable/postgres.nix b/host/Rory-portable/postgres.nix
index 60fd8d6..7223f6a 100755
--- a/host/Rory-portable/postgres.nix
+++ b/host/Rory-portable/postgres.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, ... }:
{
#systemd.tmpfiles.rules = [ "d /mnt/postgres/data 0750 postgres postgres" ];
diff --git a/host/Rory-portable/printing.nix b/host/Rory-portable/printing.nix
index 2480610..f25580f 100644
--- a/host/Rory-portable/printing.nix
+++ b/host/Rory-portable/printing.nix
@@ -1,9 +1,4 @@
-{
- config,
- pkgs,
- lib,
- ...
-}:
+{ pkgs, ... }:
{
imports = [ ];
diff --git a/host/Rory-wsl/configuration.nix b/host/Rory-wsl/configuration.nix
index 855114a..b155058 100644
--- a/host/Rory-wsl/configuration.nix
+++ b/host/Rory-wsl/configuration.nix
@@ -1,8 +1,6 @@
{
lib,
pkgs,
- config,
- modulesPath,
nhekoSrc,
mtxclientSrc,
...
@@ -40,8 +38,8 @@
easyeffects
kitty
# youtube-music
- cinnamon.nemo
- gnome.file-roller
+ nemo
+ file-roller
# - IDEs
# jetbrains-toolbox
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index f5c63fd..90d6076 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -39,7 +39,6 @@
};
time.timeZone = "Europe/Brussels";
- i18n.defaultLocale = "en_US.UTF-8";
services = {
xserver = {
@@ -122,7 +121,7 @@
dig
cloud-utils
sshfs
- cinnamon.nemo
+ nemo
firefox-bin
#epiphany
@@ -154,7 +153,6 @@
"nix-command"
"flakes"
];
- auto-optimise-store = true;
};
};
nixpkgs = {
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" ];
};
|
