diff --git a/flake.lock b/flake.lock index 206b118..9d5ca04 100644 --- a/flake.lock +++ b/flake.lock @@ -249,11 +249,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722114937, - "narHash": "sha256-MOZ9woPwdpFJcHx3wic2Mlw9aztdKjMnFT3FaeLzJkM=", + "lastModified": 1722278305, + "narHash": "sha256-xLBAegsn9wbj+pQfbX07kykd5VBV3Ywk3IbObVAAlWA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e67b60fb1b2c3aad2202d95b91d4c218cf2a4fdd", + "rev": "eab049fe178c11395d65a858ba1b56461ba9652d", "type": "github" }, "original": { diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix index b2e4363..218936a 100644 --- a/hosts/Dimaga/default.nix +++ b/hosts/Dimaga/default.nix @@ -16,7 +16,6 @@ let subdomains = [ config.secrets.services.airsonic.url - config.secrets.services.cache.url config.secrets.services.forgejo.url config.secrets.services.gremlin-lab.url config.secrets.services.jellyfin.url diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix index c3edcb3..83b7836 100644 --- a/hosts/Khanda/default.nix +++ b/hosts/Khanda/default.nix @@ -35,10 +35,7 @@ in office.enable = true; recording.enable = true; social.enable = true; - writing = { - enable = true; - languagetool.enable = true; - }; + writing.enable = true; }; # Enable Secure Boot support. @@ -65,7 +62,7 @@ in ui = { desktops.gnome = { enable = true; - tripleBuffering.enable = false; # FIXME: Weird build error + tripleBuffering.enable = true; # FIXME: Weird build error }; flatpak = { # Enable Flatpak support. diff --git a/hosts/Shura/bluetooth/xbox-elite-controller-bluetooth-params b/hosts/Shura/bluetooth/xbox-elite-controller-bluetooth-params deleted file mode 100644 index 19ef111..0000000 --- a/hosts/Shura/bluetooth/xbox-elite-controller-bluetooth-params +++ /dev/null @@ -1,38 +0,0 @@ -[General] -Name=Xbox Wireless Controller -Appearance=0x03c4 -AddressType=public -SupportedTechnologies=LE; -Trusted=true -Blocked=false -WakeAllowed=true -Services=00000001-5f60-4c4f-9c83-a7953298d40d;00001800-0000-1000-8000-00805f9b34fb;00001801-0000-1000-8000-00805f9b34fb;0000180a-0000-1000-8000-00805f9b34fb;0000180f-0000-1000-8000-00805f9b34fb;00001812-0000-1000-8000-00805f9b34fb; - -[IdentityResolvingKey] -Key=763775163AD76AF443DAEAEBCCED3776 - -[PeripheralLongTermKey] -Key=962B9CEAE31CAE1573BE763A8C64980F -Authenticated=2 -EncSize=16 -EDiv=0 -Rand=0 - -[SlaveLongTermKey] -Key=962B9CEAE31CAE1573BE763A8C64980F -Authenticated=2 -EncSize=16 -EDiv=0 -Rand=0 - -[DeviceID] -Source=2 -Vendor=1118 -Product=2850 -Version=1301 - -[ConnectionParameters] -MinInterval=6 -MaxInterval=6 -Latency=0 -Timeout=300 diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix index e568829..48d3a39 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -13,9 +13,6 @@ let shure-aonic-bluetooth = pkgs.writeText "info" ( builtins.readFile ./bluetooth/shure-aonic-bluetooth-params ); - xbox-elite-bluetooth = pkgs.writeText "info" ( - builtins.readFile ./bluetooth/xbox-elite-controller-bluetooth-params - ); mano-touchpad-bluetooth = pkgs.writeText "info" ( builtins.readFile ./bluetooth/mano-touchpad-bluetooth-params ); @@ -42,10 +39,7 @@ in office.enable = true; recording.enable = true; social.enable = true; - writing = { - enable = true; - languagetool.enable = true; - }; + writing.enable = true; }; # Configure the bootloader. @@ -136,7 +130,6 @@ in # Install Bluetooth device profiles "d /var/lib/bluetooth/AC:50:DE:9F:AB:88/ 0700 root root" # First, make sure the directory exists "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:0E:DD:72:2F:0C/info - - - - ${shure-aonic-bluetooth}" - "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F4:6A:D7:3A:16:75/info - - - - ${xbox-elite-bluetooth}" "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F8:5D:3C:7D:9A:00/info - - - - ${mano-touchpad-bluetooth}" "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:34:30:47:37:AB/info - - - - ${vitrix-pdp-pro-bluetooth}" ]; diff --git a/modules/apps/writing.nix b/modules/apps/writing.nix index 71f0f54..5a76a72 100644 --- a/modules/apps/writing.nix +++ b/modules/apps/writing.nix @@ -10,16 +10,7 @@ let in { options = { - aux.system.apps.writing = { - enable = lib.mkEnableOption (lib.mdDoc "Enables writing and editing tools"); - languagetool = { - enable = lib.mkEnableOption (lib.mdDoc "Enables local Language Tool server."); - # WARNING: Ngrams package requires an excessive amount of memory. Troubleshoot before re-enabling - ngrams.enable = lib.mkEnableOption ( - lib.mdDoc "Enables ngrams for improved grammar detection (warning: results in an 8GB+ download)." - ); - }; - }; + aux.system.apps.writing.enable = lib.mkEnableOption (lib.mdDoc "Enables writing and editing tools"); }; config = lib.mkIf cfg.enable { @@ -30,17 +21,5 @@ in haskellPackages.pandoc-crossref texliveSmall ]; - - # Spelling and grammer checking: hosted on localhost:8081 - services.languagetool = lib.mkIf cfg.languagetool.enable { - enable = true; - port = 8090; - public = false; - allowOrigin = "*"; - # Enable Ngrams - settings.languageModel = lib.mkIf cfg.languagetool.ngrams.enable "${ - (pkgs.callPackage ../../packages/languagetool-ngrams.nix { inherit pkgs lib; }) - }/ngrams"; - }; }; }