From 539d0b26735ac82e587c5bfc8f532d7b69a19c67 Mon Sep 17 00:00:00 2001
From: fqbn207 <fqbn207>
Date: Thu, 2 Jan 2025 19:16:36 +0100
Subject: [PATCH] kekl

---
 configuration.nix                  | 47 +++++++++++++++++++++++++++---
 modules/nix/hypr/raw/waybar/config |  9 ++++--
 modules/nix/mpd.nix                | 10 +++++++
 modules/nix/nvim/default.nix       | 27 ++++++++++++++++-
 modules/nix/nvim/dev.nix           |  2 ++
 modules/nix/nvim/lsp.nix           |  6 ++--
 modules/nix/nvim/treesitter.nix    | 34 +++++++++++++++++++++
 7 files changed, 124 insertions(+), 11 deletions(-)
 create mode 100644 modules/nix/nvim/treesitter.nix

diff --git a/configuration.nix b/configuration.nix
index 4de497f..dcb08f5 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -23,9 +23,15 @@ in
 
   systemd = {
     services = {
+      modem-manager.enable = false;
       mpd.environment = {
         XDG_RUNTIME_DIR = "/run/user/1000";
       };
+      #pactl-pipe = {
+      #  description = "Load Pactl Pipe for Audio";
+      #  wantedBy = [ "multi-user.target" ];
+      #  serviceConfig.ExecStart = "${pkgs.pulseaudio}/bin/pactl load-module module-null-sink sink_name=virtual_sink";
+      #};
     };
   };
 
@@ -102,6 +108,9 @@ in
     rtl-sdr = {
       enable = true;
     };
+    pulseaudio = {
+      enable = false;
+    };
   };
 
   programs = {
@@ -130,6 +139,7 @@ in
       "plugdev"
       "adbusers"
       "kvm"
+      "dialout"
     ];
   };
 
@@ -153,6 +163,9 @@ in
     tree
     gdb
     vscode
+    pavucontrol
+    usbutils
+    alsa-utils
 
     # cli
     neofetch
@@ -172,16 +185,42 @@ in
     nodejs
     gccgo14
     go
-    nixd
-    arduino-cli
-    arduino-ide
-    arduino-language-server
     dotnet-sdk
     bear
     android-tools
     android-udev-rules
     android-studio-tools
 
+    # embedded
+    espup
+    esphome
+    esptool
+    ethtool
+    espflash
+    minicom
+    pulseview
+    cp210x-program
+    arduino-ide
+    arduino-cli
+
+    # LSPs
+    nixd
+    arduino-language-server
+
+    # libs
+    python312Packages.pyserial
+
+    # SDR
+    noaa-apt
+    wsjtx
+    qsstv
+    gpredict
+    sdrangel
+    sdrpp
+    gnuradio
+    cubicsdr
+    gqrx
+
     # misc
     cava
     discord
diff --git a/modules/nix/hypr/raw/waybar/config b/modules/nix/hypr/raw/waybar/config
index a375b05..6e3c0e4 100755
--- a/modules/nix/hypr/raw/waybar/config
+++ b/modules/nix/hypr/raw/waybar/config
@@ -130,7 +130,7 @@
       "interval": 5
     },
     "modules-center": [
-    	"custom/playerlabel",
+    	"wlr/workspaces",
     ],
     "modules-left": [
       "cava#left",
@@ -140,9 +140,12 @@
     ],
     "modules-right": [
         "tray",
+        "memory",
+        "cpu",
         "battery",
         "pulseaudio",
-        "network",      
+        "network",
+        "clock",
     ],
 
     "network": {
@@ -171,7 +174,7 @@
       "spacing": 8
     },
     "wlr/workspaces": {
-      "active-only": false,
+      "active-only": true,
       "all-outputs": false,
       "disable-scroll": false,
       "format": "{name}",
diff --git a/modules/nix/mpd.nix b/modules/nix/mpd.nix
index 0e7bddf..a2b1786 100644
--- a/modules/nix/mpd.nix
+++ b/modules/nix/mpd.nix
@@ -20,6 +20,16 @@
     ncmpcpp = {
       enable = true;
       mpdMusicDir = "/home/fabian/.music";
+      settings = {
+        ncmpcpp_directory = "~/.ncmpcpp";
+        mpd_host = "localhost";
+        mpd_port = 6600;
+        header_window_color = "cyan";
+        progressbar_look = "░█";
+        visualizer_type = "wave";
+        visualizer_color = "cyan";
+        visualizer_look = "┃│";
+      };
     };
   };
 }
diff --git a/modules/nix/nvim/default.nix b/modules/nix/nvim/default.nix
index 5050b9e..462f328 100644
--- a/modules/nix/nvim/default.nix
+++ b/modules/nix/nvim/default.nix
@@ -23,12 +23,37 @@ in
     ./alpha.nix
     ./dev.nix
     ./nonels.nix
+    ./treesitter.nix
   ];
   programs.nixvim = {
     enable = true;
     colorschemes.oxocarbon.enable = true;
     plugins = {
-      neocord.enable = true;
+      neocord = {
+        enable = true;
+        settings = {
+          auto_update = true;
+          blacklist = [ ];
+          client_id = "1157438221865717891";
+          debounce_timeout = 10;
+          editing_text = "Editing...";
+          enable_line_number = false;
+          file_assets = null;
+          file_explorer_text = "Browsing...";
+          git_commit_text = "Committing changes...";
+          global_timer = true;
+          line_number_text = "Line %s out of %s";
+          log_level = null;
+          logo = "auto";
+          logo_tooltip = null;
+          main_image = "language";
+          plugin_manager_text = "Managing plugins...";
+          reading_text = "Reading...";
+          show_time = true;
+          terminal_text = "Using a 1337 Terminal...";
+          workspace_text = "Working on %s";
+        };
+      };
     };
   };
 }
diff --git a/modules/nix/nvim/dev.nix b/modules/nix/nvim/dev.nix
index 819c796..a45e4b3 100644
--- a/modules/nix/nvim/dev.nix
+++ b/modules/nix/nvim/dev.nix
@@ -10,6 +10,8 @@
       toggleterm.enable = true;
       autoclose.enable = true;
       web-devicons.enable = true;
+      which-key.enable = true;
+      trouble.enable = true;
     };
   };
 }
diff --git a/modules/nix/nvim/lsp.nix b/modules/nix/nvim/lsp.nix
index 57337ba..fa65c9d 100644
--- a/modules/nix/nvim/lsp.nix
+++ b/modules/nix/nvim/lsp.nix
@@ -65,9 +65,9 @@
           autostart = true;
         };
         omnisharp = {
-            enable = true;
-            autostart = true;
-          };
+          enable = true;
+          autostart = true;
+        };
         arduino_language_server = {
           enable = true;
           autostart = true;
diff --git a/modules/nix/nvim/treesitter.nix b/modules/nix/nvim/treesitter.nix
new file mode 100644
index 0000000..637f2ce
--- /dev/null
+++ b/modules/nix/nvim/treesitter.nix
@@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  nixvim,
+  ...
+}:
+{
+  programs.nixvim = {
+    plugins = {
+      treesitter-context = {
+        enable = true;
+      };
+      treesitter = {
+        enable = true;
+        grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
+          c
+          cpp
+          rust
+          bash
+          json
+          lua
+          make
+          markdown
+          nix
+          toml
+          vim
+          vimdoc
+          xml
+          yaml
+        ];
+      };
+    };
+  };
+}