nixos and vim

3 files changed, 27 insertions, 31 deletions

diff --git a/.zshrc b/.zshrc
index bc999f0..3de4048 100644
--- a/.zshrc
+++ b/.zshrc
@@ -16,10 +16,10 @@ path=(	"$HOME/bin"
 	"/run/current-system/sw/bin"
 )
 export PATH
-EDITOR=nvim
+EDITOR=vim
 export EDITOR
 
-autoload -Uz compinit 
+autoload -Uz compinit
 compinit
 zmodload zsh/complist
 zstyle ':completion:*' menu select
@@ -51,7 +51,6 @@ bindkey '^e' edit-command-line
 
 alias ls='ls --color'
 alias la='ls -la --color'
-alias vim='nvim'
 alias listen='mpv --no-video'
 #alias mpv='mpv -vo=drm'
 
diff --git a/nix/configuration.nix b/nix/configuration.nix
index 2ee63d0..16efd4d 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -2,49 +2,45 @@
 
 {
   imports = [ ./hardware-configuration.nix ];
-
+  boot.loader.systemd-boot.enable = true;
   networking.hostName = "nixos";
-  boot.loader.grub.device = "/dev/sda";
-  networking.interfaces.wlp3s0.useDHCP = true;
 
-  boot.loader.grub.enable = true;
   time.timeZone = "Europe/Berlin";
   networking.networkmanager.enable = true;
   i18n.defaultLocale = "en_US.UTF-8";
 
   users.users.tom = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" "lxd"];
+    extraGroups = [ "wheel" "networkmanager"];
     shell = pkgs.zsh;
   };
 
+  hardware.pulseaudio.enable = true;
   services.xserver.enable = true;
   services.xserver.autorun = false;
   services.xserver.displayManager.startx.enable = true;
   services.xserver.libinput.enable = true;
 
-  environment.variables.EDITOR = "nvim";
+  environment.variables.EDITOR = "vim";
   environment.systemPackages = with pkgs; [
-    neovim
-    git
-    htop
-    ncmpcpp
-    w3m
-    firefox
-    wget
-    tmux
+    acpi
     curl
     dmenu
-    pass
     feh
-    nixfmt
-    neomutt
-    acpi
-    ranger
-    ncdu
-    mpc_cli
+    firefox
+    git
+    htop
     lm_sensors
+    mpc_cli
+    ncdu
+    ncmpcpp
+    nixfmt
+    pass
     pinentry-curses
+    ranger
+    tmux
+    vim
+    wget
   ];
 
   programs.gnupg.agent = {
@@ -59,9 +55,7 @@
 
   fonts.fonts = with pkgs; [ hermit ];
 
-  system.stateVersion = "21.05";
-
-  virtualisation.lxd.enable = true;
+  system.stateVersion = "23.05";
 
   swapDevices = [
     {
diff --git a/scripts/passotpmenu b/scripts/passotpmenu
index 0e1c834..f46dc09 100755
--- a/scripts/passotpmenu
+++ b/scripts/passotpmenu
@@ -20,9 +20,9 @@ else
 fi
 
 prefix=${PASSWORD_STORE_DIR-~/.password-store}
-password_files=( "$prefix"/**/*.gpg )
-password_files=( "${password_files[@]#"$prefix"/}" )
-password_files=( "${password_files[@]%.gpg}" )
+password_files=("$prefix"/**/*.gpg)
+password_files=("${password_files[@]#"$prefix"/}")
+password_files=("${password_files[@]%.gpg}")
 for f in "${password_files[@]}"; do [[ $f == *"otp"* ]] && otp_files+=("$f"); done
 
 password=$(printf '%s\n' "${otp_files[@]}" | "$dmenu" "$@")
@@ -32,5 +32,8 @@ password=$(printf '%s\n' "${otp_files[@]}" | "$dmenu" "$@")
 if [[ $typeit -eq 0 ]]; then
 	pass otp show -c "$password" 2>/dev/null
 else
-	pass otp show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool
+	pass otp show "$password" | {
+		IFS= read -r pass
+		printf %s "$pass"
+	} | $xdotool
 fi