From 8d0b20c538aaf0ec0eb98b8e1284b43552908f1a Mon Sep 17 00:00:00 2001 From: fruchti Date: Sat, 25 Jan 2025 10:47:47 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Remove=20dune3d=20package=20(it=E2=80=99s?= =?UTF-8?q?=20in=20nixpkgs=20now)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/Disco.nix | 2 +- packages/dune3d.nix | 65 --------------------------------------------- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 packages/dune3d.nix diff --git a/hosts/Disco.nix b/hosts/Disco.nix index 5703b5b..fffb439 100644 --- a/hosts/Disco.nix +++ b/hosts/Disco.nix @@ -71,7 +71,7 @@ openscad freecad solvespace - (pkgs.callPackage ../packages/dune3d.nix {}) + dune3d vscodium marktext diff --git a/packages/dune3d.nix b/packages/dune3d.nix deleted file mode 100644 index f32ce7c..0000000 --- a/packages/dune3d.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - cmake, - eigen, - fetchFromGitHub, - glm, - gobject-introspection, - gtkmm4, - lib, - libepoxy, - librsvg, - libspnav, - libuuid, - meson, - ninja, - opencascade-occt, - pkg-config, - python3, - gcc13Stdenv, - wrapGAppsHook, -}: - -gcc13Stdenv.mkDerivation rec { - pname = "dune3d"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "dune3d"; - repo = "dune3d"; - rev = "v${version}"; - hash = "sha256-Z/kdOc/MbnnEyRsel3aZGndTAy1eCdAK0Wdta0HxaE4="; - }; - - nativeBuildInputs = [ - gobject-introspection - meson - ninja - pkg-config - wrapGAppsHook - ]; - buildInputs = [ - cmake - eigen - glm - gtkmm4 - libepoxy - librsvg - libspnav - libuuid - opencascade-occt - (python3.withPackages (pp: [ - pp.pygobject3 - ])) - ]; - - env.CASROOT = opencascade-occt; - - meta = with lib; { - description = "3D CAD application"; - homepage = "https://dune3d.org"; - license = licenses.gpl3Plus; - mainProgram = "dune3d"; - platforms = platforms.linux; - }; -} - From 6021552b816084c71cb21e0c8b972a7adae08d96 Mon Sep 17 00:00:00 2001 From: fruchti Date: Sat, 25 Jan 2025 10:48:27 +0100 Subject: [PATCH 2/5] Disco: Install darktable --- hosts/Disco.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/Disco.nix b/hosts/Disco.nix index fffb439..eaaa260 100644 --- a/hosts/Disco.nix +++ b/hosts/Disco.nix @@ -66,6 +66,7 @@ vlc mpv a52dec gthumb gimp + darktable tenacity openscad From 65eff9fab96e2bcf182e59fd83937546776119bf Mon Sep 17 00:00:00 2001 From: fruchti Date: Sat, 25 Jan 2025 10:48:41 +0100 Subject: [PATCH 3/5] Disco: Install KiCad --- hosts/Disco.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/Disco.nix b/hosts/Disco.nix index eaaa260..fe112de 100644 --- a/hosts/Disco.nix +++ b/hosts/Disco.nix @@ -80,6 +80,7 @@ libreoffice-fresh tdesktop horizon-eda + kicad-small cura pulseview nextcloud-client From b13c5aecaa79a544acd9da6dbc7275e14a7195e0 Mon Sep 17 00:00:00 2001 From: fruchti Date: Sat, 25 Jan 2025 10:49:29 +0100 Subject: [PATCH 4/5] Disco: Fix steam --- hosts/Disco.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/Disco.nix b/hosts/Disco.nix index fe112de..3e2d7e1 100644 --- a/hosts/Disco.nix +++ b/hosts/Disco.nix @@ -117,8 +117,9 @@ programs.steam = { enable = true; - # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; }; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ @@ -126,6 +127,7 @@ "steam-original" "steam-runtime" "steam-run" + "steam-unwrapped" ]; fileSystems."/windows" = { From b9e9b29cb32652fb29e13f414385f4eb75776d5a Mon Sep 17 00:00:00 2001 From: fruchti Date: Sat, 25 Jan 2025 10:50:33 +0100 Subject: [PATCH 5/5] Add clamav module --- hosts/Disco.nix | 1 + hosts/clamav.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 hosts/clamav.nix diff --git a/hosts/Disco.nix b/hosts/Disco.nix index 3e2d7e1..790cc05 100644 --- a/hosts/Disco.nix +++ b/hosts/Disco.nix @@ -6,6 +6,7 @@ ./x270.nix ./scanner.nix ./printer.nix + # ./clamav.nix ]; boot.loader.systemd-boot.enable = true; diff --git a/hosts/clamav.nix b/hosts/clamav.nix new file mode 100644 index 0000000..a6c9c79 --- /dev/null +++ b/hosts/clamav.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + environment.systemPackages = [ + pkgs.clamav + ]; + services.clamav.daemon.enable = true; + + services.clamav.updater.enable = true; +}