Compare commits

..

No commits in common. "85bef07b14f371040492e81dae1a92446316610c" and "a93356700563e8d09abec5a5d1c38229f5c236cb" have entirely different histories.

3 changed files with 22 additions and 69 deletions

View file

@ -9,11 +9,13 @@
hardware.opengl.enable = true; hardware.opengl.enable = true;
sound.enable = true; sound.enable = true;
services.jack.jackd.enable = true;
services.jack.alsa.enable = true;
# Includes packages needed for startx # Includes packages needed for startx
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager.autoLogin.user = "geekygay"; displayManager.autoLogin.user = "appuser";
windowManager.fluxbox.enable = true; windowManager.fluxbox.enable = true;
}; };
@ -30,12 +32,21 @@
geekygay = { geekygay = {
shell = pkgs.fish; shell = pkgs.fish;
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "audio" ]; extraGroups = [ "wheel" "dialout" "jackaudio" ];
password = ""; password = "";
openssh.authorizedKeys.keyFiles = [ openssh.authorizedKeys.keyFiles = [
./authorized_keys ./authorized_keys
]; ];
}; };
# Unprivledged user for running the application.
appuser = {
isNormalUser = true;
extraGroups = [ "jackaudio" ];
password = "";
packages = with pkgs; [
puredata websocat
];
};
}; };
}; };
programs.fish.enable = true; programs.fish.enable = true;

View file

@ -103,39 +103,20 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"mmelodies": { "mmelodies": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"napalm": "napalm", "napalm": "napalm",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"phyzzy": "phyzzy"
}, },
"locked": { "locked": {
"lastModified": 1696434603, "lastModified": 1696409911,
"narHash": "sha256-Wdv8H9IiikPTRPKw81HuOp0aHDcX7LhgKD8jgEPTYKY=", "narHash": "sha256-IFGbm0OH6EoQ/MB5uR9kWx2BWNqXEWZYCoemcq2/rv4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a1a3221f4dcaf03262a9706f97d3cf1911dfb35f", "rev": "800af05329408c236a53683a8349d5de40cb6361",
"revCount": 57, "revCount": 50,
"type": "git", "type": "git",
"url": "https://fem.mint.lgbt/mmelodies/mmelodies.git" "url": "https://fem.mint.lgbt/mmelodies/mmelodies.git"
}, },
@ -214,28 +195,6 @@
"type": "github" "type": "github"
} }
}, },
"phyzzy": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": [
"mmelodies",
"nixpkgs"
]
},
"locked": {
"lastModified": 1696434240,
"narHash": "sha256-DDOn4JmDfl7GkWIsFMF9puGSmJvAO1x1t2rQIYg+DTQ=",
"ref": "refs/heads/main",
"rev": "e36c08b5291c38796494b7d0c17d190f097f18a7",
"revCount": 25,
"type": "git",
"url": "https://fem.mint.lgbt/mmelodies/phyzzy.git"
},
"original": {
"type": "git",
"url": "https://fem.mint.lgbt/mmelodies/phyzzy.git"
}
},
"root": { "root": {
"inputs": { "inputs": {
"colmena": "colmena", "colmena": "colmena",
@ -290,21 +249,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -1,14 +1,12 @@
{pkgs, lib, modulesPath, config, ...}: {pkgs, lib, modulesPath, ...}:
{ {
imports = [ imports = [
"${modulesPath}/installer/sd-card/sd-image-aarch64.nix" "${modulesPath}/installer/sd-card/sd-image-aarch64.nix"
]; ];
services.mmelodies.midiDevice = "MPKmini2";
services.mmelodies.audioDevice = "Device";
nixpkgs.hostPlatform.system = "aarch64-linux"; nixpkgs.hostPlatform.system = "aarch64-linux";
sdImage.imageName = "${config.networking.hostName}.img"; sdImage.imageName = "orange.img";
services.jack.jackd.extraOptions = [ "-dalsa" "--device" "hw:Device" ];
boot.loader.raspberryPi.version = 4; boot.loader.raspberryPi.version = 4;
boot.supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ]; boot.supportedFilesystems = lib.mkForce [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ];