beautifying vim

flake.lock

@@ -85,11 +85,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1677259491,
+        "lastModified": 1677346766,
-        "narHash": "sha256-nTIqi2mNJfV5tuQ+52nR3OGymv6tSC8HEQdR5EDHzT8=",
+        "narHash": "sha256-0+smV3LldkVIRkD4cSfcVsJxxSB9NaRO56ze5Q8+hdo=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "1089e858b49975a4b9f6e49d377726ee4f164f96",
+        "rev": "cf566b59ce980790bc60dac8adf4df9ec8bcf9f9",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677230078,
+        "lastModified": 1677348479,
-        "narHash": "sha256-4WYJ+J76TiULFFdv1WCseklbwtunvZ9xzR4pi1MCezM=",
+        "narHash": "sha256-9k2qZo+1KPRRfHzIUs9gfrTxx7ZR+KGPLkpWpDRlp5U=",
         "owner": "pta2002",
         "repo": "nixvim",
-        "rev": "29764b28af2f27d1e4bd576754e3e1622ca24003",
+        "rev": "705356d4787ecddfc88629ca7ec5e03a8edb4944",
         "type": "github"
       },
       "original": {

users/rouven/modules/accounts/default.nix

@@ -87,7 +87,7 @@ in
       };
       neomutt = {
         enable = true;
-        mailboxName = "--rouven@rfive.de--";
+        mailboxName = " 󰒋 rfive.de";
         extraMailboxes = [ "Sent" "Trash" "Junk" "Drafts" ];
       };
     };
@@ -151,7 +151,7 @@ in
       msmtp.enable = true;
       neomutt = {
         enable = true;
-        mailboxName = "--TU Dresden-------";
+        mailboxName = "  TU Dresden";
         extraMailboxes = [ "Opal" "Sent" "Trash" "Junk" "Drafts" ];
       };
     };
@@ -212,7 +212,7 @@ in
       msmtp.enable = true;
       neomutt = {
         enable = true;
-        mailboxName = "--iFSR-------------";
+        mailboxName = "  iFSR";
         extraMailboxes = [ "Sent" "Trash" "Drafts" ];
       };
     };
@@ -269,7 +269,7 @@ in
       msmtp.enable = true;
       neomutt = {
         enable = true;
-        mailboxName = "--gmail------------";
+        mailboxName = " 󰊫 gmail";
         extraMailboxes = [ "Sent" "Trash" "Junk" "Drafts" ];
       };
     };

users/rouven/modules/accounts/powerline.neomuttrc

@@ -11,7 +11,7 @@ set vfolder_format = " %N %?n?%3n&   ?  %8m  · %f"
 set attach_format = "%u%D  %T%-75.75d %?T?%&   ? %5s · %m/%M"
 
 # no addressed to me, to me, group, cc, sent by me, mailing list
-set to_chars="󱡪➜"
+set to_chars="➜"
 # unchanged mailbox, changed, read only, attach mode
 set status_chars = " "
 ifdef crypt_chars set crypt_chars = " "

users/rouven/modules/hyprland/default.nix

@@ -17,8 +17,8 @@
     grim
     slurp
     swappy
-#    font-awesome
     swaylock-effects
+    wlogout
   ];
 
   xdg.configFile = {

users/rouven/modules/hyprland/hyprland.conf

@@ -165,9 +165,10 @@ binde = SHIFT, XF86AudioLowerVolume, exec, pactl set-source-volume @DEFAULT_SOUR
 bind = ,XF86Messenger, exec, makoctl dismiss
 bind = SHIFT ,XF86Messenger, exec, makoctl restore
 bind = ,XF86Go, exec, makoctl invoke
-bind = ,Cancel, exec, sh ~/.config/mako/do-not-disturb.sh
+bind = SHIFT, XF86Go, exec, sh ~/.config/mako/do-not-disturb.sh
 bind = ,XF86Display, exec, hyprpaper
 bind = ,XF86Favorites, exec, swaylock
+bind = ,Cancel, exec, wlogout
 
 # lock on lid
 bindl = ,switch:Lid Switch, exec, swaylock

users/rouven/modules/hyprland/waybar.nix

@@ -15,9 +15,9 @@
         modules-right = [ "network" "cpu" "temperature" "pulseaudio" "battery" "tray" "clock" ];
         network = {
           format-wifi = "  {essid} ({signalStrength}%)";
-          format-ethernet = " {ipaddr}/{cidr}";
+          format-ethernet = "󰈀 {ipaddr}/{cidr}";
-          tooltip-format = " {ifname} via {gwaddr}";
+          tooltip-format = "󰈀 {ifname} via {gwaddr}";
-          format-linked = " {ifname} (No IP)";
+          format-linked = "󰈀 {ifname} (No IP)";
           format-disconnected = "Disconnected ⚠";
           format-alt = "{ifname}: {ipaddr}/{cidr}";
         };

users/rouven/modules/neovim/default.nix

@@ -76,7 +76,6 @@
       lsp = {
         enable = true;
         onAttach = ''
-          require("lsp-format").on_attach(client)
           -- Enable completion triggered by <c-x><c-o>
           vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
 
@@ -92,6 +91,8 @@
           vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
           vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
           vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+          vim.keymap.set('n', '<leader>b', function() vim.lsp.buf.format { async = true } end, bufopts)
+
         '';
         servers = {
           pyright = {
@@ -104,6 +105,7 @@
       };
       nvim-cmp = {
         enable = true;
+        mappingPresets = [ "insert" ];
         sources = [
           {
             name = "nvim_lsp";
@@ -112,17 +114,43 @@
           { name = "buffer"; }
         ];
       };
+      treesitter = {
+        enable = true;
+        indent = true;
+        #folding = true; # somewhat broken at the moment
+        grammarPackages = with pkgs.tree-sitter-grammars; [
+          tree-sitter-bash
+          tree-sitter-c
+          tree-sitter-cpp
+          tree-sitter-css
+          tree-sitter-go
+          tree-sitter-haskell
+          tree-sitter-html
+          tree-sitter-java
+          tree-sitter-javascript
+          tree-sitter-json
+          tree-sitter-latex
+          tree-sitter-lua
+          tree-sitter-markdown
+          tree-sitter-nix
+          tree-sitter-perl
+          tree-sitter-python
+          tree-sitter-regex
+          tree-sitter-rst
+          tree-sitter-rust
+          tree-sitter-sql
+          tree-sitter-toml
+          tree-sitter-typescript
+          tree-sitter-yaml
+        ];
+      };
     };
     extraPlugins = with pkgs.vimPlugins;
       [
         vim-nix
         dracula-vim
         nerdcommenter
-        lsp-format-nvim
       ];
     highlight.ColorColumn.ctermbg = "darkgray";
-    extraConfigLuaPre = ''
-      local lsp_format = require("lsp-format")
-    '';
   };
 }

users/rouven/modules/packages.nix

@@ -5,16 +5,16 @@
     thunderbird
 
     # essentials
-    wpa_supplicant_gui
+    wpa_supplicant_gui # manage wifi
-    pcmanfm
+    pcmanfm # rock solid file manager
-    xdg-utils
+    xdg-utils # used for xdg-open
     snapper-gui
 
     # graphics
-    evince
+    evince # pdf viewer
     gimp
-    mpv
+    mpv # best video player out there
-    yt-dlp
+    yt-dlp # youtube downloader
     ffmpeg
 
     # sound
@@ -45,18 +45,18 @@
     bitwarden-cli
 
     # misc
-    neofetch
+    neofetch # obligatory
-    trash-cli
     #spotify # make probles atm
     virt-manager
     ventoy-bin
-    ripgrep
-    baobab
 
-    # font and icon stuff
+    trash-cli # better rm 
+    ripgrep # better grep
     exa # ls but with icons
-    powerline-fonts
+    bat # better less
+    duf # better df
 
+    powerline-fonts
 
     # libs
     libyubikey