Skip to content

Commit f3046fb

Browse files
committed
chores: more music stuff
1 parent e3d40ae commit f3046fb

File tree

6 files changed

+40
-22
lines changed

6 files changed

+40
-22
lines changed

channels

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ sudo nix-channel --add https://github.com/ryantm/agenix/archive/main.tar.gz agen
33
sudo nix-channel --add https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master/nixos-mailserver-master.tar.gz nixos-mailserver
44
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/refs/heads/master.tar.gz home-manager
55
sudo nix-channel --add https://github.com/tpwrules/nixos-apple-silicon/archive/refs/heads/main.tar.gz apple-silicon-support
6+
sudo nix-channel --add https://github.com/musnix/musnix/archive/master.tar.gz musnix

components/hardening.nix

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ in
4040
};
4141
};
4242

43-
# TODO: i am almost sure this import is lazy evaluated if the module isn't enabled
44-
# but i should probably double check... -- govanify
43+
# TODO: this is _not_ lazy evaluated and conflicts with musnix.... what to do
4544
imports = [
4645
<nixpkgs/nixos/modules/profiles/hardened.nix>
4746
];
4847

4948
config = mkIf cfg.enable {
5049
# Use the hardened kernel but keep IA32 emulation.
51-
boot.kernelPackages = mkIf cfg.legacy kernelPackages;
52-
boot.kernelPatches = mkIf cfg.legacy [
53-
{
54-
name = "keep-ia32";
55-
patch = null;
56-
extraConfig = ''
57-
IA32_EMULATION y
58-
'';
59-
}
60-
];
50+
# TODO: only needed if hardened kernel is used
51+
#boot.kernelPackages = mkIf cfg.legacy kernelPackages;
52+
#boot.kernelPatches = mkIf cfg.legacy [
53+
# {
54+
# name = "keep-ia32";
55+
# patch = null;
56+
# extraConfig = ''
57+
# IA32_EMULATION y
58+
# '';
59+
# }
60+
#];
6161

6262
environment.memoryAllocator.provider = if cfg.scudo then "scudo" else "libc";
6363
security.lockKernelModules = cfg.modules;

components/shell.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ in
178178

179179

180180
environment.systemPackages = mkIf cfg.build-beautify [
181-
(pkgs.writeShellScriptBin "nix-build" "${pkgs.expect}/bin/unbuffer ${pkgs.nix}/bin/nix-build \"$@\" 2>&1 | exec ${pkgs.nix-output-monitor}/bin/nom")
182181
(pkgs.writeShellScriptBin "nixos-rebuild" "${pkgs.expect}/bin/unbuffer ${pkgs.nixos-rebuild}/bin/nixos-rebuild \"$@\" 2>&1 | exec ${pkgs.nix-output-monitor}/bin/nom")
183182
# command
184183
];

infrastructure/graphical.nix

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ let
88
in
99
with lib;
1010
{
11+
imports = [
12+
<musnix>
13+
];
1114
config = mkIf config.navi.profile.graphical {
1215
# needed to export obs as a virtual camera
1316
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
@@ -55,6 +58,12 @@ with lib;
5558
)
5659
];
5760

61+
musnix = {
62+
enable = true;
63+
rtcqs.enable = true;
64+
kernel.realtime = true;
65+
das_watchdog.enable = true;
66+
};
5867

5968
environment.systemPackages = with pkgs; [
6069
waypipe
@@ -92,14 +101,16 @@ with lib;
92101
# music (DAW + plugins)
93102
ardour
94103
reaper
104+
bitwig-studio
95105
milkytracker
96106
calf
97107
sfizz
98108
# my love
99109
surge-XT
100110
infamousPlugins
101111
zynaddsubfx
102-
vcv-rack
112+
cardinal
113+
carla
103114
vital
104115
x42-plugins
105116
tunefish
@@ -128,7 +139,8 @@ with lib;
128139
# math
129140
coq
130141
lean
131-
elan
142+
# XXX: broken
143+
#elan
132144

133145
# chat
134146
discord

infrastructure/laptop.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ with lib;
33
{
44
config = mkIf (config.navi.profile.name == "laptop") {
55
programs.fuse.userAllowOther = true;
6-
fileSystems."/mnt/axolotl" =
7-
{
8-
device = "alastor-user:/mnt/axolotl";
9-
fsType = "fuse.sshfs";
10-
options = [ "defaults" "x-systemd.automount" "allow_other" "_netdev" ];
11-
};
6+
# XXX: keeps getting disconnected, better to use ssh for now
7+
#fileSystems."/mnt/axolotl" =
8+
# {
9+
# device = "alastor-user:/mnt/axolotl";
10+
# fsType = "fuse.sshfs";
11+
# options = [ "defaults" "x-systemd.automount" "allow_other" "_netdev" ];
12+
# };
1213

1314
systemd.services.forward = {
1415
description = "Sixty degrees that come in threes";

profiles/graphical.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ with lib;
88
# use networkmanager by default on graphical setups; makes life easier
99
networking.networkmanager.enable = true;
1010

11+
# let's disable navi stuff on firefox until i have the time to mess around
12+
# with it
13+
environment.variables.BROWSER = "firefox";
14+
environment.systemPackages = [ pkgs.firefox ];
1115
navi.components = {
1216
bootloader.verbose = false;
1317
vte.enable = true;
14-
browser.enable = true;
18+
#
19+
#browser.enable = true;
1520
# userspace takes ~2s to boot with the standard configuration, enabling a
1621
# splash with this much time to wait just doesn't make sense, so let's
1722
# disable it until our boot time stops being so blazingly fast :)

0 commit comments

Comments
 (0)