fix: merge conflicts

modules/core/default.nix

@@ -1,20 +1,19 @@
 { ... }:
 {
   imports =
-       # [(import ./bootloader.nix)]
-       [(import ./hardware.nix)]
-    # ++ [(import ./xserver.nix)]
+       [(import ./bootloader.nix)]
+    ++ [(import ./hardware.nix)]
+    ++ [(import ./xserver.nix)]
     ++ [(import ./network.nix)]
-    # ++ [(import ./pipewire.nix)]
+    ++ [(import ./pipewire.nix)]
     ++ [(import ./program.nix)]
     ++ [(import ./sshd.nix)]
     ++ [(import ./security.nix)]
     ++ [(import ./services.nix)]
     ++ [(import ./system.nix)]
-    ++ [(import ./wireguard.nix)]
-    ++ [(import ./user.nix)];
-    # ++ [(import ./bluetooth.nix)]
-    # ++ [(import ./yubikey.nix)]
-    # ++ [(import ./steam.nix)]
-    # ++ [(import ./wayland.nix)];
+    ++ [(import ./user.nix)]
+    ++ [(import ./bluetooth.nix)]
+    ++ [(import ./yubikey.nix)]
+    ++ [(import ./steam.nix)]
+    ++ [(import ./wayland.nix)];
 }

modules/core/yubikey.nix

@@ -7,7 +7,7 @@
   security.pam = {
     u2f = {
       enable = true;
-      cue = true;
+      settings.cue = true;
       control = "sufficient";
     };
 

modules/home/nvim.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 {
   programs.neovim = {
-    enable = true;
-    vimAlias = true;
+    enable = false;
+    vimAlias = false;
   };
 }

modules/home/packages.nix

@@ -1,6 +1,7 @@
 { inputs, pkgs, ... }: 
 {
   home.packages = with pkgs; [
+    translate-shell                   # Google Translate but in the CLI
     wireguard-tools                   # VPN connections
     openresolv                        # required for wireguard-tools
     pwgen
@@ -29,6 +30,7 @@
     wineWowPackages.wayland
     element-desktop-wayland
     tut
+    iamb
     spotify
     thunderbird
     neofetch
@@ -58,5 +60,6 @@
     xdg-utils
     xxd
     inputs.alejandra.defaultPackage.${system}
+    inputs.nixvim.packages.${pkgs.system}.default
   ];
 }

modules/home/packages.violet.nix

@@ -29,5 +29,6 @@
     wget
     xxd
     inputs.alejandra.defaultPackage.${system}
+    inputs.nixvim.defaultPackage.${system}
   ];
 }

modules/home/zsh.nix

@@ -25,6 +25,72 @@
         HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE = 1;
       };
 
+      initExtra = ''
+        autoload -U add-zsh-hook
+        autoload -U compinit
+        zmodload zsh/complist
+        autoload -U edit-command-line
+        zmodload zsh/zpty
+        # Corrections
+        setopt correct
+        
+        # History stuff
+        setopt append_history
+        setopt inc_append_history
+        setopt share_history
+        setopt extended_history
+        setopt hist_reduce_blanks
+        setopt hist_ignore_space
+        
+        # Disable annoying beep
+        setopt no_beep
+        # Fix comments
+        setopt interactive_comments
+
+        bindkey '^[[H' beginning-of-line # Home
+        bindkey '^[[F' end-of-line # End
+        bindkey "^[[1;5C" forward-word # Ctrl+Right
+        bindkey "^[[1;5D" backward-word # Ctrl+Left
+        # Menu selection
+        bindkey -M menuselect '^@' accept-and-infer-next-history # Ctrl+Space
+        # Make Alt-Backspace delete till ~!#$%^&*(){}[]<>?+; the way OMZ does
+        backward-delete-word-but-better () {
+          local WORDCHARS='~!#$%^&*(){}[]<>?+;'
+          zle backward-delete-word
+        }
+        zle -N backward-delete-word-but-better
+        
+        bindkey '\e^?' backward-delete-word-but-better
+
+        # Completions
+        #
+        # Cache so it's a bit quicker
+        zstyle ':completion:*' use-cache on
+        zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
+        # File list like ls -l
+        zstyle ':completion:*' file-list all
+        # Glorious menu
+        zstyle ':completion:*' menu select
+        # Always tab complete
+        zstyle ':completion:*' insert-tab false
+        # Comments
+        zstyle ':completion:*' verbose yes
+        # Tab key behaviour
+        zstyle ':autocomplete:tab:*' widget-style menu-complete
+        # Make set // to be / instead of default /*/
+        zstyle ':completion:*' squeeze-slashes true
+        # Complete options
+        zstyle ':completion:*' complete-options true
+        # Complete partial words (such as 3912 > _DSC3912.JPG)
+        zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+        # Move around completion menu with Vi keys
+        bindkey -M menuselect 'h' vi-backward-char
+        bindkey -M menuselect 'k' vi-up-line-or-history
+        bindkey -M menuselect 'j' vi-down-line-or-history
+        bindkey -M menuselect 'l' vi-forward-char
+
+      '';
+
       # setOptions = [
       #   # Corrections
       #   "CORRECT"
@@ -54,7 +120,8 @@
         yt-dlp-audio = "yt-dlp -f 'ba' -x --audio-format mp3";
         open = "xdg-open";
         tree = "eza --icons --tree --group-directories-first";
-        nvim = "nix run /home/liv/Development/nixvim --";
+        # nvim = "nix run /home/liv/Development/nixvim --";
+        vim = "nvim";
         doas = "sudo";
 
         # NixOS