diff --git a/home-manager/modules/de2u.nix b/home-manager/modules/de2u.nix index f068285..72ab214 100644 --- a/home-manager/modules/de2u.nix +++ b/home-manager/modules/de2u.nix @@ -57,39 +57,39 @@ in ]); profiles.default = { - settings = { - "browser.startup.homepage" = "https://wizbos.club"; + settings = { + "browser.startup.homepage" = "https://wizbos.club"; - # Make the browser usable, if I wanted autism privacy, I would use TOR browser. - "privacy.resistFingerprinting" = false; - "webgl.disabled" = false; - "privacy.clearOnShutdown.history" = false; - "privacy.clearOnShutdown.cookies" = false; - "privacy.clearOnShutdown.sessions" = false; - "privacy.clearOnShutdown.cache" = false; - "places.history.enabled" = true; - "network.dns.disableIPv6" = false; - "media.peerconnection.ice.no_host" = false; + # Make the browser usable, if I wanted autism privacy, I would use TOR browser. + "privacy.resistFingerprinting" = false; + "webgl.disabled" = false; + "privacy.clearOnShutdown.history" = false; + "privacy.clearOnShutdown.cookies" = false; + "privacy.clearOnShutdown.sessions" = false; + "privacy.clearOnShutdown.cache" = false; + "places.history.enabled" = true; + "network.dns.disableIPv6" = false; + "media.peerconnection.ice.no_host" = false; - # Make Jitsi work sanely - "media.setsinkid.enabled" = true; - "privacy.webrtc.legacyGlobalIndicator" = false; - "privacy.webrtc.hideGlobalIndicator" = true; + # Make Jitsi work sanely + "media.setsinkid.enabled" = true; + "privacy.webrtc.legacyGlobalIndicator" = false; + "privacy.webrtc.hideGlobalIndicator" = true; - # good tweaks - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "layers.acceleration.force-enabled" = true; - "gfx.webrender.all" = true; - "svg.context-properties.content.enabled" = true; + # good tweaks + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "layers.acceleration.force-enabled" = true; + "gfx.webrender.all" = true; + "svg.context-properties.content.enabled" = true; - "reader.color_scheme" = "dark"; + "reader.color_scheme" = "dark"; - # # LibreWolf ruins the user agent making sites unusable without RFP, so use the user agent from RFP manually. This also seems sane for compatibility when using Firefox. - # "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"; - # set the user agent to a _realistic_ user agent because cloudflare keeps sniffing my balls - "general.useragent.override" = "Mozilla/5.0 (X11; Linux x86_64; rv:104.0) Gecko/20100101 Firefox/104.0"; - }; + # # LibreWolf ruins the user agent making sites unusable without RFP, so use the user agent from RFP manually. This also seems sane for compatibility when using Firefox. + # "general.useragent.override" = "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0"; + # set the user agent to a _realistic_ user agent because cloudflare keeps sniffing my balls + "general.useragent.override" = "Mozilla/5.0 (X11; Linux x86_64; rv:104.0) Gecko/20100101 Firefox/104.0"; }; + }; }; programs.kermit = { @@ -336,7 +336,7 @@ in cycle-windows-backward = [ "" ]; activate-window-menu = [ "" ]; cycle-panels = [ "" ]; - cycle-panels-backward = [ ""]; + cycle-panels-backward = [ "" ]; switch-panels = [ "" ]; switch-panels-backward = [ "" ]; switch-applications = [ "Tab" ]; diff --git a/home-manager/modules/gamerenv.nix b/home-manager/modules/gamerenv.nix index 4bac07e..b73c684 100644 --- a/home-manager/modules/gamerenv.nix +++ b/home-manager/modules/gamerenv.nix @@ -25,11 +25,11 @@ in }; home.packages = with pkgs; [ - ark - unzip - unrar + ark + unzip + unrar - mpv + mpv ]; xsession.enable = true; diff --git a/home-manager/modules/kermit.nix b/home-manager/modules/kermit.nix index e214e57..8844ffb 100644 --- a/home-manager/modules/kermit.nix +++ b/home-manager/modules/kermit.nix @@ -25,9 +25,11 @@ in }; config = lib.mkIf cfg.enable { - xdg.configFile."kermit.conf".text = (lib.generators.toKeyValue { - mkKeyValue = lib.generators.mkKeyValueDefault {} " "; - } cfg.settings) + cfg.extraConfig; + xdg.configFile."kermit.conf".text = (lib.generators.toKeyValue + { + mkKeyValue = lib.generators.mkKeyValueDefault { } " "; + } + cfg.settings) + cfg.extraConfig; home.packages = [ pkgs.kermit-terminal ]; }; diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix index cebb880..a9536e5 100644 --- a/home-manager/users/notgne2.nix +++ b/home-manager/users/notgne2.nix @@ -77,9 +77,11 @@ in dhall.dhall-lang dhall.vscode-dhall-lsp-server elmtooling.elm-ls-vscode - (rust-lang.rust-analyzer.override { rust-analyzer = pkgs.writeShellScriptBin "rust-analyzer" '' - exec rust-analyzer "$@" - ''; }) + (rust-lang.rust-analyzer.override { + rust-analyzer = pkgs.writeShellScriptBin "rust-analyzer" '' + exec rust-analyzer "$@" + ''; + }) ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [ { name = "vscode-autohide"; diff --git a/modules/ezpw.nix b/modules/ezpw.nix index 07ca417..147892c 100644 --- a/modules/ezpw.nix +++ b/modules/ezpw.nix @@ -38,169 +38,172 @@ in { }; }; - config = let qr = "${toString cfg.quantum}/${toString cfg.rate}"; - in mkIf cfg.enable { - hardware.pulseaudio.enable = lib.mkDefault false; - sound.enable = lib.mkDefault false; + config = + let qr = "${toString cfg.quantum}/${toString cfg.rate}"; + in mkIf cfg.enable { + hardware.pulseaudio.enable = lib.mkDefault false; + sound.enable = lib.mkDefault false; - services.pipewire = { - enable = lib.mkDefault true; - jack.enable = lib.mkDefault true; - alsa.enable = lib.mkDefault true; - alsa.support32Bit = lib.mkDefault true; - pulse.enable = lib.mkDefault true; + services.pipewire = { + enable = lib.mkDefault true; + jack.enable = lib.mkDefault true; + alsa.enable = lib.mkDefault true; + alsa.support32Bit = lib.mkDefault true; + pulse.enable = lib.mkDefault true; - media-session.enable = lib.mkDefault false; - wireplumber.enable = lib.mkDefault true; + media-session.enable = lib.mkDefault false; + wireplumber.enable = lib.mkDefault true; - config = mkIf cfg.lowLatency { - pipewire = { - "context.properties" = { - "default.clock.rate" = cfg.rate; - "default.clock.quantum" = cfg.quantum; - "default.clock.min-quantum" = cfg.quantum; + config = mkIf cfg.lowLatency { + pipewire = { + "context.properties" = { + "default.clock.rate" = cfg.rate; + "default.clock.quantum" = cfg.quantum; + "default.clock.min-quantum" = cfg.quantum; + }; + + "context.modules" = [ + { + name = "libpipewire-module-rtkit"; + args = { + "nice.level" = -11; + "rt.prio" = 88; + "rt.time.soft" = 200000; + "rt.time.hard" = 200000; + }; + flags = [ "ifexists" "nofail" ]; + } + { name = "libpipewire-module-protocol-native"; } + { name = "libpipewire-module-profiler"; } + { name = "libpipewire-module-metadata"; } + { name = "libpipewire-module-spa-device-factory"; } + { name = "libpipewire-module-spa-node-factory"; } + { name = "libpipewire-module-client-node"; } + { name = "libpipewire-module-client-device"; } + { + name = "libpipewire-module-portal"; + flags = [ "ifexists" "nofail" ]; + } + { + name = "libpipewire-module-access"; + args = { }; + } + { name = "libpipewire-module-adapter"; } + { name = "libpipewire-module-link-factory"; } + { name = "libpipewire-module-session-manager"; } + ]; }; - "context.modules" = [ - { - name = "libpipewire-module-rtkit"; - args = { - "nice.level" = -11; - "rt.prio" = 88; - "rt.time.soft" = 200000; - "rt.time.hard" = 200000; - }; - flags = [ "ifexists" "nofail" ]; - } - { name = "libpipewire-module-protocol-native"; } - { name = "libpipewire-module-profiler"; } - { name = "libpipewire-module-metadata"; } - { name = "libpipewire-module-spa-device-factory"; } - { name = "libpipewire-module-spa-node-factory"; } - { name = "libpipewire-module-client-node"; } - { name = "libpipewire-module-client-device"; } - { - name = "libpipewire-module-portal"; - flags = [ "ifexists" "nofail" ]; - } - { - name = "libpipewire-module-access"; - args = { }; - } - { name = "libpipewire-module-adapter"; } - { name = "libpipewire-module-link-factory"; } - { name = "libpipewire-module-session-manager"; } - ]; - }; + pipewire-pulse = { + "context.modules" = [ + { + name = "libpipewire-module-rtkit"; + args = { + "nice.level" = -11; + "rt.prio" = 88; + "rt.time.soft" = 200000; + "rt.time.hard" = 200000; + }; + flags = [ "ifexists" "nofail" ]; + } + { name = "libpipewire-module-protocol-native"; } + { name = "libpipewire-module-client-node"; } + { name = "libpipewire-module-adapter"; } + { name = "libpipewire-module-metadata"; } + { + name = "libpipewire-module-protocol-pulse"; + args = { + "pulse.min.req" = qr; + "pulse.default.req" = qr; + "pulse.min.quantum" = qr; + "server.address" = [ "unix:native" ]; + }; + } + ]; - pipewire-pulse = { - "context.modules" = [ - { - name = "libpipewire-module-rtkit"; - args = { - "nice.level" = -11; - "rt.prio" = 88; - "rt.time.soft" = 200000; - "rt.time.hard" = 200000; - }; - flags = [ "ifexists" "nofail" ]; - } - { name = "libpipewire-module-protocol-native"; } - { name = "libpipewire-module-client-node"; } - { name = "libpipewire-module-adapter"; } - { name = "libpipewire-module-metadata"; } - { - name = "libpipewire-module-protocol-pulse"; - args = { - "pulse.min.req" = qr; - "pulse.default.req" = qr; - "pulse.min.quantum" = qr; - "server.address" = [ "unix:native" ]; - }; - } - ]; - - "stream.properties" = { - "node.latency" = qr; - "resample.quality" = 1; - }; - }; - }; - - media-session.config.alsa-monitor = mkIf cfg.lowLatency { - rules = [{ - matches = [{ node.name = "alsa_output.*"; }]; - actions = { - update-props = { - "audio.format" = "S32LE"; - "audio.rate" = cfg.rate * (if cfg.usbSoundcard then 2 else 1); - "api.alsa.period-size" = cfg.periodSize; + "stream.properties" = { + "node.latency" = qr; + "resample.quality" = 1; }; }; - }]; - }; - - media-session.config.bluez-monitor = { - properties = { - "bluez5.codecs" = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ]; - "bluez5.mdbc-support" = true; }; - rules = [ - { + + media-session.config.alsa-monitor = mkIf cfg.lowLatency { + rules = [{ + matches = [{ node.name = "alsa_output.*"; }]; actions = { update-props = { - "bluez5.auto-connect" = [ "hsp_hs" "hfp_hf" "a2dp_sink" ]; - "bluez5.hw-volume" = - [ "hsp_ag" "hfp_ag" "a2dp_source" "a2dp_sink" ]; - "bluez5.autoswitch-profile" = true; + "audio.format" = "S32LE"; + "audio.rate" = cfg.rate * (if cfg.usbSoundcard then 2 else 1); + "api.alsa.period-size" = cfg.periodSize; }; }; - matches = [{ "device.name" = "~bluez_card.*"; }]; - } - { - actions = { update-props = { "node.pause-on-idle" = false; }; }; - matches = [ - { "node.name" = "~bluez_input.*"; } - { "node.name" = "~bluez_output.*"; } - ]; - } - ]; + }]; + }; + + media-session.config.bluez-monitor = { + properties = { + "bluez5.codecs" = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ]; + "bluez5.mdbc-support" = true; + }; + rules = [ + { + actions = { + update-props = { + "bluez5.auto-connect" = [ "hsp_hs" "hfp_hf" "a2dp_sink" ]; + "bluez5.hw-volume" = + [ "hsp_ag" "hfp_ag" "a2dp_source" "a2dp_sink" ]; + "bluez5.autoswitch-profile" = true; + }; + }; + matches = [{ "device.name" = "~bluez_card.*"; }]; + } + { + actions = { update-props = { "node.pause-on-idle" = false; }; }; + matches = [ + { "node.name" = "~bluez_input.*"; } + { "node.name" = "~bluez_output.*"; } + ]; + } + ]; + }; }; - }; - environment.systemPackages = with pkgs; - [ - # pactl is required for pipewire-pulse - pulseaudio - ]; + environment.systemPackages = with pkgs; + [ + # pactl is required for pipewire-pulse + pulseaudio + ]; - environment.etc."wireplumber/main.lua.d/51-alsa-config.lua" = - mkIf cfg.lowLatency { text = '' - alsa_monitor.properties = { - ["audio.rate"] = ${ - toString (cfg.rate * (if cfg.usbSoundcard then 2 else 1)) - }, - ["audio.format"] = "S32LE", - ["api.alsa.headroom"] = 512, - ["api.alsa.period-size"] = ${toString cfg.periodSize} + environment.etc."wireplumber/main.lua.d/51-alsa-config.lua" = + mkIf cfg.lowLatency { + text = '' + alsa_monitor.properties = { + ["audio.rate"] = ${ + toString (cfg.rate * (if cfg.usbSoundcard then 2 else 1)) + }, + ["audio.format"] = "S32LE", + ["api.alsa.headroom"] = 512, + ["api.alsa.period-size"] = ${toString cfg.periodSize} + } + ''; + }; + + environment.etc."wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" } - ''; }; + ''; - environment.etc."wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - bluez_monitor.properties = { - ["bluez5.enable-sbc-xq"] = true, - ["bluez5.enable-msbc"] = true, - ["bluez5.enable-hw-volume"] = true, - ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - } - ''; - - xdg.portal.enable = lib.mkDefault true; - xdg.portal.gtkUsePortal = lib.mkDefault true; - xdg.portal.extraPortals = lib.mkDefault (with pkgs; [ - xdg-desktop-portal-gnome - xdg-desktop-portal-wlr - xdg-desktop-portal-gtk - ]); - }; + xdg.portal.enable = lib.mkDefault true; + xdg.portal.gtkUsePortal = lib.mkDefault true; + xdg.portal.extraPortals = lib.mkDefault (with pkgs; [ + xdg-desktop-portal-gnome + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]); + }; } diff --git a/modules/ezwg.nix b/modules/ezwg.nix index cf4f6c4..829f10f 100644 --- a/modules/ezwg.nix +++ b/modules/ezwg.nix @@ -25,7 +25,8 @@ let rangesOutput = pkgs.runCommandNoCC "exclusionary-wildcard-ranges" { } '' ${pkgs.python3}/bin/python3 ${generateRangesScript} > $out ''; - in lib.splitString ":" (builtins.readFile "${rangesOutput}"); + in + lib.splitString ":" (builtins.readFile "${rangesOutput}"); subnet = vlanIP: vlanSize: let @@ -38,7 +39,8 @@ let subnetOutput = pkgs.runCommandNoCC "subnet-without-host-bits" { } '' ${pkgs.python3}/bin/python3 ${generateSubnetScript} > $out ''; - in builtins.readFile "${subnetOutput}"; + in + builtins.readFile "${subnetOutput}"; serverOpts.options = { ip = mkOption { @@ -86,7 +88,8 @@ let description = "The IP to use on the wg VLAN"; }; }; -in { +in +{ options.services.ezwg = { enable = mkEnableOption "Enable simple Wireguard connection"; instances = mkOption { @@ -99,37 +102,49 @@ in { config = mkIf cfg.enable { networking.firewall.checkReversePath = false; - systemd.paths = mapAttrs' (instName: inst: { - name = "wireguard-${instName}"; - value = if inst.autoStart then { } else { wantedBy = mkForce [ ]; }; - }) cfg.instances; - - systemd.services = lib.listToAttrs (flatten (mapAttrsToList (instName: inst: - [{ + systemd.paths = mapAttrs' + (instName: inst: { name = "wireguard-${instName}"; value = if inst.autoStart then { } else { wantedBy = mkForce [ ]; }; - }] ++ map (server: { - name = - "wireguard-${instName}-peer${peerNameReplacement server.publicKey}"; - value = if inst.autoStart then { } else { wantedBy = mkForce [ ]; }; - }) inst.servers) cfg.instances)); + }) + cfg.instances; - networking.wireguard.interfaces = mapAttrs (instName: inst: - let - allowedIPs = if inst.proxy then - ranges (map (s: s.ip) inst.servers) - else - [ (subnet inst.vlanIP inst.vlanSize) ]; - in { - ips = [ "${inst.vlanIP}/${toString inst.vlanSize}" ]; - privateKeyFile = inst.privateKeyFile; - peers = map (server: { - inherit allowedIPs; - publicKey = server.publicKey; - endpoint = "${server.ip}:${toString server.port}"; - persistentKeepalive = 25; - }) inst.servers; - }) cfg.instances; + systemd.services = lib.listToAttrs (flatten (mapAttrsToList + (instName: inst: + [{ + name = "wireguard-${instName}"; + value = if inst.autoStart then { } else { wantedBy = mkForce [ ]; }; + }] ++ map + (server: { + name = + "wireguard-${instName}-peer${peerNameReplacement server.publicKey}"; + value = if inst.autoStart then { } else { wantedBy = mkForce [ ]; }; + }) + inst.servers) + cfg.instances)); + + networking.wireguard.interfaces = mapAttrs + (instName: inst: + let + allowedIPs = + if inst.proxy then + ranges (map (s: s.ip) inst.servers) + else + [ (subnet inst.vlanIP inst.vlanSize) ]; + in + { + ips = [ "${inst.vlanIP}/${toString inst.vlanSize}" ]; + privateKeyFile = inst.privateKeyFile; + peers = map + (server: { + inherit allowedIPs; + publicKey = server.publicKey; + endpoint = "${server.ip}:${toString server.port}"; + persistentKeepalive = 25; + }) + inst.servers; + }) + cfg.instances; }; } diff --git a/modules/fuckingprint.nix b/modules/fuckingprint.nix index 1f6be6b..8d7aae3 100644 --- a/modules/fuckingprint.nix +++ b/modules/fuckingprint.nix @@ -10,7 +10,8 @@ let platforms = super.meta.platforms ++ [ "x86_64-linux" ]; }; }); -in { +in +{ options.fuckingprint.enable = mkEnableOption "Make my fucking printer work"; config = mkIf cfg.enable {