Compare commits

...

4 Commits

Author SHA1 Message Date
24872e5e71 universedesktop: blender: no change 2025-08-09 11:09:12 -04:00
74f3632834 universedesktop: x11 joystick fix 2025-08-09 11:08:43 -04:00
58c066387a universedesktop: riscv emulatedsystems 2025-08-09 11:08:02 -04:00
bb17f24446 flake.lock: Update
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/fc25398450cdab61af9654928dfef9d101f51140?narHash=sha256-d0d7y9gjv9HU0Amws6kHJucR8bxrQ0PfVKxt2ll5cfs%3D' (2025-07-13)
  → 'github:nix-community/home-manager/e4bf85da687027cfc4a8853ca11b6b86ce41d732?narHash=sha256-0i3jU9AHuNXb0wYGzImnVwaw%2BmiE0yW13qfjC0F%2BfIE%3D' (2025-07-21)
• Updated input 'microvm':
    'github:astro/microvm.nix/f30ae9b9e740116d044935c9c0c68bd1c2ce8432?narHash=sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c%3D' (2025-07-12)
  → 'github:astro/microvm.nix/5e193f2c5cf9285f2b478ebd55bb1feebb5abdbf?narHash=sha256-IBqQyEkphl2/a4IHqgnguQGGEA8lAzgB2QLgAQYXHP8%3D' (2025-07-21)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9807714d6944a957c2e036f84b0ff8caf9930bc0?narHash=sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X%2BxgOL0%3D' (2025-07-08)
  → 'github:NixOS/nixpkgs/c87b95e25065c028d31a94f06a62927d18763fdf?narHash=sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc%3D' (2025-07-19)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/3633fc4acf03f43b260244d94c71e9e14a2f6e0d?narHash=sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA%3D' (2025-07-04)
  → 'github:Mic92/sops-nix/2c8def626f54708a9c38a5861866660395bb3461?narHash=sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U%3D' (2025-07-15)
2025-07-21 19:09:55 -04:00
5 changed files with 45 additions and 26 deletions

24
flake.lock generated
View File

@@ -112,11 +112,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752373701, "lastModified": 1753132348,
"narHash": "sha256-d0d7y9gjv9HU0Amws6kHJucR8bxrQ0PfVKxt2ll5cfs=", "narHash": "sha256-0i3jU9AHuNXb0wYGzImnVwaw+miE0yW13qfjC0F+fIE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc25398450cdab61af9654928dfef9d101f51140", "rev": "e4bf85da687027cfc4a8853ca11b6b86ce41d732",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -190,11 +190,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1752278584, "lastModified": 1753137325,
"narHash": "sha256-QaT8PpCR1IaUMa12ou2MlvNCzYVWgTQfVWJGXyFvY5c=", "narHash": "sha256-IBqQyEkphl2/a4IHqgnguQGGEA8lAzgB2QLgAQYXHP8=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "f30ae9b9e740116d044935c9c0c68bd1c2ce8432", "rev": "5e193f2c5cf9285f2b478ebd55bb1feebb5abdbf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +242,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751984180, "lastModified": 1752950548,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -289,11 +289,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1751606940, "lastModified": 1752544651,
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "rev": "2c8def626f54708a9c38a5861866660395bb3461",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -34,6 +34,9 @@
# ccache, y'know for blenders and whatnots # ccache, y'know for blenders and whatnots
./ccache.nix ./ccache.nix
# So we can run riscv 'natively'
./riscv.nix
]; ];
fileSystems."/home/universe/tmp" = { fileSystems."/home/universe/tmp" = {

View File

@@ -41,6 +41,16 @@
enable = true; enable = true;
background = "#000000"; 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 = { environment.sessionVariables = {
GTK_THEME="Adwaita-dark"; GTK_THEME="Adwaita-dark";
}; };

View File

@@ -55,20 +55,20 @@
blender_cuda = prev.blender.override { blender_cuda = prev.blender.override {
cudaSupport = true; cudaSupport = true;
}; };
blender = final.blender_cuda.withPackages (p: with p; [ # blender = final.blender_cuda.withPackages (p: with p; [
# OpenCAMLib support # # OpenCAMLib support
shapely # shapely
equation # equation
opencamlib # opencamlib
# NeuroMorphoVis support # # NeuroMorphoVis support
matplotlib # matplotlib
seaborn # seaborn
pandas # pandas
pillow # pillow
h5py # h5py
morphio # morphio
# TODO add BluePy support? # # TODO add BluePy support?
]); # ]);
# Update RX and Aseprite # Update RX and Aseprite
rx = prev.rx.overrideAttrs (old: { rx = prev.rx.overrideAttrs (old: {
version = "git"; version = "git";

View File

@@ -0,0 +1,6 @@
{ config, pkgs, lib, ... }: {
boot.binfmt.emulatedSystems = [
"riscv64-linux"
];
boot.binfmt.preferStaticEmulators = true;
}