diff --git a/modules/base-client.nix b/modules/base-client.nix
index c5ebd22..7304ffe 100755
--- a/modules/base-client.nix
+++ b/modules/base-client.nix
@@ -36,10 +36,12 @@
gparted
arandr
discord-development
+ gnome.gnome-screenshot
];
fonts.fonts = with pkgs; [
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+ cozette
];
systemd.coredump.extraConfig = lib.mkDefault ''
diff --git a/modules/base.nix b/modules/base.nix
index 22c1d3b..5727f00 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -94,6 +94,15 @@
cloud-utils
nix-output-monitor
expect
+
+
+ # - zsh
+ zsh
+ zsh-powerlevel10k
+ zsh-nix-shell
+ zsh-you-should-use
+ zsh-syntax-highlighting
+ zsh-completions
];
systemd.coredump.extraConfig = lib.mkDefault ''
diff --git a/modules/environments/home.nix b/modules/environments/home.nix
index 9bfb80e..0658abb 100755
--- a/modules/environments/home.nix
+++ b/modules/environments/home.nix
@@ -3,20 +3,24 @@
{
nix = {
distributedBuilds = true;
-
- buildMachines = [
- #"self" = {
- #
- #};
+#
+ buildMachines = builtins.filter (machine: !builtins.any (ip: ip == machine.hostName) (builtins.map (iface: iface.ipv4.addresses) (builtins.attrValues config.networking.interfaces))) [
{
systems = [ "x86_64-linux" "i686-linux" ];
hostName = "192.168.0.3";
sshUser = "Rory";
sshKey = "/home/Rory/.ssh/id_ed25519";
maxJobs = 6;
- #cores = 2;
speedFactor = 43200;
}
+ {
+ systems = [ "x86_64-linux" "i686-linux" ];
+ hostName = "192.168.0.59";
+ sshUser = "Rory";
+ sshKey = "/home/Rory/.ssh/id_ed25519";
+ maxJobs = 2;
+ speedFactor = 16000;
+ }
];
#ssh://Rory@192.168.0.3 x86_64-linux,i686-linux /home/Rory/.ssh/id_ed25519 12 1 - - -
@@ -35,6 +39,7 @@
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
];
+ trusted-users = [ "root" "@wheel" "Rory" ];
};
};
diff --git a/modules/packages/discord-screenaudio.nix b/modules/packages/discord-screenaudio.nix
new file mode 100644
index 0000000..4bf7c11
--- /dev/null
+++ b/modules/packages/discord-screenaudio.nix
@@ -0,0 +1,57 @@
+{ 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/packages/dotnet-pack.nix b/modules/packages/dotnet-pack.nix
new file mode 100644
index 0000000..27c419d
--- /dev/null
+++ b/modules/packages/dotnet-pack.nix
@@ -0,0 +1,26 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+#pkgs.stdenv.mkDerivation {
+# name = "dotnet-pack";
+# dontUnpack = true;
+# buildInputs = with pkgs; [ dotnet-sdk dotnet-sdk_7 dotnet-sdk_8 ];
+#
+# # Define the build phase
+# buildPhase = ''
+# mkdir -p $out
+# ln -sf ${pkgs.dotnet-sdk}/* $out/
+# ln -sf ${pkgs.dotnet-sdk_7}/* $out/
+# ln -sf ${pkgs.dotnet-sdk_8}/* $out/
+# '';
+#}
+
+pkgs.symlinkJoin {
+ name = "dotnet-pack";
+ paths = [ pkgs.dotnet-sdk_8 pkgs.dotnet-sdk_7 pkgs.dotnet-sdk ];
+ postBuild = ''
+ rm -rfv $out/bin
+ rm -rfv $out/dotnet
+ cp -rv ${pkgs.dotnet-sdk_8}/dotnet $out/
+ cp -rv ${pkgs.dotnet-sdk_8}/bin $out/
+ '';
+}
\ No newline at end of file
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 25ab725..e57c220 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -127,7 +127,25 @@
Install = { WantedBy = [ "default.target" ]; };
- Service = { ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx"; };
+ Service = {
+ ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx";
+ Restart = "always";
+ };
+ };
+
+ systemd.user.services.easyeffects = {
+ Unit = {
+ Description = "EasyEffects";
+ #After = [ "graphical-session-pre.target" ];
+ PartOf = [ "default.target" ];
+ };
+
+ Install = { WantedBy = [ "default.target" ]; };
+
+ Service = {
+ ExecStart = "${pkgs.easyeffects}/bin/easyeffects";
+ Restart = "always";
+ };
};
programs.neovim.plugins = with pkgs.vimPlugins; [
|
