neovim lspconfig

custom/brave-nightly/default.nix

@@ -1,79 +1,120 @@
-{ lib, stdenv, fetchurl, wrapGAppsHook, makeWrapper
+{
-, dpkg
+  lib,
-, alsa-lib
+  stdenv,
-, at-spi2-atk
+  fetchurl,
-, at-spi2-core
+  wrapGAppsHook,
-, atk
+  makeWrapper,
-, cairo
+  dpkg,
-, cups
+  alsa-lib,
-, dbus
+  at-spi2-atk,
-, expat
+  at-spi2-core,
-, fontconfig
+  atk,
-, freetype
+  cairo,
-, gdk-pixbuf
+  cups,
-, glib
+  dbus,
-, gnome
+  expat,
-, gsettings-desktop-schemas
+  fontconfig,
-, gtk3
+  freetype,
-, libuuid
+  gdk-pixbuf,
-, libdrm
+  glib,
-, libX11
+  gnome,
-, libXcomposite
+  gsettings-desktop-schemas,
-, libXcursor
+  gtk3,
-, libXdamage
+  libuuid,
-, libXext
+  libdrm,
-, libXfixes
+  libX11,
-, libXi
+  libXcomposite,
-, libxkbcommon
+  libXcursor,
-, libXrandr
+  libXdamage,
-, libXrender
+  libXext,
-, libXScrnSaver
+  libXfixes,
-, libxshmfence
+  libXi,
-, libXtst
+  libxkbcommon,
-, mesa
+  libXrandr,
-, nspr
+  libXrender,
-, nss
+  libXScrnSaver,
-, pango
+  libxshmfence,
-, pipewire
+  libXtst,
-, udev
+  mesa,
-, wayland
+  nspr,
-, xorg
+  nss,
-, zlib
+  pango,
-, xdg-utils
+  pipewire,
-, snappy
+  udev,
-
+  wayland,
+  xorg,
+  zlib,
+  xdg-utils,
+  snappy,
   # command line arguments which are always set e.g "--disable-gpu"
-, commandLineArgs ? ""
+  commandLineArgs ? "",
-
   # Necessary for USB audio devices.
-, pulseSupport ? stdenv.isLinux
+  pulseSupport ? stdenv.isLinux,
-, libpulseaudio
+  libpulseaudio,
-
   # For GPU acceleration support on Wayland (without the lib it doesn't seem to work)
-, libGL
+  libGL,
-
   # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)
-, libvaSupport ? stdenv.isLinux
+  libvaSupport ? stdenv.isLinux,
-, libva
+  libva,
-, enableVideoAcceleration ? libvaSupport
+  enableVideoAcceleration ? libvaSupport,
-
   # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
-, vulkanSupport ? false
+  vulkanSupport ? false,
-, addOpenGLRunpath
+  addOpenGLRunpath,
-, enableVulkan ? vulkanSupport
+  enableVulkan ? vulkanSupport,
-}:
+}: let
+  inherit
+    (lib)
+    optional
+    optionals
+    makeLibraryPath
+    makeSearchPathOutput
+    makeBinPath
+    optionalString
+    strings
+    escapeShellArg
+    ;
 
-let
+  deps =
-  inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath
+    [
-    optionalString strings escapeShellArg;
+      alsa-lib
-
+      at-spi2-atk
-  deps = [
+      at-spi2-core
-    alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat
+      atk
-    fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL
+      cairo
-    libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage
+      cups
-    libXext libXfixes libXi libXrandr libXrender libxshmfence
+      dbus
-    libXtst libuuid mesa nspr nss pango pipewire udev wayland
+      expat
-    xorg.libxcb zlib snappy
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libdrm
+      libX11
+      libGL
+      libxkbcommon
+      libXScrnSaver
+      libXcomposite
+      libXcursor
+      libXdamage
+      libXext
+      libXfixes
+      libXi
+      libXrandr
+      libXrender
+      libxshmfence
+      libXtst
+      libuuid
+      mesa
+      nspr
+      nss
+      pango
+      pipewire
+      udev
+      wayland
+      xorg.libxcb
+      zlib
+      snappy
     ]
     ++ optional pulseSupport libpulseaudio
     ++ optional libvaSupport libva;
@@ -81,14 +122,14 @@ let
   rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;
   binpath = makeBinPath deps;
 
-  enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ]
+  enableFeatures =
+    optionals enableVideoAcceleration ["VaapiVideoDecoder" "VaapiVideoEncoder"]
     ++ optional enableVulkan "Vulkan";
 
   # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935
   disableFeatures = optional enableVideoAcceleration "UseChromeOSDirectVideoDecoder";
   braveChannel = "nightly";
 in
-
   stdenv.mkDerivation rec {
     pname = "brave-${braveChannel}";
     version = "1.52.54";
@@ -110,7 +151,9 @@ stdenv.mkDerivation rec {
 
     buildInputs = [
       # needed for GSETTINGS_SCHEMAS_PATH
-    glib gsettings-desktop-schemas gtk3
+      glib
+      gsettings-desktop-schemas
+      gtk3
 
       # needed for XDG_ICON_DIRS
       gnome.adwaita-icon-theme

custom/lf-sixel/default.nix

@@ -1,10 +1,10 @@
-{ lib
+{
-, stdenv
+  lib,
-, buildGoModule
+  stdenv,
-, fetchFromGitHub
+  buildGoModule,
-, installShellFiles
+  fetchFromGitHub,
+  installShellFiles,
 }:
-
 buildGoModule rec {
   pname = "lf";
   version = "28-1";

flake.nix

@@ -13,16 +13,20 @@
     stylix.url = "github:danth/stylix";
   };
 
-  outputs = { nixpkgs, home-manager, hyprland, stylix, ... } @inputs :
+  outputs = {
-    let
+    nixpkgs,
+    home-manager,
+    hyprland,
+    stylix,
+    ...
+  } @ inputs: let
     system = "x86_64-linux";
     lib = nixpkgs.lib;
     mkConf = import ./lib/mkconf.nix;
 
     user = "tristan";
     userName = "Tristan Beedell";
-    in
+  in {
-    {
     nixosConfigurations = {
       zenix = mkConf "zenix" {
         inherit inputs nixpkgs system user userName home-manager;

global/home.nix

@@ -1,4 +1,10 @@
-{ config, pkgs, name, lib, ... }:
+{
+  config,
+  pkgs,
+  name,
+  lib,
+  ...
+}:
 # https://nix-community.github.io/home-manager/options.html
 let
   my-deps = {
@@ -22,8 +28,7 @@ let
     ffmpegthumbnailer = "${pkgs.ffmpegthumbnailer}/bin/ffmpegthumbnailer";
   };
   lf-sixel = pkgs.callPackage ../custom/lf-sixel/. {};
-in
+in {
-{
   programs.home-manager.enable = true;
 
   home.username = "tristan";
@@ -31,7 +36,7 @@ in
 
   xdg.userDirs.enable = true;
 
-  home.packages = (with pkgs; [
+  home.packages = with pkgs; [
     libnotify
     dig
     jq
@@ -66,7 +71,7 @@ in
       desktopName = "Logseq";
       exec = "${logseq}/bin/logseq --ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --disable-gpu";
     })
-  ]);
+  ];
 
   programs.fish = {
     enable = true;
@@ -334,6 +339,4 @@ in
       pdf-engine = "xelatex";
     };
   };
-
 }
-

global/system.nix

@@ -1,8 +1,10 @@
 # https://search.nixos.org/options
-
+user: {
-user: { config, pkgs, lib, ... }:
+  config,
-{
+  pkgs,
-
+  lib,
+  ...
+}: {
   home-manager.users.${user}.imports = [
     ./home.nix
   ];
@@ -15,7 +17,6 @@ user: { config, pkgs, lib, ... }:
     "electron-25.9.0"
   ];
 
-
   nix.settings.trusted-users = ["root" user];
 
   boot.loader.systemd-boot.enable = true;
@@ -48,11 +49,26 @@ user: { config, pkgs, lib, ... }:
   networking.firewall.allowedTCPPorts = [4713];
 
   # kde connect
-  networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
+  networking.firewall.allowedTCPPortRanges = [
-  networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
+    {
+      from = 1714;
+      to = 1764;
+    }
+  ];
+  networking.firewall.allowedUDPPortRanges = [
+    {
+      from = 1714;
+      to = 1764;
+    }
+  ];
 
   networking.firewall.interfaces.tailscale0 = {
-    allowedTCPPortRanges = [{ from = 0; to = 65535; }];
+    allowedTCPPortRanges = [
+      {
+        from = 0;
+        to = 65535;
+      }
+    ];
   };
 
   services.avahi.enable = true;
@@ -119,30 +135,6 @@ user: { config, pkgs, lib, ... }:
     trash-cli
     wget
     unzip
-    (neovim.override {
-      vimAlias = true;
-      configure = {
-        packages.myPlugins = with pkgs.vimPlugins; {
-          start = [ vim-surround vim-commentary vim-nix ];
-          opt = [ ];
-        };
-        customRC = ''
-          vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
-          vnoremap <C-R> "ry:%s/<C-R>=escape(@r,'/\')<CR>
-          vnoremap A :norm A
-          set number
-          set rnu
-          set ignorecase
-          set smartcase
-          set mouse=a
-          set path=.,**
-          let g:netrw_banner=0
-          let g:netrw_liststyle=3
-          set undofile
-          set undodir=~/.local/share/nvim/undo
-        '';
-      };
-    })
   ];
 
   services.dbus.enable = true;
@@ -184,6 +176,4 @@ user: { config, pkgs, lib, ... }:
   services.blueman.enable = true;
 
   services.prometheus.exporters.node.enable = true;
-
 }
-

hardware/displays.nix

@@ -1,20 +1,26 @@
-{ config, ... }:
+{config, ...}: {
-
-{
   displays = {
     enable = true;
     displays = [
       {
         name = "DP-1";
         description = "HP Inc. HP 24x 1CR9500W9Q";
-        resolution = { x = 1920; y = 1080; freq = 144; };
+        resolution = {
+          x = 1920;
+          y = 1080;
+          freq = 144;
+        };
         position.x = 0;
         position.y = 0;
         wallpaper = "/home/tristan/Pictures/backgrounds/demonslayer.jpg";
       }
       {
         name = "HDMI-A-1";
-        resolution = { x = 1920; y = 1080; freq = 60; };
+        resolution = {
+          x = 1920;
+          y = 1080;
+          freq = 60;
+        };
         position = {
           x = 1920;
           y = 0;

hardware/work.nix

@@ -1,8 +1,11 @@
-{user}: { config, lib, pkgs, modulesPath, ... }:
+{user}: {
-
+  config,
-{
+  lib,
-  imports =
+  pkgs,
-    [
+  modulesPath,
+  ...
+}: {
+  imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./displays.nix
   ];
@@ -12,8 +15,7 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/disk/by-uuid/48a07e82-1090-448c-a751-3a410afba0f7";
     fsType = "btrfs";
     options = ["subvol=@" "compress=zstd" "autodefrag"];
@@ -40,22 +42,19 @@
     preLVM = false;
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    {
     device = "/dev/disk/by-uuid/48a07e82-1090-448c-a751-3a410afba0f7";
     fsType = "btrfs";
     options = ["subvol=@home" "compress=zstd" "autodefrag"];
   };
 
-  fileSystems."/swap" =
+  fileSystems."/swap" = {
-    {
     device = "/dev/disk/by-uuid/48a07e82-1090-448c-a751-3a410afba0f7";
     fsType = "btrfs";
     options = ["subvol=@swap"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-uuid/EED9-A165";
     fsType = "vfat";
   };
@@ -89,12 +88,13 @@
   networking.hostName = "FCS-Tristan-Nixbook";
 
   system.stateVersion = "22.11"; # do not change
-  home-manager.users.${user}.imports = [{
+  home-manager.users.${user}.imports = [
+    {
       home.stateVersion = "22.05";
 
       programs.waybar.settings.mainBar."hyprland/workspaces".persistent_workspaces = {
         eDP-1 = 5;
       };
-  }];
+    }
-
+  ];
 }

hardware/zenix.nix

@@ -1,8 +1,11 @@
-{user}: { config, lib, pkgs, modulesPath, ... }:
+{user}: {
-
+  config,
-{
+  lib,
-  imports =
+  pkgs,
-    [
+  modulesPath,
+  ...
+}: {
+  imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     ./displays.nix
   ];
@@ -12,8 +15,7 @@
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    {
     device = "/dev/disk/by-uuid/2dad5ed6-44cc-4d9d-9392-32afaa7b3909";
     fsType = "btrfs";
     options = ["subvol=@" "compress=zstd" "autodefrag"];
@@ -43,21 +45,18 @@
     preLVM = false;
   };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    {
     device = "/dev/disk/by-uuid/2dad5ed6-44cc-4d9d-9392-32afaa7b3909";
     fsType = "btrfs";
     options = ["subvol=@home" "compress=zstd" "autodefrag"];
   };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    {
     device = "/dev/disk/by-uuid/FE7E-0DE3";
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/da57b489-ab77-4830-b710-9f96cf43d053";}];
-    [{ device = "/dev/disk/by-uuid/da57b489-ab77-4830-b710-9f96cf43d053"; }];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -85,7 +84,8 @@
     };
   };
 
-  home-manager.users.${user}.imports = [{
+  home-manager.users.${user}.imports = [
+    {
       home.stateVersion = "22.05";
 
       wayland.windowManager.hyprland = {
@@ -101,7 +101,6 @@
       programs.waybar.settings.mainBar."hyprland/workspaces".persistent_workspaces = {
         DP-1 = 5;
       };
-
+    }
-  }];
+  ];
-
 }

lib/home.nix

@@ -1,12 +1,15 @@
-{ user
-, name
-, work ? false
-, displays ? [ ]
-, userName
-, ...
-}:
-{ config, pkgs, ... }:
 {
+  user,
+  name,
+  work ? false,
+  displays ? [],
+  userName,
+  ...
+}: {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     (import ./modules/terminal.nix {inherit user;})
     (import ./modules/scripts.nix {inherit user;})
@@ -35,5 +38,4 @@
   roles.personal.enable = !work;
   roles.mpd.enable = true;
   programs.editor.neovim = true;
-
 }

lib/mkapp.nix

@@ -1,5 +1,10 @@
-name: { pkgs, app-id, browser, desktopName, ... }:
+name: {
-
+  pkgs,
+  app-id,
+  browser,
+  desktopName,
+  ...
+}:
 pkgs.makeDesktopItem {
   name = "${name}";
   desktopName = "${desktopName}";

lib/mkconf.nix

@@ -1,23 +1,25 @@
-name:
+name: {
-{ nixpkgs
+  nixpkgs,
-, inputs
+  inputs,
-, home-manager
+  home-manager,
-, system
+  system,
-, user
+  user,
-, laptop ? false
+  laptop ? false,
-, work ? false
+  work ? false,
-, userName
+  userName,
-, ...
+  ...
 }:
-
 nixpkgs.lib.nixosSystem rec {
   specialArgs = {inherit inputs;};
 
   inherit system;
 
   modules = [
-
+    ({
-    ({ inputs, pkgs, ... }: {
+      inputs,
+      pkgs,
+      ...
+    }: {
       programs.hyprland = {
         enable = true;
         package = inputs.hyprland.packages.${pkgs.system}.hyprland;

lib/modules/dev.nix

@@ -1,9 +1,12 @@
-{ user, ... }: { lib, pkgs, config, ... }:
+{user, ...}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.roles.dev;
-in
+in {
-{
   options.roles = {
     dev = {
       enable = mkEnableOption "editor";
@@ -14,14 +17,16 @@ in
     programs.editor.enable = true;
     roles.git.enable = true;
     programs.terminal.enable = true;
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
-      home.packages = (with pkgs; [
+      {
+        home.packages = with pkgs; [
           insomnia
           dbeaver
           ansible
           tig
           fx
-      ]);
+        ];
-    }];
+      }
+    ];
   };
 }

lib/modules/display.nix

@@ -1,24 +1,34 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.displays;
 
   renderDisplaysForHyprland = displays: (map displayHyprlandSetting displays);
 
-  displayHyprlandSetting = display: specificDisplay display +
+  displayHyprlandSetting = display:
-    ", " + resToString display.resolution +
+    specificDisplay display
-    ", " + positionToHyprlandString display.position +
+    + ", "
-    ", " + toString display.scaling +
+    + resToString display.resolution
-    ", " + "transform," + toString display.rotation;
+    + ", "
+    + positionToHyprlandString display.position
+    + ", "
+    + toString display.scaling
+    + ", "
+    + "transform,"
+    + toString display.rotation;
 
-  swaybgJob = displays:
+  swaybgJob = displays: {
-    {
     Unit = {
       Description = "SwayBG";
     };
     Service = {
-        ExecStart = "${pkgs.swaybg}/bin/swaybg " +
+      ExecStart =
-          concatStringsSep " " (map swaybgCmd displays);
+        "${pkgs.swaybg}/bin/swaybg "
+        + concatStringsSep " " (map swaybgCmd displays);
     };
     Install = {
       WantedBy = ["graphical-session.target"];
@@ -26,32 +36,45 @@ let
   };
 
   swaybgCmd = display:
-    if (display.wallpaper != "") then "-o ${display.name} -i ${display.wallpaper} -m fill" else "";
+    if (display.wallpaper != "")
+    then "-o ${display.name} -i ${display.wallpaper} -m fill"
+    else "";
 
   specificDisplay = display:
     if display.description == ""
     then display.name
     else "desc:" + display.description;
 
-  positionToHyprlandString = { x, y }:
+  positionToHyprlandString = {
-    if (x == -1 || y == -1) then "auto" else toString x + "x" + toString y;
+    x,
+    y,
+  }:
+    if (x == -1 || y == -1)
+    then "auto"
+    else toString x + "x" + toString y;
 
   renderDisplaysForSway = displays:
     listToAttrs (map displaySwaySetting displays);
 
   displaySwaySetting = display: {
     name = display.name;
-    value = let res = display.resolution; in
+    value = let
-      {
+      res = display.resolution;
-        mode = mkIf (!resUnset res)
+    in {
+      mode =
+        mkIf (!resUnset res)
         "${toString res.x}x${toString res.y}@${toString res.freq}Hz";
       bg = display.wallpaper + " fill";
       scale = toString display.scaling;
     };
   };
 
-  resolutionType = types.submodule ({ x, y, freq, ... }:
+  resolutionType = types.submodule ({
-    {
+    x,
+    y,
+    freq,
+    ...
+  }: {
     options = {
       x = mkOption {
         description = "x";
@@ -70,7 +93,8 @@ let
       };
     };
   });
-  displayType = types.submodule
+  displayType =
+    types.submodule
     ({...}: {
       options = {
         name = mkOption {
@@ -108,18 +132,14 @@ let
       };
     });
 
-  resUnset = res:
+  resUnset = res: (res.x == 0 || res.y == 0 || res.freq == 0);
-    (res.x == 0 || res.y == 0 || res.freq == 0);
 
   resToString = res:
     if resUnset res
     then "preferred"
     else "${toString res.x}x${toString res.y}@${toString res.freq}";
-
+in {
-in
+  options.displays = {
-{
-  options.displays =
-    {
     enable = mkEnableOption "manage displays";
     displays = mkOption {
       type = types.listOf displayType;
@@ -130,14 +150,15 @@ in
   config = mkIf cfg.enable {
     home-manager.users.${user}.imports = [
       {
-        wayland.windowManager.hyprland.settings.monitor = mkIf (cfg.displays != [ ])
+        wayland.windowManager.hyprland.settings.monitor =
+          mkIf (cfg.displays != [])
           (renderDisplaysForHyprland cfg.displays);
 
         systemd.user.services.swaybg = swaybgJob cfg.displays;
-        wayland.windowManager.sway.config.output = mkIf (cfg.displays != [ ])
+        wayland.windowManager.sway.config.output =
+          mkIf (cfg.displays != [])
           (renderDisplaysForSway cfg.displays);
       }
     ];
   };
 }
-

lib/modules/editor.nix

@@ -1,13 +1,16 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   editor = config.programs.editor;
   pkg = editor.package;
   terminal = config.programs.terminal.package;
   termcmd = "${terminal}/bin/${terminal.pname}";
   menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
-in
+in {
-{
   options.programs = {
     editor = {
       enable = mkEnableOption "editor";
@@ -19,77 +22,78 @@ in
   };
 
   config = mkIf editor.enable {
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         programs.vscode = {
           enable = true;
           package = editor.package;
           extensions =
-          if editor.neovim then with pkgs; [
+            if editor.neovim
+            then
+              with pkgs; [
                 vscode-extensions.asvetliakov.vscode-neovim
-          ] else [ ];
+              ]
-        userSettings = {
+            else [];
+          userSettings =
+            {
               "keyboard.dispatch" = "keyCode";
               "terminal.integrated.sendKeybindingsToShell" = true;
               "aws.telemetry" = false;
               "gitlens.telemetry.enabled" = false;
               "redhat.telemetry.enabled" = false;
               "cSpell.language" = "en,en-GB";
-        } // (if editor.neovim then {
+            }
+            // (
+              if editor.neovim
+              then {
                 "vscode-neovim.neovimExecutablePaths.linux" = "${pkgs.neovim}/bin/nvim";
                 "extensions.experimental.affinity" = {
                   "asvetliakov.vscode-neovim" = 1;
                 };
-        } else { });
+              }
+              else {}
+            );
         };
 
         programs.neovim = mkIf editor.neovim {
           enable = true;
           defaultEditor = true;
-        coc = {
+          extraLuaConfig = ''
-          enable = true;
+            ${builtins.readFile ./neovim/config.lua}
-          settings = {
-            languageserver = {
-              go = {
-                command = "${pkgs.gopls}/bin/gopls";
-                filetypes = [ "go" ];
-              };
-              nix = {
-                command = "${pkgs.rnix-lsp}/bin/rnix-lsp";
-                filetypes = [ "nix" ];
-              };
-              typescript = {
-                command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server";
-                filetypes = [ "ts" "tsx" ];
-              };
-            };
-          };
-        };
-        extraConfig = ''
-          vnoremap * y/\V<C-R>=escape(@",'/\')<CR><CR>
-          vnoremap <C-R> "ry:%s/<C-R>=escape(@r,'/\')<CR>
-          vnoremap A :norm A
-          noremap <C-S-I> :CocCommand editor.action.formatDocument<CR>
-          set number
-          set rnu
-          set ignorecase
-          set smartcase
-          set mouse=a
-          set path=.,**
-          let g:netrw_banner=0
-          let g:netrw_liststyle=3
-          set undofile
-          set undodir=~/.local/share/nvim/undo
           '';
+          extraPackages = with pkgs; [
+            nodePackages_latest.typescript-language-server
+            vscode-langservers-extracted
+            gopls
+            nil
+          ];
           plugins = with pkgs.vimPlugins; [
             vim-surround
             vim-commentary
+            {
+              plugin = telescope-nvim;
+              type = "lua";
+              config = ''
+                local builtin = require('telescope.builtin')
+                vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+                vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+                vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+                vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+              '';
+            }
+            {
+              plugin = nvim-lspconfig;
+              type = "lua";
+              config = builtins.readFile ./neovim/lspconfig.lua;
+            }
             firenvim
           ];
         };
+      }
+    ];
 
-    }];
+    programs.scripts = [
-
+      {
-    programs.scripts = [{
         name = "open-code";
         text = ''
           code_dir=~/Documents/code
@@ -104,7 +108,7 @@ in
         '';
         install = false;
         hotkeys = [{key = "C";}];
-    }];
+      }
-  };
+    ];
-
+  };
 }

lib/modules/email.nix

@@ -1,11 +1,17 @@
-{ user, userName }: { lib, pkgs, config, ... }:
+{
-with lib;
+  user,
-let
+  userName,
+}: {
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.roles.email;
   terminal = config.programs.terminal.package;
   termcmd = "${terminal}/bin/${terminal.pname}";
-in
+in {
-{
   options.roles = {
     email = {
       enable = mkEnableOption "email settings";
@@ -20,7 +26,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    
     programs.scripts = [
       {
         name = "email";
@@ -32,7 +37,8 @@ in
       }
     ];
 
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         programs.git = {
           userName = userName;
           userEmail = cfg.email;
@@ -224,7 +230,7 @@ in
             };
           };
         };
-    }];
+      }
-  };
+    ];
-  
+  };
 }

lib/modules/gamer.nix

@@ -1,6 +1,10 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-{
+  pkgs,
+  config,
+  ...
+}:
+with lib; {
   options.roles.gamer = {
     enable = mkEnableOption "gamer packages";
   };
@@ -11,7 +15,8 @@ with lib;
       "electron-25.9.0"
     ];
 
-      home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         home.packages = with pkgs; [
           airshipper
           minetest
@@ -36,9 +41,11 @@ with lib;
           })
           oversteer
         ];
-      }];
+      }
+    ];
 
-      nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+    nixpkgs.config.allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) [
         "steam"
         "steam-run"
         "steam-original"
@@ -67,6 +74,5 @@ with lib;
       ATTR{idVendor}=="046d", ATTR{idProduct}=="c261", RUN+="${pkgs.usb-modeswitch}/bin/usb_modeswitch -c '/etc/usb_modeswitch.d/046d:c261'"
     '';
     hardware.new-lg4ff.enable = true;
-
   };
 }

lib/modules/git.nix

@@ -1,9 +1,15 @@
-{ user, userName }: { lib, pkgs, config, ... }:
-with lib;
-let
-  cfg = config.roles.git;
-in
 {
+  user,
+  userName,
+}: {
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
+  cfg = config.roles.git;
+in {
   options.roles = {
     git = {
       enable = mkEnableOption "email settings";
@@ -11,7 +17,8 @@ in
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         programs.git = {
           enable = true;
           aliases = {
@@ -25,7 +32,7 @@ in
             pull.rebase = true;
           };
         };
-    }];
+      }
-  };
+    ];
-  
+  };
 }

lib/modules/keyboard.nix

@@ -1,6 +1,10 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-{
+  pkgs,
+  config,
+  ...
+}:
+with lib; {
   options.keyboard = {
     dvorak = {
       enable = mkEnableOption "use a good keyboard layout on a qwerty keyboard";
@@ -26,7 +30,9 @@ with lib;
         };
       }
     ];
-    services.xserver.xkbVariant = if config.keyboard.dvorak.enable then "dvorak" else "";
+    services.xserver.xkbVariant =
+      if config.keyboard.dvorak.enable
+      then "dvorak"
+      else "";
   };
-
 }

lib/modules/laptop.nix

@@ -1,9 +1,12 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.roles.laptop;
-in
+in {
-{
   options.roles = {
     laptop = {
       enable = mkEnableOption "is a laptop";
@@ -14,14 +17,17 @@ in
   config = mkIf cfg.enable {
     displays = mkIf cfg.displays {
       enable = true;
-      displays = [{
+      displays = [
+        {
           name = "eDP-1";
           scaling = 1.2;
-      }];
+        }
+      ];
     };
     keyboard.dvorak.enable = true;
 
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         wayland.windowManager.hyprland = {
           settings = {
             general = {
@@ -38,6 +44,7 @@ in
             };
           };
         };
-    }];
+      }
+    ];
   };
 }

lib/modules/menu.nix

@@ -1,11 +1,14 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.programs.menu;
   terminal = config.programs.terminal.package;
   termcmd = "${terminal}/bin/${terminal.pname}";
-in
+in {
-{
   options.programs = {
     menu = {
       enable = mkEnableOption "menu";
@@ -20,7 +23,8 @@ in
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         programs.wofi = mkIf (cfg.package == pkgs.wofi) {
           enable = true;
           settings = {
@@ -28,6 +32,7 @@ in
             insensitive = true;
           };
         };
-    }];
+      }
+    ];
   };
 }

lib/modules/mpd.nix

@@ -1,26 +1,48 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.roles.mpd;
-in
+in {
-{
   options.roles.mpd = {
     enable = mkEnableOption "setup mpd client";
     host = mkOption {default = "192.168.1.2";};
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         programs.ncmpcpp = {
           enable = true;
           settings.mpd_host = cfg.host;
           bindings = [
-          { key = "j"; command = "scroll_down"; }
+            {
-          { key = "k"; command = "scroll_up"; }
+              key = "j";
-          { key = "l"; command = "next_column"; }
+              command = "scroll_down";
-          { key = "h"; command = "previous_column"; }
+            }
-          { key = "J"; command = [ "select_item" "scroll_down" ]; }
+            {
-          { key = "K"; command = [ "select_item" "scroll_up" ]; }
+              key = "k";
+              command = "scroll_up";
+            }
+            {
+              key = "l";
+              command = "next_column";
+            }
+            {
+              key = "h";
+              command = "previous_column";
+            }
+            {
+              key = "J";
+              command = ["select_item" "scroll_down"];
+            }
+            {
+              key = "K";
+              command = ["select_item" "scroll_up"];
+            }
           ];
         };
         services.mpd-mpris = {
@@ -41,7 +63,7 @@ in
             };
           };
         };
-    }];
+      }
-  };
+    ];
-
+  };
 }

lib/modules/neovim/config.lua

@@ -0,0 +1,19 @@
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
+vim.o.relativenumber = true
+vim.o.signcolumn = 'yes'
+vim.o.tabstop = 2
+vim.o.shiftwidth = 2
+vim.o.expandtab = true
+vim.o.smartindent = true
+vim.o.hlsearch = false
+vim.o.scrolloff = 6
+
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
+vim.keymap.set("x", "p", "\"_dP")
+
+vim.keymap.set("n", "<leader>y", "\"+y")
+vim.keymap.set("v", "<leader>y", "\"+y")
+

lib/modules/neovim/lspconfig.lua

@@ -0,0 +1,55 @@
+-- Setup language servers.
+local lspconfig = require('lspconfig')
+
+lspconfig.tsserver.setup {
+  on_attach = function(client)
+    client.server_capabilities.documentFormattingProvider = false
+  end
+}
+
+lspconfig.eslint.setup {
+  on_attach = function(client)
+    client.server_capabilities.documentFormattingProvider = true
+  end
+}
+
+lspconfig.gopls.setup {}
+lspconfig.nil_ls.setup {}
+
+-- Global mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
+
+-- Use LspAttach autocommand to only map the following keys
+-- after the language server attaches to the current buffer
+vim.api.nvim_create_autocmd('LspAttach', {
+  group = vim.api.nvim_create_augroup('UserLspConfig', {}),
+  callback = function(ev)
+    -- Enable completion triggered by <c-x><c-o>
+    vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+
+    -- Buffer local mappings.
+    -- See `:help vim.lsp.*` for documentation on any of the below functions
+    local opts = { buffer = ev.buf }
+    vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
+    vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
+    vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
+    vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
+    vim.keymap.set('n', '<leader>wa', vim.lsp.buf.add_workspace_folder, opts)
+    vim.keymap.set('n', '<leader>wr', vim.lsp.buf.remove_workspace_folder, opts)
+    vim.keymap.set('n', '<leader>wl', function()
+		print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, opts)
+    vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, opts)
+    vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
+    vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
+    vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
+    vim.keymap.set('n', '<leader>f', function()
+		vim.lsp.buf.format { async = true }
+    end, opts)
+  end,
+})

lib/modules/personal.nix

@@ -1,12 +1,15 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-{
+  pkgs,
+  config,
+  ...
+}:
+with lib; {
   options.roles.personal = {
     enable = mkEnableOption "personal packages";
   };
 
   config = mkIf config.roles.personal.enable {
-
     roles.email = {
       enable = true;
       email = "tristan@tristans.cloud";
@@ -22,7 +25,8 @@ with lib;
       "en_US.UTF-8/UTF-8"
     ];
 
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         services.nextcloud-client.enable = true;
         services.gnome-keyring.enable = true;
 
@@ -47,7 +51,7 @@ with lib;
           libsForQt5.neochat
           bookworm
         ];
-
+      }
-    }];
+    ];
   };
 }

lib/modules/scripts.nix

@@ -1,6 +1,10 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   scripts = config.programs.scripts;
 
   hotkeyType = types.submodule ({...}: {
@@ -42,21 +46,22 @@ let
   scriptToPackage = script:
     pkgs.writeShellScriptBin script.name script.text;
 
-  scriptExec = { script, hotkey }:
+  scriptExec = {
-    "${scriptToPackage script}/bin/${script.name} ${hotkey.args}";
+    script,
+    hotkey,
+  }: "${scriptToPackage script}/bin/${script.name} ${hotkey.args}";
 
-  installScripts = scripts:
+  installScripts = scripts: (map scriptToPackage (filter (s: s.install) scripts));
-    (map scriptToPackage (filter (s: s.install) scripts));
 
-  bindScript = script: concatStrings (
+  bindScript = script:
+    concatStrings (
       map
-      (hotkey:
+      (
-        "${hotkey.modifier}, ${hotkey.key}, exec, ${scriptExec {inherit script hotkey;}}"
+        hotkey: "${hotkey.modifier}, ${hotkey.key}, exec, ${scriptExec {inherit script hotkey;}}"
       )
-      script.hotkeys);
+      script.hotkeys
-
+    );
-in
+in {
-{
   options.programs = {
     scripts = mkOption {
       type = types.listOf scriptType;
@@ -65,10 +70,11 @@ in
   };
 
   config = {
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         home.packages = installScripts scripts;
-      wayland.windowManager.hyprland.settings.bind = (map bindScript scripts);
+        wayland.windowManager.hyprland.settings.bind = map bindScript scripts;
-    }];
+      }
-  };
+    ];
-
+  };
 }

lib/modules/terminal.nix

@@ -1,9 +1,12 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.programs.terminal;
-in
+in {
-{
   options.programs = {
     terminal = {
       enable = mkEnableOption "editor";
@@ -14,13 +17,15 @@ in
   };
 
   config = mkIf cfg.enable {
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         programs.foot = mkIf (cfg.package == pkgs.foot) {
           enable = true;
           server.enable = true;
         };
 
         home.packages = [cfg.package];
-    }];
+      }
+    ];
   };
 }

lib/modules/wayland.nix

@@ -1,9 +1,12 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-let
+  pkgs,
+  config,
+  ...
+}:
+with lib; let
   cfg = config.windowManager;
-in
+in {
-{
   options.windowManager = {
     hyprland = mkEnableOption "hyprland";
     sway = mkEnableOption "sway";
@@ -21,11 +24,15 @@ in
           command = "sway";
           user = user;
         };
-        default_session = if cfg.sway then sway_session else hypr_session;
+        default_session =
+          if cfg.sway
+          then sway_session
+          else hypr_session;
       };
     };
 
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
+      {
         wayland.windowManager.hyprland = mkIf cfg.hyprland {
           enable = true;
           systemd.enable = true;
@@ -114,6 +121,7 @@ in
               "QT_AUTO_SCREEN_SCALE_FACTOR,1"
               "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
               "NIXOS_OZONE_WL,1"
+              "WLR_NO_HARDWARE_CURSORS,1"
             ];
             windowrule = [
               "float, title:wlogout"
@@ -181,8 +189,14 @@ in
           enable = true;
           systemdTarget = "graphical-session.target";
           events = [
-          { event = "before-sleep"; command = "${pkgs.swaylock-effects}/bin/swaylock"; }
+            {
-          { event = "lock"; command = "${pkgs.swaylock-effects}/bin/swaylock"; }
+              event = "before-sleep";
+              command = "${pkgs.swaylock-effects}/bin/swaylock";
+            }
+            {
+              event = "lock";
+              command = "${pkgs.swaylock-effects}/bin/swaylock";
+            }
           ];
           timeouts = [
             {
@@ -282,8 +296,7 @@ in
             }
           '';
         };
-
+      }
-
+    ];
-    }];
   };
 }

lib/modules/work.nix

@@ -1,12 +1,15 @@
-{ user }: { lib, pkgs, config, ... }:
+{user}: {
-with lib;
+  lib,
-{
+  pkgs,
+  config,
+  ...
+}:
+with lib; {
   options.roles.work = {
     enable = mkEnableOption "work packages";
   };
 
   config = mkIf config.roles.work.enable {
-
     roles.email = {
       enable = true;
       email = "tristan.beedell@cryoserver.com";
@@ -20,8 +23,8 @@ with lib;
       package = pkgs.vscode;
     };
 
-    home-manager.users.${user}.imports = [{
+    home-manager.users.${user}.imports = [
-
+      {
         home.packages = with pkgs; [
           onedrive
           kubectl
@@ -70,10 +73,11 @@ with lib;
             bind = SUPER, t, focuswindow, brave-cifhbcnohmdccbgoicgdjpfamggdegmo-Profile_2
           '';
         };
+      }
+    ];
 
-    }];
+    nixpkgs.config.allowUnfreePredicate = pkg:
-
+      builtins.elem (lib.getName pkg) [
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
         # nonfree vscode required for dev containers
         "vscode"
         "steam-run"
@@ -97,6 +101,5 @@ with lib;
         };
       };
     };
-
   };
 }

lib/scripts.nix

@@ -1,5 +1,9 @@
-{ config, pkgs, lib, ... }:
+{
-let
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
   my-deps = {
     notify-send = "${pkgs.libnotify}/bin/notify-send";
     playerctl = "${pkgs.playerctl}/bin/playerctl";
@@ -21,8 +25,7 @@ let
     hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
     sed = "${pkgs.gnused}/bin/sed";
   };
-in
+in {
-{
   programs.scripts = [
     {
       name = "play-pause";
@@ -38,7 +41,10 @@ in
         fi
       '';
       hotkeys = [
-        { modifier = ""; key = "XF86AudioPlay"; }
+        {
+          modifier = "";
+          key = "XF86AudioPlay";
+        }
       ];
     }
     {
@@ -56,7 +62,12 @@ in
         items="$(rbw list)"
         echo "$items" | ${my-deps.menu} | xargs -I_ rbw code _ | wl-copy
       '';
-      hotkeys = [{ modifier = "SUPER_SHIFT"; key = "P"; }];
+      hotkeys = [
+        {
+          modifier = "SUPER_SHIFT";
+          key = "P";
+        }
+      ];
       install = false;
     }
     {
@@ -72,7 +83,10 @@ in
         cat "$FILE" | wl-copy -t image/png
       '';
       hotkeys = [
-        { modifier = "SUPER_SHIFT"; key = "S"; }
+        {
+          modifier = "SUPER_SHIFT";
+          key = "S";
+        }
       ];
     }
     {
@@ -82,8 +96,16 @@ in
         ${my-deps.notify-send} "Brightness" -h int:value:$(light) -a brightness-down -t 1000
       '';
       hotkeys = [
-        { modifier = ""; key = "XF86MonBrightnessDown"; args = "10"; }
+        {
-        { modifier = "SHIFT"; key = "XF86MonBrightnessDown"; args = "1"; }
+          modifier = "";
+          key = "XF86MonBrightnessDown";
+          args = "10";
+        }
+        {
+          modifier = "SHIFT";
+          key = "XF86MonBrightnessDown";
+          args = "1";
+        }
       ];
       install = false;
     }
@@ -94,8 +116,16 @@ in
         ${my-deps.notify-send} "Brightness" -h int:value:$(light) -a brightness-up -t 1000
       '';
       hotkeys = [
-        { modifier = ""; key = "XF86MonBrightnessUp"; args = "10"; }
+        {
-        { modifier = "SHIFT"; key = "XF86MonBrightnessUp"; args = "1"; }
+          modifier = "";
+          key = "XF86MonBrightnessUp";
+          args = "10";
+        }
+        {
+          modifier = "SHIFT";
+          key = "XF86MonBrightnessUp";
+          args = "1";
+        }
       ];
       install = false;
     }
@@ -118,18 +148,22 @@ in
       text = ''
         ${my-deps.hyprpicker} | wl-copy && notify-send "Copied Colour" "$(wl-paste)"
       '';
-      hotkeys = [{
+      hotkeys = [
+        {
           key = "G";
-      }];
+        }
+      ];
     }
     (lib.mkIf config.roles.mpd.enable {
       name = "ncmpcpp";
       text = ''
         ${my-deps.terminal} -e ncmpcpp
       '';
-      hotkeys = [{
+      hotkeys = [
+        {
           key = "M";
-      }];
+        }
+      ];
       install = false;
     })
     {
@@ -137,9 +171,11 @@ in
       text = ''
         ${my-deps.runmenu}
       '';
-      hotkeys = [{
+      hotkeys = [
+        {
           key = "D";
-      }];
+        }
+      ];
       install = false;
     }
     {
@@ -147,10 +183,12 @@ in
       text = ''
         hyprctl keyword misc:cursor_zoom_factor 2
       '';
-      hotkeys = [{
+      hotkeys = [
+        {
           modifier = "SUPER";
           key = "EQUAL";
-      }];
+        }
+      ];
       install = false;
     }
     {
@@ -158,10 +196,12 @@ in
       text = ''
         hyprctl keyword misc:cursor_zoom_factor 1
       '';
-      hotkeys = [{
+      hotkeys = [
+        {
           modifier = "SUPER";
           key = "MINUS";
-      }];
+        }
+      ];
       install = false;
     }
     {
@@ -171,7 +211,10 @@ in
       '';
       hotkeys = [
         {key = "bracketright";}
-        { modifier = ""; key = "XF86AudioRaiseVolume"; }
+        {
+          modifier = "";
+          key = "XF86AudioRaiseVolume";
+        }
       ];
       install = false;
     }
@@ -182,7 +225,10 @@ in
       '';
       hotkeys = [
         {key = "bracketleft";}
-        { modifier = ""; key = "XF86AudioLowerVolume"; }
+        {
+          modifier = "";
+          key = "XF86AudioLowerVolume";
+        }
       ];
       install = false;
     }
@@ -192,8 +238,14 @@ in
         ${my-deps.playerctl} next
       '';
       hotkeys = [
-        { modifier = "SUPER_SHIFT"; key = "period"; }
+        {
-        { modifier = ""; key = "XF86AudioNext"; }
+          modifier = "SUPER_SHIFT";
+          key = "period";
+        }
+        {
+          modifier = "";
+          key = "XF86AudioNext";
+        }
       ];
       install = false;
     }
@@ -203,8 +255,14 @@ in
         ${my-deps.playerctl} previous
       '';
       hotkeys = [
-        { modifier = "SUPER_SHIFT"; key = "comma"; }
+        {
-        { modifier = ""; key = "XF86AudioPrev"; }
+          modifier = "SUPER_SHIFT";
+          key = "comma";
+        }
+        {
+          modifier = "";
+          key = "XF86AudioPrev";
+        }
       ];
       install = false;
     }