File tree Expand file tree Collapse file tree 6 files changed +40
-22
lines changed Expand file tree Collapse file tree 6 files changed +40
-22
lines changed Original file line number Diff line number Diff line change @@ -3,3 +3,4 @@ sudo nix-channel --add https://github.com/ryantm/agenix/archive/main.tar.gz agen
3
3
sudo nix-channel --add https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master/nixos-mailserver-master.tar.gz nixos-mailserver
4
4
sudo nix-channel --add https://github.com/nix-community/home-manager/archive/refs/heads/master.tar.gz home-manager
5
5
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
Original file line number Diff line number Diff line change 40
40
} ;
41
41
} ;
42
42
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
45
44
imports = [
46
45
<nixpkgs/nixos/modules/profiles/hardened.nix>
47
46
] ;
48
47
49
48
config = mkIf cfg . enable {
50
49
# 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
+ #];
61
61
62
62
environment . memoryAllocator . provider = if cfg . scudo then "scudo" else "libc" ;
63
63
security . lockKernelModules = cfg . modules ;
Original file line number Diff line number Diff line change 178
178
179
179
180
180
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" )
182
181
( pkgs . writeShellScriptBin "nixos-rebuild" "${ pkgs . expect } /bin/unbuffer ${ pkgs . nixos-rebuild } /bin/nixos-rebuild \" $@\" 2>&1 | exec ${ pkgs . nix-output-monitor } /bin/nom" )
183
182
# command
184
183
] ;
Original file line number Diff line number Diff line change 8
8
in
9
9
with lib ;
10
10
{
11
+ imports = [
12
+ <musnix>
13
+ ] ;
11
14
config = mkIf config . navi . profile . graphical {
12
15
# needed to export obs as a virtual camera
13
16
boot . extraModulePackages = [ config . boot . kernelPackages . v4l2loopback ] ;
@@ -55,6 +58,12 @@ with lib;
55
58
)
56
59
] ;
57
60
61
+ musnix = {
62
+ enable = true ;
63
+ rtcqs . enable = true ;
64
+ kernel . realtime = true ;
65
+ das_watchdog . enable = true ;
66
+ } ;
58
67
59
68
environment . systemPackages = with pkgs ; [
60
69
waypipe
@@ -92,14 +101,16 @@ with lib;
92
101
# music (DAW + plugins)
93
102
ardour
94
103
reaper
104
+ bitwig-studio
95
105
milkytracker
96
106
calf
97
107
sfizz
98
108
# my love
99
109
surge-XT
100
110
infamousPlugins
101
111
zynaddsubfx
102
- vcv-rack
112
+ cardinal
113
+ carla
103
114
vital
104
115
x42-plugins
105
116
tunefish
@@ -128,7 +139,8 @@ with lib;
128
139
# math
129
140
coq
130
141
lean
131
- elan
142
+ # XXX: broken
143
+ #elan
132
144
133
145
# chat
134
146
discord
Original file line number Diff line number Diff line change @@ -3,12 +3,13 @@ with lib;
3
3
{
4
4
config = mkIf ( config . navi . profile . name == "laptop" ) {
5
5
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
+ # };
12
13
13
14
systemd . services . forward = {
14
15
description = "Sixty degrees that come in threes" ;
Original file line number Diff line number Diff line change @@ -8,10 +8,15 @@ with lib;
8
8
# use networkmanager by default on graphical setups; makes life easier
9
9
networking . networkmanager . enable = true ;
10
10
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 ] ;
11
15
navi . components = {
12
16
bootloader . verbose = false ;
13
17
vte . enable = true ;
14
- browser . enable = true ;
18
+ #
19
+ #browser.enable = true;
15
20
# userspace takes ~2s to boot with the standard configuration, enabling a
16
21
# splash with this much time to wait just doesn't make sense, so let's
17
22
# disable it until our boot time stops being so blazingly fast :)
You can’t perform that action at this time.
0 commit comments