now fuzzel and so on. Idk what happened last time

arduino flake
yes
2025-08-24 14:54:50 +02:00 · 2025-06-23 15:29:28 +02:00 · 2025-06-16 01:08:44 +02:00 · 2025-05-25 21:35:28 +02:00 · 2025-05-25 21:25:55 +02:00 · 2025-05-25 00:17:53 +02:00
96 changed files with 2337 additions and 1038 deletions
--- a/Shells/flake.nix
+++ b/Shells/flake.nix
@@ -1,69 +0,0 @@
-{
-description = "Flutter 3.13.x";
-inputs = {
-  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  flake-utils.url = "github:numtide/flake-utils";
-
-   android-nixpkgs = {
-      url = "github:tadfisher/android-nixpkgs";
-   };
-};
-outputs = { self, nixpkgs, flake-utils, android-nixpkgs }:
-  flake-utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs {
-        inherit system;
-        config = {
-          android_sdk.accept_license = true;
-          allowUnfree = true;
-        };
-      };
-      androidComposition = pkgs.androidenv.composeAndroidPackages {
-        buildToolsVersions = [ "30.0.3" "34.0.0" "33.0.1"];
-        platformVersions = [ "35" "34" "33" "28" ];
-        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-      };
-      androidCustomPackage = android-nixpkgs.sdk.${system} (
-        sdkPkgs: with sdkPkgs; [
-          build-tools-30.0.3
-          build-tools-34.0.0
-        ]
-      );
-      androidSdk = androidComposition.androidsdk;
-    in
-    {
-      devShell =
-        with pkgs; mkShell rec {
-          shellHook = ''
-            nu
-            exit
-          '';
-          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";   
-
-          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
-          buildInputs = [
-            flutter
-            androidSdk # The customized SDK that we've made above
-#            jdk17
-            jdk21
-
-            (vscode-with-extensions.override {
-              vscode = vscodium;
-              vscodeExtensions = with vscode-extensions; [
-                vscodevim.vim
-                dart-code.dart-code
-                dart-code.flutter
-              ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace[
-                {
-                  name = "awesome-flutter-snippets";
-                  publisher = "nash";
-                  version = "4.0.1";
-                  sha256 = "lXdos/xB18h3Z0YfkgEk55G2JvRMYudUUIltugQjylU=";
-                }
-              ];
-            })
-          ];
-
-        };
-    });
-}
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,64 +1,70 @@
-# Edit this configuration file to define what should be installed on your system.  Help is available 
-# in the configuration.nix(5) man page and in the NixOS manual (accessible by running ‘nixos-help’).
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
 { config, pkgs, inputs,  ... }:

-{ imports =
+{
+  imports =
    [ # Include the results of the hardware scan.
      ./hardware-configuration.nix
      inputs.home-manager.nixosModules.default
- ];
+
+    ];
+

  # home manager
  home-manager = {
    extraSpecialArgs = { inherit inputs; };
    users = {
-      "nico" = import ./home-nico.nix;
+      "n" = import ./home-nico.nix;
    };
  };

+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-33.4.11"
+  ];
+
  # hyprland
- programs.hyprland = {
-   enable = true;
-   xwayland.enable = true;
- };
-
- programs.adb.enable = true;
-
-  # Bootloader.
-boot.loader.systemd-boot.enable = true;
-boot.loader.efi.canTouchEfiVariables = true;
-
-
-  swapDevices = [ ];
-
-  fileSystems."mnt/win" = {
-    device = "/dev/sdb1";
-    fsType = "ntfs";
+  programs.hyprland = {
+    enable = true;
+    xwayland.enable = true;
  };

-  # Flakes
+  programs.niri.enable = true;
+
+  boot.supportedFilesystems = [ "ntfs" ];
+
  nix.settings.experimental-features = [ "nix-command" "flakes" ];

-  networking.hostName = "nico-nixos"; # Define your hostname.
-  networking.enableIPv6  = false;
-  # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
+  security.polkit.enable = true;
+  nix.settings.trusted-users = [ "root" "n" ];

-  # Configure network proxy if necessary networking.proxy.default = 
-  # "http://user:password@proxy:port/"; networking.proxy.noProxy = 
-  # "127.0.0.1,localhost,internal.domain";
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.kernelParams = [ "ipv6.disable=1" ];
+  networking.hostName = "nico-nixos-laptop"; # Define your hostname.
+  networking.enableIPv6  = false;
+#   networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";

  # Enable networking
  networking.networkmanager.enable = true;
+  hardware.bluetooth.enable = true;
+  services.blueman.enable = true;

-  # VM
-  virtualisation.virtualbox.host.enable = true;
-  virtualisation.virtualbox.host.enableExtensionPack = true;
-  virtualisation.virtualbox.host.enableKvm = true;
-  virtualisation.virtualbox.host.addNetworkInterface = false;
-  users.extraGroups.vboxusers.members = [ "nico" ];
-  # virtualisation.virtualbox.guest.enable = true;
-  # virtualisation.virtualbox.guest.dragAndDrop = true;
-#  virtualisation.docker.enable = true;
+  services.resolved = {
+    enable = true;
+  };
+
+  services.mullvad-vpn.enable = true;
+  services.teamviewer.enable = true;

  # Set your time zone.
  time.timeZone = "Europe/Berlin";
@@ -66,109 +72,155 @@ boot.loader.efi.canTouchEfiVariables = true;
  # Select internationalisation properties.
  i18n.defaultLocale = "en_US.UTF-8";

-  i18n.extraLocaleSettings = { LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8"; 
-    LC_MEASUREMENT = "en_US.UTF-8"; LC_MONETARY = "en_US.UTF-8"; LC_NAME = "en_US.UTF-8"; LC_NUMERIC = 
-    "en_US.UTF-8"; LC_PAPER = "en_US.UTF-8"; LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
  };

-  # Enable the X11 windowing system. You can disable this if you're only using the Wayland session.
+
+  # Enable the X11 windowing system.
  services.xserver.enable = true;

-  # Enable the KDE Plasma Desktop Environment.
+  # Enable the XFCE Desktop Environment.
  services.displayManager.sddm.enable = true;
-   services.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    konsole
+  ];
+
+  
+
+  virtualisation.virtualbox.host.enable = true;
+  virtualisation.docker.enable = true;
+  users.extraGroups.vboxusers.members = [ "n" ];
+  virtualisation.virtualbox.host.enableExtensionPack = true;
+

  # Configure keymap in X11
-  services.xserver = { xkb.layout = "us"; xkb.variant = "";
+  services.xserver = {
+    xkb = {
+      variant = "";
+      layout = "de";
+    };
  };

  # Configure console keymap
-  console.keyMap = "us";
+  console.keyMap = "de";

  # Enable CUPS to print documents.
  services.printing.enable = true;

  # Enable sound with pipewire.
- services.pulseaudio.enable = true;
- security.rtkit.enable = true; 
- services.pipewire = {
-    enable = false; 
-    alsa.enable = true; 
-    alsa.support32Bit = true; 
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this jack.enable = true;
+    wireplumber.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;

-    # use the example session manager (no others are packaged yet so this is enabled by default, no 
-    # need to redefine it in your config for now)
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
    #media-session.enable = true;
  };

-  # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable 
-  # = true;
-services.mullvad-vpn.enable = true;
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.libinput.enable = true;
+
+  programs.light.enable = true;
+
+  programs.zsh.enable = true;
+#  programs.nushell.enable = true;
+
+  programs.adb.enable = true;
+
  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.nico = { isNormalUser = true; description = "nico"; extraGroups = [ "networkmanager" 
-    "wheel" "adbusers" "docker"]; packages = with pkgs; [
-                 obsidian
-                 musescore
-                 mullvad-vpn
+  users.users.n = {
+    isNormalUser = true;
+    description = "n";
+    extraGroups = [ "networkmanager" "wheel" "video" "adbusers" "input" "docker" "dialout" ];
+    packages = with pkgs; [
+      obsidian
    ];
+    shell = pkgs.zsh;
  };

-  users.defaultUserShell = pkgs.nushell;
-  environment.shells = with pkgs; [ zsh nushell ];
-  programs.zsh.enable = true;
+

  # Install firefox.
  programs.firefox.enable = true;
+  services.flatpak.enable = true;
+

  # Allow unfree packages
  nixpkgs.config.allowUnfree = true;

+#  nixpkgs.config.allowBroken = true;

-  # List packages installed in system profile. To search, run: $ nix search wget
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  
  environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed 
-    wget
-    git
-    kitty
-    tree
-    nodejs
-    gparted
-    heroic
-    wineWowPackages.stable
-    spotify
-    #spicetify-cli
-    sshfs

-    # sway
-    networkmanager
-    networkmanagerapplet
-    # wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
-    cliphist
-#    mako # notification system developed by swaywm maintainer
-    waybar # bar
-    pulseaudio
-    pavucontrol
-    brightnessctl # brightness controls
-    # wpaperd # wallpaper manager
+     # pkgs.teamviewer
+     pkgs.spotify
+   pkgs.devenv
+   pkgs.vim 
+   pkgs.wget
+   pkgs.git
+#  pkgs.kitty
+   pkgs.tree
+   pkgs.nodejs
+   pkgs.anki-bin
+   pkgs.unzip
+  pkgs.mullvad-vpn
+  pkgs.discord
+  # pkgs.musescore
+#  pkgs.butterfly
+  pkgs.btop
+#  pkgs.cura
+#    bitwarden-cli
+
+
+    # nvim
+    pkgs.gnumake
+    pkgs.python312Packages.pip
+    pkgs.python312
+  pkgs.cargo
+  pkgs.rustup
+  pkgs.rust-analyzer
+    pkgs.ripgrep
+  pkgs.gcc
+  pkgs.lua-language-server
+  pkgs.nil
+
+  # sway
+  pkgs.pavucontrol
+    pkgs.networkmanagerapplet
+    pkgs.wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
+    pkgs.go
+    pkgs.cliphist
+    pkgs.mako # notification system developed by swaywm maintainer
+    pkgs.waybar # bar
+    pkgs.pulseaudio # audiocontrols
+    pkgs.brightnessctl # brightness controls
+  pkgs.wpaperd # wallpaper manager
+  pkgs.onboard
+
  ];

-fonts.packages = with pkgs; [
-#  iosevka
-  # (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
-  nerd-fonts.jetbrains-mono
-  nerd-fonts.ubuntu-mono
-];
-
-hardware.amdgpu.opencl.enable = true;
-
-  programs.steam = {
-    enable = true;
-  };
-
-
-	  services.gnome.gnome-keyring.enable = true;
+  services.gnome.gnome-keyring.enable = true;

  programs.sway = {
    enable = true;
@@ -176,23 +228,32 @@ hardware.amdgpu.opencl.enable = true;
  };


-#   programs.hyprland = {
-#    enable = true;
-#    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-#  };
+  #fonts
+fonts.packages = with pkgs; [
+  #iosevka
+#  (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
+  nerd-fonts.jetbrains-mono
+  nerd-fonts.ubuntu-mono
+];


-  # Some programs need SUID wrappers, can be configured further or are started in user sessions. 
-  # programs.mtr.enable = true; programs.gnupg.agent = {
-  #   enable = true; enableSSHSupport = true;
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
  # };

  # List services that you want to enable:

-  # Enable the OpenSSH daemon. services.openssh.enable = true;
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;

-  # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ ... ]; 
-  # networking.firewall.allowedUDPPorts = [ ... ]; Or disable the firewall altogether. 
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
  # networking.firewall.enable = false;

  networking.firewall = { 
@@ -206,11 +267,12 @@ hardware.amdgpu.opencl.enable = true;
  };  


-  # This value determines the NixOS release from which the default settings for stateful data, like 
-  # file locations and database versions on your system were taken. It‘s perfectly fine and 
-  # recommended to leave this value at the release version of the first install of this system. Before 
-  # changing this value read the documentation for this option (e.g. man configuration.nix or on 
-  # https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?

 }
--- a/flake.lock
+++ b/flake.lock
@@ -3,14 +3,15 @@
    "ags": {
      "inputs": {
        "astal": "astal",
+        "gnim": "gnim",
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1738087375,
-        "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
+        "lastModified": 1754487835,
+        "narHash": "sha256-GRCkm7a1odlN3hHR1iBIxwmBPWAw1CDOnOdpmZGSKkQ=",
        "owner": "Aylur",
        "repo": "ags",
-        "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
+        "rev": "8e91fcd52b807f576a794ccc9533bdf720ef5af7",
        "type": "github"
      },
      "original": {
@@ -27,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737670815,
-        "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=",
+        "lastModified": 1752404970,
+        "narHash": "sha256-XULTToDUkIshNXEO+YP2mAHdQv8bxWDvKjbamBfOC8E=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042",
+        "rev": "2c5eb54f39e1710c6e2c80915a240978beb3269a",
        "type": "github"
      },
      "original": {
@@ -40,6 +41,59 @@
        "type": "github"
      }
    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751685974,
+        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
+        "ref": "refs/heads/main",
+        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
+        "revCount": 92,
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.lix.systems/lix-project/flake-compat.git"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nvf",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753121425,
+        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "gnim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1753090800,
+        "narHash": "sha256-6sS6KHong2cMGn+6xJwjiizZzwu2XUmp++DtiKZhFMU=",
+        "owner": "aylur",
+        "repo": "gnim",
+        "rev": "2f58f8444c4cb8fefeab7a9901a33e99cfa92457",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "gnim",
+        "type": "github"
+      }
+    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -47,11 +101,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744038920,
-        "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=",
+        "lastModified": 1754503522,
+        "narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a",
+        "rev": "13461dec40bf03d9196ff79d1abe48408268cc35",
        "type": "github"
      },
      "original": {
@@ -60,13 +114,49 @@
        "type": "github"
      }
    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "zen-browser",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1755121891,
+        "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "mnw": {
+      "locked": {
+        "lastModified": 1748710831,
+        "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "mnw",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1753694789,
+        "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
        "type": "github"
      },
      "original": {
@@ -78,11 +168,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1743827369,
-        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
+        "lastModified": 1754214453,
+        "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "42a1c966be226125b48c384171c44c651c236c22",
+        "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
        "type": "github"
      },
      "original": {
@@ -94,45 +184,65 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1743827369,
-        "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=",
-        "owner": "NixOS",
+        "lastModified": 1753432016,
+        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "42a1c966be226125b48c384171c44c651c236c22",
+        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nvf": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-parts": "flake-parts",
+        "mnw": "mnw",
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1754388740,
+        "narHash": "sha256-6++6FDc/hcMpaJPgOrGzwmzCSgix3zIlcuTIy9+aNSs=",
+        "owner": "notashelf",
+        "repo": "nvf",
+        "rev": "22fb0d22cc474e85f94c5aa95b6c550c81ca7278",
+        "type": "github"
+      },
+      "original": {
+        "owner": "notashelf",
+        "repo": "nvf",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "ags": "ags",
        "home-manager": "home-manager",
        "nixpkgs": "nixpkgs_2",
-        "spicetify-nix": "spicetify-nix"
-      }
-    },
-    "spicetify-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1743946771,
-        "narHash": "sha256-n/LxWCGJtDi/rWMKEXWQn39v46iFZpW+V9mY4/4LJQs=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "af24d96983faa41e79fa00312106c37a7cc2ca0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
+        "nvf": "nvf",
+        "zen-browser": "zen-browser"
      }
    },
    "systems": {
@@ -149,6 +259,25 @@
        "repo": "default",
        "type": "github"
      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1755184939,
+        "narHash": "sha256-gxKs+3tfe5lNgu3hpiJmRUCkvri4vq2mUL6GL/+OCxM=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "884b88c3ff7f283aec14ecb0a2a35e2da7607eae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -11,10 +11,13 @@

    ags.url = "github:Aylur/ags";

-    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
+    nvf.url = "github:notashelf/nvf";
+
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
+
  };

-  outputs = { self, nixpkgs, ... }@inputs:
+  outputs = { self, nixpkgs, nvf, zen-browser, ... }@inputs:
  let system = "x86_64-linux"; in
  {
    nixosConfigurations.my-nixos = nixpkgs.lib.nixosSystem {
@@ -24,6 +27,8 @@
      };
      modules = [
        ./configuration.nix
+        # inputs.zen-browser.packages."${system}".default
+#        nvf.homeManagerModules.default
        inputs.home-manager.nixosModules.default
      ];
    };
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,18 +8,18 @@
    [ (modulesPath + "/installer/scan/not-detected.nix")
    ];

-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
  boot.extraModulePackages = [ ];

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/926a710f-a999-4c59-9040-8045efaa6e28";
+    { device = "/dev/disk/by-uuid/1d64861a-3d30-4b76-8a19-9a68618ddf3a";
      fsType = "ext4";
    };

  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/39F5-52FB";
+    { device = "/dev/disk/by-uuid/580D-111D";
      fsType = "vfat";
      options = [ "fmask=0022" "dmask=0022" ];
    };
@@ -31,8 +31,9 @@
  # still possible to use this option, but it's recommended to use it in conjunction
  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/home-nico.nix
+++ b/home-nico.nix
@@ -1,12 +1,12 @@
 { config, pkgs, inputs, ... }:

 {
-  home.username = "nico";
-  home.homeDirectory = "/home/nico";
+  home.username = "n";
+  home.homeDirectory = "/home/n";

  imports = [
    ./packages
-    inputs.spicetify-nix.homeManagerModules.default
+    inputs.zen-browser.homeModules.default
  ];

    nixpkgs = {
@@ -18,30 +18,15 @@

  home.packages = with pkgs; [
    floorp
+#    freetube
  ];
-
-  programs.spicetify =
-    let
-    spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-  in
-  {
+  programs.zen-browser = {
    enable = true;
-    theme = spicePkgs.themes.catppuccin;
-    colorScheme = "mocha";
-
-    enabledExtensions = with spicePkgs.extensions; [
-      keyboardShortcut
-      wikify
-      songStats
-      betterGenres
-      hidePodcasts
-      fullScreen
-    ];
  };

  home.stateVersion = "24.05";

+
  programs.home-manager.enable = true;

 }
-
--- a/packages/alacritty/alacritty.toml
+++ b/packages/alacritty/alacritty.toml
@@ -0,0 +1,3 @@
+general.import = [
+   "/etc/nixos/packages/alacritty/catppuccin-mocha.toml"
+]
--- a/packages/alacritty/alacritty.toml~
+++ b/packages/alacritty/alacritty.toml~
@@ -0,0 +1,3 @@
+general.import = [
+   "~/.config/alacritty/catppuccin-mocha.toml"
+]
--- a/packages/alacritty/catppuccin-mocha.toml
+++ b/packages/alacritty/catppuccin-mocha.toml
@@ -0,0 +1,65 @@
+[colors.primary]
+background = "#1e1e2e"
+foreground = "#cdd6f4"
+dim_foreground = "#7f849c"
+bright_foreground = "#cdd6f4"
+
+[colors.cursor]
+text = "#1e1e2e"
+cursor = "#f5e0dc"
+
+[colors.vi_mode_cursor]
+text = "#1e1e2e"
+cursor = "#b4befe"
+
+[colors.search.matches]
+foreground = "#1e1e2e"
+background = "#a6adc8"
+
+[colors.search.focused_match]
+foreground = "#1e1e2e"
+background = "#a6e3a1"
+
+[colors.footer_bar]
+foreground = "#1e1e2e"
+background = "#a6adc8"
+
+[colors.hints.start]
+foreground = "#1e1e2e"
+background = "#f9e2af"
+
+[colors.hints.end]
+foreground = "#1e1e2e"
+background = "#a6adc8"
+
+[colors.selection]
+text = "#1e1e2e"
+background = "#f5e0dc"
+
+[colors.normal]
+black = "#45475a"
+red = "#f38ba8"
+green = "#a6e3a1"
+yellow = "#f9e2af"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+cyan = "#94e2d5"
+white = "#bac2de"
+
+[colors.bright]
+black = "#585b70"
+red = "#f38ba8"
+green = "#a6e3a1"
+yellow = "#f9e2af"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+cyan = "#94e2d5"
+white = "#a6adc8"
+
+[[colors.indexed_colors]]
+index = 16
+color = "#fab387"
+
+[[colors.indexed_colors]]
+index = 17
+color = "#f5e0dc"
--- a/packages/alacritty/default.nix
+++ b/packages/alacritty/default.nix
@@ -0,0 +1,12 @@
+{pkgs, config, lib, ...}:
+{
+  home.packages = with pkgs; [
+    alacritty
+  ];
+
+  home.file = {
+    ".config/alacritty/alacritty.toml" = {
+      source = "/etc/nixos/packages/alacritty/alacritty.toml";
+    };
+  };
+}
--- a/packages/alacritty/default.nix~
+++ b/packages/alacritty/default.nix~
@@ -0,0 +1,13 @@
+{pkgs, config, lib, ...}:
+{
+  home.packages = with pkgs; [
+    alacritty
+    alacritty-theme
+  ];
+
+  home.file = {
+    ".config/alacritty/alacritty.toml" = {
+      source = "/etc/nixos/packages/alacritty/alacritty.toml";
+    };
+  };
+}
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -2,6 +2,7 @@
 {
  imports = [
 #    ./ags
+    ./fuzzel
    ./other
    ./sway
    ./swaync
@@ -9,9 +10,14 @@
    ./wpaperd
    ./nvim
    ./emacs
-    ./kitty
+    ./terminal
    ./rofi
+    # ./alacritty
+    # ./tmux
+    # ./mako
+#    ./qutebrowser
    ./hyprland
+    ./niri
 #    ./vscode
  ];
 }
--- a/packages/default.nix~
+++ b/packages/default.nix~
@@ -1,16 +0,0 @@
-{ ... }:
-{
-  imports = [
-#    ./ags
-    ./other
-    ./sway
-    ./waybar
-    ./wpaperd
-    ./nvim
-    ./emacs
-    ./kitty
-    ./rofi
-#    ./hyprland
-#    ./vscode
-  ];
-}
--- a/packages/emacs/default.nix~
+++ b/packages/emacs/default.nix~
@@ -12,6 +12,7 @@ in {
 (telephone-line-mode 1)
 (xterm-mouse-mode 1)

+
 (setq evil-want-C-u-scroll t)

 (menu-bar--display-line-numbers-mode-relative)
@@ -232,13 +233,14 @@ in {

 (setq lsp-keymap-prefix "C-c l")
 (require 'lsp-mode)
-
+(evil-set-undo-system 'undo-redo)
 (flycheck-inline-mode nil)
+(global-evil-vimish-fold-mode 1)
    '';
    package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
-    catppuccin-theme
      ])
-      ++ (with epkgs.melpaPackages; [
+    ++ (with epkgs.melpaPackages; [
+  catppuccin-theme
 	evil
 	nix-mode
  lsp-treemacs
@@ -258,6 +260,7 @@ in {
  which-key
  magit
  format-all
+  evil-vimish-fold
      ])
      ++ (with epkgs.elpaPackages; [
  undo-tree
--- a/packages/emacs/flutter/flake.nix
+++ b/packages/emacs/flutter/flake.nix
@@ -1,7 +1,7 @@
 {
 description = "Flutter 3.13.x";
 inputs = {
-  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
  flake-utils.url = "github:numtide/flake-utils";
 };
 outputs = { self, nixpkgs, flake-utils }:
@@ -14,46 +14,18 @@ outputs = { self, nixpkgs, flake-utils }:
          allowUnfree = true;
        };
      };
-      buildToolsVersion = "34.0.0";
-      androidComposition = pkgs.androidenv.composeAndroidPackages {
-        buildToolsVersions = [ buildToolsVersion "33.0.1" ];
-        platformVersions = [ "34" "33" "28" ];
-        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-      };
-      androidSdk = androidComposition.androidsdk;
+      androidSdk = pkgs.androidenv.androidSdk
    in
    {
      devShell =
        with pkgs; mkShell rec {
-          shellHook = ''
-            nu
-            exit
-          '';
-          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/33.0.1/aapt2";   
-
          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
          buildInputs = [
            flutter
-            androidSdk # The customized SDK that we've made above
+            androidSdk
            jdk17
-
-            (vscode-with-extensions.override {
-              vscode = vscodium;
-              vscodeExtensions = with vscode-extensions; [
-                vscodevim.vim
-                dart-code.dart-code
-                dart-code.flutter
-              ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace[
-                {
-                  name = "awesome-flutter-snippets";
-                  publisher = "nash";
-                  version = "4.0.1";
-                  sha256 = "lXdos/xB18h3Z0YfkgEk55G2JvRMYudUUIltugQjylU=";
-                }
-              ];
-            })
          ];
-
        };
    });
 }
+
--- a/packages/emacs/flutter/flake.nix~
+++ b/packages/emacs/flutter/flake.nix~
@@ -1,60 +0,0 @@
-{
-description = "Flutter 3.13.x";
-inputs = {
-  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  flake-utils.url = "github:numtide/flake-utils";
-};
-outputs = { self, nixpkgs, flake-utils }:
-  flake-utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs {
-        inherit system;
-        config = {
-          android_sdk.accept_license = true;
-          allowUnfree = true;
-        };
-      };
-      buildToolsVersion = "34.0.0";
-      androidComposition = pkgs.androidenv.composeAndroidPackages {
-        buildToolsVersions = [ buildToolsVersion "33.0.1" ];
-        platformVersions = [ "34" "33" "28" ];
-        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-      };
-      androidSdk = androidComposition.androidsdk;
-    in
-    {
-      devShell =
-        with pkgs; mkShell rec {
-          shellHook = ''
-            nu
-            exit
-          '';
-          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/33.0.1/aapt2";   
-
-          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
-          buildInputs = [
-            flutter
-            androidSdk # The customized SDK that we've made above
-            jdk17
-            vscode
-
-            (vscode-with-extensions.override {
-              vscode = vscodium;
-              vscodeExtensions = with vscode-extensions; [
-                vscodevim.vim
-                dart-code.dart-code
-                dart-code.flutter
-              ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace[
-                {
-                  name = "awesome-flutter-snippets";
-                  publisher = "nash";
-                  version = "4.0.1";
-                  sha256 = "lXdos/xB18h3Z0YfkgEk55G2JvRMYudUUIltugQjylU=";
-                }
-              ];
-            })
-          ];
-
-        };
-    });
-}
--- a/packages/fuzzel/default.nix
+++ b/packages/fuzzel/default.nix
@@ -0,0 +1,18 @@
+
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+    # raffi
+    fuzzel
+ ];
+
+
+home.file."/home/n/.config/fuzzel/fuzzel.ini" = {
+  source = ./fuzzel.ini;
+};
+
+# home.file."/home/n/.config/raffi/raffi.yaml" = {
+#   source = ./raffi.yaml;
+#};
+
+}
--- a/packages/fuzzel/fuzzel.ini
+++ b/packages/fuzzel/fuzzel.ini
@@ -0,0 +1,17 @@
+dpi-aware=yes
+font=RobotoMonoNerdFont-Thin:size=8
+terminal=ghostty
+width=30
+layer=overlay
+exit-on-keyboard-focus-loss=no
+inner-pad=15
+fields=filename,name
+
+[colors]
+background=282a36ff
+text=f8f8f2ff
+match=8be9fdff
+selection-match=8be9fdff
+selection=44475add
+selection-text=f8f8f2ff
+border=bd93f9ff
--- a/packages/nvim/lua/plugins/plugins/comment.lua~
+++ b/packages/nvim/lua/plugins/plugins/comment.lua~
--- a/packages/hyprland/keybinds.conf
+++ b/packages/hyprland/keybinds.conf
@@ -1,7 +1,7 @@
 $mainMod = SUPER

 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, RETURN, exec, kitty
+bind = $mainMod, RETURN, exec, ghostty
 bind = $mainMod, B, exec, floorp
 bind = SUPER, BackSpace, killactive, 
 bind = SUPER_SHIFT, P, exec, rofi -show power-menu -modi power-menu:rofi-power-menu
@@ -67,6 +67,8 @@ bindm = $mainMod, mouse:273, resizewindow
 bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%
 bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -1%
 bind = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
+bind = , XF86MonBrightnessDown, exec, light -U 10
+bind = , XF86MonBrightnessUp, exec, light -A 10


 # will switch to a submap called resize
--- a/packages/hyprland/setup.conf
+++ b/packages/hyprland/setup.conf
@@ -1,10 +1,6 @@
 input {
    kb_layout = us,de
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-    kb_options=alt_space_toggle
+    kb_options=grp:alt_space_toggle

    follow_mouse = 1

--- a/packages/hyprland/startup.conf
+++ b/packages/hyprland/startup.conf
@@ -1,3 +1,4 @@
 exec-once=waybar
+exec-once=wpaperd
 exec-once=swaync
 exec-once=wl-paste --watch cliphist store
--- a/packages/kitty/default.nix
+++ b/packages/kitty/default.nix
@@ -45,13 +45,14 @@ programs.zsh = {
  syntaxHighlighting.enable = true;
  initExtra = ''
    eval "$(starship init zsh)"
+    export PATH=$PATH:$HOME/Documents/Shells/flutter/flutter/bin
  '';


  shellAliases = {
    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
    emacs = "emacs -nw";
-    femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
+    femacs = "emacs -nw --load /etc/nixos/packages/emacs/flutter/init.el";
    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
  };
  zplug = {
@@ -71,7 +72,7 @@ programs.zsh = {


 programs.kitty = {
-  enable = true;
+  enable = false;
  
  extraConfig = ''

--- a/packages/kitty/default.nix~
+++ b/packages/kitty/default.nix~
@@ -5,6 +5,25 @@

 ];

+
+
+programs.nushell = {
+  enable = true;
+  extraConfig = ''
+    $env.config = {
+      show_banner: false,
+      edit_mode: vi
+    }
+  '';
+  shellAliases = { 
+    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
+    emacs = "emacs -nw";
+    femacs = "emacs -nw --load /etc/nixos/packages/emacs/flutter/init.el";
+    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
+  };
+};
+
+
 programs.starship = {
  enable = true;

@@ -13,6 +32,10 @@ programs.starship = {
  };
 };

+programs.carapace = {
+  enable = true;
+  enableNushellIntegration = true;
+};


 programs.zsh = {
@@ -28,7 +51,7 @@ programs.zsh = {
  shellAliases = {
    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
    emacs = "emacs -nw";
-    femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
+    femacs = "emacs -nw --load /etc/nixos/packages/emacs/flutter/init.el";
    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
  };
  zplug = {
@@ -60,6 +83,7 @@ programs.kitty = {
 ## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
 ## blurb:    Soothing pastel theme for the high-spirited!

+map ctrl+shift+w no_op


 # The basic colors
--- a/packages/mako/config
+++ b/packages/mako/config
@@ -0,0 +1,9 @@
+# Colors
+
+background-color=#1e1e2e
+text-color=#cdd6f4
+border-color=#cba6f7
+progress-color=over #313244
+
+[urgency=high]
+border-color=#fab387
--- a/packages/mako/default.nix
+++ b/packages/mako/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, config, lib, ...}:
+{
+  home.packages = with pkgs; [
+    mako
+  ];
+
+  home.file = {
+    ".config/mako/config" = {
+      source = "/etc/nixos/packages/mako/config" ;
+    };
+  };
+}
--- a/packages/niri/config.kdl
+++ b/packages/niri/config.kdl
@@ -0,0 +1,607 @@
+// This config is in the KDL format: https://kdl.dev
+// "/-" comments out the following node.
+// Check the wiki for a full description of the configuration:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction
+
+// Input device configuration.
+// Find the full list of options on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Input
+input {
+    keyboard {
+        xkb {
+            // You can set rules, model, layout, variant and options.
+            // For more information, see xkeyboard-config(7).
+
+            // For example:
+            layout "us,de"
+            options "grp:win_space_toggle"
+        }
+
+        // Enable numlock on startup, omitting this setting disables it.
+        numlock
+    }
+
+    // Next sections include libinput settings.
+    // Omitting settings disables them, or leaves them at their default values.
+    touchpad {
+        // off
+        tap
+        // dwt
+        // dwtp
+        // drag false
+        // drag-lock
+        natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "two-finger"
+        // disabled-on-external-mouse
+    }
+
+    mouse {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "no-scroll"
+    }
+
+    trackpoint {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "on-button-down"
+        // scroll-button 273
+        // middle-emulation
+    }
+
+    // Uncomment this to make the mouse warp to the center of newly focused windows.
+    // warp-mouse-to-focus
+
+    // Focus windows and outputs automatically when moving the mouse into them.
+    // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
+    // focus-follows-mouse max-scroll-amount="0%"
+}
+
+// You can configure outputs by their name, which you can find
+// by running `niri msg outputs` while inside a niri instance.
+// The built-in laptop monitor is usually called "eDP-1".
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
+// Remember to uncomment the node by removing "/-"!
+output "eDP-1" {
+    // Uncomment this line to disable this output.
+    // off
+
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    mode "1920x1080"
+
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    scale 1
+
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    transform "normal"
+
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    // position x=1280 y=0
+}
+
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+    gaps 10
+
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "never"
+
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        // Proportion sets the width as a fraction of the output width, taking gaps into account.
+        // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
+        // The default preset widths are 1/3, 1/2 and 2/3 of the output.
+        proportion 0.33333
+        proportion 0.5
+        proportion 0.66667
+
+        // Fixed sets the width in logical pixels exactly.
+        // fixed 1920
+    }
+
+    // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
+    // preset-window-heights { }
+
+    // You can change the default width of the new windows.
+    default-column-width { proportion 0.5; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    // default-column-width {}
+
+    // By default focus ring and border are rendered as a solid background rectangle
+    // behind windows. That is, they will show up through semitransparent windows.
+    // This is because windows using client-side decorations can have an arbitrary shape.
+    //
+    // If you don't like that, you should uncomment `prefer-no-csd` below.
+    // Niri will draw focus ring and border *around* windows that agree to omit their
+    // client-side decorations.
+    //
+    // Alternatively, you can override it with a window rule called
+    // `draw-border-with-background`.
+
+    // You can change how the focus ring looks.
+    focus-ring {
+        // Uncomment this line to disable the focus ring.
+        // off
+
+        // How many logical pixels the ring extends out from the windows.
+        width 4
+
+        // Colors can be set in a variety of ways:
+        // - CSS named colors: "red"
+        // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
+        // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
+
+        // Color of the ring on the active monitor.
+        // active-color "#8839ef"
+
+        // Color of the ring on inactive monitors.
+        inactive-color "#505050"
+
+        // You can also use gradients. They take precedence over solid colors.
+        // Gradients are rendered the same as CSS linear-gradient(angle, from, to).
+        // The angle is the same as in linear-gradient, and is optional,
+        // defaulting to 180 (top-to-bottom gradient).
+        // You can use any CSS linear-gradient tool on the web to set these up.
+        // Changing the color space is also supported, check the wiki for more info.
+        //
+        active-gradient from="#8839ef" to="#dc8a78" angle=45
+
+        // You can also color the gradient relative to the entire view
+        // of the workspace, rather than relative to just the window itself.
+        // To do that, set relative-to="workspace-view".
+        //
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        off
+
+        width 4
+        active-color "#ffc87f"
+        inactive-color "#505050"
+
+        // Color of the border around windows that request your attention.
+        urgent-color "#9b0000"
+
+        // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can enable drop shadows for windows.
+    shadow {
+        // Uncomment the next line to enable shadows.
+        // on
+
+        // By default, the shadow draws only around its window, and not behind it.
+        // Uncomment this setting to make the shadow draw behind its window.
+        //
+        // Note that niri has no way of knowing about the CSD window corner
+        // radius. It has to assume that windows have square corners, leading to
+        // shadow artifacts inside the CSD rounded corners. This setting fixes
+        // those artifacts.
+        // 
+        // However, instead you may want to set prefer-no-csd and/or
+        // geometry-corner-radius. Then, niri will know the corner radius and
+        // draw the shadow correctly, without having to draw it behind the
+        // window. These will also remove client-side shadows if the window
+        // draws any.
+        // 
+        // draw-behind-window true
+
+        // You can change how shadows look. The values below are in logical
+        // pixels and match the CSS box-shadow properties.
+
+        // Softness controls the shadow blur radius.
+        softness 30
+
+        // Spread expands the shadow.
+        spread 5
+
+        // Offset moves the shadow relative to the window.
+        offset x=0 y=5
+
+        // You can also change the shadow color and opacity.
+        color "#0007"
+    }
+
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixels.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        // left 64
+        // right 64
+        // top 64
+        // bottom 64
+    }
+}
+
+// Add lines like this to spawn processes at startup.
+// Note that running niri as a session supports xdg-desktop-autostart,
+// which may be more convenient to use.
+// See the binds section below for more spawn examples.
+
+// This line starts waybar, a commonly used bar for Wayland compositors.
+spawn-at-startup "waybar"
+spawn-at-startup "wpaperd"
+spawn-at-startup "xwayland-satellite"
+spawn-at-startup "wl-paste" "--watch" "cliphist" "store"
+
+environment {
+  DISPLAY ":0"
+}
+
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
+// This option will also fix border/focus ring drawing behind some semitransparent windows.
+// After enabling or disabling this, you need to restart the apps for this to take effect.
+// prefer-no-csd
+
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/Pictures/Screenshots/Screenshot%Y-%m-%d.png"
+
+// You can also set this to null to disable saving screenshots to disk.
+// screenshot-path null
+
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations
+animations {
+    // Uncomment to turn off all animations.
+    // off
+
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 3.0
+}
+
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
+
+// Work around WezTerm's initial configure bug
+// by setting an empty default-column-width.
+window-rule {
+    // This regular expression is intentionally made as specific as possible,
+    // since this is the default config, and we want no false positives.
+    // You can get away with just app-id="wezterm" if you want.
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    default-column-width {}
+}
+
+// Open the Firefox picture-in-picture player as floating by default.
+window-rule {
+    // This app-id regular expression will work for both:
+    // - host Firefox (app-id is "firefox")
+    // - Flatpak Firefox (app-id is "org.mozilla.firefox")
+    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    open-floating true
+}
+
+// open rofi in floating window
+window-rule {
+  match app-id=r#"rofi$"#
+  match title="rofi"
+  open-floating true
+}
+
+window-rule {
+  match app-id=r#"nautilus$"#
+  match title="nautilus"
+  open-floating true
+}
+
+// Example: block out two password managers from screen capture.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+
+    block-out-from "screen-capture"
+
+    // Use this instead if you want them visible on third-party screenshot tools.
+    // block-out-from "screencast"
+}
+
+// Example: enable rounded corners for all windows.
+// (This example rule is commented out with a "/-" in front.)
+window-rule {
+    geometry-corner-radius 12
+    clip-to-geometry true
+}
+
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Slash { show-hotkey-overlay; }
+
+    // Suggested binds for running programs: terminal, app launcher, screen locker.
+    Mod+Return hotkey-overlay-title="Open a Terminal: ghostty" { spawn "ghostty"; }
+    Mod+M hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+    Super+Alt+L hotkey-overlay-title="Power menu" { spawn "rofi" "-show" "power-menu" "-modi" "power-menu:rofi-power-menu"; }
+    Super+V hotkey-overlay-title="Clipboard history" { spawn "bash" "-c" "cliphist list | fuzzel -d | cliphist decode | wl-copy"; }
+
+    // You can also use a shell. Do this if you need pipes, multiple commands, etc.
+    // Note: the entire command goes as a single argument in the end.
+    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
+
+    // Example volume keys mappings for PipeWire & WirePlumber.
+    // The allow-when-locked=true property makes them work even when the session is locked.
+    XF86AudioRaiseVolume allow-when-locked=true { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "+1%"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "-1%"; }
+    XF86AudioMute        allow-when-locked=true { spawn "pactl" "set-sink-mute" "@DEFAULT_SINK@" "toggle"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "light" "-U" "5"; }
+    XF86MonBrightnessUp allow-when-locked=true { spawn "light" "-A" "5"; }
+    // XF86AudioMicMute     allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; }
+
+    // Open/close the Overview: a zoomed-out view of workspaces and windows.
+    // You can also move the mouse into the top-left hot corner,
+    // or do a four-finger swipe up on a touchpad.
+    Mod+O repeat=false { toggle-overview; }
+
+    Mod+BackSpace { close-window; }
+
+    // Mod+Left  { focus-column-left; }
+    // Mod+Down  { focus-window-down; }
+    // Mod+Up    { focus-window-up; }
+    // Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    // Mod+Ctrl+Left  { move-column-left; }
+    // Mod+Ctrl+Down  { move-window-down; }
+    // Mod+Ctrl+Up    { move-window-up; }
+    // Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    // Alternative commands that move across workspaces when reaching
+    // the first or last window in a column.
+    // Mod+J     { focus-window-or-workspace-down; }
+    // Mod+K     { focus-window-or-workspace-up; }
+    // Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    // Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }
+    // ...
+
+    // And you can also move a whole workspace to another monitor:
+    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    // ...
+
+    // Mod+Page_Down      { focus-workspace-down; }
+    // Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    // Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    // Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+    // ...
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; }
+
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace 1; }
+    Mod+Ctrl+2 { move-column-to-workspace 2; }
+    Mod+Ctrl+3 { move-column-to-workspace 3; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+
+    // The following binds move the focused window in and out of a column.
+    // If the window is alone, they will consume it into the nearby column to the side.
+    // If the window is already in a column, they will expel it out.
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    // Consume one window from the right to the bottom of the focused column.
+    Mod+Comma  { consume-window-into-column; }
+    // Expel the bottom window from the focused column to the right.
+    Mod+Period { expel-window-from-column; }
+
+    Mod+R { switch-preset-column-width; }
+    Mod+Shift+R { switch-preset-window-height; }
+    Mod+Ctrl+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+
+    // Expand the focused column to space not taken up by other fully visible columns.
+    // Makes the column "fill the rest of the space".
+    Mod+Ctrl+F { expand-column-to-available-width; }
+
+    Mod+C { center-column; }
+
+    // Center all fully visible columns on screen.
+    Mod+Ctrl+C { center-visible-columns; }
+
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    // Move the focused window between the floating and the tiling layout.
+    Mod+Space       { toggle-window-floating; }
+    Mod+Shift+Space { switch-focus-between-floating-and-tiling; }
+
+    // Toggle tabbed column display mode.
+    // Windows in this column will appear as vertical tabs,
+    // rather than stacked on top of each other.
+    Mod+W { toggle-column-tabbed-display; }
+
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    // Applications such as remote-desktop clients and software KVM switches may
+    // request that niri stops processing the keyboard shortcuts defined here
+    // so they may, for example, forward the key presses as-is to a remote machine.
+    // It's a good idea to bind an escape hatch to toggle the inhibitor,
+    // so a buggy application can't hold your session hostage.
+    //
+    // The allow-inhibiting=false property can be applied to other binds as well,
+    // which ensures niri always processes them, even when an inhibitor is active.
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete { quit; }
+
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    // Mod+Shift+P { power-off-monitors; }
+}
--- a/packages/niri/default.nix
+++ b/packages/niri/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+  xwayland-satellite
+  xdg-desktop-portal-gtk
+  xdg-desktop-portal-gnome
+  nautilus
+ ];
+
+  home.file."/home/n/.config/niri/config.kdl" = {
+    source = ./config.kdl;
+  };
+}
--- a/packages/nvim/default.nix
+++ b/packages/nvim/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib,... }:
+{ pkgs, lib,... }:
 {

 home.packages = with pkgs; [
@@ -8,6 +8,9 @@
  lldb
  lazygit
  gcc
+  # gopls
+  stylua
+  # rustfmt
 ];

 programs.neovim = {
@@ -30,7 +33,7 @@ programs.neovim.plugins = [
    ".config/nvim/lua/plugins/blink-cmp.lua".source = ./lua/plugins/blink-cmp.lua;
    ".config/nvim/lua/plugins/lsp.lua".source = ./lua/plugins/lsp.lua;
 #    ".config/nvim/lua/plugins/mason.lua".source = ./lua/plugins/mason.lua;
-    ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua;
+    # ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua;
    ".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.lua;
    ".config/nvim/lua/plugins/telescope.lua".source = ./lua/plugins/telescope.lua;
    ".config/nvim/lua/plugins/highlight-colors.lua".source = ./lua/plugins/highlight-colors.lua;
@@ -50,6 +53,11 @@ programs.neovim.plugins = [
    ".config/nvim/lua/plugins/tabout.lua".source = ./lua/plugins/tabout.lua;
    ".config/nvim/lua/plugins/autopair.lua".source = ./lua/plugins/autopair.lua;
    ".config/nvim/lua/plugins/mini-animate.lua".source = ./lua/plugins/mini-animate.lua;
+    ".config/nvim/lua/plugins/vim-suda.lua".source = ./lua/plugins/vim-suda.lua;
+    ".config/nvim/lua/plugins/tiny-inline-diagnostic.lua".source = ./lua/plugins/tiny-inline-diagnostic.lua;
+    ".config/nvim/lua/plugins/conform.lua".source = ./lua/plugins/conform.lua;
+    ".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua;
+    # ".config/nvim/lua/plugins/arduino.lua".source = ./lua/plugins/arduino.lua;

   }
  ];
--- a/packages/nvim/default.nix~
+++ b/packages/nvim/default.nix~
@@ -1,31 +0,0 @@
-{ pkgs, config, lib,... }:
-{
-
- home.packages = with pkgs; [
-    
- ];
-
-programs.neovim = {
-  enable = true;
-  vimAlias = true;
-};
-
-
-programs.neovim.plugins = [
-  pkgs.vimPlugins.lazy-nvim
-];
-
- home.file =
-  lib.mkMerge [
-   {
-    ".config/nvim/init.lua".source = ./init.lua;
-    ".config/nvim/lua/config/lazy.lua".source = ./lua/config/lazy.lua;
-    ".config/nvim/lua/plugins/flutter.lua".source = ./lua/plugins/flutter.lua;
-    ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
-    ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua;
-    ".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.lua;
-    ".config/nvim/lua/plugins/telescope.lua".source = ./lua/plugins/telescope.lua;
-    ".config/nvim/lua/plugins/highlight-colors.lua".source = ./lua/plugins/highlight-colors.lua;
-   }
-  ];
-}
--- a/packages/nvim/init.lua
+++ b/packages/nvim/init.lua
@@ -1,41 +1,43 @@
 -- Tab
-vim.opt.tabstop = 2                 -- number of visual spaces per TAB
-vim.opt.softtabstop = 2             -- number of spacesin tab when editing
-vim.opt.shiftwidth = 2              -- insert 4 spaces on a tab
-vim.opt.expandtab = true            -- tabs are spaces, mainly because of python
+vim.opt.tabstop = 2 -- number of visual spaces per TAB
+vim.opt.softtabstop = 2 -- number of spacesin tab when editing
+vim.opt.shiftwidth = 2 -- insert 4 spaces on a tab
+vim.opt.expandtab = true -- tabs are spaces, mainly because of python

 -- UI config
-vim.opt.number = true               -- show absolute number
-vim.opt.relativenumber = true       -- add numbers to each line on the left side
-vim.opt.splitbelow = true           -- open new vertical split bottom
-vim.opt.splitright = true           -- open new horizontal splits right
+vim.opt.number = true -- show absolute number
+vim.opt.relativenumber = true -- add numbers to each line on the left side
+vim.opt.splitbelow = true -- open new vertical split bottom
+vim.opt.splitright = true -- open new horizontal splits right
 -- vim.opt.termguicolors = true        -- enabl 24-bit RGB color in the TUI
-vim.opt.showmode = false            -- we are experienced, wo don't need the "-- INSERT --" mode hint
+vim.opt.showmode = false -- we are experienced, wo don't need the "-- INSERT --" mode hint

 -- Searching
-vim.opt.incsearch = true            -- search as characters are entered
-vim.opt.hlsearch = false            -- do not highlight matches
-vim.opt.ignorecase = true           -- ignore case in searches by default
-vim.opt.smartcase = true            -- but make it case sensitive if an uppercase is entered
+vim.opt.incsearch = true -- search as characters are entered
+vim.opt.hlsearch = false -- do not highlight matches
+vim.opt.ignorecase = true -- ignore case in searches by default
+vim.opt.smartcase = true -- but make it case sensitive if an uppercase is entered
+vim.cmd("set nowrap")

 -- -- Keybinds
-vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
-vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
-vim.keymap.set('n', '<C-k>', '<C-w>k', opts)
-vim.keymap.set('n', '<C-l>', '<C-w>l', opts)
+vim.keymap.set("n", "<C-h>", "<C-w>h", opts)
+vim.keymap.set("n", "<C-j>", "<C-w>j", opts)
+vim.keymap.set("n", "<C-k>", "<C-w>k", opts)
+vim.keymap.set("n", "<C-l>", "<C-w>l", opts)

 -- Resize with arrows
 -- delta: 2 lines
-vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
-vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
+vim.keymap.set("n", "<C-Up>", ":resize -2<CR>", opts)
+vim.keymap.set("n", "<C-Down>", ":resize +2<CR>", opts)
+vim.keymap.set("n", "<C-Left>", ":vertical resize -2<CR>", opts)
+vim.keymap.set("n", "<C-Right>", ":vertical resize +2<CR>", opts)

-vim.keymap.set('i', 'jk', '<Esc>', opts)
-vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+vim.keymap.set("i", "jk", "<Esc>", opts)
+vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)

 -- jump to definition
-vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
+vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
+

 -- code actions
 vim.keymap.set("n", "<leader>ca", function()
@@ -46,177 +48,107 @@ end, { noremap = true, silent = true })
 require("config.lazy")

 -- require("flutter-tools").setup {} -- use defaults
-require("catppuccin").setup({
-    integrations = {
-        cmp = false,
-        gitsigns = true,
-        nvimtree = true,
-        treesitter = true,
-        notify = false,
-        mini = {
-            enabled = false,
-            indentscope_color = "",
-        },
-    }
-})
+require("catppuccin").setup({})
+vim.cmd.colorscheme("catppuccin")

 -- css colors
 vim.opt.termguicolors = true
-require('nvim-highlight-colors').setup({})
-
-vim.cmd.colorscheme "catppuccin"
-
+require("nvim-highlight-colors").setup({})

 -- Plugin setups
-require('lualine').setup()
+require("lualine").setup()
 require("dapui").setup()
 require("ibl").setup()
 require("telescope").load_extension("flutter")
-require("toggleterm").setup{}
-require("tabby").setup{}
+require("toggleterm").setup({})
 require("mini.animate").setup()

-- alternatively you can override the default configs
-require("flutter-tools").setup {
-  ui = {
-    -- the border type to use for all floating windows, the same options/formats
-    -- used for ":h nvim_open_win" e.g. "single" | "shadow" | {<table-of-eight-chars>}
-    border = "rounded",
-    -- This determines whether notifications are show with `vim.notify` or with the plugin's custom UI
-    -- please note that this option is eventually going to be deprecated and users will need to
-    -- depend on plugins like `nvim-notify` instead.
-    notification_style = 'plugin'
-  },
-  decorations = {
-    statusline = {
-      -- set to true to be able use the 'flutter_tools_decorations.app_version' in your statusline
-      -- this will show the current version of the flutter app from the pubspec.yaml file
-      app_version = false,
-      -- set to true to be able use the 'flutter_tools_decorations.device' in your statusline
-      -- this will show the currently running device if an application was started with a specific
-      -- device
-      device = true,
-      -- set to true to be able use the 'flutter_tools_decorations.project_config' in your statusline
-      -- this will show the currently selected project configuration
-      project_config = false,
-    }
-  },
-  debugger = { -- integrate with nvim dap + install dart code debugger
-    enabled = true,
-    -- if empty dap will not stop on any exceptions, otherwise it will stop on those specified
-    -- see |:help dap.set_exception_breakpoints()| for more info
-    exception_breakpoints = { "uncaught" },
-    -- Whether to call toString() on objects in debug views like hovers and the
-    -- variables list.
-    -- Invoking toString() has a performance cost and may introduce side-effects,
-    -- although users may expected this functionality. null is treated like false.
-    evaluate_to_string_in_debug_views = true,
-  },
-  flutter_lookup_cmd = nil, -- example "dirname $(which flutter)" or "asdf where flutter"
-  root_patterns = { ".git", "pubspec.yaml" }, -- patterns to find the root of your flutter project
-  fvm = false, -- takes priority over path, uses <workspace>/.fvm/flutter_sdk if enabled
-  widget_guides = {
-    enabled = true,
-  },
-  closing_tags = {
-    highlight = "ErrorMsg", -- highlight for the closing tag
-    prefix = ">", -- character to use for close tag e.g. > Widget
-    priority = 10, -- priority of virtual text in current line
-    -- consider to configure this when there is a possibility of multiple virtual text items in one line
-    -- see `priority` option in |:help nvim_buf_set_extmark| for more info
-    enabled = true -- set to false to disable
-  },
-  dev_log = {
-    enabled = true,
-    filter = nil, -- optional callback to filter the log
-    -- takes a log_line as string argument; returns a boolean or nil;
-    -- the log_line is only added to the output if the function returns true
-    notify_errors = false, -- if there is an error whilst running then notify the user
-    open_cmd = "15split", -- command to use to open the log buffer
-    focus_on_open = true, -- focus on the newly opened log window
-  },
-  dev_tools = {
-    autostart = false, -- autostart devtools server if not detected
-    auto_open_browser = false, -- Automatically opens devtools in the browser
-  },
-  outline = {
-    open_cmd = "30vnew", -- command to use to open the outline buffer
-    auto_open = false -- if true this will open the outline automatically when it is first populated
-  },
-  lsp = {
-    color = { -- show the derived colours for dart variables
-      enabled = true, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
-      background = true, -- highlight the background
-      background_color = nil, -- required, when background is transparent (i.e. background_color = { r = 19, g = 17, b = 24},)
-      foreground = false, -- highlight the foreground
-      virtual_text = true, -- show the highlight using virtual text
-      virtual_text_str = "■", -- the virtual text character to highlight
-    },
-    -- see the link below for details on each option:
-    -- https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md#client-workspace-configuration
-    settings = {
-      showTodos = true,
-      completeFunctionCalls = true,
-      renameFilesWithClasses = "prompt", -- "always"
-      enableSnippets = true,
-      updateImportsOnRename = true, -- Whether to update imports and other directives when files are renamed. Required for `FlutterRename` command.
-    }
-  }
-}
+vim.o.showtabline = 2
+require("tabby").setup({
+  preset = "tab_only"
+})

+require("tiny-inline-diagnostic").setup({})
+
+-- conform (code formatter)
+require("conform").setup({})
+
+-- flutter
+require("flutter-tools").setup({})
+
+-- GO
+require("go").setup()

 ------------- -- Debugger
 local dap, dapui = require("dap"), require("dapui")
 dap.listeners.before.attach.dapui_config = function()
-  dapui.open()
+	dapui.open()
 end
 dap.listeners.before.launch.dapui_config = function()
-  dapui.open()
+	dapui.open()
 end
 dap.listeners.before.event_terminated.dapui_config = function()
-  dapui.close()
+	dapui.close()
 end
 dap.listeners.before.event_exited.dapui_config = function()
-  dapui.close()
+	dapui.close()
 end

 -- c und rust
-dap.adapters.lldb = {
-  type = 'executable',
-  command = 'lldb', -- adjust as needed, must be absolute path
-  name = 'lldb'
+-- dap.adapters.lldb = {
+--   type = 'executable',
+--   command = 'lldb', -- adjust as needed, must be absolute path
+--   name = 'lldb'
+-- }
+-- dap.configurations.c = dap.configurations.cpp
+-- dap.configurations.rust = dap.configurations.cpp
+dap.adapters.gdb = {
+	type = "executable",
+	command = "gdb",
+	args = { "--interpreter=dap", "--eval-command", "set print pretty on" },
 }
-dap.configurations.c = dap.configurations.cpp
-dap.configurations.rust = dap.configurations.cpp
-
+dap.configurations.cpp = dap.configurations.gdb
+dap.configurations.rust = dap.configurations.gdb

 --------------------------------------------
-local builtin = require('telescope.builtin')
+local builtin = require("telescope.builtin")
+local conform = require("conform")
+-- Rust binds
+vim.keymap.set("n", "<leader>rrr", ":RustRun<CR>", { desc = "Run rust program" })
+vim.keymap.set("n", "<leader>rd", ":RustLsp debug<CR>", { desc = "Debug rust program" })
+vim.keymap.set("n", "<leader>rh", ":RustLsp hover actions<CR>", { desc = "rust hover actions" })
+vim.keymap.set("n", "<leader>re", ":RustLsp explainError<CR>", { desc = "explain rust error" })
+vim.keymap.set("n", "<leader>rs", ":RustLsp openDocs<CR>", { desc = "open rust docs for symbol under cursor" })
+vim.keymap.set("n", "<leader>rrn", ":RustLsp ssr ", { desc = "rust rename" })
 -- Telescope binds
-vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
-vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
-vim.keymap.set('n', '<leader>fb', ":Telescope file_browser<CR>", { desc = 'Telescope file_browser' })
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
-vim.keymap.set('n', '<leader>fl', ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
-vim.keymap.set('n', '<leader>fl', ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
+vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
+vim.keymap.set("n", "<leader>fg", builtin.live_grep, { desc = "Telescope live grep" })
+vim.keymap.set("n", "<leader>fb", ":Telescope file_browser<CR>", { desc = "Telescope file_browser" })
+vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Telescope help tags" })
+vim.keymap.set("n", "<leader>fl", ": Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
+vim.keymap.set("n", "<leader>fl", ":Telescope flutter commands<CR>", { desc = "Open Telescope flutter" })
 -- Dap binds
-vim.keymap.set('n', '<leader>do', dapui.open, { desc = "Open debug overlay" })
-vim.keymap.set('n', '<leader>dc', dapui.close, { desc = "Close debug overlay" })
-vim.keymap.set('n', '<F5>', dap.toggle_breakpoint, { desc = "Toggle breakpoint" })
-vim.keymap.set('n', '<F6>', dap.continue, { desc = "dap Continue" })
-vim.keymap.set('n', '<F7>', dap.step_over, { desc = "dap step over" })
-vim.keymap.set('n', '<F8>', dap.step_into, { desc = "dap step into" })
-
-
-
+vim.keymap.set("n", "<leader>do", dapui.open, { desc = "Open debug overlay" })
+vim.keymap.set("n", "<leader>dc", dapui.close, { desc = "Close debug overlay" })
+vim.keymap.set("n", "<F5>", dap.toggle_breakpoint, { desc = "Toggle breakpoint" })
+vim.keymap.set("n", "<F6>", dap.continue, { desc = "dap Continue" })
+vim.keymap.set("n", "<F7>", dap.step_over, { desc = "dap step over" })
+vim.keymap.set("n", "<F8>", dap.step_into, { desc = "dap step into" })
+-- sudawrite
+vim.keymap.set("n", "<leader>sw", ":SudaWrite<CR>", { desc = "Write as sudo" })
+-- conform
+vim.keymap.set("n", "<leader>cf", conform.format, { desc = "format code" })
 -- toggleterm binds
-vim.keymap.set('n', '<leader>tf', ':ToggleTerm direction=float <CR>', { desc = "Open floating terminal" })
-vim.keymap.set('n', '<leader>tt', ':ToggleTerm direction=tab size=50 <CR>', { desc = "Open terminal in new tab" })
-vim.keymap.set('n', '<leader>tv', ':ToggleTerm direction=vertical <CR>', { desc = "Open terminal vertical" })
-vim.keymap.set('n', '<leader>ts', ':ToggleTerm direction=vertical <CR>', { desc = "select open terminal" })
+vim.keymap.set("n", "<leader>tf", ":ToggleTerm direction=float <CR>", { desc = "Open floating terminal" })
+vim.keymap.set("n", "<leader>tt", ":ToggleTerm direction=tab size=50 <CR>", { desc = "Open terminal in new tab" })
+vim.keymap.set("n", "<leader>tv", ":ToggleTerm direction=vertical <CR>", { desc = "Open terminal vertical" })
+vim.keymap.set("n", "<leader>ts", ":ToggleTerm direction=vertical <CR>", { desc = "select open terminal" })
 -- code actions
 vim.keymap.set("n", "<leader>ca", function()
 	require("tiny-code-action").code_action()
 end, { desc = "Show code actions", noremap = true, silent = true })


+-- disable annoying inline type things 
+vim.lsp.inlay_hint.enable(false)
+vim.diagnostic.config({virtual_text = false})
--- a/packages/nvim/init.lua~
+++ b/packages/nvim/init.lua~
@@ -1,113 +0,0 @@
-- Tab
-vim.opt.tabstop = 2                 -- number of visual spaces per TAB
-vim.opt.softtabstop = 2             -- number of spacesin tab when editing
-vim.opt.shiftwidth = 2              -- insert 4 spaces on a tab
-vim.opt.expandtab = true            -- tabs are spaces, mainly because of python
-
-- UI config
-vim.opt.number = true               -- show absolute number
-vim.opt.relativenumber = true       -- add numbers to each line on the left side
-vim.opt.splitbelow = true           -- open new vertical split bottom
-vim.opt.splitright = true           -- open new horizontal splits right
-- vim.opt.termguicolors = true        -- enabl 24-bit RGB color in the TUI
-vim.opt.showmode = false            -- we are experienced, wo don't need the "-- INSERT --" mode hint
-
-- Searching
-vim.opt.incsearch = true            -- search as characters are entered
-vim.opt.hlsearch = false            -- do not highlight matches
-vim.opt.ignorecase = true           -- ignore case in searches by default
-vim.opt.smartcase = true            -- but make it case sensitive if an uppercase is entered
-
-- -- Keybinds
-vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
-vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
-vim.keymap.set('n', '<C-k>', '<C-w>k', opts)
-vim.keymap.set('n', '<C-l>', '<C-w>l', opts)
-
-- Resize with arrows
-- delta: 2 lines
-vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
-vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
-vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
-
-- Telescope binds
-vim.keymap.set("n", "<space>fb", ":Telescope file_browser<CR>")
-
-
-vim.keymap.set('i', 'jk', '<Esc>', opts)
-
-- Lazy
-require("config.lazy")
-- require("flutter-tools").setup {} -- use defaults
-require("catppuccin").setup({
-    integrations = {
-        cmp = false,
-        gitsigns = true,
-        nvimtree = true,
-        treesitter = true,
-        notify = false,
-        mini = {
-            enabled = false,
-            indentscope_color = "",
-        },
-    }
-})
-
-- css colors
-vim.opt.termguicolors = true
-require('nvim-highlight-colors').setup({})
-
-vim.cmd.colorscheme "catppuccin"
-
-
-
-
-- lsp
-local on_attach = function(_, bufnr)
-
-  local bufmap = function(keys, func)
-    vim.keymap.set('n', keys, func, { buffer = bufnr })
-  end
-
-  bufmap('<leader>r', vim.lsp.buf.rename)
-  bufmap('<leader>a', vim.lsp.buf.code_action)
-
-  bufmap('gd', vim.lsp.buf.definition)
-  bufmap('gD', vim.lsp.buf.declaration)
-  bufmap('gI', vim.lsp.buf.implementation)
-  bufmap('<leader>D', vim.lsp.buf.type_definition)
-
-  bufmap('gr', require('telescope.builtin').lsp_references)
-  bufmap('<leader>s', require('telescope.builtin').lsp_document_symbols)
-  bufmap('<leader>S', require('telescope.builtin').lsp_dynamic_workspace_symbols)
-
-  bufmap('K', vim.lsp.buf.hover)
-
-  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-    vim.lsp.buf.format()
-  end, {})
-end
-
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('coq').lsp_ensure_capabilities(capabilities)
-
-require('lspconfig').lua_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-	root_dir = function()
-        return vim.loop.cwd()
-    end,
-	cmd = { "lua-lsp" },
-    settings = {
-        Lua = {
-            workspace = { checkThirdParty = false },
-            telemetry = { enable = false },
-        },
-    }
-}
-
-require('lspconfig').nil_ls.setup {
-    on_attach = on_attach,
-    capabilities = capabilities,
-}
--- a/packages/nvim/lua/plugins/arduino.lua
+++ b/packages/nvim/lua/plugins/arduino.lua
@@ -0,0 +1,7 @@
+return{
+  "glebzlat/arduino-nvim",
+  config = {
+    function() require("arduino-nvim").setup() end,
+    filetype = "arduino",
+  }
+}
--- a/packages/nvim/lua/plugins/catppuccin.lua
+++ b/packages/nvim/lua/plugins/catppuccin.lua
@@ -1 +1,18 @@
-return { "catppuccin/nvim", name = "catppuccin", priority = 1000 }
+return {
+  "catppuccin/nvim",
+  name = "catppuccin",
+  priority = 1000,
+  opts = {
+    integrations = {
+        cmp = false,
+        gitsigns = true,
+        nvimtree = true,
+        treesitter = true,
+        notify = false,
+        mini = {
+            enabled = false,
+            indentscope_color = "",
+        },
+    }
+  }
+}
--- a/packages/nvim/lua/plugins/conform.lua
+++ b/packages/nvim/lua/plugins/conform.lua
@@ -0,0 +1,11 @@
+return {
+  'stevearc/conform.nvim',
+  opts = {
+  formatters_by_ft = {
+    dart = { "dart_format" },
+    lua = { "stylua" },
+    rust = { "rustfmt" },
+    go = { "gofmt" },
+  },
+  },
+}
--- a/packages/nvim/lua/plugins/dioxus.lua
+++ b/packages/nvim/lua/plugins/dioxus.lua
@@ -0,0 +1,9 @@
+return {
+  "mrxiaozhuox/dioxus.nvim",
+  opts = {
+    format = {
+      split_line_attributes = true,
+    },
+  },
+  ft = "rust",
+}
--- a/packages/nvim/lua/plugins/flutter.lua
+++ b/packages/nvim/lua/plugins/flutter.lua
@@ -1,5 +1,4 @@
 return {
-
    'nvim-flutter/flutter-tools.nvim',
    lazy = false,
    dependencies = {
@@ -7,4 +6,90 @@ return {
        'stevearc/dressing.nvim', -- optional for vim.ui.select
    },
    config = true,
+    opts = {
+  ui = {
+    -- the border type to use for all floating windows, the same options/formats
+    -- used for ":h nvim_open_win" e.g. "single" | "shadow" | {<table-of-eight-chars>}
+    border = "rounded",
+    -- This determines whether notifications are show with `vim.notify` or with the plugin's custom UI
+    -- please note that this option is eventually going to be deprecated and users will need to
+    -- depend on plugins like `nvim-notify` instead.
+    notification_style = 'plugin'
+  },
+  decorations = {
+    statusline = {
+      -- set to true to be able use the 'flutter_tools_decorations.app_version' in your statusline
+      -- this will show the current version of the flutter app from the pubspec.yaml file
+      app_version = false,
+      -- set to true to be able use the 'flutter_tools_decorations.device' in your statusline
+      -- this will show the currently running device if an application was started with a specific
+      -- device
+      device = true,
+      -- set to true to be able use the 'flutter_tools_decorations.project_config' in your statusline
+      -- this will show the currently selected project configuration
+      project_config = false,
+    }
+  },
+  debugger = { -- integrate with nvim dap + install dart code debugger
+    enabled = true,
+    -- if empty dap will not stop on any exceptions, otherwise it will stop on those specified
+    -- see |:help dap.set_exception_breakpoints()| for more info
+    exception_breakpoints = { "uncaught" },
+    -- Whether to call toString() on objects in debug views like hovers and the
+    -- variables list.
+    -- Invoking toString() has a performance cost and may introduce side-effects,
+    -- although users may expected this functionality. null is treated like false.
+    evaluate_to_string_in_debug_views = true,
+  },
+  flutter_lookup_cmd = nil, -- example "dirname $(which flutter)" or "asdf where flutter"
+  root_patterns = { ".git", "pubspec.yaml" }, -- patterns to find the root of your flutter project
+  fvm = false, -- takes priority over path, uses <workspace>/.fvm/flutter_sdk if enabled
+  widget_guides = {
+    enabled = true,
+  },
+  closing_tags = {
+    highlight = "ErrorMsg", -- highlight for the closing tag
+    prefix = ">", -- character to use for close tag e.g. > Widget
+    priority = 10, -- priority of virtual text in current line
+    -- consider to configure this when there is a possibility of multiple virtual text items in one line
+    -- see `priority` option in |:help nvim_buf_set_extmark| for more info
+    enabled = true -- set to false to disable
+  },
+  dev_log = {
+    enabled = true,
+    filter = nil, -- optional callback to filter the log
+    -- takes a log_line as string argument; returns a boolean or nil;
+    -- the log_line is only added to the output if the function returns true
+    notify_errors = false, -- if there is an error whilst running then notify the user
+    open_cmd = "15split", -- command to use to open the log buffer
+    focus_on_open = true, -- focus on the newly opened log window
+  },
+  dev_tools = {
+    autostart = true, -- autostart devtools server if not detected
+    auto_open_browser = false, -- Automatically opens devtools in the browser
+  },
+  outline = {
+    open_cmd = "30vnew", -- command to use to open the outline buffer
+    auto_open = false -- if true this will open the outline automatically when it is first populated
+  },
+  lsp = {
+    color = { -- show the derived colours for dart variables
+      enabled = true, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
+      background = true, -- highlight the background
+      background_color = nil, -- required, when background is transparent (i.e. background_color = { r = 19, g = 17, b = 24},)
+      foreground = false, -- highlight the foreground
+      virtual_text = true, -- show the highlight using virtual text
+      virtual_text_str = "■", -- the virtual text character to highlight
+    },
+    -- see the link below for details on each option:
+    -- https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md#client-workspace-configuration
+    settings = {
+      showTodos = true,
+      completeFunctionCalls = true,
+      renameFilesWithClasses = "prompt", -- "always"
+      enableSnippets = true,
+      updateImportsOnRename = true, -- Whether to update imports and other directives when files are renamed. Required for `FlutterRename` command.
+    }
+  }
+  }
 }
--- a/packages/nvim/lua/plugins/go.lua
+++ b/packages/nvim/lua/plugins/go.lua
@@ -0,0 +1,25 @@
+return {
+  "ray-x/go.nvim",
+  dependencies = {  -- optional packages
+    "neovim/nvim-lspconfig",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  opts = {
+    -- lsp_keymaps = false,
+    -- other options
+  },
+  config = function(lp, opts)
+    require("go").setup(opts)
+    local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {})
+    vim.api.nvim_create_autocmd("BufWritePre", {
+      pattern = "*.go",
+      callback = function()
+      require('go.format').goimports()
+      end,
+      group = format_sync_grp,
+    })
+  end,
+  event = {"CmdlineEnter"},
+  ft = {"go", 'gomod'},
+  build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
+}
--- a/packages/nvim/lua/plugins/lsp.lua
+++ b/packages/nvim/lua/plugins/lsp.lua
@@ -7,7 +7,9 @@ return {
    servers = {
      lua_ls = {},
      nil_ls = {},
-      rust_analyzer = {}
+      -- rust_analyzer = {},
+      gopls = {},
+      -- arduino_language_server = {},
    }
  },
  config = function(_, opts)
--- a/packages/nvim/lua/plugins/neominimap.lua
+++ b/packages/nvim/lua/plugins/neominimap.lua
@@ -0,0 +1,48 @@
+---@module "neominimap.config.meta"
+return {
+  "Isrothy/neominimap.nvim",
+  version = "v3.x.x",
+  lazy = false, -- NOTE: NO NEED to Lazy load
+  -- Optional. You can alse set your own keybindings
+  keys = {
+    -- Global Minimap Controls
+    { "<leader>nm", "<cmd>Neominimap Toggle<cr>", desc = "Toggle global minimap" },
+    { "<leader>no", "<cmd>Neominimap Enable<cr>", desc = "Enable global minimap" },
+    { "<leader>nc", "<cmd>Neominimap Disable<cr>", desc = "Disable global minimap" },
+    { "<leader>nr", "<cmd>Neominimap Refresh<cr>", desc = "Refresh global minimap" },
+
+    -- Window-Specific Minimap Controls
+    { "<leader>nwt", "<cmd>Neominimap WinToggle<cr>", desc = "Toggle minimap for current window" },
+    { "<leader>nwr", "<cmd>Neominimap WinRefresh<cr>", desc = "Refresh minimap for current window" },
+    { "<leader>nwo", "<cmd>Neominimap WinEnable<cr>", desc = "Enable minimap for current window" },
+    { "<leader>nwc", "<cmd>Neominimap WinDisable<cr>", desc = "Disable minimap for current window" },
+
+    -- Tab-Specific Minimap Controls
+    { "<leader>ntt", "<cmd>Neominimap TabToggle<cr>", desc = "Toggle minimap for current tab" },
+    { "<leader>ntr", "<cmd>Neominimap TabRefresh<cr>", desc = "Refresh minimap for current tab" },
+    { "<leader>nto", "<cmd>Neominimap TabEnable<cr>", desc = "Enable minimap for current tab" },
+    { "<leader>ntc", "<cmd>Neominimap TabDisable<cr>", desc = "Disable minimap for current tab" },
+
+    -- Buffer-Specific Minimap Controls
+    { "<leader>nbt", "<cmd>Neominimap BufToggle<cr>", desc = "Toggle minimap for current buffer" },
+    { "<leader>nbr", "<cmd>Neominimap BufRefresh<cr>", desc = "Refresh minimap for current buffer" },
+    { "<leader>nbo", "<cmd>Neominimap BufEnable<cr>", desc = "Enable minimap for current buffer" },
+    { "<leader>nbc", "<cmd>Neominimap BufDisable<cr>", desc = "Disable minimap for current buffer" },
+
+    ---Focus Controls
+    { "<leader>nf", "<cmd>Neominimap Focus<cr>", desc = "Focus on minimap" },
+    { "<leader>nu", "<cmd>Neominimap Unfocus<cr>", desc = "Unfocus minimap" },
+    { "<leader>ns", "<cmd>Neominimap ToggleFocus<cr>", desc = "Switch focus on minimap" },
+  },
+  init = function()
+    -- The following options are recommended when layout == "float"
+    vim.opt.wrap = false
+    vim.opt.sidescrolloff = 36 -- Set a large value
+
+    --- Put your configuration here
+    ---@type Neominimap.UserConfig
+    vim.g.neominimap = {
+      auto_enable = true,
+    }
+  end,
+}
--- a/packages/nvim/lua/plugins/nio.lua
+++ b/packages/nvim/lua/plugins/nio.lua
@@ -0,0 +1 @@
+return { "nvim-neotest/nvim-nio" }
--- a/packages/nvim/lua/plugins/nvim-tmux-navigation.lua
+++ b/packages/nvim/lua/plugins/nvim-tmux-navigation.lua
@@ -0,0 +1,17 @@
+return { 'alexghergh/nvim-tmux-navigation', config = function()
+
+    local nvim_tmux_nav = require('nvim-tmux-navigation')
+
+    nvim_tmux_nav.setup {
+        disable_when_zoomed = true -- defaults to false
+    }
+
+    vim.keymap.set('n', "<C-h>", nvim_tmux_nav.NvimTmuxNavigateLeft)
+    vim.keymap.set('n', "<C-j>", nvim_tmux_nav.NvimTmuxNavigateDown)
+    vim.keymap.set('n', "<C-k>", nvim_tmux_nav.NvimTmuxNavigateUp)
+    vim.keymap.set('n', "<C-l>", nvim_tmux_nav.NvimTmuxNavigateRight)
+    vim.keymap.set('n', "<C-\\>", nvim_tmux_nav.NvimTmuxNavigateLastActive)
+    vim.keymap.set('n', "<C-Space>", nvim_tmux_nav.NvimTmuxNavigateNext)
+
+end
+}
--- a/packages/nvim/lua/plugins/plugins/catppuccin.lua
+++ b/packages/nvim/lua/plugins/plugins/catppuccin.lua
@@ -1 +0,0 @@
-return { "catppuccin/nvim", name = "catppuccin", priority = 1000 }
--- a/packages/nvim/lua/plugins/plugins/comment.lua
+++ b/packages/nvim/lua/plugins/plugins/comment.lua
@@ -1,6 +0,0 @@
-return {
-    'numToStr/Comment.nvim',
-    opts = {
-        -- add any options here
-    }
-}
--- a/packages/nvim/lua/plugins/plugins/coq.lua
+++ b/packages/nvim/lua/plugins/plugins/coq.lua
@@ -1,30 +0,0 @@
-
- return {
-  "neovim/nvim-lspconfig", -- REQUIRED: for native Neovim LSP integration
-  lazy = false, -- REQUIRED: tell lazy.nvim to start this plugin at startup
-  dependencies = {
-    -- main one
-    { "ms-jpq/coq_nvim", branch = "coq" },
-
-    -- 9000+ Snippets
-    { "ms-jpq/coq.artifacts", branch = "artifacts" },
-
-    -- lua & third party sources -- See https://github.com/ms-jpq/coq.thirdparty
-    -- Need to **configure separately**
-    { 'ms-jpq/coq.thirdparty', branch = "3p" }
-    -- - shell repl
-    -- - nvim lua api
-    -- - scientific calculator
-    -- - comment banner
-    -- - etc
-  },
-  init = function()
-    vim.g.coq_settings = {
-        auto_start = true, -- if you want to start COQ at startup
-        -- Your COQ settings here
-    }
-  end,
-  config = function()
-    -- Your LSP settings here
-  end,
-}
--- a/packages/nvim/lua/plugins/plugins/flutter.lua
+++ b/packages/nvim/lua/plugins/plugins/flutter.lua
@@ -1,10 +0,0 @@
-return {
-
-    'nvim-flutter/flutter-tools.nvim',
-    lazy = false,
-    dependencies = {
-        'nvim-lua/plenary.nvim',
-        'stevearc/dressing.nvim', -- optional for vim.ui.select
-    },
-    config = true,
-}
--- a/packages/nvim/lua/plugins/plugins/highlight-colors.lua
+++ b/packages/nvim/lua/plugins/plugins/highlight-colors.lua
@@ -1 +0,0 @@
-return { "brenoprata10/nvim-highlight-colors", name = "highlight-colotrs" }
--- a/packages/nvim/lua/plugins/plugins/lazydev.lua
+++ b/packages/nvim/lua/plugins/plugins/lazydev.lua
@@ -1,33 +0,0 @@
-return {
-  {
-    "folke/lazydev.nvim",
-    ft = "lua", -- only load on lua files
-    opts = {
-      library = {
-        -- See the configuration section for more details
-        -- Load luvit types when the `vim.uv` word is found
-        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
-      },
-    },
-  },
-  { -- optional blink completion source for require statements and module annotations
-    "saghen/blink.cmp",
-    build = 'cargo +nightly build --release',
-
-    opts = {
-      sources = {
-        -- add lazydev to your completion providers
-        default = { "lazydev", "lsp", "path", "snippets", "buffer" },
-        providers = {
-          lazydev = {
-            name = "LazyDev",
-            module = "lazydev.integrations.blink",
-            -- make lazydev completions top priority (see `:h blink.cmp`)
-            score_offset = 100,
-          },
-        },
-      },
-    },
-  }
-  -- { "folke/neodev.nvim", enabled = false }, -- make sure to uninstall or disable neodev.nvim
-}
--- a/packages/nvim/lua/plugins/plugins/lazydev.lua~
+++ b/packages/nvim/lua/plugins/plugins/lazydev.lua~
--- a/packages/nvim/lua/plugins/plugins/lsp.lua
+++ b/packages/nvim/lua/plugins/plugins/lsp.lua
@@ -1,30 +0,0 @@
-return {
-  'neovim/nvim-lspconfig',
-  dependencies = { 'saghen/blink.cmp' },
-
-  -- example using `opts` for defining servers
-  opts = {
-    servers = {
-      lua_ls = {},
-      nil_ls = {},
--      rust_analyzer = {}
-    }
-  },
-  config = function(_, opts)
-    local lspconfig = require('lspconfig')
-    for server, config in pairs(opts.servers) do
-      -- passing config.capabilities to blink.cmp merges with the capabilities in your
-      -- `opts[server].capabilities, if you've defined it
-      config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
-      lspconfig[server].setup(config)
-    end
-  end
-
- -- -- example calling setup directly for each LSP
- --  config = function()
- --    local capabilities = require('blink.cmp').get_lsp_capabilities()
- --    local lspconfig = require('lspconfig')
- --
- --    lspconfig['lua_ls'].setup({ capabilities = capabilities })
- --  end
-}
--- a/packages/nvim/lua/plugins/plugins/lsp.lua~
+++ b/packages/nvim/lua/plugins/plugins/lsp.lua~
@@ -1,13 +0,0 @@
-return 
-{
-  "neovim/nvim-lspconfig",
-  opts = function()
-    local keys = require("lazyvim.plugins.lsp.keymaps").get()
-    -- change a keymap
-    keys[#keys + 1] = { "K", "<cmd>echo 'hello'<cr>" }
-    -- disable a keymap
-    keys[#keys + 1] = { "K", false }
-    -- add a keymap
-    keys[#keys + 1] = { "H", "<cmd>echo 'hello'<cr>" }
-  end,
-}
--- a/packages/nvim/lua/plugins/plugins/lualine.lua
+++ b/packages/nvim/lua/plugins/plugins/lualine.lua
@@ -1,5 +0,0 @@
-return {
-    'nvim-lualine/lualine.nvim',
-    dependencies = { 'nvim-tree/nvim-web-devicons' }
-
-}
--- a/packages/nvim/lua/plugins/plugins/lualine.lua~
+++ b/packages/nvim/lua/plugins/plugins/lualine.lua~
--- a/packages/nvim/lua/plugins/plugins/mason.lua
+++ b/packages/nvim/lua/plugins/plugins/mason.lua
@@ -1,37 +0,0 @@
-return {
-
-  "williamboman/mason.nvim",
-  cmd = "Mason",
-  keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
-  build = ":MasonUpdate",
-  opts_extend = { "ensure_installed" },
-  opts = {
-    ensure_installed = {
-      "stylua",
-      "shfmt",
-    },
-  },
-  ---@param opts MasonSettings | {ensure_installed: string[]}
-  config = function(_, opts)
-    require("mason").setup(opts)
-    local mr = require("mason-registry")
-    mr:on("package:install:success", function()
-      vim.defer_fn(function()
-        -- trigger FileType event to possibly load this newly installed LSP server
-        require("lazy.core.handler.event").trigger({
-          event = "FileType",
-          buf = vim.api.nvim_get_current_buf(),
-        })
-      end, 100)
-    end)
-
-    mr.refresh(function()
-      for _, tool in ipairs(opts.ensure_installed) do
-        local p = mr.get_package(tool)
-        if not p:is_installed() then
-          p:install()
-        end
-      end
-    end)
-  end,
-}
--- a/packages/nvim/lua/plugins/plugins/telescope.lua
+++ b/packages/nvim/lua/plugins/plugins/telescope.lua
@@ -1,4 +0,0 @@
-return {
-    "nvim-telescope/telescope-file-browser.nvim",
-    dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }
-}
--- a/packages/nvim/lua/plugins/plugins/treesitter.lua
+++ b/packages/nvim/lua/plugins/plugins/treesitter.lua
@@ -1,15 +0,0 @@
-
-return {
-    "nvim-treesitter/nvim-treesitter",
-    build = ":TSUpdate",
-    config = function () 
-      local configs = require("nvim-treesitter.configs")
-
-      configs.setup({
-          ensure_installed = { "c", "lua", "html", "dart", "rust" },
-          sync_install = false,
-          highlight = { enable = true },
-          indent = { enable = true },
-        })
-    end
- }
--- a/packages/nvim/lua/plugins/plugins/whichkey.lua~
+++ b/packages/nvim/lua/plugins/plugins/whichkey.lua~
--- a/packages/nvim/lua/plugins/rustaceanvim.lua
+++ b/packages/nvim/lua/plugins/rustaceanvim.lua
@@ -1,5 +1,5 @@
 return {
  'mrcjkb/rustaceanvim',
-  version = '^5', -- Recommended
+  version = '^6', -- Recommended
  lazy = false, -- This plugin is already lazy
 }
--- a/packages/nvim/lua/plugins/tabby.lua
+++ b/packages/nvim/lua/plugins/tabby.lua
@@ -2,7 +2,7 @@ return {
  'nanozuki/tabby.nvim',
  -- event = 'VimEnter', -- if you want lazy load, see below
  dependencies = 'nvim-tree/nvim-web-devicons',
-  config = function()
-    -- configs...
-  end,
+  opts = {
+  preset = "tab_only"
+  }
 }
--- a/packages/nvim/lua/plugins/tiny-inline-diagnostic.lua
+++ b/packages/nvim/lua/plugins/tiny-inline-diagnostic.lua
@@ -0,0 +1,19 @@
+return {
+    "rachartier/tiny-inline-diagnostic.nvim",
+    event = "VeryLazy", -- Or `LspAttach`
+    priority = 1000, -- needs to be loaded in first
+    config = function()
+        require('tiny-inline-diagnostic').setup({
+  preset = "ghost";
+  options = {
+    use_icons_from_diagnostic = true,
+    multilines = {
+      enabled = true,
+    },
+    show_all_diags_on_cursorline = false,
+    enable_on_insert = true,
+  }
+    })
+        vim.diagnostic.config({ virtual_text = false }) -- Only if needed in your configuration, if you already have native LSP diagnostics
+    end
+}
--- a/packages/nvim/lua/plugins/vim-suda.lua
+++ b/packages/nvim/lua/plugins/vim-suda.lua
@@ -0,0 +1,3 @@
+return {
+	"lambdalisue/vim-suda"
+}
--- a/packages/nvim/lua/plugins/plugins/autopair.lua
+++ b/packages/nvim/lua/plugins/plugins/autopair.lua
--- a/packages/nvim/lua/plugins/plugins/blankline.lua
+++ b/packages/nvim/lua/plugins/plugins/blankline.lua
--- a/packages/nvim/lua/plugins/plugins/blink-cmp.lua
+++ b/packages/nvim/lua/plugins/plugins/blink-cmp.lua
@@ -5,22 +5,20 @@ return {

  -- use a release tag to download pre-built binaries
  version = '1.*',
-  -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-  -- build = 'cargo build --release',
-  -- If you use nix, you can build from source using latest nightly rust with:
-  -- build = 'nix run .#build-plugin',
-
-  ---@module 'blink.cmp'
-  ---@type blink.cmp.Config
  opts = {
+    -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
+    -- 'super-tab' for mappings similar to vscode (tab to accept)
+    -- 'enter' for enter to accept
+    -- 'none' for no mappings
+    --
+    -- All presets have the following mappings:
+    -- C-space: Open menu or open docs if already open
+    -- C-n/C-p or Up/Down: Select next/previous item
+    -- C-e: Hide menu
+    -- C-k: Toggle signature help (if signature.enabled = true)
+    --
    -- See :h blink-cmp-config-keymap for defining your own keymap
-    keymap = {
-      preset = 'enter',
-      -- map tap to cycle through
-      ['<S-Tab>'] = { 'select_prev', 'fallback' },
-      ['<Tab>'] = { 'select_next', 'fallback' },
-    },
-
+    keymap = { preset = 'enter' },

    appearance = {
      -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
--- a/packages/nvim/nvim/plugins/code-action.lua
+++ b/packages/nvim/nvim/plugins/code-action.lua
@@ -0,0 +1,11 @@
+return {
+    "rachartier/tiny-code-action.nvim",
+    dependencies = {
+        {"nvim-lua/plenary.nvim"},
+        {"nvim-telescope/telescope.nvim"},
+    },
+    event = "LspAttach",
+    config = function()
+        require('tiny-code-action').setup()
+    end
+}
--- a/packages/nvim/nvim/plugins/comment.lua
+++ b/packages/nvim/nvim/plugins/comment.lua
@@ -0,0 +1,8 @@
+-- add this to your lua/plugins.lua, lua/plugins/init.lua,  or the file you keep your other plugins:
+return {
+    'numToStr/Comment.nvim',
+    opts = {
+        -- add any options here
+    }
+}
+
--- a/packages/nvim/lua/plugins/plugins/dap.lua
+++ b/packages/nvim/lua/plugins/plugins/dap.lua
--- a/packages/nvim/lua/plugins/plugins/lazygit.lua
+++ b/packages/nvim/lua/plugins/plugins/lazygit.lua
--- a/packages/nvim/nvim/plugins/love.lua
+++ b/packages/nvim/nvim/plugins/love.lua
@@ -0,0 +1,11 @@
+-- using lazy.nvim
+return {
+  "S1M0N38/love2d.nvim",
+  cmd = "LoveRun",
+  opts = { },
+  keys = {
+    { "<leader>v", ft = "lua", desc = "LÖVE" },
+    { "<leader>vv", "<cmd>LoveRun<cr>", ft = "lua", desc = "Run LÖVE" },
+    { "<leader>vs", "<cmd>LoveStop<cr>", ft = "lua", desc = "Stop LÖVE" },
+  },
+}
--- a/packages/nvim/nvim/plugins/mini-animate.lua
+++ b/packages/nvim/nvim/plugins/mini-animate.lua
@@ -0,0 +1 @@
+return { 'echasnovski/mini.animate', version = '*' }
--- a/packages/nvim/nvim/plugins/nio.nvim
+++ b/packages/nvim/nvim/plugins/nio.nvim
@@ -0,0 +1 @@
+return { "nvim-neotest/nvim-nio" }
--- a/packages/nvim/lua/plugins/plugins/rustaceanvim.lua
+++ b/packages/nvim/lua/plugins/plugins/rustaceanvim.lua
@@ -1,5 +1,5 @@
 return {
  'mrcjkb/rustaceanvim',
-  version = '^5', -- Recommended
+  version = '^6', -- Recommended
  lazy = false, -- This plugin is already lazy
 }
--- a/packages/nvim/nvim/plugins/tabby.lua
+++ b/packages/nvim/nvim/plugins/tabby.lua
@@ -0,0 +1,8 @@
+return {
+  'nanozuki/tabby.nvim',
+  -- event = 'VimEnter', -- if you want lazy load, see below
+  dependencies = 'nvim-tree/nvim-web-devicons',
+  config = function()
+    -- configs...
+  end,
+}
--- a/packages/nvim/lua/plugins/plugins/tabout.lua
+++ b/packages/nvim/lua/plugins/plugins/tabout.lua
@@ -1,3 +1,4 @@
+-- Lua
 return {
  {
    'abecodes/tabout.nvim',
--- a/packages/nvim/nvim/plugins/toggleterm.lua
+++ b/packages/nvim/nvim/plugins/toggleterm.lua
@@ -0,0 +1,6 @@
+return {
+  -- amongst your other plugins
+  {'akinsho/toggleterm.nvim', version = "*", config = true}
+  -- or
+  {'akinsho/toggleterm.nvim', version = "*", opts = {--[[ things you want to change go here]]}}
+}
--- a/packages/nvim/lua/plugins/plugins/trouble.lua
+++ b/packages/nvim/lua/plugins/plugins/trouble.lua
--- a/packages/nvim/lua/plugins/plugins/whichkey.lua
+++ b/packages/nvim/lua/plugins/plugins/whichkey.lua
@@ -15,4 +15,4 @@ return {
      desc = "Buffer Local Keymaps (which-key)",
    },
  },
-}
+}
--- a/packages/other/#default.nix#
+++ b/packages/other/#default.nix#
@@ -1,3 +1,16 @@
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+
+ ];
+
+programs.ranger = {
+  enable = true;
+  extraConfig = ''
+set preview_images true
+set preview_images_method kitty
+  '';
+};


 programs.git = {
--- a/packages/other/default.nix~
+++ b/packages/other/default.nix~
@@ -28,9 +28,7 @@ services.kdeconnect = {
  indicator = true;
 };

-programs.obsidian = {
-  enable = true;
-};
+programs.ladybird.enable = true;



--- a/packages/rofi/default.nix
+++ b/packages/rofi/default.nix
@@ -3,6 +3,7 @@
 home.packages = with pkgs; [
   rofi-screenshot
   rofi-power-menu
+   bitwarden-menu
 ];


--- a/packages/rofi/default.nix~
+++ b/packages/rofi/default.nix~
@@ -3,6 +3,7 @@
 home.packages = with pkgs; [
   rofi-screenshot
   rofi-power-menu
+   rofi-bluetooth
   bitwarden-menu
 ];

--- a/packages/sway/default.nix
+++ b/packages/sway/default.nix
@@ -6,26 +6,20 @@
    config = rec {
      modifier = "Mod4";
      # Use kitty as default terminal
-      terminal = "kitty"; 
+      terminal = "alacritty"; 
      bars = [
 	{command = "waybar";}
        ];
      
      startup = [
        # Launch Firefox on start
-#	      {command = "wpaperd";}
+	{command = "wpaperd";}
+	{command = "wl-paste --watch cliphist store";}
      ];
    };


    extraConfig = ''
-## screens
-#output DP-3 scale 0.9
-#output DP-2 pos 0 0
-
-workspace 10 output DP-3
-for_window [class="Spotify"] scratchpad show
-
      ## Input configuration
      input "type:keyboard" {
        xkb_layout de,us
@@ -33,6 +27,23 @@ for_window [class="Spotify"] scratchpad show
        xkb_options grp:alt_shift_toggle
      }

+input "type:touchpad" {
+    tap enabled         # enables click-on-tap
+    tap_button_map lrm  # tap with 1 finger = left click, 2 fingers = right click, 3 fingers = middle click
+    dwt enabled         # disable (touchpad) while typing
+    dwtp disabled        # disable (touchpad) while track pointing
+}
+
+#touch {
+#    set along_the_top "20px x 1.0 @ .5 x 0"
+#    set bottom_half "1.0 x .5 @ 0 x .5"
+#    set right_half ".5 x 1.0 @ .5 x 0"
+
+#    gesture exec 'rofi -show drun'{
+#            down 1 $along_the_top
+#            horiz +100px < move
+#    }
+#}

      # Brightness
      bindsym XF86MonBrightnessDown exec light -U 10
@@ -44,10 +55,10 @@ for_window [class="Spotify"] scratchpad show
      bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'

      # app launcher
-	      bindsym Mod4+m exec 'rofi -show drun'
+      bindsym Mod4+m exec 'rofi -show drun'
      bindsym Mod4+Shift+x exec 'rofi -show power-menu -modi power-menu:rofi-power-menu'
      bindsym Mod4+Print exec 'rofi-screenshot'
-
+      bindsym Mod4+Shift+v exec 'cliphist list | rofi -dmenu | cliphist decode | wl-copy'
      bindsym Mod4+BackSpace kill

      # disable window border
--- a/packages/sway/default.nix~
+++ b/packages/sway/default.nix~
@@ -13,26 +13,37 @@
      
      startup = [
        # Launch Firefox on start
-#	      {command = "wpaperd";}
+	{command = "wpaperd";}
+	{command = "wl-paste --watch cliphist store";}
      ];
    };


    extraConfig = ''
-## screens
-#output DP-3 scale 0.9
-#output DP-2 pos 0 0
-
-workspace 10 output DP-3
-for_window [class="Spotify"] scratchpad show
-
      ## Input configuration
      input "type:keyboard" {
-        xkb_layout de, us
+        xkb_layout de,us
        xkb_variant "nodeadkeys"
        xkb_options grp:alt_shift_toggle
      }

+input "type:touchpad" {
+    tap enabled         # enables click-on-tap
+    tap_button_map lrm  # tap with 1 finger = left click, 2 fingers = right click, 3 fingers = middle click
+    dwt enabled         # disable (touchpad) while typing
+    dwtp disabled        # disable (touchpad) while track pointing
+}
+
+#touch {
+#    set along_the_top "20px x 1.0 @ .5 x 0"
+#    set bottom_half "1.0 x .5 @ 0 x .5"
+#    set right_half ".5 x 1.0 @ .5 x 0"
+
+#    gesture exec 'rofi -show drun'{
+#            down 1 $along_the_top
+#            horiz +100px < move
+#    }
+#}

      # Brightness
      bindsym XF86MonBrightnessDown exec light -U 10
@@ -44,10 +55,10 @@ for_window [class="Spotify"] scratchpad show
      bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'

      # app launcher
-	      bindsym Mod4+m exec 'rofi -show drun'
+      bindsym Mod4+m exec 'rofi -show drun'
      bindsym Mod4+Shift+x exec 'rofi -show power-menu -modi power-menu:rofi-power-menu'
      bindsym Mod4+Print exec 'rofi-screenshot'
-
+      bindsym Mod4+Shift+v exec 'cliphist list | rofi -dmenu | cliphist decode | wl-copy'
      bindsym Mod4+BackSpace kill

      # disable window border
--- a/packages/terminal/alacritty-catppuccin-mocha.yml
+++ b/packages/terminal/alacritty-catppuccin-mocha.yml
@@ -0,0 +1,78 @@
+colors:
+    primary:
+        background: "#1E1E2E" # base
+        foreground: "#CDD6F4" # text
+        # Bright and dim foreground colors
+        dim_foreground: "#CDD6F4" # text
+        bright_foreground: "#CDD6F4" # text
+
+    # Cursor colors
+    cursor:
+        text: "#1E1E2E" # base
+        cursor: "#F5E0DC" # rosewater
+    vi_mode_cursor:
+        text: "#1E1E2E" # base
+        cursor: "#B4BEFE" # lavender
+
+    # Search colors
+    search:
+        matches:
+            foreground: "#1E1E2E" # base
+            background: "#A6ADC8" # subtext0
+        focused_match:
+            foreground: "#1E1E2E" # base
+            background: "#A6E3A1" # green
+        footer_bar:
+            foreground: "#1E1E2E" # base
+            background: "#A6ADC8" # subtext0
+
+    # Keyboard regex hints
+    hints:
+        start:
+            foreground: "#1E1E2E" # base
+            background: "#F9E2AF" # yellow
+        end:
+            foreground: "#1E1E2E" # base
+            background: "#A6ADC8" # subtext0
+
+    # Selection colors
+    selection:
+        text: "#1E1E2E" # base
+        background: "#F5E0DC" # rosewater
+
+    # Normal colors
+    normal:
+        black: "#45475A" # surface1
+        red: "#F38BA8" # red
+        green: "#A6E3A1" # green
+        yellow: "#F9E2AF" # yellow
+        blue: "#89B4FA" # blue
+        magenta: "#F5C2E7" # pink
+        cyan: "#94E2D5" # teal
+        white: "#BAC2DE" # subtext1
+
+    # Bright colors
+    bright:
+        black: "#585B70" # surface2
+        red: "#F38BA8" # red
+        green: "#A6E3A1" # green
+        yellow: "#F9E2AF" # yellow
+        blue: "#89B4FA" # blue
+        magenta: "#F5C2E7" # pink
+        cyan: "#94E2D5" # teal
+        white: "#A6ADC8" # subtext0
+
+    # Dim colors
+    dim:
+        black: "#45475A" # surface1
+        red: "#F38BA8" # red
+        green: "#A6E3A1" # green
+        yellow: "#F9E2AF" # yellow
+        blue: "#89B4FA" # blue
+        magenta: "#F5C2E7" # pink
+        cyan: "#94E2D5" # teal
+        white: "#BAC2DE" # subtext1
+
+    indexed_colors:
+        - { index: 16, color: "#FAB387" }
+        - { index: 17, color: "#F5E0DC" }
--- a/packages/terminal/default.nix
+++ b/packages/terminal/default.nix
@@ -0,0 +1,175 @@
+
+{ pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+
+ ];
+
+
+
+programs.nushell = {
+  enable = false;
+  extraConfig = ''
+    $env.config = {
+      show_banner: false,
+      edit_mode: vi
+    }
+  '';
+  shellAliases = { 
+    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
+    emacs = "emacs -nw";
+    femacs = "emacs -nw --load /etc/nixos/packages/emacs/flutter/init.el";
+    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
+  };
+};
+
+
+programs.carapace = {
+  enable = false;
+  enableNushellIntegration = true;
+};
+
+
+programs.starship.enable = true;
+
+programs.zsh = {
+  enable = true;
+  enableCompletion = true;
+  autosuggestion.enable = true;
+  syntaxHighlighting.enable = true;
+
+  shellAliases = {
+    # update = "sudo nixos-rebuild switch";
+    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
+    emacs = "emacs -nw";
+    femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
+    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
+  };
+
+  initContent = ''
+    eval "$(starship init zsh)"
+    '';
+
+  zplug = {
+    enable = false;
+    plugins = [
+      { name = "zsh-users/zsh-autosuggestions"; } # Simple plugin installation
+    ];
+  };
+
+  oh-my-zsh = {
+    enable = true;
+    plugins = [ ];
+    # theme = "";
+  };
+};
+
+
+programs.fzf = {
+  enable = true;
+  enableZshIntegration = true;
+};
+
+programs.zoxide = {
+  enable = true;
+  enableZshIntegration = true;
+};
+
+programs.ghostty = {
+  enable = true;
+};
+
+home.file."/home/n/.config/ghostty/config" = {
+  source = ./ghostty-config;
+};
+
+
+programs.kitty = {
+  enable = true;
+  
+  extraConfig = ''
+
+# vim:ft=kitty
+
+## name:     Catppuccin Kitty Mocha
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+map ctrl+shift+w no_op
+
+
+# The basic colors
+foreground              #cdd6f4
+background              #1e1e2e
+selection_foreground    #1e1e2e
+selection_background    #f5e0dc
+
+# Cursor colors
+cursor                  #f5e0dc
+cursor_text_color       #1e1e2e
+
+# URL underline color when hovering with mouse
+url_color               #f5e0dc
+
+# Kitty window border colors
+active_border_color     #b4befe
+inactive_border_color   #6c7086
+bell_border_color       #f9e2af
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111b
+active_tab_background   #cba6f7
+inactive_tab_foreground #cdd6f4
+inactive_tab_background #181825
+tab_bar_background      #11111b
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1e1e2e
+mark1_background #b4befe
+mark2_foreground #1e1e2e
+mark2_background #cba6f7
+mark3_foreground #1e1e2e
+mark3_background #74c7ec
+
+# The 16 terminal colors
+
+# black
+color0 #45475a
+color8 #585b70
+
+# red
+color1 #f38ba8
+color9 #f38ba8
+
+# green
+color2  #a6e3a1
+color10 #a6e3a1
+
+# yellow
+color3  #f9e2af
+color11 #f9e2af
+
+# blue
+color4  #89b4fa
+color12 #89b4fa
+
+# magenta
+color5  #f5c2e7
+color13 #f5c2e7
+
+# cyan
+color6  #94e2d5
+color14 #94e2d5
+
+# white
+color7  #bac2de
+color15 #a6adc8
+  '';
+};
+}
--- a/packages/terminal/ghostty-config
+++ b/packages/terminal/ghostty-config
@@ -0,0 +1,24 @@
+palette = 0=#45475a
+palette = 1=#f38ba8
+palette = 2=#a6e3a1
+palette = 3=#f9e2af
+palette = 4=#89b4fa
+palette = 5=#f5c2e7
+palette = 6=#94e2d5
+palette = 7=#bac2de
+palette = 8=#585b70
+palette = 9=#f38ba8
+palette = 10=#a6e3a1
+palette = 11=#f9e2af
+palette = 12=#89b4fa
+palette = 13=#f5c2e7
+palette = 14=#94e2d5
+palette = 15=#a6adc8
+background = 1e1e2e
+foreground = cdd6f4
+cursor-color = f5e0dc
+cursor-text = 1e1e2e
+selection-background = 353749
+selection-foreground = cdd6f4
+
+gtk-titlebar = false
--- a/packages/terminal/kitty.conf
+++ b/packages/terminal/kitty.conf
@@ -0,0 +1,80 @@
+# vim:ft=kitty
+
+## name:     Catppuccin Kitty Mocha
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground              #cdd6f4
+background              #1e1e2e
+selection_foreground    #1e1e2e
+selection_background    #f5e0dc
+
+# Cursor colors
+cursor                  #f5e0dc
+cursor_text_color       #1e1e2e
+
+# URL underline color when hovering with mouse
+url_color               #f5e0dc
+
+# Kitty window border colors
+active_border_color     #b4befe
+inactive_border_color   #6c7086
+bell_border_color       #f9e2af
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #11111b
+active_tab_background   #cba6f7
+inactive_tab_foreground #cdd6f4
+inactive_tab_background #181825
+tab_bar_background      #11111b
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1e1e2e
+mark1_background #b4befe
+mark2_foreground #1e1e2e
+mark2_background #cba6f7
+mark3_foreground #1e1e2e
+mark3_background #74c7ec
+
+# The 16 terminal colors
+
+# black
+color0 #45475a
+color8 #585b70
+
+# red
+color1 #f38ba8
+color9 #f38ba8
+
+# green
+color2  #a6e3a1
+color10 #a6e3a1
+
+# yellow
+color3  #f9e2af
+color11 #f9e2af
+
+# blue
+color4  #89b4fa
+color12 #89b4fa
+
+# magenta
+color5  #f5c2e7
+color13 #f5c2e7
+
+# cyan
+color6  #94e2d5
+color14 #94e2d5
+
+# white
+color7  #bac2de
+color15 #a6adc8
--- a/packages/tmux/default.nix
+++ b/packages/tmux/default.nix
@@ -5,10 +5,18 @@

 programs.tmux = {
   enable = true;
+    terminal = "tmux-256color";
+    disableConfirmationPrompt = true;
   extraConfig = ''
-set-option -sa terminal-overrides ",xterm*:Tc"
-set -g @catppuccin_flavor 'mocha'
-set -g @catppuccin_window_status_style "rounded"
+# set-option -sa terminal-overrides ",xterm*:Tc"
+#  set -g @catppuccin_flavor 'mocha'
+#  set -g @catppuccin_window_status_style "rounded"
+#       set -g default-terminal "xterm-256color"
+#       set -ga terminal-overrides ",*256col*:Tc"
+#       set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q'
+#       set-environment -g COLORTERM "truecolor"
+#
+# run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux

 set -g base-index 1
 set -g pane-base-index 1
@@ -18,17 +26,51 @@ set-option -g renumber-windows on
 bind '"' split-window -v -c "#{pane_current_path}"
 bind % split-window -h -c "#{pane_current_path}"

-unbind C-b
-set -g prefix C-Space
-bind C-Space send-prefix
 set -g mouse on

 bind -n M-H previous-window
 bind -n M-L next-window
+
+
+
+# Smart pane switching with awareness of Vim splits.
+# See: https://github.com/christoomey/vim-tmux-navigator
+
+# decide whether we're in a Vim process
+is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
+    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+
+bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
+bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
+bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
+bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
+
+tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
+
+if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
+    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
+if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
+    "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
+
+bind-key -n 'C-Space' if-shell "$is_vim" 'send-keys C-Space' 'select-pane -t:.+'
+
+bind-key -T copy-mode-vi 'C-h' select-pane -L
+bind-key -T copy-mode-vi 'C-j' select-pane -D
+bind-key -T copy-mode-vi 'C-k' select-pane -U
+bind-key -T copy-mode-vi 'C-l' select-pane -R
+bind-key -T copy-mode-vi 'C-\' select-pane -l
+bind-key -T copy-mode-vi 'C-Space' select-pane -t:.+
   '';

-   plugins = [
-    pkgs.tmuxPlugins.catppuccin
+   plugins = with pkgs.tmuxPlugins; [
+      catppuccin {
+        plugin = catppuccin;
+        extraConfig = ''
+        set -g @plugin 'catppuccin/tmux#2.1.3'
+         set -g @catppuccin_window_status_style "rounded"
+         set -g @catppuccin_flavor 'mocha'
+        '';
+      }
 #    pkgs.tmuxPlugins.vim-tmux-navigator
   ];
 };
--- a/packages/waybar/config
+++ b/packages/waybar/config
@@ -3,9 +3,9 @@
  "position": "top",
  "height": 38,
  "spacing": 0,
-  "modules-left": ["clock", "hyprland/workspaces", "hyprland/submap"],
+  "modules-left": ["clock", "niri/workspaces", "hyprland/submap"],
  "modules-center": [ ],
-  "modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],
+  "modules-right": ["network", "battery", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],

 "custom/keyboard-layout": {
  "interval": 1,
--- a/packages/wpaperd/default.nix
+++ b/packages/wpaperd/default.nix
@@ -1,7 +1,6 @@
 { pkgs, config, lib,... }:
 {
  home.packages = with pkgs; [
-  wpaperd
  ];

  home.file =
--- a/push.sh
+++ b/push.sh
@@ -9,4 +9,4 @@ fi
 sudo cp -r /etc/nixos/* .
 git add *
 git commit -m "$1"
-git push origin pc
+git push origin laptop
--- a/shells/arduino/flake.nix
+++ b/shells/arduino/flake.nix
@@ -0,0 +1,53 @@
+{
+  description = "Arduino";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        };
+      in
+        {
+        devShell =
+          with pkgs; mkShell rec {
+            buildInputs = [
+              arduino-ide
+              arduino-cli
+              # arduino-language-server
+
+              # (vscode-with-extensions.override {
+              #   vscode = vscodium;
+              #   vscodeExtensions = with vscode-extensions; [
+              #     ms-vscode.cpptools
+              #   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+              #     {
+              #       name = "vscode-arduino-community";
+              #       publisher = "vscode-arduino";
+              #       version = "0.7.2";
+              #       sha256 = "FvKCAHiebcBObSFXCftcFpsDrA1TUv7TqKftFNeLAPI=";
+              #     }
+              #     # {
+              #     #   name = "vscode-serial-monitor";
+              #     #   publisher = "microsoft";
+              #     #   version = "0.13.250616001";
+              #     #   sha256 = "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb";
+              #     # }
+              #   ];
+              # })
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/flutter/flake.lock
+++ b/shells/flutter/flake.lock
@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1721138476,
-        "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/shells/flutter/flake.nix
+++ b/shells/flutter/flake.nix
@@ -1,48 +1,101 @@
 {
-description = "Flutter 3.13.x";
-inputs = {
-  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-  flake-utils.url = "github:numtide/flake-utils";
-};
-outputs = { self, nixpkgs, flake-utils }:
-  flake-utils.lib.eachDefaultSystem (system:
-    let
-      pkgs = import nixpkgs {
-        inherit system;
-        config = {
-          android_sdk.accept_license = true;
-          allowUnfree = true;
-        };
-      };
-      buildToolsVersion = "34.0.0";
-      androidComposition = pkgs.androidenv.composeAndroidPackages {
-        buildToolsVersions = [ buildToolsVersion "28.0.3" ];
-        platformVersions = [ "34" "28" ];
-        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
-      };
-      androidSdk = androidComposition.androidsdk;
-    in
-    {
-      devShell =
-        with pkgs; mkShell rec {
-          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
-          buildInputs = [
-            flutter
-            androidSdk # The customized SDK that we've made above
-            jdk17
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";

-	
-  (vscode-with-extensions.override {
-    vscode = vscodium;
-    vscodeExtensions = with vscode-extensions; [
-	vscodevim.vim
-	dart-code.flutter
-jnoortheen.nix-ide
-      ];
-     }
-    )
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };

-          ];
-        };
-    });
+    android-nixpkgs.url = "github:tadfisher/android-nixpkgs";
+  };
+
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-parts,
+    ...
+  } @ inputs:
+    flake-parts.lib.mkFlake {inherit inputs;} {
+      systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
+      perSystem = {
+        pkgs,
+        system,
+        lib,
+        ...
+      }: {
+        devShells.default = let
+          pkgs = import nixpkgs {
+            inherit system;
+            config = {
+              allowUnfree = true;
+              android_sdk.accept_license = true;
+            };
+            overlays = [];
+          };
+          android-nixpkgs = pkgs.callPackage inputs.android-nixpkgs {};
+          androidSdk = android-nixpkgs.sdk (sdkPkgs:
+            with sdkPkgs; [
+              cmdline-tools-latest
+              build-tools-34-0-0
+              build-tools-30-0-3
+              platform-tools
+              platforms-android-35
+              platforms-android-34
+              platforms-android-33
+              platforms-android-31
+              platforms-android-30
+              ndk-26-3-11579264
+              cmake-3-22-1
+            ]);
+          PWD = builtins.getEnv "PWD";
+          patchedFlutter = pkgs.flutter.override (prev: rec {
+            flutter = prev.flutter.overrideAttrs (prevAttrs: {
+              patches = prevAttrs.patches ++ [
+                # This patch is needed to avoid the Kotlin Gradle plugin writing to the store.
+                (pkgs.writeText "kotlin-fix.patch" ''
+                  --- a/packages/flutter_tools/gradle/build.gradle.kts
+                  +++ b/packages/flutter_tools/gradle/build.gradle.kts
+                  @@ -4,6 +4,8 @@
+
+                   import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+                  +gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
+                  +
+                   plugins {
+                       `java-gradle-plugin`
+                       groovy
+                '')
+              ];
+              passthru = prevAttrs.passthru // {
+                sdk = flutter;
+              };
+              # postInstall = (prevAttrs.postInstall or "") + ''
+              #   mkdir -p $out/bin/cache
+              #   touch $out/bin/cache/engine.realm
+              # '';
+            });
+          });
+        in
+          pkgs.mkShell {
+            ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+            ANDROID_NDK_ROOT = "${androidSdk}/libexec/android-sdk/ndk-bundle";
+            ANDROID_AVD_HOME = "${PWD}/.android/avd";
+            ANDROID_HOME = "${androidSdk}/libexec/android-sdk";
+            FLUTTER_SDK = "${patchedFlutter}";
+            GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/share/android-sdk/build-tools/34.0.0/aapt2";
+            buildInputs = with pkgs; [
+              patchedFlutter
+              jdk17
+              androidSdk
+              clang
+              dart
+              cmake
+              android-tools
+            ];
+          };
+        # formatter = pkgs.alejandra;
+      };
+    };
 }
--- a/shells/go/flake.nix
+++ b/shells/go/flake.nix
@@ -0,0 +1,33 @@
+{
+  description = "GO";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+      in
+        {
+        devShell =
+          with pkgs; mkShell rec {
+            # ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+            GOPATH="${go}";
+            buildInputs = [
+              go
+              gopls
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/rust/flake.nix
+++ b/shells/rust/flake.nix
@@ -0,0 +1,74 @@
+{
+  description = "Rust development environment";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        # Read the file relative to the flake's root
+        # overrides = (builtins.fromTOML (builtins.readFile (self + "/rust-toolchain.toml")));
+        libPath = with pkgs; lib.makeLibraryPath [
+          # load external libraries that you need in your rust project here
+        ];
+      in
+      {
+        devShells.default = pkgs.mkShell rec {
+          nativeBuildInputs = [ pkgs.pkg-config ];
+          buildInputs = with pkgs; [
+            clang
+            llvmPackages.bintools
+            rustup
+            dioxus-cli
+            webkitgtk_4_1
+            wasm-pack
+            wasm-bindgen-cli
+            curl
+            wget
+            file
+            openssl
+            gtk3
+            librsvg
+            xdotool
+            rustfmt
+          ];
+
+          # RUSTC_VERSION = overrides.toolchain.channel;
+
+          # https://github.com/rust-lang/rust-bindgen#environment-variables
+          LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
+
+          shellHook = ''
+            export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
+            export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/
+          '';
+
+          # Add precompiled library to rustc search path
+          RUSTFLAGS = (builtins.map (a: ''-L ${a}/lib'') [
+            # add libraries here (e.g. pkgs.libvmi)
+          ]);
+
+          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (buildInputs ++ nativeBuildInputs);
+
+
+          # Add glibc, clang, glib, and other headers to bindgen search path
+          BINDGEN_EXTRA_CLANG_ARGS =
+          # Includes normal include path
+          (builtins.map (a: ''-I"${a}/include"'') [
+            # add dev libraries here (e.g. pkgs.libvmi.dev)
+            pkgs.glibc.dev
+          ])
+          # Includes with special directory paths
+          ++ [
+            ''-I"${pkgs.llvmPackages_latest.libclang.lib}/lib/clang/${pkgs.llvmPackages_latest.libclang.version}/include"''
+            ''-I"${pkgs.glib.dev}/include/glib-2.0"''
+            ''-I${pkgs.glib.out}/lib/glib-2.0/include/''
+          ];
+        };
+      }
+    );
+}
Author	SHA1	Message	Date
nico	1cac4ca84d	now fuzzel and so on. Idk what happened last time	2025-08-24 14:54:50 +02:00
Nico	1b56d25e41	arduino flake	2025-06-23 15:29:28 +02:00
Nico	10bf6d204c	yes	2025-06-16 01:08:44 +02:00
Nico	e3c6e694f1	added shells	2025-05-25 21:35:28 +02:00
Nico	efae880e63	tried to get tmux to work. Didnt work	2025-05-25 21:25:55 +02:00
Nico	4d252c9880	cleaned up all neovim things and added rust and go forgot go keybinds ig	2025-05-25 00:17:53 +02:00
Nico	4ed9152f57	working flutter flake and nivm tabby	2025-05-10 23:33:59 +02:00
Nico	c1da805aad	neovim update; removed unused files; dont now what else. whoops	2025-05-05 20:09:34 +02:00
nico	981a2edcb4	nix ig	2025-03-31 15:15:23 +02:00
nico	aef0a291da	nvim dap	2025-03-31 15:01:05 +02:00
Nico	a9fc101532	initW	2025-03-31 00:07:38 +02:00
Nico	c45866e66e	init	2025-03-31 00:04:25 +02:00
				`@@ -1 +0,0 @@`
				`return { "catppuccin/nvim", name = "catppuccin", priority = 1000 }`
				`@@ -1 +0,0 @@`
				`return { "brenoprata10/nvim-highlight-colors", name = "highlight-colotrs" }`
				`@@ -0,0 +1 @@`
				`return { 'echasnovski/mini.animate', version = '*' }`