Compare commits

...

3 Commits

Author SHA1 Message Date
Bailey Stevens 85bef07b14 Updates mmelodies. 2023-10-04 11:50:49 -04:00
Bailey Stevens 79fa5991d9 Moves appuser to app specific config. 2023-10-04 10:53:46 -04:00
Bailey Stevens 4b8e6a9935 Removes jack. 2023-10-04 08:42:32 -04:00
3 changed files with 69 additions and 22 deletions

View File

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

View File

@ -103,20 +103,39 @@
"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": {
"inputs": {
"flake-utils": "flake-utils_3",
"napalm": "napalm",
"nixpkgs": [
"nixpkgs"
]
],
"phyzzy": "phyzzy"
},
"locked": {
"lastModified": 1696409911,
"narHash": "sha256-IFGbm0OH6EoQ/MB5uR9kWx2BWNqXEWZYCoemcq2/rv4=",
"lastModified": 1696434603,
"narHash": "sha256-Wdv8H9IiikPTRPKw81HuOp0aHDcX7LhgKD8jgEPTYKY=",
"ref": "refs/heads/main",
"rev": "800af05329408c236a53683a8349d5de40cb6361",
"revCount": 50,
"rev": "a1a3221f4dcaf03262a9706f97d3cf1911dfb35f",
"revCount": 57,
"type": "git",
"url": "https://fem.mint.lgbt/mmelodies/mmelodies.git"
},
@ -195,6 +214,28 @@
"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": {
"inputs": {
"colmena": "colmena",
@ -249,6 +290,21 @@
"repo": "default",
"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",

View File

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