diff --git a/flake.lock b/flake.lock index 36b12ba..3bb6965 100644 --- a/flake.lock +++ b/flake.lock @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1753132348, + "narHash": "sha256-0i3jU9AHuNXb0wYGzImnVwaw+miE0yW13qfjC0F+fIE=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "e4bf85da687027cfc4a8853ca11b6b86ce41d732", "type": "github" }, "original": { @@ -153,7 +153,7 @@ "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz" }, "original": { "type": "tarball", @@ -190,11 +190,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1750358184, - "narHash": "sha256-17EYMeY5v8KRk9HW6Z4dExY8Wg4y/zM2eM2wbbx+vMs=", + "lastModified": 1753137325, + "narHash": "sha256-IBqQyEkphl2/a4IHqgnguQGGEA8lAzgB2QLgAQYXHP8=", "owner": "astro", "repo": "microvm.nix", - "rev": "fd9f5dba1ffee5ad6f29394b2a9e4c66c1ce77dc", + "rev": "5e193f2c5cf9285f2b478ebd55bb1feebb5abdbf", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1750325256, - "narHash": "sha256-vvlxGz/waqJ3TGqM/iqXbnEc7/R1qnEXmaBiPaQ1RE0=", + "lastModified": 1751313918, + "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "0d71cbf88d63e938b37b85b3bf8b238bcf7b39b9", + "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1752950548, + "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1750119275, - "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", + "lastModified": 1752544651, + "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", "owner": "Mic92", "repo": "sops-nix", - "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2", + "rev": "2c8def626f54708a9c38a5861866660395bb3461", "type": "github" }, "original": { @@ -305,11 +305,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1746869549, - "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=", + "lastModified": 1751265943, + "narHash": "sha256-XoHSo6GEElzRUOYAEg/jlh5c8TDsyDESFIux3nU/NMc=", "ref": "refs/heads/main", - "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87", - "revCount": 862, + "rev": "37c8663fab86fdb202fece339ef7ac7177ffc201", + "revCount": 904, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, diff --git a/flake.nix b/flake.nix index 5396e40..2f83b12 100644 --- a/flake.nix +++ b/flake.nix @@ -71,8 +71,8 @@ modules = [ ./machines/pericyte/configuration.nix modules.sops - #lix-module.nixosModules.default - microvm.nixosModules.host + # lix-module.nixosModules.default + # microvm.nixosModules.host ]; }; }; diff --git a/machines/hippocampus/backups/gitea.nix b/machines/hippocampus/backups/gitea.nix index 4c36208..289d378 100644 --- a/machines/hippocampus/backups/gitea.nix +++ b/machines/hippocampus/backups/gitea.nix @@ -1,6 +1,24 @@ -{ ... }: { +{ pkgs, config, ... }: { services.gitea.dump = { enable = true; interval = "2:45"; }; + systemd.timers."gitea-clear-dump" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "daily"; + Persistent = true; + Unit = "gitea-clear-dump.service"; + }; + }; + + systemd.services."gitea-clear-dump" = { + script = '' + ${pkgs.findutils}/bin/find /var/lib/gitea/dump -type f -ctime +5 -exec rm -f {} \; + ''; + serviceConfig = { + Type = "oneshot"; + User = config.services.gitea.user; + }; + }; } diff --git a/machines/hippocampus/modules/headscale.nix b/machines/hippocampus/modules/headscale.nix index 58d809b..515d4da 100644 --- a/machines/hippocampus/modules/headscale.nix +++ b/machines/hippocampus/modules/headscale.nix @@ -91,7 +91,7 @@ let partOf = ["headscale.service"]; script = '' - ${cfg.package}/bin/headscale preauthkeys -u ${name} create \ + ${cfg.package}/bin/headscale preauthkeys -u $(${cfg.package}/bin/headscale users -o json-line list | ${pkgs.jq}/bin/jq '.[] | select(.name=="${name}").id') create \ ${lib.optionalString options.preAuthEphemeral "--ephemeral"} \ ${lib.optionalString options.preAuthReusable "--reusable"} \ --expiration ${options.preAuthExpiration} \ diff --git a/machines/hippocampus/oci/Wireguard.ContainerFile b/machines/hippocampus/oci/Wireguard.ContainerFile new file mode 100644 index 0000000..7add9a4 --- /dev/null +++ b/machines/hippocampus/oci/Wireguard.ContainerFile @@ -0,0 +1,5 @@ +FROM alpine:3.16 +RUN apk add --no-cache bash wireguard-tools jq curl git ncurses +RUN git clone https://github.com/pia-foss/manual-connections /manual-connections +WORKDIR /manual-connections +CMD bash -c "/manual-connections/run_setup.sh && watch -n 60 curl ip.me" diff --git a/machines/hippocampus/oci/jelly.nix b/machines/hippocampus/oci/jelly.nix index 12689ee..73447a5 100644 --- a/machines/hippocampus/oci/jelly.nix +++ b/machines/hippocampus/oci/jelly.nix @@ -18,10 +18,12 @@ in { containers = { wireguard = { - image = "thrnz/docker-wireguard-pia"; + # Derived from the pia-wg.tar.gz + # which was built from the containerfile + image = "localhost/pia-wg:latest"; volumes = [ # "${configDir}/wireguard:/config" - "${configDir}/wireguard_pia:/pia" + # "${configDir}/wireguard_pia:/pia" ]; ports = getPorts [ "deluge" @@ -34,13 +36,23 @@ ]; environment = { TZ = "America/Toronto"; - LOC = "ca"; + LOC = "ca"; + PIA_DNS = "false"; # - true/false + PIA_PF = "false"; # - true/false + PIA_CONNECT = "true"; # - true/false; connect to VPN after configuration has been created. Set to false to only create configuration file. Only effective for wireguard protocol. Default true. + MAX_LATENCY = "0.2"; # - numeric value, in seconds + AUTOCONNECT = "true"; # - true/false; this will test for and select the server with the lowest latency, it will override PREFERRED_REGION + # PREFERRED_REGION = ""; # - the region ID for a PIA server + DIP_TOKEN = "n"; + VPN_PROTOCOL = "wireguard"; # - wireguard or openvpn; openvpn will default to openvpn_udp_standard, but can also specify openvpn_tcp/udp_standad/strong + DISABLE_IPV6 = "no"; # - yes/no }; extraOptions = [ - "--cap-add=ALL" - "--pull=newer" - "--dns=1.1.1.1" + "--privileged" "--dns=1.1.1.1" "--env-file=${config.sops.secrets.jellyfin-pia.path}" + "--cap-add=NET_ADMIN,NET_RAW,SYS_MODULE" + "--cap-drop=MKNOD,AUDIT_WRITE" + "--sysctl=net.ipv4.ip_forward=1" "--sysctl=net.ipv4.conf.all.src_valid_mark=1" "--sysctl=net.ipv6.conf.lo.disable_ipv6=1" "--sysctl=net.ipv6.conf.all.disable_ipv6=1" diff --git a/machines/hippocampus/oci/pia-wg.tar.gz b/machines/hippocampus/oci/pia-wg.tar.gz new file mode 100644 index 0000000..edb45f9 Binary files /dev/null and b/machines/hippocampus/oci/pia-wg.tar.gz differ diff --git a/machines/hippocampus/riscv.nix b/machines/hippocampus/riscv.nix index cbcbda2..7e634dd 100644 --- a/machines/hippocampus/riscv.nix +++ b/machines/hippocampus/riscv.nix @@ -2,4 +2,5 @@ boot.binfmt.emulatedSystems = [ "riscv64-linux" ]; + boot.binfmt.preferStaticEmulators = true; } diff --git a/machines/hippocampus/secrets/pass.yaml b/machines/hippocampus/secrets/pass.yaml index 6ee8598..c8b2d5c 100644 --- a/machines/hippocampus/secrets/pass.yaml +++ b/machines/hippocampus/secrets/pass.yaml @@ -1,7 +1,7 @@ nextcloud: adminPass: ENC[AES256_GCM,data:D2SAD/Somvw8abIm0KX4fWRfuQ==,iv:Y7K14yZZFcu97KVBd0219hwnGY4LEX2DNxxulSegr/8=,tag:aRJAlz1xvQxWodcE2bZLdQ==,type:str] s3secret: ENC[AES256_GCM,data:lIVuiZMh376MSuu13UPCu49Q64bVbk+WM/CUEIGzV0Q=,iv:J2vHalppWEupWK07zXsMoiH6avmpsgg0Cqcc7EkZVV4=,tag:pxKwiaH5SZa8Vh71gLGQWw==,type:str] -jellyfin-pia: ENC[AES256_GCM,data:rbqpmm2EtxcMeJfjlGaJOwPCn4UAZaKsH8Zeztk7A6QiSw==,iv:8A6NHVHgKIL6iwLKgRrT6T3k0pgDI5lL5rDMN5/Egrw=,tag:P6Kh9cOnrB23Z7S72xBK7g==,type:str] +jellyfin-pia: ENC[AES256_GCM,data:hOgUAr47FMd2QgzgXBeqv41Paqy6zn6tyWVDbF1JtqcTog/zZC4=,iv:opnxrycFszAhuMARcP48gKF6eL1ERNgWS68wO+s4CIM=,tag:fqimxKdTAh55ANKD3bp46w==,type:str] ddclient: ENC[AES256_GCM,data:a31MKnoEZXrj/s8z3+MP9jhQ5/sBjljZphXBJsWj5GU=,iv:YHKCartadDQa59aUf9Fw/KgdgMgsqsVLDAIh/KeqehQ=,tag:hUaUqjcX75xw6eC9axtQmw==,type:str] anki: ENC[AES256_GCM,data:hUBKr/s1DDorlmbHDUvHtVSumw==,iv:Ekjt6dsncinHhM+dV/mxOjErBQpgKtPOVbmwGRy9XOE=,tag:zvfV9z3QROgsk4eznmxqDw==,type:str] tandoor-secret: ENC[AES256_GCM,data:/clEIU38M7lJ6+JbFSKWb5kKSUvxdGYPq2Hl9TjgijZtYIYFOleJQ9PiT+d/osmY/r0=,iv:Nulu93V+s9RBmEDRs2LXJXy7l0O/AeU0CwwtTNLGw2c=,tag:brRyVaWeUGLx1nt0MtcIEw==,type:str] @@ -14,10 +14,6 @@ restic: passwd: ENC[AES256_GCM,data:vUsAP5+iZo7U55xnUP7Cnk1OxnrO+paHKmT2cuc=,iv:GF7fybEQZIxHPm1Z6Sj5dn/zOR5dRVgikH8LILsTMIs=,tag:Mh61boRPsfHeiSfXmrEx5Q==,type:str] backblaze: ENC[AES256_GCM,data:IfWzuIYUrCGYpP68CPFi2vLqq9NVmiVyCE+Z8yi+cnaQwgwNL40lJEPL/U3d0lgsmrsV4GheNJ0oQ9tnrrJeBgZgwMl/CwXMctuUHo+cvVot/cNRd1vCdjRr7WUnw8737uxyW45OaaYbkZRa3NWEGDll1iFDWB2w4n5DTsomyO03tFZB5gckwQYmpjYmK4DcIWyTaEiDrznmkyM+sxoWv9pcTHZIIN7TCHHkzmlMzXXqJnoRfCpdVm/QF9jbrAYs,iv:tOa1FFyggm0ScoRdFk6tACOnQVcZMYaDqeJyX5SMKXc=,tag:EY5jQhZnLP6IzqY9garoEQ==,type:str] sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] age: - recipient: age1crymppz88etsdjpckmtdhr397x5xg5wv8jt6tcj23gt2snq73pzs04fuve enc: | @@ -28,8 +24,7 @@ sops: RVUzMlFya3Z0amdTUTJ5YjFRck5kZzQKoWZzExqzPRpQPL4CdqBalc1/dYtjBH6J LGR0oImfOWlIJwcaJLv/fc470UvXHHwIji9v/pbV7xMkgMjlJthaYg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-26T02:45:21Z" - mac: ENC[AES256_GCM,data:t5+2iRUJprwwW8GRiQx/h8IOYjjhsq+954GDL2ujXiZVM3oBhESdeBi6aMMwsqABCr+PjP4gb4qHHbduxWlGSZlAh4HSiVwwizI8XV8HZqUqPKBJEqRThzcwznCk4DOGpf1PMbktBX/r50pDeoDcgShKka1bMY8kD385SVklgNE=,iv:EXFXz12HNTMRoW0gIrTEZPHhdTG2cxaWf65uTgT7nZ4=,tag:5XweTiLnO9N8eZb4EPkh6g==,type:str] - pgp: [] + lastmodified: "2025-07-19T19:15:37Z" + mac: ENC[AES256_GCM,data:RPGKe5f+5GUnGK3zybRrTnd8N4TprLWBEWLI2HI68Acf1MlJ1AMOWOhpi5xa0Hkxpah8D/d0CEH2ymaO5EBSUamPdYThI4g/4cxNBXboKnALSf91ZUty86/1+14TbI6vFCZ5ghjB4THxszGf47ajIDa/TjHx0yHFWDi7rpApmcw=,iv:ep/NlJfkIkQe5RJ4U2YfZ7/0S4vWqxjg+xrLLnJwfwI=,tag:c01jey2juzoPKux7n/0rug==,type:str] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.10.2 diff --git a/machines/hippocampus/servers/public.nix b/machines/hippocampus/servers/public.nix index 4b6185c..4c4538c 100644 --- a/machines/hippocampus/servers/public.nix +++ b/machines/hippocampus/servers/public.nix @@ -25,7 +25,7 @@ ./public/nextcloud.nix # Rabb.it at home - ./public/watchthingz.nix + # ./public/watchthingz.nix # Pterodactyl Game Server ./public/pterodactyl.nix @@ -47,5 +47,8 @@ # Random Usage, specific port ./public/random.nix + + # Perfect Pitch Project + ./public/perfect_pitch.nix ]; } diff --git a/machines/hippocampus/servers/public/headscale.nix b/machines/hippocampus/servers/public/headscale.nix index 5da725a..50c04b2 100644 --- a/machines/hippocampus/servers/public/headscale.nix +++ b/machines/hippocampus/servers/public/headscale.nix @@ -26,6 +26,9 @@ dns = { base_domain = "tailnet"; magic_dns = true; + nameservers.global = [ + "1.1.1.1" + ]; }; }; }; diff --git a/machines/hippocampus/servers/public/hydra.nix b/machines/hippocampus/servers/public/hydra.nix index 5e1f03f..7837c3e 100644 --- a/machines/hippocampus/servers/public/hydra.nix +++ b/machines/hippocampus/servers/public/hydra.nix @@ -17,7 +17,7 @@ in { ''; }; nix.extraOptions = '' - allowed-uris = https://github.com/ https://git.savannah.gnu.org/ https://git.syzygial.cc https://gitlab.com https://sr.ht github: gitlab: + allowed-uris = https://github.com/ https://git.savannah.gnu.org/ https://git.syzygial.cc https://gitlab.com https://sr.ht github: gitlab: https://git.lix.systems ''; systemd.services.hydra = { serviceConfig = { diff --git a/machines/hippocampus/servers/public/nextcloud.nix b/machines/hippocampus/servers/public/nextcloud.nix index 7d3a6a3..5ee4663 100644 --- a/machines/hippocampus/servers/public/nextcloud.nix +++ b/machines/hippocampus/servers/public/nextcloud.nix @@ -13,7 +13,7 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud30; + package = pkgs.nextcloud31; hostName = "localhost"; settings = { trusted_domains = [ diff --git a/machines/hippocampus/servers/public/perfect_pitch.nix b/machines/hippocampus/servers/public/perfect_pitch.nix new file mode 100644 index 0000000..88879e5 --- /dev/null +++ b/machines/hippocampus/servers/public/perfect_pitch.nix @@ -0,0 +1,52 @@ +{config, pkgs, ...}: + +{ + systemd.targets.machines.enable = true; + systemd.services."perfectpitch-container" = { + enable = true; + wantedBy = ["machines.target"]; + environment = { + # SYSTEMD_NSPAWN_USE_CGNS = "0"; + }; + script = '' + exec ${config.systemd.package}/bin/systemd-nspawn --hostname perfectpitch \ + --resolv-conf=off --system-call-filter="add_key keyctl bpf" --bind /dev/fuse \ + -nbD /var/lib/machines/perfectpitch --machine perfectpitch + ''; + postStart = '' + ${pkgs.iproute2}/bin/ip link set ve-perfectpitch up || true + ${pkgs.iproute2}/bin/ip addr add 10.2.0.0 dev ve-perfectpitch || true + ${pkgs.iproute2}/bin/ip route add 10.2.0.1 dev ve-perfectpitch || true + ''; + serviceConfig = { + Type = "notify"; + Slice = "machine.slice"; + Delegate = true; + DeviceAllow = "/dev/fuse rwm"; + }; + }; + networking.nat = { + enable = true; + # Check for hostBridge use vb instead of ve + internalInterfaces = ["ve-perfectpitch"]; + externalInterface = "enp0s25"; + enableIPv6 = true; + forwardPorts = [ + { sourcePort = 8022; + destination = "10.2.0.1:22"; + proto = "tcp"; + } + { sourcePort = 8022; + destination = "10.2.0.1:22"; + proto = "udp"; + } + ]; + }; + services.caddy.virtualHosts = { + "pitch.crompton.cc" = { + extraConfig = '' + reverse_proxy 10.2.0.1:8080 + ''; + }; + }; +} diff --git a/machines/hippocampus/servers/public/pterodactyl.nix b/machines/hippocampus/servers/public/pterodactyl.nix index f2deca9..1a82aab 100644 --- a/machines/hippocampus/servers/public/pterodactyl.nix +++ b/machines/hippocampus/servers/public/pterodactyl.nix @@ -32,11 +32,11 @@ externalInterface = "enp0s25"; enableIPv6 = true; forwardPorts = [ - { sourcePort = "25565:28000"; + { sourcePort = "25565:26000"; destination = "10.1.0.1:25565-25600"; proto = "tcp"; } - { sourcePort = "25565:28000"; + { sourcePort = "25565:26000"; destination = "10.1.0.1:25565-25600"; proto = "udp"; } diff --git a/machines/hippocampus/servers/public/tandoor.nix b/machines/hippocampus/servers/public/tandoor.nix index b033131..8eed3a1 100644 --- a/machines/hippocampus/servers/public/tandoor.nix +++ b/machines/hippocampus/servers/public/tandoor.nix @@ -18,7 +18,8 @@ in { }; systemd.services.tandoor-recipes = { - environment.GUNICORN_MEDIA = lib.mkForce null; + # https://github.com/TandoorRecipes/recipes/issues/3617 + environment.GUNICORN_MEDIA = "1"; #lib.mkForce null; serviceConfig = { EnvironmentFile = config.sops.secrets.tandoor-pass.path; }; diff --git a/machines/hippocampus/services/dyndns.nix b/machines/hippocampus/services/dyndns.nix index 939be63..5219918 100644 --- a/machines/hippocampus/services/dyndns.nix +++ b/machines/hippocampus/services/dyndns.nix @@ -2,7 +2,7 @@ sops.secrets.ddclient = {}; services.ddclient = { enable = true; - usev4 = "web, web=dynamicdns.park-your-domain.com/getip"; + usev4 = "webv4, web=dynamicdns.park-your-domain.com/getip"; protocol = "namecheap"; server = "dynamicdns.park-your-domain.com"; username = "crompton.cc"; diff --git a/machines/pericyte/configuration.nix b/machines/pericyte/configuration.nix index 1aec683..511f39e 100644 --- a/machines/pericyte/configuration.nix +++ b/machines/pericyte/configuration.nix @@ -6,7 +6,6 @@ ./podman.nix ./container-registry.nix - ./test.nix # ./microvm-configuration.nix # ./k3s.nix ]; diff --git a/machines/pericyte/k3s.nix b/machines/pericyte/k3s.nix index e8e8508..add7760 100644 --- a/machines/pericyte/k3s.nix +++ b/machines/pericyte/k3s.nix @@ -16,4 +16,7 @@ # "--debug" # Optionally add additional args to k3s ]; }; + environment.systemPackages = with pkgs; [ + rancher + ]; } diff --git a/machines/universedesktop/configuration.nix b/machines/universedesktop/configuration.nix index bb4235e..8872f9d 100644 --- a/machines/universedesktop/configuration.nix +++ b/machines/universedesktop/configuration.nix @@ -34,6 +34,9 @@ # ccache, y'know for blenders and whatnots ./ccache.nix + + # So we can run riscv 'natively' + ./riscv.nix ]; fileSystems."/home/universe/tmp" = { diff --git a/machines/universedesktop/desktop/dwm.nix b/machines/universedesktop/desktop/dwm.nix index 4a8a007..166161a 100644 --- a/machines/universedesktop/desktop/dwm.nix +++ b/machines/universedesktop/desktop/dwm.nix @@ -41,6 +41,16 @@ enable = true; background = "#000000"; }; + services.xserver.config = lib.mkAfter '' +Section "InputClass" + Identifier "joystick catchall" + MatchIsJoystick "on" + MatchDevicePath "/dev/input/event*" + Driver "joystick" + Option "StartKeysEnabled" "False" + Option "StartMouseEnabled" "False" +EndSection + ''; environment.sessionVariables = { GTK_THEME="Adwaita-dark"; }; diff --git a/machines/universedesktop/programs/art.nix b/machines/universedesktop/programs/art.nix index e11d8c4..0e2b257 100644 --- a/machines/universedesktop/programs/art.nix +++ b/machines/universedesktop/programs/art.nix @@ -5,41 +5,9 @@ python-final: python-prev: let py = python-prev; in { - opencamlib = py.toPythonModule (pkgs.stdenv.mkDerivation rec { - pname = "opencamlib"; - version = "2019.07"; - nativeBuildInputs = (with pkgs;[ - cmake - git - doxygen - boost - texlive.combined.scheme-full - ]); - propagatedNativeBuildInputs = [ - py.python - py.boost - py.vtk - ]; - postPatch = '' - mkdir -p $out/${py.python.sitePackages}/{lib,ocl} - sed -e 's#LIBRARY DESTINATION ''${PYTHON_ARCH_PACKAGES}#LIBRARY DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake - sed -e 's#DESTINATION ''${PYTHON_SITE_PACKAGES}#DESTINATION '"$out"'/${py.python.sitePackages}#g' -i src/pythonlib/pythonlib.cmake - ''; - cmakeFlags = [ - "-DVERSION_STRING=2019.07" - "-DBUILD_CXX_LIB=ON" - "-DBUILD_PY_LIB=ON" - "-DUSE_PY_3=ON" - "-DCMAKE_BUILD_TYPE=Release" - ]; - src = pkgs.fetchFromGitHub { - owner = "aewallin"; - repo = "opencamlib"; - rev = "2019.07"; - sha256 = "1a8pxp1mh8x3bfsb0l97vgxrpk482p7q9jprkd4m9hv69vva2bdz"; - }; - }); equation = py.buildPythonPackage { + pyproject = true; + build-system = [ py.setuptools ]; pname = "Equation"; version = "1.2.01"; nativeBuildInputs = [ @@ -52,6 +20,8 @@ }; }; morphio = py.toPythonModule ( pkgs.stdenv.mkDerivation rec { + pyproject = true; + build-system = [ py.setuptools ]; pname = "MorphIO"; version = "3.3.4"; nativeBuildInputs = (with pkgs; [ @@ -85,20 +55,20 @@ blender_cuda = prev.blender.override { cudaSupport = true; }; - blender = final.blender_cuda.withPackages (p: with p; [ - # OpenCAMLib support - shapely - equation - #opencamlib - # NeuroMorphoVis support - matplotlib - seaborn - pandas - pillow - h5py - morphio - # TODO add BluePy support? - ]); +# blender = final.blender_cuda.withPackages (p: with p; [ +# # OpenCAMLib support +# shapely +# equation +# opencamlib +# # NeuroMorphoVis support +# matplotlib +# seaborn +# pandas +# pillow +# h5py +# morphio +# # TODO add BluePy support? +# ]); # Update RX and Aseprite rx = prev.rx.overrideAttrs (old: { version = "git"; @@ -118,6 +88,7 @@ rx aseprite-unfree + pixelorama gimp glaxnimate diff --git a/machines/universedesktop/programs/terminal.nix b/machines/universedesktop/programs/terminal.nix index 293835f..bc17888 100644 --- a/machines/universedesktop/programs/terminal.nix +++ b/machines/universedesktop/programs/terminal.nix @@ -9,7 +9,8 @@ htop btop xclip - screen + tio + tmux usbutils man-pages man-pages-posix diff --git a/machines/universedesktop/riscv.nix b/machines/universedesktop/riscv.nix new file mode 100644 index 0000000..7e634dd --- /dev/null +++ b/machines/universedesktop/riscv.nix @@ -0,0 +1,6 @@ +{ config, pkgs, lib, ... }: { + boot.binfmt.emulatedSystems = [ + "riscv64-linux" + ]; + boot.binfmt.preferStaticEmulators = true; +}