Merge branch 'pc' of ssh://server/nico/nix-files into pc

Waybar fixes
Merge branch 'pc' of server:/nico/nix-files into pc
2026-02-13 20:35:28 +01:00 · 2026-02-13 20:35:03 +01:00 · 2026-02-07 17:12:19 +01:00 · 2026-01-26 21:12:31 +01:00 · 2026-01-11 21:19:17 +01:00 · 2025-12-19 15:22:07 +01:00
76 changed files with 3045 additions and 1524 deletions
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,70 +1,77 @@
-# 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
-      ./packages/zen/zen-mod.nix
-    ];
-
+ ];

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

-  # nixpkgs.config.permittedInsecurePackages = [
-  #   "electron-33.4.11"
-  # ];
-
  # hyprland
-  programs.hyprland = {
-      enable = false;
-    xwayland.enable = true;
-  };
-
-  programs.niri.enable = true;
-
-  boot.supportedFilesystems = [ "ntfs" ];
-
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  security.polkit.enable = true;
-  nix.settings.trusted-users = [ "root" "n" ];
+ # programs.hyprland = {
+ #   enable = true;
+ #   xwayland.enable = true;
+ # };

+ programs.niri.enable = true;

  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+boot.loader.systemd-boot.enable = true;
+boot.loader.efi.canTouchEfiVariables = true;
+boot.loader.grub.useOSProber = 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.
+fileSystems."mnt/win" = {
+  device = "/dev/disk/by-partuuid/8d0a8dd9-7a4c-4d3e-a5eb-98c0aed35db5";
+  fsType = "ntfs-3g";
+  options = ["rw" "uid=1000"];
+};

-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+# hibernation
+swapDevices = [
+  {
+    device = "/var/lib/swapfile";
+    size = 16 * 1024;
+  }
+];
+
+boot.resumeDevice = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31";
+
+powerManagement.enable = true;
+
+  # Flakes
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  # 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
+  boot.kernelParams = [ "ipv6.disable=1" "resume_offset=94015488"];
  networking.networkmanager.enable = true;
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
+  networking.hostName = "nixos"; # Define your hostname.
+  networking.enableIPv6  = false;

-  services.resolved = {
-    enable = true;
-  };
-
-  services.mullvad-vpn.enable = true;
-  # services.teamviewer.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;

  # Set your time zone.
  time.timeZone = "Europe/Berlin";
@@ -72,197 +79,173 @@
  # Select internationalisation properties.
  i18n.defaultLocale = "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";
+  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";
  };

+  # Enable the X11 windowing system. You can disable this if you're only using the Wayland session.
+ 	  services.xserver = {
+	    enable = true;
+	    desktopManager = {
+	      xterm.enable = false;
+	      xfce.enable = false;
+	    };
+	  };

-  # Enable the X11 windowing system.
-  services.xserver = {
+  xdg.portal = {
    enable = true;
-    desktopManager = {
-      xterm.enable = false;
-      xfce.enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-gnome
+    ];
+    config = {
+      common = {
+        default = [ "gtk" ];
+      };
+      niri = {
+        # default = [
+        #   "gtk"
+        #   "gnome"
+        # ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
+        "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
+      };
    };
  };
-  # services.displayManager.defaultSession = "xfce";

-  # Enable the XFCE Desktop Environment.
+
+  # Enable the KDE Plasma Desktop Environment.
  services.displayManager.sddm.enable = true;
-  services.displayManager.ly.enable = false;
-  services.displayManager.lemurs.enable = false;
-  services.desktopManager.plasma6.enable = false;
+    services.displayManager.ly.enable = false;
+   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 = {
-      variant = "";
-      layout = "de";
-    };
+  services.xserver = { xkb.layout = "us"; xkb.variant = "";
  };

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

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

  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
+ services.pulseaudio.enable = false;
+ security.rtkit.enable = true; 
+ services.pipewire = {
    enable = true; 
    alsa.enable = true; 
    alsa.support32Bit = true; 
    pulse.enable = true;
-    wireplumber.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.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,
-    # nor 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.libinput.enable = true;
-
-  programs.light.enable = true;
-
-  programs.zsh.enable = true;
-#  programs.nushell.enable = true;
-
-  programs.adb.enable = true;
-
+  systemd.user.services.orca.enable = false;
+  # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable 
+  # = true;
+services.mullvad-vpn.enable = true;
+  services.mullvad-vpn.package = pkgs.mullvad-vpn;
  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.n = {
-    isNormalUser = true;
-    description = "n";
-    extraGroups = [ "networkmanager" "wheel" "video" "adbusers" "input" "docker" "dialout"];
-    packages = with pkgs; [
-      obsidian
+  users.users.nico = { isNormalUser = true; description = "nico"; extraGroups = [ "networkmanager" 
+    "wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [
    ];
-    shell = pkgs.zsh;
  };

-
-
-  # Install firefox.
-  programs.firefox.enable = true;
-  services.flatpak.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+  environment.shells = with pkgs; [ zsh nushell ];
+  programs.zsh.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
-  
-  environment.systemPackages = with pkgs; [
-
-     # pkgs.teamviewer
-   pkgs.devenv
-   pkgs.vim 
-   pkgs.wget
-   pkgs.git
-   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
-
+  services.udev.packages = [ 
+    pkgs.platformio-core
+    pkgs.openocd
  ];

-  services.gnome.gnome-keyring.enable = true;
+# services.flatpak.enable = true;
+programs.nix-ld.enable = true;

-  # programs.sway = {
-  #   enable = true;
-  #   wrapperFeatures.gtk = true;
-  # };
+  # List packages installed in system profile. To search, run: $ nix search wget
+  environment.systemPackages = with pkgs; [
+    # grayjay
+    signal-desktop
+    obsidian
+    discord
+    anki
+    grayjay
+    lutris
+    qbittorrent
+    vim 
+    wget
+    git
+    tree
+    ntfs3g
+    heroic
+    wineWowPackages.stable
+    sshfs
+    devenv

+    # 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
+  ];

-  #fonts
 fonts.packages = with pkgs; [
-  #iosevka
-#  (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
+#  iosevka
+  # (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
  nerd-fonts.jetbrains-mono
  nerd-fonts.ubuntu-mono
 ];

+hardware.amdgpu.opencl.enable = 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;
+  programs.steam = {
+    enable = true;
+  };
+	  services.gnome.gnome-keyring.enable = true;
+
+  programs.sway = {
+    enable = false;
+    wrapperFeatures.gtk = true;
+  };
+
+
+#   programs.hyprland = {
+#    enable = true;
+#    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+#  };
+
+
+  # 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;
+  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 = { 
-    enable = true;
+    enable = false;
    allowedTCPPortRanges = [ 
      { from = 1714; to = 1764; } # KDE Connect
    ];  
@@ -272,12 +255,11 @@ fonts.packages = with pkgs; [
  };  


-  # 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?
+  # 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?

 }
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,39 @@
        "type": "github"
      }
    },
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1767750947,
+        "narHash": "sha256-zqe9esphlAFu19TGL/nAyOHyOiR+Vu8M2IWWLg9cm4U=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "e7135074fe2a3d17bee3c229b5a7d3da26f76ce8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
+    "crane": {
+      "locked": {
+        "lastModified": 1765145449,
+        "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@@ -56,6 +89,21 @@
        "url": "https://git.lix.systems/lix-project/flake-compat.git"
      }
    },
+    "flake-compat_2": {
+      "locked": {
+        "lastModified": 1765121682,
+        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@@ -83,6 +131,27 @@
          "nixpkgs"
        ]
      },
+      "locked": {
+        "lastModified": 1767802041,
+        "narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "bdaa3743831168787f528570f2b87963e72a2f23",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "zen-browser",
+          "nixpkgs"
+        ]
+      },
      "locked": {
        "lastModified": 1767104570,
        "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
@@ -150,6 +219,83 @@
      }
    },
    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1767116409,
+        "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cad22e7d996aea55ecab064e84834289143e44a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1767640445,
+        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1767364772,
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1767379071,
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1765772535,
+        "narHash": "sha256-I715zWsdVZ+CipmLtoCAeNG0etQywiWRE5PaWntnaYk=",
+        "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre911985.09b8fda8959d/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1766902085,
        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
@@ -165,37 +311,21 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1764081664,
-        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nvf": {
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
        "mnw": "mnw",
        "ndg": "ndg",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1767123832,
-        "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=",
+        "lastModified": 1767766515,
+        "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "0390abd6736ff34a016afc66366d1f46372f28de",
+        "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4",
        "type": "github"
      },
      "original": {
@@ -207,12 +337,55 @@
    "root": {
      "inputs": {
        "ags": "ags",
+        "catppuccin": "catppuccin",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
        "nvf": "nvf",
+        "spicetify-nix": "spicetify-nix",
+        "zed": "zed",
        "zen-browser": "zen-browser"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "zed",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1765465581,
+        "narHash": "sha256-fCXT0aZXmTalM3NPCTedVs9xb0egBG5BOZkcrYo5PGE=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "99cc5667eece98bb35dcf35f7e511031a8b7a125",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "spicetify-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1767502559,
+        "narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1681028828,
@@ -228,22 +401,57 @@
        "type": "github"
      }
    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
+    "systems_2": {
      "locked": {
-        "lastModified": 1766377218,
-        "narHash": "sha256-y3g3OqPB0tmRjbHJNnJKivSQRtAJR+/9S1xbxBWEatg=",
-        "owner": "youwen5",
-        "repo": "zen-browser-flake",
-        "rev": "2f61341b32dd69c07e147188e67e09ba2bb99c33",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
-        "owner": "youwen5",
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "zed": {
+      "inputs": {
+        "crane": "crane",
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": "nixpkgs_6",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1767801498,
+        "narHash": "sha256-BKzeTqSo1hTnxmjQSiQzERg2+NOYAHCibUVsQ49Ztgg=",
+        "owner": "zed-industries",
+        "repo": "zed",
+        "rev": "69acab7f81950588ea0bb0ab73f4f28df1c05931",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zed-industries",
+        "repo": "zed",
+        "type": "github"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_7"
+      },
+      "locked": {
+        "lastModified": 1767763594,
+        "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
        "repo": "zen-browser-flake",
        "type": "github"
      }
--- a/flake.nix
+++ b/flake.nix
@@ -13,17 +13,19 @@

    nvf.url = "github:notashelf/nvf";

-    zen-browser = {
-      url = "github:youwen5/zen-browser-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";

+    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
+
+    zed.url = "github:zed-industries/zed";
+
+    catppuccin.url = "github:catppuccin/nix";
  };

-  outputs = { self, nixpkgs, nvf, zen-browser, ... }@inputs:
+  outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, catppuccin, ... }@inputs:
  let system = "x86_64-linux"; in
  {
-    nixosConfigurations.my-nixos = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
      inherit system;
      specialArgs = {
        inherit inputs;
@@ -32,10 +34,9 @@
        ./configuration.nix
        # inputs.zen-browser.packages."${system}".default
 #        nvf.homeManagerModules.default
+        # inputs.zed.packages."${system}".default
+        catppuccin.nixosModules.catppuccin
        inputs.home-manager.nixosModules.default
-      # {
-      #   home.packages = with inputs; [ zen-browser.packages.${system}.zen-browser ];
-      # }
      ];
    };
  };
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,18 +8,18 @@
    [ (modulesPath + "/installer/scan/not-detected.nix")
    ];

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

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1d64861a-3d30-4b76-8a19-9a68618ddf3a";
+    { device = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31";
      fsType = "ext4";
    };

  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/580D-111D";
+    { device = "/dev/disk/by-uuid/CB01-5AA6";
      fsType = "vfat";
      options = [ "fmask=0022" "dmask=0022" ];
    };
@@ -31,9 +31,8 @@
  # 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.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;

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

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

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

-    nixpkgs = {
+  nixpkgs = {
    config = {
      allowUnfree = true;
      allowUnfreePredicate = (_: true);
@@ -18,15 +20,80 @@

  home.packages = with pkgs; [
    # floorp
-#    freetube
  ];
-  # programs.zen-browser = {
-  #   enable = true;
-  # };
+
+  programs.zen-browser.enable = true;
+
+  catppuccin = {
+    enable = true;
+    accent = "mauve";
+    flavor = "mocha";
+  };
+
+  home.pointerCursor = 
+    let 
+      getFrom = url: hash: name: {
+          gtk.enable = true;
+          x11.enable = true;
+          name = name;
+          size = 48;
+          package = 
+            pkgs.runCommand "moveUp" {} ''
+              mkdir -p $out/share/icons
+              ln -s ${pkgs.fetchzip {
+                url = url;
+                hash = hash;
+              }} $out/share/icons/${name}
+          '';
+        };
+    in
+      getFrom 
+        "https://github.com/ful1e5/banana-cursor/releases/download/v2.0.0/Banana-Blue.tar.xz"
+        # "https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz"
+        "sha256-IZ6sidRjcg0r+E2eFlVfIouTpKWndvrZlCNNYZMQJE0="
+        "Banana-Blue";
+
+
+
+
+
+  programs.spicetify =
+    let
+    spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+  in
+  {
+    enable = false;
+    theme = spicePkgs.themes.catppuccin;
+    colorScheme = "mocha";
+
+    enabledExtensions = with spicePkgs.extensions; [
+      keyboardShortcut
+      wikify
+      songStats
+      betterGenres
+      hidePodcasts
+      fullScreen
+    ];
+    enabledCustomApps = with spicePkgs.apps; [
+        lyricsPlus
+    ];
+  };

  home.stateVersion = "24.05";

-
  programs.home-manager.enable = true;

+  # options = {
+  #   services.zed = {
+  #     enable = lib.mkEnableOption "Zed Editor";
+  #   };
+  # };
+  #
+  # config = lib.mkIf config.services.zed.enable {
+  #   environment.systemPackages = [
+  #     inputs.zed.packages.${system}.default
+  #     pkgs.nixd  # System-wide Nix LSP installation
+  #   ];
+  # };
 }
+
--- a/packages/alacritty/alacritty.toml
+++ b/packages/alacritty/alacritty.toml
@@ -1,3 +0,0 @@
-general.import = [
-   "/etc/nixos/packages/alacritty/catppuccin-mocha.toml"
-]
--- a/packages/alacritty/alacritty.toml~
+++ b/packages/alacritty/alacritty.toml~
@@ -1,3 +0,0 @@
-general.import = [
-   "~/.config/alacritty/catppuccin-mocha.toml"
-]
--- a/packages/alacritty/catppuccin-mocha.toml
+++ b/packages/alacritty/catppuccin-mocha.toml
@@ -1,65 +0,0 @@
-[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
@@ -1,12 +0,0 @@
-{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~
@@ -1,13 +0,0 @@
-{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,24 +2,21 @@
 {
  imports = [
 #    ./ags
-    ./fuzzel
    ./other
-    # ./sway
-    # ./swaync
+    # ./floorp
+    ./sway
+    ./swaync
    ./waybar
    ./wpaperd
    ./nvim
-    ./zed-editor
    # ./emacs
    ./terminal
    ./rofi
-    # ./alacritty
-    # ./tmux
-   # ./mako
-#    ./qutebrowser
-    # ./hyprland
+    ./fuzzel
    ./niri
+    ./hyprland
+    ./zed-editor
+    ./tmux
 #    ./vscode
-    # ./zen
  ];
 }
--- a/packages/default.nix~
+++ b/packages/default.nix~
@@ -0,0 +1,16 @@
+{ ... }:
+{
+  imports = [
+#    ./ags
+    ./other
+    ./sway
+    ./waybar
+    ./wpaperd
+    ./nvim
+    ./emacs
+    ./kitty
+    ./rofi
+#    ./hyprland
+#    ./vscode
+  ];
+}
--- a/packages/emacs/default.nix~
+++ b/packages/emacs/default.nix~
@@ -12,7 +12,6 @@ in {
 (telephone-line-mode 1)
 (xterm-mouse-mode 1)

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

 (menu-bar--display-line-numbers-mode-relative)
@@ -233,14 +232,13 @@ 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; [
-  catppuccin-theme
+      ++ (with epkgs.melpaPackages; [
 	evil
 	nix-mode
  lsp-treemacs
@@ -260,7 +258,6 @@ 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/nixpkgs-unstable";
+  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
  flake-utils.url = "github:numtide/flake-utils";
 };
 outputs = { self, nixpkgs, flake-utils }:
@@ -14,18 +14,46 @@ outputs = { self, nixpkgs, flake-utils }:
          allowUnfree = true;
        };
      };
-      androidSdk = pkgs.androidenv.androidSdk
+      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
+            androidSdk # The customized SDK that we've made above
            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~
@@ -0,0 +1,60 @@
+{
+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/floorp/default.nix
+++ b/packages/floorp/default.nix
@@ -0,0 +1,44 @@
+{ inputs, pkgs, config, lib,... }:
+{
+ home.packages = with pkgs; [
+
+ ];
+
+  programs.floorp = {
+    enable = true;
+    profiles.default = {
+      extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [
+        ublock-origin
+        vimium
+        darkreader
+        sidebery
+        bitwarden
+      ];
+      # extensions.force.settings = {
+      #   dark-reader = {
+      #
+      #   };
+      # };
+
+      extensions.force.settings.sidebery = {
+        # Beispielhafte Einstellungen für Sidebery
+        "showInSidebar" = true;  # Stelle sicher, dass Sidebery in der Sidebar angezeigt wird
+        "showOtherExtensions" = false;  # Verstecke andere Extensions
+      };
+
+      settings = {
+
+        "ui.systemUsesDarkTheme" = 1;
+        "floorp.delete.browser.border" = true;
+        "floorp.chrome.theme.mode" = 2;
+        "floorp.browser.tabbar.settings" = 2;
+        "floorp.Tree-type.verticaltab.optimization" = true;
+        "floorp.bookmarks.bar.focus.mode" = true;
+      };
+    };
+  };
+
+
+
+
+}
--- a/packages/fuzzel/default.nix
+++ b/packages/fuzzel/default.nix
@@ -7,7 +7,7 @@
 ];


-home.file."/home/n/.config/fuzzel/fuzzel.ini" = {
+home.file."/home/nico/.config/fuzzel/fuzzel.ini" = {
  source = ./fuzzel.ini;
 };

--- a/packages/fuzzel/fuzzel.ini
+++ b/packages/fuzzel/fuzzel.ini
@@ -1,7 +1,6 @@
 dpi-aware=yes
-font=RobotoMonoNerdFont-Thin:size=8
+font=RobotoMonoNerdFont-Thin:size=12
 terminal=ghostty
-width=30
 layer=overlay
 exit-on-keyboard-focus-loss=no
 inner-pad=15
--- a/packages/hyprland/keybinds.conf
+++ b/packages/hyprland/keybinds.conf
@@ -67,8 +67,6 @@ 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,6 +1,10 @@
 input {
    kb_layout = us,de
-    kb_options=grp:alt_space_toggle
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+    kb_options=alt_space_toggle

    follow_mouse = 1

--- a/packages/kitty/default.nix
+++ b/packages/kitty/default.nix
@@ -45,14 +45,13 @@ 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";
+    update = "sudo nixos-rebuild switch";
    emacs = "emacs -nw";
-    femacs = "emacs -nw --load /etc/nixos/packages/emacs/flutter/init.el";
+    femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
  };
  zplug = {
@@ -72,7 +71,7 @@ programs.zsh = {


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

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

 ];

-
-
-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;

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

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


 programs.zsh = {
@@ -51,7 +28,7 @@ programs.zsh = {
  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";
+    femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
    pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
  };
  zplug = {
@@ -83,7 +60,6 @@ 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
@@ -1,9 +0,0 @@
-# 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
@@ -1,12 +0,0 @@
-{ 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
@@ -1,3 +1,20 @@
+cursor {
+    xcursor-theme "Banana-Blue"
+    xcursor-size 30
+}
+
+// Mod+O Overview
+// Make workspaces four times smaller than normal in the overview.
+overview {
+    zoom 0.5
+    backdrop-color "#1e1e2e"
+}
+
+// Disable hotkey overlay at startup:
+hotkey-overlay {
+    skip-at-startup
+}
+
 // 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:
@@ -13,8 +30,8 @@ input {
            // For more information, see xkeyboard-config(7).

            // For example:
-            layout "us,de"
-            options "grp:alt_shift_toggle"
+            // layout "us,ru"
+            // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
        }

        // Enable numlock on startup, omitting this setting disables it.
@@ -63,14 +80,13 @@ input {
    // 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" {
+/-output "eDP-1" {
    // Uncomment this line to disable this output.
    // off

@@ -80,10 +96,10 @@ output "eDP-1" {
    // 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"
+    mode "1920x1080@120.030"

    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
-    scale 1
+    scale 2

    // Transform allows to rotate the output counter-clockwise, valid values are:
    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
@@ -98,14 +114,7 @@ output "eDP-1" {
    // 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=0 y=0
-}
-
-output "HDMI-A-1" {
-    mode "1920x1080"
-    scale 1
-    transform "normal"
-    position x=1920 y=0
+    position x=1280 y=0
 }

 // Settings that influence how windows are positioned and sized.
@@ -210,7 +219,7 @@ layout {
    // You can enable drop shadows for windows.
    shadow {
        // Uncomment the next line to enable shadows.
-        // on
+//        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.
@@ -252,7 +261,7 @@ layout {
    struts {
        // left 64
        // right 64
-        // top 64
+        top -6
        // bottom 64
    }
 }
@@ -277,7 +286,7 @@ environment {
 // 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
+prefer-no-csd

 // You can change the path where screenshots are saved.
 // A ~ at the front will be expanded to the home directory.
@@ -295,7 +304,7 @@ animations {
    // off

    // Slow down all animations by this factor. Values below 1 speed them up instead.
-    // slowdown 3.0
+    slowdown 0.8
 }

 // Window rules let you adjust behavior for individual windows.
@@ -371,8 +380,10 @@ binds {
    // 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"; }
+    // Mod+M hotkey-overlay-title="Run an Application: rofi" { spawn "rofi" "-show" "drun"; }
    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"; }
+    Super+E hotkey-overlay-title="Umlaute" { spawn "bash" "-c" "echo 'aä\noö\nuü\nsß\nAÄ\nOÖ\nUÜ' | fuzzel -d | tr -d '\n aousAOU' | 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.
@@ -383,8 +394,6 @@ binds {
    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.
--- a/packages/niri/default.nix
+++ b/packages/niri/default.nix
@@ -2,12 +2,12 @@
 {
 home.packages = with pkgs; [
  xwayland-satellite
-  xdg-desktop-portal-gtk
-  xdg-desktop-portal-gnome
+  # xdg-desktop-portal-gtk
+  # xdg-desktop-portal-gnome
  nautilus
 ];

-  home.file."/home/n/.config/niri/config.kdl" = {
+  home.file."/home/nico/.config/niri/config.kdl" = {
    source = ./config.kdl;
  };
 }
--- a/packages/nvim/default.nix
+++ b/packages/nvim/default.nix
@@ -17,7 +17,7 @@ programs.neovim = {
  enable = true;
  vimAlias = true;
 };
-
+catppuccin.nvim.enable = false;

 programs.neovim.plugins = [
  pkgs.vimPlugins.lazy-nvim
@@ -59,6 +59,10 @@ programs.neovim.plugins = [
    ".config/nvim/lua/plugins/conform.lua".source = ./lua/plugins/conform.lua;
    ".config/nvim/lua/plugins/nvim-tree.lua".source = ./lua/plugins/nvim-tree.lua;
    ".config/nvim/lua/plugins/notify.lua".source = ./lua/plugins/notify.lua;
+    # ".config/nvim/lua/plugins/rest.lua".source = ./lua/plugins/rest.lua;
+    ".config/nvim/lua/plugins/neominimap.lua".source = ./lua/plugins/neominimap.lua;
+    ".config/nvim/lua/plugins/vim-tmux-navigator.lua".source = ./lua/plugins/vim-tmux-navigator.lua;
+    # ".config/nvim/lua/plugins/workspaces.lua".source = ./lua/plugins/workspaces.lua;

    # ".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua;
    # ".config/nvim/lua/plugins/typst.lua".source = ./lua/plugins/typst.lua;
--- a/packages/nvim/init.lua
+++ b/packages/nvim/init.lua
@@ -46,8 +46,8 @@ end, { noremap = true, silent = true })
 -- Lazy
 require("config.lazy")

-require("catppuccin").setup({})
-vim.cmd.colorscheme("catppuccin")
+-- require("catppuccin").setup({})
+-- vim.cmd.colorscheme("catppuccin")

 -- css colors
 vim.opt.termguicolors = true
@@ -57,7 +57,6 @@ require("nvim-highlight-colors").setup({})
 require("lualine").setup()
 require("dapui").setup()
 require("ibl").setup()
-require("telescope").load_extension("flutter")
 require("toggleterm").setup({})
 require("mini.animate").setup()
 require('nvim-autopairs').enable()
@@ -110,17 +109,17 @@ 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")
 -- Love binds
 vim.keymap.set("n", "<leader>lr", ":LoveRun<CR>", { desc = "Love run" })
 -- 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" })
--- a/packages/nvim/lua/plugins/arduino.lua
+++ b/packages/nvim/lua/plugins/arduino.lua
@@ -1,7 +0,0 @@
-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
@@ -14,5 +14,9 @@ return {
            indentscope_color = "",
        },
    }
-  }
+  },
+  config = function()
+	require("catppuccin").setup({})
+	vim.cmd.colorscheme("catppuccin")
+  end
 }
--- a/packages/nvim/lua/plugins/nvim-tmux-navigation.lua
+++ b/packages/nvim/lua/plugins/nvim-tmux-navigation.lua
@@ -1,17 +0,0 @@
-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/nvim-tree.lua
+++ b/packages/nvim/lua/plugins/nvim-tree.lua
@@ -10,6 +10,11 @@ return {
      view = {
        width = 30,
      },
+      renderer = {
+        indent_markers = {
+          enable = true;
+        }
+      }
    })
 	end,
 }
--- a/packages/nvim/lua/plugins/rest.lua
+++ b/packages/nvim/lua/plugins/rest.lua
@@ -0,0 +1,10 @@
+return {
+  "rest-nvim/rest.nvim",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter",
+    opts = function (_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      table.insert(opts.ensure_installed, "http")
+    end,
+  }
+}
--- a/packages/nvim/lua/plugins/telescope.lua
+++ b/packages/nvim/lua/plugins/telescope.lua
@@ -1,4 +1,16 @@
 return {
-    "nvim-telescope/telescope-file-browser.nvim",
-    dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }
+	"nvim-telescope/telescope-file-browser.nvim",
+	dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" },
+
+	config = function()
+    local telescope = require("telescope")
+		telescope.load_extension("flutter")
+		local builtin = require("telescope.builtin")
+		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" })
+	end,
 }
--- a/packages/nvim/lua/plugins/vim-tmux-navigator.lua
+++ b/packages/nvim/lua/plugins/vim-tmux-navigator.lua
@@ -0,0 +1,18 @@
+return {
+  "christoomey/vim-tmux-navigator",
+  cmd = {
+    "TmuxNavigateLeft",
+    "TmuxNavigateDown",
+    "TmuxNavigateUp",
+    "TmuxNavigateRight",
+    "TmuxNavigatePrevious",
+    "TmuxNavigatorProcessList",
+  },
+  keys = {
+    { "<c-h>", "<cmd><C-U>TmuxNavigateLeft<cr>" },
+    { "<c-j>", "<cmd><C-U>TmuxNavigateDown<cr>" },
+    { "<c-k>", "<cmd><C-U>TmuxNavigateUp<cr>" },
+    { "<c-l>", "<cmd><C-U>TmuxNavigateRight<cr>" },
+    { "<c-\\>", "<cmd><C-U>TmuxNavigatePrevious<cr>" },
+  },
+}
--- a/packages/nvim/lua/plugins/workspaces.lua
+++ b/packages/nvim/lua/plugins/workspaces.lua
@@ -0,0 +1,16 @@
+return {
+  "natecraddock/workspaces.nvim",
+  dependencies = {
+    "nvim-telescope/telescope.nvim",
+  },
+
+  config = function ()
+    require("workspaces").setup()
+    require("telescope").load_extension("workspaces");
+
+		vim.keymap.set("n", "<leader>w", "", { desc = "Open telescope workspaces" })
+		vim.keymap.set("n", "<leader>wa", ":WorkspacesAdd ", { desc = "Add workspace" })
+		vim.keymap.set("n", "<leader>wo", ":Telescope workspaces<CR>", { desc = "Show workspaces" })
+		vim.keymap.set("n", "<leader>wd", ":WorkspacesRemove ", { desc = "Remove workspace" })
+  end
+}
--- a/packages/other/#default.nix#
+++ b/packages/other/#default.nix#
@@ -1,16 +1,3 @@
-{ 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
@@ -15,10 +15,10 @@ set preview_images_method kitty

 programs.git = {
  enable = true;
-  settings = {
+  settings.user.name = "Nico";
+  settings.user.email = "nico@getmemy.coffee";
+  settings.extraConfig = {
    safe.directory = "/etc/nixos";
-    user.name = "Nico";
-    user.email = "nicovessen@gmail.com";
  };
 };

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

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



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

+catppuccin.rofi.enable = false;

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

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


    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
@@ -27,23 +33,6 @@
        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
@@ -55,10 +44,10 @@ input "type:touchpad" {
      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,37 +13,26 @@
      
      startup = [
        # Launch Firefox on start
-	{command = "wpaperd";}
-	{command = "wl-paste --watch cliphist store";}
+#	      {command = "wpaperd";}
      ];
    };


    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
@@ -55,10 +44,10 @@ input "type:touchpad" {
      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/swaync/default.nix
+++ b/packages/swaync/default.nix
--- a/packages/terminal/default.nix
+++ b/packages/terminal/default.nix
@@ -6,7 +6,6 @@
 ];


-
 programs.nushell = {
  enable = false;
  extraConfig = ''
@@ -29,6 +28,7 @@ programs.carapace = {
  enableNushellIntegration = true;
 };

+# programs.thefuck.enable = true;

 programs.starship.enable = true;

@@ -39,35 +39,61 @@ programs.zsh = {
  syntaxHighlighting.enable = true;

  shellAliases = {
-    # update = "sudo nixos-rebuild switch";
-    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
+    update = "sudo nixos-rebuild switch";
    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";
+    dvu = "devenv up";
+    dvs = "devenv shell";
  };

  initContent = ''
+    if [ "$TMUX" = "" ]; then exec tmux; fi
+    
    eval "$(starship init zsh)"
+
+    export NIX_LD=$(nix eval --impure --raw --expr 'let pkgs = import <nixpkgs> {}; NIX_LD = pkgs.lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker"; in NIX_LD')
+
+    export ZVM_VI_INSERT_ESCAPE_BINDKEY=jk
+    function zvm_after_init() {
+      bindkey "^[[1;5C" forward-word && bindkey "^[[1;5D" backward-word
+    }
+
+    autoload -U select-word-style
+    select-word-style bash
    '';

+
  zplug = {
    enable = false;
    plugins = [
-      { name = "zsh-users/zsh-autosuggestions"; } # Simple plugin installation
+      { name = "jeffreytse/zsh-vi-mode"; }
    ];
  };
-
  oh-my-zsh = {
-    enable = true;
-    plugins = [ ];
+    enable = false;
+    # plugins = [ "thefuck" ];
    # theme = "";
  };
+  plugins = [
+  {
+    name = "vi-mode";
+    src = pkgs.zsh-vi-mode;
+    file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
+  }
+];
 };


-programs.fzf = {
+
+programs.ghostty = {
  enable = true;
-  enableZshIntegration = true;
+};
+
+catppuccin.ghostty.enable = false;
+
+home.file."/home/nico/.config/ghostty/config" = {
+  source = ./ghostty-config;
 };

 programs.zoxide = {
@@ -75,15 +101,6 @@ programs.zoxide = {
  enableZshIntegration = true;
 };

-programs.ghostty = {
-  enable = true;
-};
-
-home.file."/home/n/.config/ghostty/config" = {
-  source = ./ghostty-config;
-};
-
-
 programs.kitty = {
  enable = true;
  
--- a/packages/terminal/ghostty-config
+++ b/packages/terminal/ghostty-config
@@ -1,24 +1,30 @@
-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
+# 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
+
+background-opacity = 0.8
+background-opacity-cells = true
+# background-blur = true
+theme = Catppuccin Mocha

 gtk-titlebar = false
+
--- a/packages/tmux/default.nix
+++ b/packages/tmux/default.nix
@@ -1,30 +1,66 @@
-{ pkgs, config, lib,... }:
+{ pkgs, config, lib, inputs, ... }:
 {
 home.packages = with pkgs; [
 ];

+  catppuccin.tmux = {
+    enable = true;
+    extraConfig = ''
+         set -g @catppuccin_window_status_style "rounded"
+    '';
+    flavor = "mocha";
+  };
+
 programs.tmux = {
   enable = true;
    terminal = "tmux-256color";
    disableConfirmationPrompt = true;
+    keyMode = "vi";
+    # newSession = true;
   extraConfig = ''
-# 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
+
+# unbind C-b
+# set -g prefix C-t
+# bind C-t send-prefix
+
+# vim-like pane resizing  
+bind -r C-k resize-pane -U
+bind -r C-j resize-pane -D
+bind -r C-h resize-pane -L
+bind -r C-l resize-pane -R
+
+unbind k     
+unbind j   
+unbind h   
+unbind l  
+
+# vim-like pane switching
+bind -r k select-pane -U 
+bind -r j select-pane -D 
+bind -r h select-pane -L 
+bind -r l select-pane -R 
+
+# and now unbind keys
+unbind Up     
+unbind Down   
+unbind Left   
+unbind Right  
+
+
+unbind C-Up   
+unbind C-Down 
+unbind C-Left 
+unbind C-Right

 set -g base-index 1
 set -g pane-base-index 1
 set-window-option -g pane-base-index 1
 set-option -g renumber-windows on

-bind '"' split-window -v -c "#{pane_current_path}"
-bind % split-window -h -c "#{pane_current_path}"
+unbind s
+bind s split-window -v -c "#{pane_current_path}"
+unbind x
+bind x split-window -h -c "#{pane_current_path}"

 set -g mouse on

@@ -32,45 +68,32 @@ bind -n M-H previous-window
 bind -n M-L next-window


+# set vi-mode
+set-window-option -g mode-keys vi
+# keybindings
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
+bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel

-# 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 = 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'
-        '';
-      }
+   # vim-tmux-navigator {
+   #  plugin = vim-tmux-navigator;
+   # }
+   # tmux-which-key {
+   #  plugin = tmux-which-key;
+   # }
+      # 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
@@ -5,17 +5,40 @@
  "spacing": 0,
  "modules-left": ["clock", "niri/workspaces"],
  "modules-center": [ ],
-  "modules-right": ["network", "battery", "cpu", "memory", "custom/notification", "pulseaudio", "tray"],
+  "modules-right": [
+    "network",
+    "custom/separator",
+    "cpu",
+    "custom/separator",
+    "memory",
+    "custom/separator",
+    "custom/notification",
+    "custom/separator",
+    "pulseaudio",
+    "custom/separator",
+    "tray"
+  ],

-"custom/keyboard-layout": {
-  "interval": 1,
-  "exec": "hyprctl devices -j |  jq -r '.keyboards[] | .active_keymap' |  head -n1 |  cut -c1-2 |  tr 'a-z' 'A-Z'"
-},
+  "tray": {
+    "spacing": 10,
+    "show-passive-items": true
+  },

-"custom/notification": {
-  "on-click": "swaync-client -t",
-  "format": "♥"
-},
+  "custom/keyboard-layout": {
+    "interval": 1,
+    "exec": "hyprctl devices -j |  jq -r '.keyboards[] | .active_keymap' |  head -n1 |  cut -c1-2 |  tr 'a-z' 'A-Z'"
+  },
+
+  "custom/separator": {
+    "format": "|",
+    "interval": "once",
+    "tooltip": false
+  },
+
+  "custom/notification": {
+    "on-click": "swaync-client -t",
+    "format": "♥"
+  },

  "cpu": {
    "interval": 5,
@@ -29,7 +52,7 @@


  "pulseaudio": {
-    "format": "{icon}   {volume}%",
+    "format": "{icon}    {volume}%",
    "format-muted": " Muted",
    "format-icons": ["", "", ""]
  },
@@ -39,24 +62,12 @@
  },

  "network": {
-    "format-wifi": "   {essid} {signalStrength}%",
-    "format-disconnected": "  No Connection"
-  },
-  
-  "battery": {
-    "format": "{capacity}% {icon}",
-//    "format-icons": [, ""]
-      "format-icons": {
-        "default": [ "", "", "" ],
-        "charging": [ "" ],
-        "warning": "",
-        "critical": ""
-      },
-
-      "states": {
-        "warning": 20,
-        "critical": 10
-      }
+    "interval": 1,
+    "format": "{ifname}",
+    "format-wifi": " {signalStrength}%   {bandwidthDownBytes}  {bandwidthUpBytes} {ipaddr} {essid}",
+    "format-disconnected": "No Connection",
+    "format-ethernet": " {bandwidthDownBytes}   {bandwidthUpBytes}   {ipaddr}"
  }

+
 }
--- a/packages/waybar/style.css
+++ b/packages/waybar/style.css
@@ -11,7 +11,8 @@

 window#waybar {
 /*	background: rgba(0,130,130,0); */
-	background: @base;
+	/* background: rgba(0,0,0,0.9); */
+	background: transparent;
 }

 #clock,
@@ -25,14 +26,22 @@ window#waybar {
 #custom-notification,
 #tray,
 #battery{
-	background: rgba(10,10,10,100);
-	opacity: 0.8;
+	/* background: rgba(10,10,10,100); */
+	background: @crust;
+	/* opacity: 0.8; */
 /*	color: #00ffff; */
 	color: @mauve;
 	padding: 0px 10px ;
 	margin: 3px 0px;
 }

+#custom-separator {
+	background: @crust;
+	color: @mauve;
+	padding: 0px 2px ;
+	margin: 3px 0px;
+}
+
 #workspaces button{
 	color: @mauve;
 	border-radius: 7px;
@@ -62,11 +71,11 @@ window#waybar {
 	background: none;
 }

-#network{
+#network {
 	border-radius: 10px 0px 0px 10px;
 }

-#tray{
+#tray {
 	border-radius: 0px 10px 10px 0px;
 	margin-right: 5px
 }
--- a/packages/wpaperd/config.toml
+++ b/packages/wpaperd/config.toml
@@ -1,4 +1,4 @@
 [any]
 duration = "10m"
 mode = "center"
-path = "/home/n/Documents/Wallpapers"
+path = "/home/nico/Documents/Wallpapers"
--- a/packages/wpaperd/default.nix
+++ b/packages/wpaperd/default.nix
@@ -1,6 +1,7 @@
 { pkgs, config, lib,... }:
 {
  home.packages = with pkgs; [
+  wpaperd
  ];

  home.file =
--- a/packages/zed-editor/default.nix
+++ b/packages/zed-editor/default.nix
@@ -4,6 +4,7 @@
  home.file."/home/nico/.config/zed/settings.json" = {
    source = ./settings.json;
  };
+  catppuccin.zed.enable = false;
    programs.zed-editor = {
        enable = true;
    };
--- a/packages/zen/default.nix
+++ b/packages/zen/default.nix
@@ -1,51 +0,0 @@
-{ config, pkgs, lib, inputs, ... }:
-
-let
-  zenBrowser = inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser;
-
-  extension = shortId: guid: {
-    name = guid;
-    value = {
-      install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
-      installation_mode = "normal_installed";
-    };
-  };
-
-  prefs = {
-    "extensions.autoDisableScopes" = 0;
-    "extensions.pocket.enabled" = false;
-    "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-  };
-
-  extensions = [
-    (extension "ublock-origin" "uBlock0@raymondhill.net")
-    (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
-    (extension "styl-us" "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}")
-    (extension "vimium-ff" "{d7742d87-e61d-4b78-b8a1-b469842139fa}")
-  ];
-
-in
-{
-  home.packages = [
-    (pkgs.wrapFirefox
-      zenBrowser
-      {
-        extraPrefs = lib.concatLines (
-          lib.mapAttrsToList (
-            name: value: ''lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});''
-          ) prefs
-        );
-
-        extraPolicies = {
-          DisableTelemetry = true;
-          ExtensionSettings = builtins.listToAttrs extensions;
-
-          SearchEngines = {
-            Default = "ddg";
-          };
-        };
-      }
-    )
-  ];
-}
-
--- a/packages/zen/zen-mod.nix
+++ b/packages/zen/zen-mod.nix
@@ -1,53 +0,0 @@
-{
-  inputs,
-  pkgs,
-  lib,
-  ...
-}:
-let
-  extension = shortId: guid: {
-    name = guid;
-    value = {
-      install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
-      installation_mode = "normal_installed";
-    };
-  };
-
-  prefs = {
-    "extensions.autoDisableScopes" = 0;
-    "extensions.pocket.enabled" = false;
-    "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-  };
-
-  extensions = [
-    (extension "ublock-origin" "uBlock0@raymondhill.net")
-    (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
-    (extension "styl-us" "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}")
-    (extension "vimium-ff" "{d7742d87-e61d-4b78-b8a1-b469842139fa}")
-  ];
-
-in
-{
-  environment.systemPackages = [
-    (pkgs.wrapFirefox
-      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped
-      {
-        extraPrefs = lib.concatLines (
-          lib.mapAttrsToList (
-            name: value: ''lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});''
-          ) prefs
-        );
-
-        extraPolicies = {
-          DisableTelemetry = true;
-          ExtensionSettings = builtins.listToAttrs extensions;
-
-          SearchEngines = {
-            Default = "ddg";
-          };
-        };
-      }
-    )
-  ];
-}
-
--- 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 laptop
+git push origin pc
--- a/shells/arduino/flake.nix
+++ b/shells/arduino/flake.nix
@@ -1,53 +1,198 @@
 {
-  description = "Arduino";
+  description = "PlatformIO Development Environment with VSCodium";
+
  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";
-              #     # }
-              #   ];
-              # })
-            ];
+  outputs = { self, nixpkgs }:
+    let
+      system = "x86_64-linux";
+      pkgs = import <nixpkgs> { inherit system; };

-            shellHook = ''
-              zsh 
+      platformioVsix = pkgs.fetchurl {
+        url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/platformio/vsextensions/platformio-ide/3.3.4/vspackage?targetPlatform=linux-x64";
+        sha256 = "sha256-Ri5TZDxSsW1cW33Rh+l/5Fxl23MNzFEjcFGLDx/xzT8=";
+      };

-              exit
-            '';
-          };
-      });
+      patchedExtension = pkgs.stdenv.mkDerivation {
+        name = "platformio-ide-patched";
+        src = platformioVsix;
+        buildInputs = [ pkgs.jq pkgs.unzip pkgs.gzip ];
+        unpackCmd = ''
+          gzip -d < $src > temp.zip
+          unzip temp.zip
+          rm temp.zip
+        '';
+        buildPhase = ''
+          jq '.extensionDependencies = [] |
+              .["platformio-ide.useBuiltinPIOCore"].default = false |
+              .["platformio-ide.useBuiltinPython"].default = false |
+              .["platformio-ide.forceSystemPIOCore"].default = true |
+              .["platformio-ide.forceSystemPython"].default = true' \
+              package.json > package.json.new
+          mv package.json.new package.json
+        '';
+        installPhase = ''
+          cd ..
+          mkdir -p $out
+          ${pkgs.zip}/bin/zip -r $out/platformio-ide.vsix .
+        '';
+      };
+
+      platformioWrapper = pkgs.writeScriptBin "platformio" ''
+        #!/bin/sh
+        VENV_DIR="''${PLATFORMIO_VENV_DIR:-$HOME/.platformio/penv}"
+        . "$VENV_DIR/bin/activate"
+        exec ${pkgs.platformio}/bin/platformio "$@"
+      '';
+
+      configureVSCodeSettings = ''
+        USER_CONFIG_DIR="''${XDG_CONFIG_HOME:-$HOME/.config}/VSCodium/User"
+        mkdir -p "$USER_CONFIG_DIR"
+        SETTINGS_FILE="$USER_CONFIG_DIR/settings.json"
+        if [ ! -f "$SETTINGS_FILE" ]; then
+          echo '{}' > "$SETTINGS_FILE"
+        fi
+        ${pkgs.jq}/bin/jq '. + {
+          "platformio-ide.useBuiltinPIOCore": true,
+          "platformio-ide.useBuiltinPython": false,
+          "platformio-ide.forceSystemPIOCore": false,
+          "platformio-ide.forceSystemPython": true,
+          "platformio-ide.customPATH": "$PATH"
+        }' "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp"
+        if [ $? -eq 0 ]; then
+          mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE"
+        else
+          rm -f "$SETTINGS_FILE.tmp"
+        fi
+      '';
+
+      fhsEnv = pkgs.buildFHSEnv {
+        name = "platformio-env";
+        targetPkgs = pkgs: with pkgs; [
+          platformio
+          platformioWrapper
+          python312
+          git
+          vscodium
+          gcc
+          gdb
+          gnumake
+          udev
+          zlib
+          ncurses
+          stdenv.cc.cc.lib
+          glibc
+          libusb1
+          openssl
+          tio
+          chromium
+        ];
+        profile = ''
+          export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+          export PLATFORMIO_CORE_DIR="''${PLATFORMIO_CORE_DIR:-$HOME/.platformio}"
+          export PATH=${platformioWrapper}/bin:$PATH
+          export PATH=${pkgs.python312}/bin:$PATH
+        '';
+        runScript = pkgs.writeScript "platformio-shell" ''
+          export XDG_DATA_HOME="''${XDG_DATA_HOME:-$HOME/.local/share}"
+          export PATH=${pkgs.python312}/bin:${platformioWrapper}/bin:$PATH
+          export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+          ${configureVSCodeSettings}
+          VSCODE_PORTABLE="''${VSCODE_PORTABLE:-$HOME/.vscode-portable}"
+          EXTENSION_DIR="''${VSCODE_PORTABLE}/extensions"
+          mkdir -p "$EXTENSION_DIR"
+          ${pkgs.vscodium}/bin/codium --install-extension ${patchedExtension}/platformio-ide.vsix
+          mkdir -p $HOME/.local/bin
+          ln -sf ${platformioWrapper}/bin/platformio $HOME/.local/bin/pio
+          echo "PlatformIO environment ready. PlatformIO Core: $(platformio --version)"
+          echo "Run 'codium .' to open VSCodium in current directory"
+          if [ -f $HOME/.platformio/penv/bin/activate ]; then
+             source $HOME/.platformio/penv/bin/activate
+          fi
+          PS1="Codium-PIO> "
+          exec bash --norc
+        '';
+      };
+
+      # Create a dedicated VSCodium launcher package that accepts arguments
+      codiumLauncher = pkgs.writeScriptBin "launch-codium" ''
+        #!/usr/bin/env bash
+        export XDG_DATA_HOME="''${XDG_DATA_HOME:-$HOME/.local/share}"
+        export PATH=${pkgs.python312}/bin:${platformioWrapper}/bin:$PATH
+        export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+        ${configureVSCodeSettings}
+        VSCODE_PORTABLE="''${VSCODE_PORTABLE:-$HOME/.vscode-portable}"
+        EXTENSION_DIR="''${VSCODE_PORTABLE}/extensions"
+        mkdir -p "$EXTENSION_DIR"
+        ${pkgs.vscodium}/bin/codium --install-extension ${patchedExtension}/platformio-ide.vsix
+        mkdir -p $HOME/.local/bin
+        ln -sf ${platformioWrapper}/bin/platformio $HOME/.local/bin/pio
+        
+        # Initialize PlatformIO environment if needed
+        if [ ! -f $HOME/.platformio/penv/bin/activate ] && [ -x "$(command -v python3)" ]; then
+          echo "Initializing PlatformIO environment..."
+          python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py)"
+        fi
+        
+        if [ -f $HOME/.platformio/penv/bin/activate ]; then
+          source $HOME/.platformio/penv/bin/activate
+        fi
+        
+        # If no arguments are provided, open the current directory
+        if [ $# -eq 0 ]; then
+          exec ${pkgs.vscodium}/bin/codium .
+        else
+          # Otherwise, pass all arguments to VSCodium
+          exec ${pkgs.vscodium}/bin/codium "$@"
+        fi
+      '';
+
+      # Create an FHS environment specifically for launching VSCodium
+      codiumFhsEnv = pkgs.buildFHSEnv {
+        name = "codium-launcher";
+        targetPkgs = pkgs: with pkgs; [
+          platformio
+          platformioWrapper
+          python312
+          git
+          vscodium
+          gcc
+          gdb
+          gnumake
+          udev
+          zlib
+          ncurses
+          stdenv.cc.cc.lib
+          glibc
+          libusb1
+          openssl
+          codiumLauncher
+          tio
+        ];
+        profile = ''
+          export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+          export PLATFORMIO_CORE_DIR="''${PLATFORMIO_CORE_DIR:-$HOME/.platformio}"
+          export PATH=${platformioWrapper}/bin:$PATH
+          export PATH=${pkgs.python312}/bin:$PATH
+        '';
+        # Pass all arguments received to the launch-codium script
+        runScript = pkgs.writeScript "codium-launch-wrapper" ''
+          exec ${codiumLauncher}/bin/launch-codium "$@"
+        '';
+      };
+
+    in
+    {
+      devShells.${system} = {
+        default = fhsEnv.env;
+        codium = codiumFhsEnv.env;
+      };
+
+      packages.${system} = {
+        default = fhsEnv;
+        platformioExtension = patchedExtension;
+        codium = codiumFhsEnv;
+      };
+    };
 }
-
-
--- a/shells/flalingo/arduino/flake.nix
+++ b/shells/flalingo/arduino/flake.nix
@@ -0,0 +1,198 @@
+{
+  description = "PlatformIO Development Environment with VSCodium";
+
+  inputs = {
+  };
+
+  outputs = { self, nixpkgs }:
+    let
+      system = "x86_64-linux";
+      pkgs = import <nixpkgs> { inherit system; };
+
+      platformioVsix = pkgs.fetchurl {
+        url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/platformio/vsextensions/platformio-ide/3.3.4/vspackage?targetPlatform=linux-x64";
+        sha256 = "sha256-Ri5TZDxSsW1cW33Rh+l/5Fxl23MNzFEjcFGLDx/xzT8=";
+      };
+
+      patchedExtension = pkgs.stdenv.mkDerivation {
+        name = "platformio-ide-patched";
+        src = platformioVsix;
+        buildInputs = [ pkgs.jq pkgs.unzip pkgs.gzip ];
+        unpackCmd = ''
+          gzip -d < $src > temp.zip
+          unzip temp.zip
+          rm temp.zip
+        '';
+        buildPhase = ''
+          jq '.extensionDependencies = [] |
+              .["platformio-ide.useBuiltinPIOCore"].default = false |
+              .["platformio-ide.useBuiltinPython"].default = false |
+              .["platformio-ide.forceSystemPIOCore"].default = true |
+              .["platformio-ide.forceSystemPython"].default = true' \
+              package.json > package.json.new
+          mv package.json.new package.json
+        '';
+        installPhase = ''
+          cd ..
+          mkdir -p $out
+          ${pkgs.zip}/bin/zip -r $out/platformio-ide.vsix .
+        '';
+      };
+
+      platformioWrapper = pkgs.writeScriptBin "platformio" ''
+        #!/bin/sh
+        VENV_DIR="''${PLATFORMIO_VENV_DIR:-$HOME/.platformio/penv}"
+        . "$VENV_DIR/bin/activate"
+        exec ${pkgs.platformio}/bin/platformio "$@"
+      '';
+
+      configureVSCodeSettings = ''
+        USER_CONFIG_DIR="''${XDG_CONFIG_HOME:-$HOME/.config}/VSCodium/User"
+        mkdir -p "$USER_CONFIG_DIR"
+        SETTINGS_FILE="$USER_CONFIG_DIR/settings.json"
+        if [ ! -f "$SETTINGS_FILE" ]; then
+          echo '{}' > "$SETTINGS_FILE"
+        fi
+        ${pkgs.jq}/bin/jq '. + {
+          "platformio-ide.useBuiltinPIOCore": true,
+          "platformio-ide.useBuiltinPython": false,
+          "platformio-ide.forceSystemPIOCore": false,
+          "platformio-ide.forceSystemPython": true,
+          "platformio-ide.customPATH": "$PATH"
+        }' "$SETTINGS_FILE" > "$SETTINGS_FILE.tmp"
+        if [ $? -eq 0 ]; then
+          mv "$SETTINGS_FILE.tmp" "$SETTINGS_FILE"
+        else
+          rm -f "$SETTINGS_FILE.tmp"
+        fi
+      '';
+
+      fhsEnv = pkgs.buildFHSEnv {
+        name = "platformio-env";
+        targetPkgs = pkgs: with pkgs; [
+          platformio
+          platformioWrapper
+          python312
+          git
+          vscodium
+          gcc
+          gdb
+          gnumake
+          udev
+          zlib
+          ncurses
+          stdenv.cc.cc.lib
+          glibc
+          libusb1
+          openssl
+          tio
+          chromium
+        ];
+        profile = ''
+          export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+          export PLATFORMIO_CORE_DIR="''${PLATFORMIO_CORE_DIR:-$HOME/.platformio}"
+          export PATH=${platformioWrapper}/bin:$PATH
+          export PATH=${pkgs.python312}/bin:$PATH
+        '';
+        runScript = pkgs.writeScript "platformio-shell" ''
+          export XDG_DATA_HOME="''${XDG_DATA_HOME:-$HOME/.local/share}"
+          export PATH=${pkgs.python312}/bin:${platformioWrapper}/bin:$PATH
+          export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+          ${configureVSCodeSettings}
+          VSCODE_PORTABLE="''${VSCODE_PORTABLE:-$HOME/.vscode-portable}"
+          EXTENSION_DIR="''${VSCODE_PORTABLE}/extensions"
+          mkdir -p "$EXTENSION_DIR"
+          ${pkgs.vscodium}/bin/codium --install-extension ${patchedExtension}/platformio-ide.vsix
+          mkdir -p $HOME/.local/bin
+          ln -sf ${platformioWrapper}/bin/platformio $HOME/.local/bin/pio
+          echo "PlatformIO environment ready. PlatformIO Core: $(platformio --version)"
+          echo "Run 'codium .' to open VSCodium in current directory"
+          if [ -f $HOME/.platformio/penv/bin/activate ]; then
+             source $HOME/.platformio/penv/bin/activate
+          fi
+          PS1="Codium-PIO> "
+          exec bash --norc
+        '';
+      };
+
+      # Create a dedicated VSCodium launcher package that accepts arguments
+      codiumLauncher = pkgs.writeScriptBin "launch-codium" ''
+        #!/usr/bin/env bash
+        export XDG_DATA_HOME="''${XDG_DATA_HOME:-$HOME/.local/share}"
+        export PATH=${pkgs.python312}/bin:${platformioWrapper}/bin:$PATH
+        export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+        ${configureVSCodeSettings}
+        VSCODE_PORTABLE="''${VSCODE_PORTABLE:-$HOME/.vscode-portable}"
+        EXTENSION_DIR="''${VSCODE_PORTABLE}/extensions"
+        mkdir -p "$EXTENSION_DIR"
+        ${pkgs.vscodium}/bin/codium --install-extension ${patchedExtension}/platformio-ide.vsix
+        mkdir -p $HOME/.local/bin
+        ln -sf ${platformioWrapper}/bin/platformio $HOME/.local/bin/pio
+        
+        # Initialize PlatformIO environment if needed
+        if [ ! -f $HOME/.platformio/penv/bin/activate ] && [ -x "$(command -v python3)" ]; then
+          echo "Initializing PlatformIO environment..."
+          python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio-core-installer/master/get-platformio.py)"
+        fi
+        
+        if [ -f $HOME/.platformio/penv/bin/activate ]; then
+          source $HOME/.platformio/penv/bin/activate
+        fi
+        
+        # If no arguments are provided, open the current directory
+        if [ $# -eq 0 ]; then
+          exec ${pkgs.vscodium}/bin/codium .
+        else
+          # Otherwise, pass all arguments to VSCodium
+          exec ${pkgs.vscodium}/bin/codium "$@"
+        fi
+      '';
+
+      # Create an FHS environment specifically for launching VSCodium
+      codiumFhsEnv = pkgs.buildFHSEnv {
+        name = "codium-launcher";
+        targetPkgs = pkgs: with pkgs; [
+          platformio
+          platformioWrapper
+          python312
+          git
+          vscodium
+          gcc
+          gdb
+          gnumake
+          udev
+          zlib
+          ncurses
+          stdenv.cc.cc.lib
+          glibc
+          libusb1
+          openssl
+          codiumLauncher
+          tio
+        ];
+        profile = ''
+          export PYTHONPATH=${pkgs.platformio}/lib/python3.12/site-packages:$PYTHONPATH
+          export PLATFORMIO_CORE_DIR="''${PLATFORMIO_CORE_DIR:-$HOME/.platformio}"
+          export PATH=${platformioWrapper}/bin:$PATH
+          export PATH=${pkgs.python312}/bin:$PATH
+        '';
+        # Pass all arguments received to the launch-codium script
+        runScript = pkgs.writeScript "codium-launch-wrapper" ''
+          exec ${codiumLauncher}/bin/launch-codium "$@"
+        '';
+      };
+
+    in
+    {
+      devShells.${system} = {
+        default = fhsEnv.env;
+        codium = codiumFhsEnv.env;
+      };
+
+      packages.${system} = {
+        default = fhsEnv;
+        platformioExtension = patchedExtension;
+        codium = codiumFhsEnv;
+      };
+    };
+}
--- a/shells/flalingo/devenv.lock
+++ b/shells/flalingo/devenv.lock
@@ -0,0 +1,103 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1761343822,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "679d2951cee2d09da3c732d00b320ce752d21ee0",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1747046372,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1760663237,
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1758532697,
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "207a4cb0e1253c7658c6736becc6eb9cace1f25f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs",
+        "pre-commit-hooks": [
+          "git-hooks"
+        ]
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/shells/flalingo/devenv.nix
+++ b/shells/flalingo/devenv.nix
@@ -0,0 +1,24 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  # https://devenv.sh/languages/
+  languages = {
+    rust.enable = true;
+    javascript.enable = true;
+  };
+
+  # https://devenv.sh/packages/
+  packages = [
+    pkgs.nodejs
+    pkgs.yarn
+    pkgs.wabt # Wasm dependencies for Tauri
+    # pkgs.webkitgtk # Linux Tauri dependency (Webview2 is the one used on Widnows)
+  ];
+
+  # See full reference at https://devenv.sh/reference/options/
+}
+
--- a/shells/flalingo/devenv.yaml
+++ b/shells/flalingo/devenv.yaml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling
+
+# If you're using non-OSS software, you can set allowUnfree to true.
+# allowUnfree: true
+
+# If you're willing to use a package that's vulnerable
+# permittedInsecurePackages:
+#  - "openssl-1.1.1w"
+
+# If you have more than one devenv you can merge them
+#imports:
+# - ./backend
--- a/shells/flalingo/flake.lock
+++ b/shells/flalingo/flake.lock
@@ -0,0 +1,100 @@
+{
+  "nodes": {
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1756795219,
+        "narHash": "sha256-tKBQtz1JLKWrCJUxVkHKR+YKmVpm0KZdJdPWmR2slQ8=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "80dbdab137f2809e3c823ed027e1665ce2502d74",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1756819007,
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "fenix": "fenix",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756597274,
+        "narHash": "sha256-wfaKRKsEVQDB7pQtAt04vRgFphkVscGRpSx3wG1l50E=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "21614ed2d3279a9aa1f15c88d293e65a98991b30",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "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/flalingo/flake.nix
+++ b/shells/flalingo/flake.nix
@@ -0,0 +1,111 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    fenix.url = "github:nix-community/fenix";
+    fenix.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    fenix,
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        system = system;
+        config.allowUnfree = true;
+        # config.android_sdk.accept_license = true;
+      };
+
+      # android_sdk =
+      #   (pkgs.androidenv.composeAndroidPackages {
+      #     platformVersions = ["34"];
+      #     ndkVersions = ["26.3.11579264"];
+      #     includeNDK = true;
+      #     useGoogleAPIs = false;
+      #     useGoogleTVAddOns = false;
+      #     includeEmulator = false;
+      #     includeSystemImages = false;
+      #     includeSources = false;
+      #   })
+      #   .androidsdk;
+
+      packages = with pkgs; [
+        curl
+        wget
+        pkg-config
+
+        nodejs_20
+        # typescript-language-server
+        # vtsls
+        # vue-language-server
+        
+        zed-editor
+        # (vscode-with-extensions.override {
+        #   # vscode = vscodium;
+        #   vscodeExtensions = with vscode-extensions; [
+        #     vscodevim.vim
+        #     vue.volar
+        #     catppuccin.catppuccin-vsc
+        #     github.copilot
+        #     github.copilot-chat
+        #     tauri-apps.tauri-vscode
+        #     rust-lang.rust-analyzer
+        #   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+        #     # {
+        #     #   name = "vscode-arduino-community";
+        #     #   publisher = "vscode-arduino";
+        #     #   version = "0.7.2";
+        #     #   sha256 = "/HdPJ6LBnyPhz7jeJ0MLRXO2L3bcAzM7J65nKsXsacY=";
+        #     # }
+        #   ];
+        # })
+
+        (with fenix.packages.${system};
+          combine [
+            complete.rustc
+            complete.cargo
+            complete.clippy
+            # targets.aarch64-linux-android.latest.rust-std
+            # targets.armv7-linux-androideabi.latest.rust-std
+            # targets.i686-linux-android.latest.rust-std
+            targets.x86_64-linux-android.latest.rust-std
+          ])
+        rust-analyzer
+        sqlx-cli
+
+        # android_sdk
+        jdk
+      ];
+
+      libraries = with pkgs; [
+        gtk3
+        libsoup_3
+        webkitgtk_4_1
+        cairo
+        gdk-pixbuf
+        glib
+        dbus
+        openssl
+        librsvg
+      ];
+    in {
+      devShell = pkgs.mkShell {
+        buildInputs = packages ++ libraries;
+
+        shellHook = ''
+          zsh 
+
+          exit
+        '';
+
+        LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH";
+        XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";
+        # ANDROID_HOME = "${android_sdk}/libexec/android-sdk";
+        # NDK_HOME = "${android_sdk}/libexec/android-sdk/ndk/26.3.11579264";
+        # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${android_sdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
+      };
+    });
+}
--- a/shells/flalingo/flutter/flake.nix
+++ b/shells/flalingo/flutter/flake.nix
@@ -0,0 +1,43 @@
+{
+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;
+        };
+      };
+      androidComposition = pkgs.androidenv.composeAndroidPackages {
+        buildToolsVersions = [ "28.0.3" "34.0.0" ];
+        platformVersions = [ "34" "35" "33" ];
+        includeNDK = true;
+        ndkVersions = ["26.3.11579264"];
+        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+        cmakeVersions = [ "3.22.1" ];
+      };
+      androidSdk = androidComposition.androidsdk;
+    in
+    {
+      devShell =
+        with pkgs; mkShell rec {
+          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
+          buildInputs = [
+            flutter
+            androidSdk # The customized SDK that we've made above
+            jdk17
+          ];
+          shellHook = ''
+            zsh
+            exit
+          '';
+        };
+    });
+}
--- a/shells/flalingo/flutter/flake.nix.bk
+++ b/shells/flalingo/flutter/flake.nix.bk
@@ -0,0 +1,109 @@
+{
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
+    android-nixpkgs.url = "github:tadfisher/android-nixpkgs";
+
+    cursor.url = "github:omarcresp/cursor-flake/main";
+  };
+
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-parts,
+    cursor,
+    ...
+  } @ 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
+              cursor.packages.${pkgs.system}.default
+            ];
+              shellHook = ''
+                zsh
+                exit
+              '';
+          };
+        # formatter = pkgs.alejandra;
+      };
+    };
+}
--- a/shells/flalingo/go/flake.nix
+++ b/shells/flalingo/go/flake.nix
@@ -0,0 +1,32 @@
+{
+  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
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/flalingo/linguacafe/flake.nix
+++ b/shells/flalingo/linguacafe/flake.nix
@@ -0,0 +1,53 @@
+{
+  description = "Everything for linguacafe <3";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    cursor.url = "github:omarcresp/cursor-flake/main";
+  };
+  outputs = { self, nixpkgs, flake-utils, cursor }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          config.allowUnfree = true;
+          inherit system;
+        };
+      in
+        {
+        devShell =
+          with pkgs; mkShell rec {
+            buildInputs = [
+              vue-language-server
+              cursor.packages.${pkgs.system}.default
+              php
+
+              (vscode-with-extensions.override {
+                # vscode = vscodium;
+                vscodeExtensions = with vscode-extensions; [
+                  vscodevim.vim
+                  vue.volar
+                  catppuccin.catppuccin-vsc
+                  github.copilot
+                  github.copilot-chat
+                ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+                  # {
+                  #   name = "vscode-arduino-community";
+                  #   publisher = "vscode-arduino";
+                  #   version = "0.7.2";
+                  #   sha256 = "/HdPJ6LBnyPhz7jeJ0MLRXO2L3bcAzM7J65nKsXsacY=";
+                  # }
+                ];
+              })
+
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/flalingo/luckyshroom/flake.nix
+++ b/shells/flalingo/luckyshroom/flake.nix
@@ -0,0 +1,33 @@
+{
+  description = "Love you";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    cursor.url = "github:omarcresp/cursor-flake/main";
+  };
+  outputs = { self, nixpkgs, flake-utils, cursor }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        };
+      in
+        {
+        devShell =
+          with pkgs; mkShell rec {
+            buildInputs = [
+              love
+              cursor.packages.${pkgs.system}.default
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/flalingo/rust/flake.nix
+++ b/shells/flalingo/rust/flake.nix
@@ -0,0 +1,73 @@
+{
+  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
+          ];
+
+          # 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/''
+          ];
+        };
+      }
+    );
+}
--- a/shells/flutter/flake.nix
+++ b/shells/flutter/flake.nix
@@ -1,101 +1,43 @@
 {
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
-
-    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;
+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;
+        };
      };
-    };
+      androidComposition = pkgs.androidenv.composeAndroidPackages {
+        buildToolsVersions = [ "28.0.3" "34.0.0" ];
+        platformVersions = [ "34" "35" "33" ];
+        includeNDK = true;
+        ndkVersions = ["26.3.11579264"];
+        abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+        cmakeVersions = [ "3.22.1" ];
+      };
+      androidSdk = androidComposition.androidsdk;
+    in
+    {
+      devShell =
+        with pkgs; mkShell rec {
+          ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
+          buildInputs = [
+            flutter
+            androidSdk # The customized SDK that we've made above
+            jdk17
+          ];
+          shellHook = ''
+            zsh
+            exit
+          '';
+        };
+    });
 }
--- a/shells/flutter/flake.nix.bk
+++ b/shells/flutter/flake.nix.bk
@@ -0,0 +1,109 @@
+{
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+
+    flake-parts = {
+      url = "github:hercules-ci/flake-parts";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
+    };
+
+    android-nixpkgs.url = "github:tadfisher/android-nixpkgs";
+
+    cursor.url = "github:omarcresp/cursor-flake/main";
+  };
+
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-parts,
+    cursor,
+    ...
+  } @ 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
+              cursor.packages.${pkgs.system}.default
+            ];
+              shellHook = ''
+                zsh
+                exit
+              '';
+          };
+        # formatter = pkgs.alejandra;
+      };
+    };
+}
--- a/shells/go/flake.nix
+++ b/shells/go/flake.nix
@@ -18,7 +18,6 @@
            GOPATH="${go}";
            buildInputs = [
              go
-              gopls
            ];

            shellHook = ''
--- a/shells/linguacafe/flake.nix
+++ b/shells/linguacafe/flake.nix
@@ -0,0 +1,53 @@
+{
+  description = "Everything for linguacafe <3";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    cursor.url = "github:omarcresp/cursor-flake/main";
+  };
+  outputs = { self, nixpkgs, flake-utils, cursor }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          config.allowUnfree = true;
+          inherit system;
+        };
+      in
+        {
+        devShell =
+          with pkgs; mkShell rec {
+            buildInputs = [
+              vue-language-server
+              cursor.packages.${pkgs.system}.default
+              php
+
+              (vscode-with-extensions.override {
+                # vscode = vscodium;
+                vscodeExtensions = with vscode-extensions; [
+                  vscodevim.vim
+                  vue.volar
+                  catppuccin.catppuccin-vsc
+                  github.copilot
+                  github.copilot-chat
+                ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+                  # {
+                  #   name = "vscode-arduino-community";
+                  #   publisher = "vscode-arduino";
+                  #   version = "0.7.2";
+                  #   sha256 = "/HdPJ6LBnyPhz7jeJ0MLRXO2L3bcAzM7J65nKsXsacY=";
+                  # }
+                ];
+              })
+
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/luckyshroom/flake.nix
+++ b/shells/luckyshroom/flake.nix
@@ -0,0 +1,33 @@
+{
+  description = "Love you";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    cursor.url = "github:omarcresp/cursor-flake/main";
+  };
+  outputs = { self, nixpkgs, flake-utils, cursor }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          config.allowUnfree = true;
+        };
+      in
+        {
+        devShell =
+          with pkgs; mkShell rec {
+            buildInputs = [
+              love
+              cursor.packages.${pkgs.system}.default
+            ];
+
+            shellHook = ''
+              zsh 
+
+              exit
+            '';
+          };
+      });
+}
+
+
--- a/shells/rust/flake.nix
+++ b/shells/rust/flake.nix
@@ -34,7 +34,6 @@
            gtk3
            librsvg
            xdotool
-            rustfmt
          ];

          # RUSTC_VERSION = overrides.toolchain.channel;
--- a/shells/triolingo/flake.nix
+++ b/shells/triolingo/flake.nix
@@ -0,0 +1,106 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    fenix.url = "github:nix-community/fenix";
+    fenix.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils,
+    fenix,
+  }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        system = system;
+        config.allowUnfree = true;
+        # config.android_sdk.accept_license = true;
+      };
+
+      # android_sdk =
+      #   (pkgs.androidenv.composeAndroidPackages {
+      #     platformVersions = ["34"];
+      #     ndkVersions = ["26.3.11579264"];
+      #     includeNDK = true;
+      #     useGoogleAPIs = false;
+      #     useGoogleTVAddOns = false;
+      #     includeEmulator = false;
+      #     includeSystemImages = false;
+      #     includeSources = false;
+      #   })
+      #   .androidsdk;
+
+      packages = with pkgs; [
+        curl
+        wget
+        pkg-config
+
+        nodejs_20
+        typescript-language-server
+
+        (vscode-with-extensions.override {
+          # vscode = vscodium;
+          vscodeExtensions = with vscode-extensions; [
+            vscodevim.vim
+            vue.volar
+            catppuccin.catppuccin-vsc
+            github.copilot
+            github.copilot-chat
+            tauri-apps.tauri-vscode
+          ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+            # {
+            #   name = "vscode-arduino-community";
+            #   publisher = "vscode-arduino";
+            #   version = "0.7.2";
+            #   sha256 = "/HdPJ6LBnyPhz7jeJ0MLRXO2L3bcAzM7J65nKsXsacY=";
+            # }
+          ];
+        })
+
+        (with fenix.packages.${system};
+          combine [
+            complete.rustc
+            complete.cargo
+            complete.clippy
+            # targets.aarch64-linux-android.latest.rust-std
+            # targets.armv7-linux-androideabi.latest.rust-std
+            # targets.i686-linux-android.latest.rust-std
+            targets.x86_64-linux-android.latest.rust-std
+          ])
+        rust-analyzer
+
+        # android_sdk
+        jdk
+      ];
+
+      libraries = with pkgs; [
+        gtk3
+        libsoup_3
+        webkitgtk_4_1
+        cairo
+        gdk-pixbuf
+        glib
+        dbus
+        openssl
+        librsvg
+      ];
+    in {
+      devShell = pkgs.mkShell {
+        buildInputs = packages ++ libraries;
+
+        shellHook = ''
+          zsh 
+
+          exit
+        '';
+
+        LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH";
+        XDG_DATA_DIRS = "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";
+        # ANDROID_HOME = "${android_sdk}/libexec/android-sdk";
+        # NDK_HOME = "${android_sdk}/libexec/android-sdk/ndk/26.3.11579264";
+        # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${android_sdk}/libexec/android-sdk/build-tools/34.0.0/aapt2";
+      };
+    });
+}
Author	SHA1	Message	Date
Nico	b1a4493c9d	Merge branch 'pc' of ssh://server/nico/nix-files into pc	2026-02-13 20:35:28 +01:00
Nico	99503b4291	Waybar fixes	2026-02-13 20:35:03 +01:00
Nico	68b86e3162	Merge branch 'pc' of server:/nico/nix-files into pc	2026-02-07 17:12:19 +01:00
Nico	ea1eb4b73d	hibernate & waybar & maybe some other things	2026-01-26 21:12:31 +01:00
Nico	2586d31db5	dunno	2026-01-11 21:19:17 +01:00
Nico	05429407db	tmux + catppuccin mostly	2025-12-19 15:22:07 +01:00
Nico	e7721eb516	Merge branch 'pc' of server:/nico/nix-files into pc	2025-11-28 17:17:03 +01:00
Nico	93d98e3001	dunno tbh	2025-11-28 13:30:56 +01:00
Nico	66767ebdfe	vim notify, and devenv	2025-10-25 13:43:27 +02:00
Nico	2224c25e2b	Change nvim lspconfig to work with mason and vue	2025-10-24 19:21:22 +02:00
Nico	f60bf4608f	update after a long time ig	2025-10-08 20:31:44 +02:00
Nico	3030897071	Merge branch 'pc' of server:/nico/nix-files into pc	2025-09-13 16:09:07 +02:00
Nico	e39404d44d	added fuzzel, nvim-tree and updated	2025-09-05 03:13:36 +02:00
Nico	3ddfb249d9	deleted save files	2025-07-06 20:30:32 +02:00
Nico	3cb6e5d907	niri update	2025-07-06 20:27:54 +02:00
Nico	5b303353f5	update flutter flakes	2025-06-24 20:37:19 +02:00
Nico	20996e42e1	niri	2025-06-23 17:01:02 +02:00
Nico	936064f3e7	flutter flake update	2025-06-15 19:31:45 +02:00
Nico	32fe50e27c	nvim ai	2025-06-15 19:30:41 +02:00
Nico	f85d945337	cleanup, neovim optimizations and updates ig	2025-05-29 14:50:58 +02:00
Nico	6c601333a0	added conform and tiny inline diagnostics to nvim	2025-05-05 20:15:02 +02:00
Nico	9476766bb0	/etc/nixos copied	2025-04-28 23:10:42 +02:00
Nico	ca27831f4a	flutter flake	2025-04-28 23:08:49 +02:00
Nico	cdc170770f	rights2	2025-04-28 23:07:58 +02:00
Nico	b9e3afef79	hyprland swaync und cliphist & nvim merge + animate	2025-04-09 23:40:11 +02:00
Nico	a764ae7695	no idea	2025-04-07 23:06:16 +02:00
Nico	0b2e29fa76	keyboard based resize in hyprland and waybar	2025-04-01 21:18:15 +02:00
Nico	6419427a05	finish hyprland	2025-04-01 21:04:27 +02:00
Nico	25ab3a589b	new installation	2025-04-01 20:06:28 +02:00