diff --git a/configuration.nix b/configuration.nix index 0320bd1..ed40a82 100755 --- a/configuration.nix +++ b/configuration.nix @@ -103,13 +103,13 @@ in # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - (callPackage ./modules/systemd-manager_sovran_systems.nix {}) git wget fish htop btop - gnomeExtensions.dash-to-dock + gnomeExtensions.systemd-manager + gnomeExtensions.dash-to-dock gnomeExtensions.vitals gnomeExtensions.pop-shell gnomeExtensions.just-perfection @@ -372,8 +372,8 @@ backup /etc/nix-bitcoin-secrets/ localhost/ ####### Open ports in the firewall ####### - networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3050 3051 ]; - networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3050 3051 ]; + networking.firewall.allowedTCPPorts = [ 80 443 5349 8448 3051 ]; + networking.firewall.allowedUDPPorts = [ 80 443 5349 8448 3051 ]; networking.firewall.allowedUDPPortRanges = [ { from=49152; to=65535; } # TURN relay diff --git a/flake.nix b/flake.nix index 6ff0a82..d712f3f 100755 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "The Ultimate Sovran_SystemsOS Configuration for the Sovran Pro from Sovran Systems"; + description = "The Ultimate Sovran_SystemsOS Configuration from Sovran Systems"; inputs = { @@ -62,11 +62,11 @@ ]; environment.systemPackages = with pkgs; [ - btc-clients.packages.x86_64-linux.bisq + + btc-clients.packages.x86_64-linux.bisq btc-clients.packages.x86_64-linux.bisq2 btc-clients.packages.x86_64-linux.sparrow - ]; }; diff --git a/modules/systemd-manager_sovran_systems.nix b/modules/systemd-manager_sovran_systems.nix deleted file mode 100755 index 5b376f3..0000000 --- a/modules/systemd-manager_sovran_systems.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchzip, buildPackages }: - -stdenv.mkDerivation rec { - pname = "systemd-manager"; - version = "18"; - - src = fetchzip { - url = "https://github.com/hardpixel/systemd-manager/releases/download/v${version}/systemd-manager-v${version}.zip"; - hash = "sha256-Kd8ZxZ1f6aR1vThrWStsjk8cHrjo2KCYQgpg1em/n2k="; - stripRoot = false; - }; - - passthru = { - extensionUuid = "systemd-manager@hardpixel.eu"; - extensionPortalSlug = "systemd-manager"; - }; - - nativeBuildInputs = [ buildPackages.glib ]; - - buildPhase = '' - runHook preBuild - if [ -d schemas ]; then - glib-compile-schemas --strict schemas - fi - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r -T . $out/share/gnome-shell/extensions/${passthru.extensionUuid} - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension to manage systemd services"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - homepage = "https://github.com/hardpixel/systemd-manager"; - }; -}