diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/flake.lock | 8 | ||||
| -rw-r--r-- | nix/modules/configuration.nix | 3 | ||||
| -rw-r--r-- | nix/modules/home/default.nix | 3 | ||||
| -rw-r--r-- | nix/modules/home/firefox.nix | 2 | ||||
| -rw-r--r-- | nix/modules/home/mako.nix | 18 | ||||
| -rw-r--r-- | nix/modules/home/user.nix | 5 | ||||
| -rw-r--r-- | nix/modules/home/zsh.nix | 2 | ||||
| -rw-r--r-- | nix/modules/pipewire.nix | 44 |
8 files changed, 49 insertions, 36 deletions
diff --git a/nix/flake.lock b/nix/flake.lock index 523d2c5..42dba61 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -239,16 +239,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1749154018, + "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 4fd49d2..65c566e 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -156,6 +156,7 @@ "kernel.kptr_restrict" = 2; # madaidan + "kernel.smtcontrol" = "on"; "vm.swappiness" = 1; "vm.unprivileged_userfaultfd" = 0; "dev.tty.ldisc_autoload" = 0; @@ -260,7 +261,7 @@ lockKernelModules = true; protectKernelImage = true; - allowSimultaneousMultithreading = false; + allowSimultaneousMultithreading = true; forcePageTableIsolation = true; tpm2 = { diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index d068383..bebd670 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -159,15 +159,16 @@ ardour audacity blender + foxdot fluidsynth qjackctl qsynth qpwgraph imagemagick + supercollider inkscape kdePackages.kdenlive kicad - reaper murmur ]) else []); diff --git a/nix/modules/home/firefox.nix b/nix/modules/home/firefox.nix index 986fccf..7e51433 100644 --- a/nix/modules/home/firefox.nix +++ b/nix/modules/home/firefox.nix @@ -13,7 +13,7 @@ name = "default"; isDefault = true; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ ublock-origin tree-style-tab firefox-color diff --git a/nix/modules/home/mako.nix b/nix/modules/home/mako.nix index d9a4610..14edde8 100644 --- a/nix/modules/home/mako.nix +++ b/nix/modules/home/mako.nix @@ -2,14 +2,14 @@ { services.mako = { enable = lib.mkDefault config.monorepo.profiles.graphics.enable; - backgroundColor = "#11111bf8"; - textColor = "#cdd6f4"; - borderColor = "#89b4faff"; - borderRadius = 1; - font = "Fira Code 10"; - defaultTimeout = 3000; - extraConfig = '' -on-notify=exec mpv ${sounds}/polite.ogg --no-config --no-video -''; + settings = { + on-notify = "exec mpv ${sounds}/polite.ogg --no-config --no-video"; + background-color = "#11111bf8"; + text-color = "#cdd6f4"; + border-color = "#89b4faff"; + border-radius = 1; + font = "Fira Code 10"; + default-timeout = 3000; + }; }; } diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix index 1087ebc..709caf0 100644 --- a/nix/modules/home/user.nix +++ b/nix/modules/home/user.nix @@ -37,7 +37,8 @@ graphviz jq # Apps - octaveFull vesktop grim swww vim + octaveFull + vesktop grim swww vim # Sound/media pavucontrol alsa-utils imagemagick ffmpeg helvum @@ -85,7 +86,7 @@ nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos- services = { gpg-agent = { - pinentryPackage = pkgs.pinentry-emacs; + pinentry.package = pkgs.pinentry-emacs; enable = true; extraConfig = '' allow-emacs-pinentry diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix index 263cc58..ef0f5fd 100644 --- a/nix/modules/home/zsh.nix +++ b/nix/modules/home/zsh.nix @@ -2,7 +2,7 @@ { programs.zsh = { enable = true; - initExtra = '' + initContent = '' umask 0022 export EXTRA_CCFLAGS="-I/usr/include" source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh diff --git a/nix/modules/pipewire.nix b/nix/modules/pipewire.nix index 14b4654..1ed2082 100644 --- a/nix/modules/pipewire.nix +++ b/nix/modules/pipewire.nix @@ -9,23 +9,33 @@ pulse.enable = true; jack.enable = true; wireplumber.enable = true; - extraConfig.pipewire-pulse."92-low-latency" = { - "context.properties" = [ - { - name = "libpipewire-module-protocol-pulse"; - args = { }; - } - ]; - "pulse.properties" = { - "pulse.min.req" = "32/48000"; - "pulse.default.req" = "32/48000"; - "pulse.max.req" = "32/48000"; - "pulse.min.quantum" = "32/48000"; - "pulse.max.quantum" = "32/48000"; - }; - "stream.properties" = { - "node.latency" = "32/48000"; - "resample.quality" = 1; + extraConfig = { + pipewire."92-low-latency" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.quantum" = 256; + "default.clock.min-quantum" = 32; + "default.clock.max-quantum" = 512; + }; + pipewire-pulse."92-low-latency" = { + "context.properties" = [ + { + name = "libpipewire-module-protocol-pulse"; + args = { }; + } + ]; + "pulse.properties" = { + "pulse.min.req" = "32/48000"; + "pulse.default.req" = "32/48000"; + "pulse.max.req" = "32/48000"; + "pulse.min.quantum" = "32/48000"; + "pulse.max.quantum" = "32/48000"; + }; + "stream.properties" = { + "node.latency" = "32/48000"; + "resample.quality" = 1; + }; + }; }; }; }; |