added fuzzel, nvim-tree and updated

configuration.nix

@@ -1,70 +1,66 @@
-# Edit this configuration file to define what should be installed on
+# Edit this configuration file to define what should be installed on your system.  Help is available 
-# your system.  Help is available in the configuration.nix(5) man page
+# in the configuration.nix(5) man page and in the NixOS manual (accessible by running ‘nixos-help’).
-# 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
+ ];
-    ];
 
 
   # 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 = {
+ programs.hyprland = {
-      enable = false;
+   enable = true;
-    xwayland.enable = true;
+   xwayland.enable = true;
-  };
+ };
 
-  programs.niri.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.adb.enable = true;
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
+boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
+boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.kernelParams = [ "ipv6.disable=1" ];
-  networking.hostName = "nico-nixos-laptop"; # Define your hostname.
-  networking.enableIPv6  = false;
-#   networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-  # Configure network proxy if necessary
+# fileSystems."mnt/win" = {
-  # networking.proxy.default = "http://user:password@proxy:port/";
+#   device = "/dev/sdb1";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+#   fsType = "ntfs";
+# };
+
+  # 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" ];
   networking.networkmanager.enable = true;
-  hardware.bluetooth.enable = true;
+  networking.hostName = "nixos"; # Define your hostname.
-  services.blueman.enable = true;
+  networking.enableIPv6  = false;
 
-  services.resolved = {
+  # VM
-    enable = true;
+  virtualisation.virtualbox.host.enable = true;
-  };
+  virtualisation.virtualbox.host.enableExtensionPack = true;
-
+  virtualisation.virtualbox.host.enableKvm = true;
-  services.mullvad-vpn.enable = true;
+  virtualisation.virtualbox.host.addNetworkInterface = false;
-  # services.teamviewer.enable = true;
+  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 +68,147 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
-  i18n.extraLocaleSettings = {
+  i18n.extraLocaleSettings = { LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8"; 
-    LC_ADDRESS = "de_DE.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8"; LC_MONETARY = "en_US.UTF-8"; LC_NAME = "en_US.UTF-8"; LC_NUMERIC = 
-    LC_IDENTIFICATION = "de_DE.UTF-8";
+    "en_US.UTF-8"; LC_PAPER = "en_US.UTF-8"; LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
   };
 
+  # Enable the X11 windowing system. You can disable this if you're only using the Wayland session.
+  services.xserver.enable = true;
 
-  # Enable the X11 windowing system.
+  # Enable the KDE Plasma Desktop Environment.
-  services.xserver = {
-    enable = true;
-    desktopManager = {
-      xterm.enable = false;
-      xfce.enable = true;
-    };
-  };
-  # services.displayManager.defaultSession = "xfce";
-
-  # Enable the XFCE Desktop Environment.
   services.displayManager.sddm.enable = true;
-  services.displayManager.ly.enable = false;
+   services.desktopManager.plasma6.enable = true;
-  services.displayManager.lemurs.enable = false;
-  services.desktopManager.plasma6.enable = false;
-
-  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 = {
+  services.xserver = { xkb.layout = "us"; xkb.variant = "";
-    xkb = {
-      variant = "";
-      layout = "de";
-    };
   };
 
   # 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;
+ services.pulseaudio.enable = true;
-  security.rtkit.enable = true;
+ security.rtkit.enable = true; 
-  services.pipewire = {
+ services.pipewire = {
-    enable = true;
+    enable = false; 
     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,
+    # use the example session manager (no others are packaged yet so this is enabled by default, no 
-    # nor need to redefine it in your config for now)
+    # need to redefine it in your config for now)
     #media-session.enable = true;
   };
 
-  # Enable touchpad support (enabled default in most desktopManager).
+  # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable 
-  services.libinput.enable = true;
+  # = true;
-
+services.mullvad-vpn.enable = true;
-  programs.light.enable = true;
+  services.mullvad-vpn.package = pkgs.mullvad-vpn;
-
-  programs.zsh.enable = true;
-#  programs.nushell.enable = true;
-
-  programs.adb.enable = true;
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.n = {
+  users.users.nico = { isNormalUser = true; description = "nico"; extraGroups = [ "networkmanager" 
-    isNormalUser = true;
+    "wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [
-    description = "n";
-    extraGroups = [ "networkmanager" "wheel" "video" "adbusers" "input" "docker" "dialout"];
-    packages = with pkgs; [
-      obsidian
     ];
-    shell = pkgs.zsh;
   };
 
-
+  users.defaultUserShell = pkgs.zsh;
-
+  environment.shells = with pkgs; [ zsh nushell ];
-  # Install firefox.
+  programs.zsh.enable = true;
-  programs.firefox.enable = true;
-  services.flatpak.enable = true;
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-#  nixpkgs.config.allowBroken = true;
+  services.udev.packages = [ 
-
+    pkgs.platformio-core
-  # List packages installed in system profile. To search, run:
+    pkgs.openocd
-  # $ 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.gnome.gnome-keyring.enable = true;
+# services.flatpak.enable = true;
 
-  # programs.sway = {
+  # List packages installed in system profile. To search, run: $ nix search wget
-  #   enable = true;
+  environment.systemPackages = with pkgs; [
-  #   wrapperFeatures.gtk = true;
+    # grayjay
-  # };
+    signal-desktop
+    obsidian
+    discord
+    anki
+    grayjay
+    lutris
+    qbittorrent
+    vim 
+    wget
+    git
+    kitty
+    tree
+    nodejs
+    gparted
+    heroic
+    wineWowPackages.stable
+    spotify
+    #spicetify-cli
+    sshfs
+    # anydesk
 
+    # 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
+#  iosevka
-#  (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
+  # (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
+  programs.steam = {
-  # started in user sessions.
+    enable = true;
-  # programs.mtr.enable = true;
+  };
-  # programs.gnupg.agent = {
+
-  #   enable = true;
+
-  #   enableSSHSupport = true;
+	  services.gnome.gnome-keyring.enable = true;
+
+  programs.sway = {
+    enable = true;
+    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.
+  # Enable the OpenSSH daemon. services.openssh.enable = true;
-  # services.openssh.enable = true;
 
-  # Open ports in the firewall.
+  # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ ... ]; 
-  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ]; Or disable the firewall altogether. 
-  # 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 +218,11 @@ fonts.packages = with pkgs; [
   };  
 
 
-  # This value determines the NixOS release from which the default
+  # This value determines the NixOS release from which the default settings for stateful data, like 
-  # settings for stateful data, like file locations and database versions
+  # file locations and database versions on your system were taken. It‘s perfectly fine and 
-  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # recommended to leave this value at the release version of the first install of this system. Before 
-  # this value at the release version of the first install of this system.
+  # changing this value read the documentation for this option (e.g. man configuration.nix or on 
-  # Before changing this value read the documentation for this option
+  # https://nixos.org/nixos/options.html).
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.11"; # Did you read the comment?
-  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

flake.lock

@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1764289441,
+        "lastModified": 1756679577,
-        "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=",
+        "narHash": "sha256-pkfftqE2CxVN6nKDZvlNdBxIkb/x5ch4wVfwZMYNGCM=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea",
+        "rev": "04d51ac4082af3ec47e8a803417a1a55b75151d7",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764173295,
+        "lastModified": 1756474652,
-        "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=",
+        "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=",
         "owner": "aylur",
         "repo": "astal",
-        "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef",
+        "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760948891,
+        "lastModified": 1756770412,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1767104570,
+        "lastModified": 1756991914,
-        "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
+        "narHash": "sha256-4ve/3ah5H/SpL2m3qmZ9GU+VinQYp2MN1G7GamimTds=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
+        "rev": "b08f8737776f10920c330657bee8b95834b7a70f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "zen-browser",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1752603129,
+        "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
         "type": "github"
       },
       "original": {
@@ -99,11 +120,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1758834834,
+        "lastModified": 1756659871,
-        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
+        "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
+        "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16",
         "type": "github"
       },
       "original": {
@@ -112,34 +133,13 @@
         "type": "github"
       }
     },
-    "ndg": {
-      "inputs": {
-        "nixpkgs": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765720983,
-        "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
-        "owner": "feel-co",
-        "repo": "ndg",
-        "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
-        "type": "github"
-      },
-      "original": {
-        "owner": "feel-co",
-        "repo": "ndg",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1763966396,
+        "lastModified": 1756542300,
-        "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
+        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
+        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766902085,
+        "lastModified": 1756787288,
-        "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
+        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
+        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1764081664,
+        "lastModified": 1756696532,
-        "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
+        "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
+        "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f",
         "type": "github"
       },
       "original": {
@@ -181,21 +181,52 @@
         "type": "github"
       }
     },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1756542300,
+        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nvf": {
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "mnw": "mnw",
-        "ndg": "ndg",
         "nixpkgs": "nixpkgs_3",
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767123832,
+        "lastModified": 1756870502,
-        "narHash": "sha256-WI+DaMQLJ/QVUKCNk1gvo8y0Rw6C4uDx8BW1mRVVOMU=",
+        "narHash": "sha256-0diPvHFwQbKvKkz0bmEVEoFIzL4rdD80CaApHaj6hzs=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "0390abd6736ff34a016afc66366d1f46372f28de",
+        "rev": "7b009c945d2f0213409aa0bae07c79d28b92d625",
         "type": "github"
       },
       "original": {
@@ -210,9 +241,29 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
         "nvf": "nvf",
+        "spicetify-nix": "spicetify-nix",
         "zen-browser": "zen-browser"
       }
     },
+    "spicetify-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1756614537,
+        "narHash": "sha256-qyszmZO9CEKAlj5NBQo1AIIADm5Fgqs5ZggW1sU1TVo=",
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "rev": "374eb5d97092b97f7aaafd58a2012943b388c0df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerg-L",
+        "repo": "spicetify-nix",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -228,22 +279,36 @@
         "type": "github"
       }
     },
-    "zen-browser": {
+    "systems_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1766377218,
+        "lastModified": 1681028828,
-        "narHash": "sha256-y3g3OqPB0tmRjbHJNnJKivSQRtAJR+/9S1xbxBWEatg=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "youwen5",
+        "owner": "nix-systems",
-        "repo": "zen-browser-flake",
+        "repo": "default",
-        "rev": "2f61341b32dd69c07e147188e67e09ba2bb99c33",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "youwen5",
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1756999202,
+        "narHash": "sha256-AiJDRmIt2DuMk2IlBPnMG52ghUI9+D1nO7JRBF2vnZ0=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "369fbe5c53420b1a17295c5e85ea0dbe02fbcfbd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
         "repo": "zen-browser-flake",
         "type": "github"
       }

flake.nix

@@ -13,17 +13,16 @@
 
     nvf.url = "github:notashelf/nvf";
 
-    zen-browser = {
+    zen-browser.url = "github:0xc000022070/zen-browser-flake";
-      url = "github:youwen5/zen-browser-flake";
+
-      inputs.nixpkgs.follows = "nixpkgs";
+    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
-    };
 
   };
 
-  outputs = { self, nixpkgs, nvf, zen-browser, ... }@inputs:
+  outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, ... }@inputs:
   let system = "x86_64-linux"; in
   {
-    nixosConfigurations.my-nixos = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
       inherit system;
       specialArgs = {
         inherit inputs;
@@ -33,9 +32,6 @@
         # inputs.zen-browser.packages."${system}".default
 #        nvf.homeManagerModules.default
         inputs.home-manager.nixosModules.default
-      # {
-      #   home.packages = with inputs; [ zen-browser.packages.${system}.zen-browser ];
-      # }
       ];
     };
   };

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.enp4s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.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;
 }

home-nico.nix

@@ -1,12 +1,13 @@
 { config, pkgs, inputs, ... }:
 
 {
-  home.username = "n";
+  home.username = "nico";
-  home.homeDirectory = "/home/n";
+  home.homeDirectory = "/home/nico";
 
   imports = [
     ./packages
-    # inputs.zen-browser.homeModules.default
+    inputs.spicetify-nix.homeManagerModules.default
+    inputs.zen-browser.homeModules.default
   ];
 
     nixpkgs = {
@@ -17,16 +18,36 @@
   };
 
   home.packages = with pkgs; [
-    # floorp
+    floorp
-#    freetube
   ];
-  # programs.zen-browser = {
+
-  #   enable = true;
+  programs.zen-browser.enable = true;
-  # };
+
+  programs.spicetify =
+    let
+    spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+  in
+  {
+    enable = true;
+    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;
 
 }
+

packages/alacritty/alacritty.toml

@@ -1,3 +0,0 @@
-general.import = [
-   "/etc/nixos/packages/alacritty/catppuccin-mocha.toml"
-]

packages/alacritty/alacritty.toml~

@@ -1,3 +0,0 @@
-general.import = [
-   "~/.config/alacritty/catppuccin-mocha.toml"
-]

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"

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

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

packages/default.nix

@@ -2,24 +2,20 @@
 {
   imports = [
 #    ./ags
-    ./fuzzel
     ./other
-    # ./sway
+    # ./floorp
-    # ./swaync
+    ./sway
+    ./swaync
     ./waybar
     ./wpaperd
     ./nvim
-    ./zed-editor
+    ./emacs
-    # ./emacs
     ./terminal
     ./rofi
-    # ./alacritty
+    ./fuzzel
-    # ./tmux
-   # ./mako
-#    ./qutebrowser
-    # ./hyprland
     ./niri
+    ./hyprland
+    # ./tmux
 #    ./vscode
-    # ./zen
   ];
 }

packages/default.nix~

@@ -0,0 +1,16 @@
+{ ... }:
+{
+  imports = [
+#    ./ags
+    ./other
+    ./sway
+    ./waybar
+    ./wpaperd
+    ./nvim
+    ./emacs
+    ./kitty
+    ./rofi
+#    ./hyprland
+#    ./vscode
+  ];
+}

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; [
+      ++ (with epkgs.melpaPackages; [
-  catppuccin-theme
 	evil
 	nix-mode
   lsp-treemacs
@@ -260,7 +258,6 @@ in {
   which-key
   magit
   format-all
-  evil-vimish-fold
       ])
       ++ (with epkgs.elpaPackages; [
   undo-tree

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=";
+                }
+              ];
+            })
           ];
+
         };
     });
 }
-

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=";
+                }
+              ];
+            })
+          ];
+
+        };
+    });
+}

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

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

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

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

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
 

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 = ''
 

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

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

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

packages/niri/config.kdl

@@ -13,8 +13,8 @@ input {
             // For more information, see xkeyboard-config(7).
 
             // For example:
-            layout "us,de"
+            // layout "us,ru"
-            options "grp:alt_shift_toggle"
+            // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
         }
 
         // Enable numlock on startup, omitting this setting disables it.
@@ -63,14 +63,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 +79,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 +97,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
+    position x=1280 y=0
-}
-
-output "HDMI-A-1" {
-    mode "1920x1080"
-    scale 1
-    transform "normal"
-    position x=1920 y=0
 }
 
 // Settings that influence how windows are positioned and sized.
@@ -371,6 +363,7 @@ 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"; }
 
@@ -383,8 +376,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.

packages/niri/default.nix

@@ -7,7 +7,7 @@
   nautilus
  ];
 
-  home.file."/home/n/.config/niri/config.kdl" = {
+  home.file."/home/nico/.config/niri/config.kdl" = {
     source = ./config.kdl;
   };
 }

packages/nvim/default.nix

@@ -32,8 +32,7 @@ programs.neovim.plugins = [
 #    ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
     ".config/nvim/lua/plugins/blink-cmp.lua".source = ./lua/plugins/blink-cmp.lua;
     ".config/nvim/lua/plugins/lsp.lua".source = ./lua/plugins/lsp.lua;
-   ".config/nvim/lua/plugins/mason.lua".source = ./lua/plugins/mason.lua;
+#    ".config/nvim/lua/plugins/mason.lua".source = ./lua/plugins/mason.lua;
-   ".config/nvim/lua/plugins/mason-lspconfig.lua".source = ./lua/plugins/mason-lspconfig.lua;
     # ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua;
     ".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.lua;
     ".config/nvim/lua/plugins/telescope.lua".source = ./lua/plugins/telescope.lua;
@@ -45,7 +44,7 @@ programs.neovim.plugins = [
     ".config/nvim/lua/plugins/trouble.lua".source = ./lua/plugins/trouble.lua;
     ".config/nvim/lua/plugins/dap.lua".source = ./lua/plugins/dap.lua;
     ".config/nvim/lua/plugins/blankline.lua".source = ./lua/plugins/blankline.lua;
-    # ".config/nvim/lua/plugins/rustaceanvim.lua".source = ./lua/plugins/rustaceanvim.lua;
+    ".config/nvim/lua/plugins/rustaceanvim.lua".source = ./lua/plugins/rustaceanvim.lua;
     ".config/nvim/lua/plugins/lazygit.lua".source = ./lua/plugins/lazygit.lua;
     ".config/nvim/lua/plugins/toggleterm.lua".source = ./lua/plugins/toggleterm.lua;
     ".config/nvim/lua/plugins/love.lua".source = ./lua/plugins/love.lua;
@@ -58,8 +57,6 @@ programs.neovim.plugins = [
     ".config/nvim/lua/plugins/tiny-inline-diagnostic.lua".source = ./lua/plugins/tiny-inline-diagnostic.lua;
     ".config/nvim/lua/plugins/conform.lua".source = ./lua/plugins/conform.lua;
     ".config/nvim/lua/plugins/nvim-tree.lua".source = ./lua/plugins/nvim-tree.lua;
-    ".config/nvim/lua/plugins/notify.lua".source = ./lua/plugins/notify.lua;
-
     # ".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua;
     # ".config/nvim/lua/plugins/typst.lua".source = ./lua/plugins/typst.lua;
 

packages/nvim/default.nix~

@@ -0,0 +1,31 @@
+{ pkgs, config, lib,... }:
+{
+
+ home.packages = with pkgs; [
+    
+ ];
+
+programs.neovim = {
+  enable = true;
+  vimAlias = true;
+};
+
+
+programs.neovim.plugins = [
+  pkgs.vimPlugins.lazy-nvim
+];
+
+ home.file =
+  lib.mkMerge [
+   {
+    ".config/nvim/init.lua".source = ./init.lua;
+    ".config/nvim/lua/config/lazy.lua".source = ./lua/config/lazy.lua;
+    ".config/nvim/lua/plugins/flutter.lua".source = ./lua/plugins/flutter.lua;
+    ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
+    ".config/nvim/lua/plugins/treesitter.lua".source = ./lua/plugins/treesitter.lua;
+    ".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.lua;
+    ".config/nvim/lua/plugins/telescope.lua".source = ./lua/plugins/telescope.lua;
+    ".config/nvim/lua/plugins/highlight-colors.lua".source = ./lua/plugins/highlight-colors.lua;
+   }
+  ];
+}

packages/nvim/init.lua

@@ -112,6 +112,13 @@ dap.configurations.rust = dap.configurations.gdb
 --------------------------------------------
 local builtin = require("telescope.builtin")
 local conform = require("conform")
+-- Rust binds
+vim.keymap.set("n", "<leader>rrr", ":RustRun<CR>", { desc = "Run rust program" })
+vim.keymap.set("n", "<leader>rd", ":RustLsp debug<CR>", { desc = "Debug rust program" })
+vim.keymap.set("n", "<leader>rh", ":RustLsp hover actions<CR>", { desc = "rust hover actions" })
+vim.keymap.set("n", "<leader>re", ":RustLsp explainError<CR>", { desc = "explain rust error" })
+vim.keymap.set("n", "<leader>rs", ":RustLsp openDocs<CR>", { desc = "open rust docs for symbol under cursor" })
+vim.keymap.set("n", "<leader>rrn", ":RustLsp ssr ", { desc = "rust rename" })
 -- Love binds
 vim.keymap.set("n", "<leader>lr", ":LoveRun<CR>", { desc = "Love run" })
 -- Telescope binds
@@ -138,7 +145,7 @@ vim.keymap.set("n", "<leader>tt", ":ToggleTerm direction=tab size=50 <CR>", { de
 vim.keymap.set("n", "<leader>tv", ":ToggleTerm direction=vertical <CR>", { desc = "Open terminal vertical" })
 vim.keymap.set("n", "<leader>ts", ":ToggleTerm direction=vertical <CR>", { desc = "select open terminal" })
 -- file explorer binds (nvim-tree)
-vim.keymap.set("n", "<leader>fe", ":NvimTreeToggle <CR>", { desc = "Toggle nvim tree" })
+vim.keymap.set("n", "<leader>fe", ":NvimTreeToggle <CR>", { desc = "select open terminal" })
 -- code actions
 vim.keymap.set("n", "<leader>ca", function()
 	require("tiny-code-action").code_action()
@@ -147,5 +154,3 @@ end, { desc = "Show code actions", noremap = true, silent = true })
 -- disable annoying inline type things 
 vim.lsp.inlay_hint.enable(false)
 vim.diagnostic.config({virtual_text = false})
-
-

packages/nvim/init.lua~

@@ -0,0 +1,113 @@
+-- Tab
+vim.opt.tabstop = 2                 -- number of visual spaces per TAB
+vim.opt.softtabstop = 2             -- number of spacesin tab when editing
+vim.opt.shiftwidth = 2              -- insert 4 spaces on a tab
+vim.opt.expandtab = true            -- tabs are spaces, mainly because of python
+
+-- UI config
+vim.opt.number = true               -- show absolute number
+vim.opt.relativenumber = true       -- add numbers to each line on the left side
+vim.opt.splitbelow = true           -- open new vertical split bottom
+vim.opt.splitright = true           -- open new horizontal splits right
+-- vim.opt.termguicolors = true        -- enabl 24-bit RGB color in the TUI
+vim.opt.showmode = false            -- we are experienced, wo don't need the "-- INSERT --" mode hint
+
+-- Searching
+vim.opt.incsearch = true            -- search as characters are entered
+vim.opt.hlsearch = false            -- do not highlight matches
+vim.opt.ignorecase = true           -- ignore case in searches by default
+vim.opt.smartcase = true            -- but make it case sensitive if an uppercase is entered
+
+-- -- Keybinds
+vim.keymap.set('n', '<C-h>', '<C-w>h', opts)
+vim.keymap.set('n', '<C-j>', '<C-w>j', opts)
+vim.keymap.set('n', '<C-k>', '<C-w>k', opts)
+vim.keymap.set('n', '<C-l>', '<C-w>l', opts)
+
+-- Resize with arrows
+-- delta: 2 lines
+vim.keymap.set('n', '<C-Up>', ':resize -2<CR>', opts)
+vim.keymap.set('n', '<C-Down>', ':resize +2<CR>', opts)
+vim.keymap.set('n', '<C-Left>', ':vertical resize -2<CR>', opts)
+vim.keymap.set('n', '<C-Right>', ':vertical resize +2<CR>', opts)
+
+-- Telescope binds
+vim.keymap.set("n", "<space>fb", ":Telescope file_browser<CR>")
+
+
+vim.keymap.set('i', 'jk', '<Esc>', opts)
+
+-- Lazy
+require("config.lazy")
+-- require("flutter-tools").setup {} -- use defaults
+require("catppuccin").setup({
+    integrations = {
+        cmp = false,
+        gitsigns = true,
+        nvimtree = true,
+        treesitter = true,
+        notify = false,
+        mini = {
+            enabled = false,
+            indentscope_color = "",
+        },
+    }
+})
+
+-- css colors
+vim.opt.termguicolors = true
+require('nvim-highlight-colors').setup({})
+
+vim.cmd.colorscheme "catppuccin"
+
+
+
+
+-- lsp
+local on_attach = function(_, bufnr)
+
+  local bufmap = function(keys, func)
+    vim.keymap.set('n', keys, func, { buffer = bufnr })
+  end
+
+  bufmap('<leader>r', vim.lsp.buf.rename)
+  bufmap('<leader>a', vim.lsp.buf.code_action)
+
+  bufmap('gd', vim.lsp.buf.definition)
+  bufmap('gD', vim.lsp.buf.declaration)
+  bufmap('gI', vim.lsp.buf.implementation)
+  bufmap('<leader>D', vim.lsp.buf.type_definition)
+
+  bufmap('gr', require('telescope.builtin').lsp_references)
+  bufmap('<leader>s', require('telescope.builtin').lsp_document_symbols)
+  bufmap('<leader>S', require('telescope.builtin').lsp_dynamic_workspace_symbols)
+
+  bufmap('K', vim.lsp.buf.hover)
+
+  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+    vim.lsp.buf.format()
+  end, {})
+end
+
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require('coq').lsp_ensure_capabilities(capabilities)
+
+require('lspconfig').lua_ls.setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+	root_dir = function()
+        return vim.loop.cwd()
+    end,
+	cmd = { "lua-lsp" },
+    settings = {
+        Lua = {
+            workspace = { checkThirdParty = false },
+            telemetry = { enable = false },
+        },
+    }
+}
+
+require('lspconfig').nil_ls.setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+}

packages/nvim/lua/plugins/arduino.lua

@@ -1,7 +0,0 @@
-return{
-  "glebzlat/arduino-nvim",
-  config = {
-    function() require("arduino-nvim").setup() end,
-    filetype = "arduino",
-  }
-}

packages/nvim/lua/plugins/lsp.lua

@@ -1,70 +1,32 @@
 return {
   'neovim/nvim-lspconfig',
   dependencies = { 'saghen/blink.cmp' },
-  config = function(_,_) 
 
-    local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server'
+  -- example using `opts` for defining servers
-
+  opts = {
-    local tsserver_filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }
+    servers = {
-    local vue_plugin = {
+      lua_ls = {},
-      name = '@vue/typescript-plugin',
+      nil_ls = {},
-      location = vue_language_server_path,
+      -- vue_ls = {},
-      languages = { 'vue' },
+      -- rust_analyzer = {},
-      configNamespace = 'typescript',
+      -- gopls = {},
     }
-    local vtsls_config = {
+  },
-      settings = {
+  config = function(_, opts)
-        vtsls = {
+    local lspconfig = require('lspconfig')
-          tsserver = {
+    for server, config in pairs(opts.servers) do
-            globalPlugins = {
+      -- passing config.capabilities to blink.cmp merges with the capabilities in your
-              vue_plugin,
+      -- `opts[server].capabilities, if you've defined it
-            },
+      config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
-          },
+      lspconfig[server].setup(config)
-        },
+    end
-      },
-      filetypes = tsserver_filetypes,
-    }
-
-    local ts_ls_config = {
-      init_options = {
-        plugins = {
-          vue_plugin,
-        },
-      },
-      filetypes = tsserver_filetypes,
-    }
-
-    -- If you are on most recent `nvim-lspconfig`
-    local vue_ls_config = {}
-    -- nvim 0.11 or above
-    vim.lsp.config('vtsls', vtsls_config)
-    vim.lsp.config('vue_ls', vue_ls_config)
-    vim.lsp.config('lua_ls', {})
-    -- vim.lsp.config('rust_analyzer', {})
-    vim.lsp.enable({'vtsls', 'vue_ls', 'lua_ls'})
   end
 
-
+ -- -- example calling setup directly for each LSP
-    -- opts = {
+ --  config = function()
-    --   servers = {
+ --    local capabilities = require('blink.cmp').get_lsp_capabilities()
-    --     lua_ls = {},
+ --    local lspconfig = require('lspconfig')
-    --     nil_ls = {},
+ --
-    --     vstls = {},
+ --    lspconfig['lua_ls'].setup({ capabilities = capabilities })
-    --     vue_ls = {},
+ --  end
-    --     -- rust_analyzer = {},
-    --     -- gopls = {},
-    --   }
-    -- },
-    -- config = function(_, opts)
-    --   for server, config in pairs(opts.servers) do
-    --     config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
-    --     
-    --     -- Verwende `vim.lsp.config` um die Konfiguration anzupassen
-    --     vim.lsp.config(server, config)
-    --     
-    --     -- Aktiviere die Konfiguration
-    --     vim.lsp.enable(server)
-    --   end
-    -- end
 }
-

packages/nvim/lua/plugins/mason-lspconfig.lua

@@ -1,8 +0,0 @@
-return {
-    "mason-org/mason-lspconfig.nvim",
-    opts = {},
-    dependencies = {
-        { "mason-org/mason.nvim", opts = {} },
-        "neovim/nvim-lspconfig",
-    },
-}

packages/nvim/lua/plugins/mason.lua

@@ -1,46 +1,37 @@
 return {
-    "mason-org/mason.nvim",
+
-    config = function ()
+  "williamboman/mason.nvim",
-      require("mason").setup()
+  cmd = "Mason",
-    end
+  keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
+  build = ":MasonUpdate",
+  opts_extend = { "ensure_installed" },
+  opts = {
+    ensure_installed = {
+      "stylua",
+      "shfmt",
+    },
+  },
+  ---@param opts MasonSettings | {ensure_installed: string[]}
+  config = function(_, opts)
+    require("mason").setup(opts)
+    local mr = require("mason-registry")
+    mr:on("package:install:success", function()
+      vim.defer_fn(function()
+        -- trigger FileType event to possibly load this newly installed LSP server
+        require("lazy.core.handler.event").trigger({
+          event = "FileType",
+          buf = vim.api.nvim_get_current_buf(),
+        })
+      end, 100)
+    end)
+
+    mr.refresh(function()
+      for _, tool in ipairs(opts.ensure_installed) do
+        local p = mr.get_package(tool)
+        if not p:is_installed() then
+          p:install()
+        end
+      end
+    end)
+  end,
 }
-
-
--- return {
---
---   "williamboman/mason.nvim",
---   cmd = "Mason",
---   keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
---   build = ":MasonUpdate",
---   opts_extend = { "ensure_installed" },
---   opts = {
---     ensure_installed = {
---       -- "stylua",
---       -- "shfmt",
---     },
---   },
---   ---@param opts MasonSettings | {ensure_installed: string[]}
---   config = function(_, opts)
---     require("mason").setup(opts)
---     local mr = require("mason-registry")
---     mr:on("package:install:success", function()
---       vim.defer_fn(function()
---         -- trigger FileType event to possibly load this newly installed LSP server
---         require("lazy.core.handler.event").trigger({
---           event = "FileType",
---           buf = vim.api.nvim_get_current_buf(),
---         })
---       end, 100)
---     end)
---
---     mr.refresh(function()
---       for _, tool in ipairs(opts.ensure_installed) do
---         local p = mr.get_package(tool)
---         if not p:is_installed() then
---           p:install()
---         end
---       end
---     end)
---   end,
--- }
-

packages/nvim/lua/plugins/notify.lua

@@ -1,6 +0,0 @@
-return {
-  "rcarriga/nvim-notify",
-  config = function ()
-    vim.notify = require("notify")
-  end
-}

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

packages/nvim/lua/plugins/rustaceanvim.lua

@@ -1,29 +1,5 @@
 return {
-	"mrcjkb/rustaceanvim",
+  'mrcjkb/rustaceanvim',
-	version = "^6", -- Recommended
+  version = '^6', -- Recommended
-	lazy = false, -- This plugin is already lazy
+  lazy = false, -- This plugin is already lazy
-
-  keys = {
-    { "<leader>rrr", ":RustRun<CR>", desc = "Rust run" },
-    {"<leader>rd", ":RustLsp debug<CR>", desc = "Debug rust program" },
-    {"<leader>rh", ":RustLsp hover actions<CR>", desc = "rust hover actions" },
-    {"<leader>re", ":RustLsp explainError<CR>", desc = "explain rust error" },
-    {"<leader>rs", ":RustLsp openDocs<CR>",desc = "open rust docs for symbol under cursor" },
-    {"<leader>rrn", ":RustLsp ssr ", desc = "rust rename" }
-  },
-	-- opts = {
-	-- 	function()
-	-- 		vim.keymap.set("n", "<leader>rrr", ":RustRun<CR>", { desc = "Run rust program" })
-	-- 		vim.keymap.set("n", "<leader>rd", ":RustLsp debug<CR>", { desc = "Debug rust program" })
-	-- 		vim.keymap.set("n", "<leader>rh", ":RustLsp hover actions<CR>", { desc = "rust hover actions" })
-	-- 		vim.keymap.set("n", "<leader>re", ":RustLsp explainError<CR>", { desc = "explain rust error" })
-	-- 		vim.keymap.set(
-	-- 			"n",
-	-- 			"<leader>rs",
-	-- 			":RustLsp openDocs<CR>",
-	-- 			{ desc = "open rust docs for symbol under cursor" }
-	-- 		)
-	-- 		vim.keymap.set("n", "<leader>rrn", ":RustLsp ssr ", { desc = "rust rename" })
-	-- 	end,
-	-- },
 }

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 = {

packages/other/default.nix

@@ -15,10 +15,10 @@ set preview_images_method kitty
 
 programs.git = {
   enable = true;
-  settings = {
+  userName = "Nico";
+  userEmail = "nicovessen@gmail.com";
+  extraConfig = {
     safe.directory = "/etc/nixos";
-    user.name = "Nico";
-    user.email = "nicovessen@gmail.com";
   };
 };
 

packages/other/default.nix~

@@ -28,7 +28,9 @@ services.kdeconnect = {
   indicator = true;
 };
 
-programs.ladybird.enable = true;
+programs.obsidian = {
+  enable = true;
+};
 
 
 

packages/rofi/default.nix

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

packages/rofi/default.nix~

@@ -3,7 +3,6 @@
  home.packages = with pkgs; [
    rofi-screenshot
    rofi-power-menu
-   rofi-bluetooth
    bitwarden-menu
  ];
 

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 = "wpaperd";}
-	{command = "wl-paste --watch cliphist store";}
       ];
     };
 
 
     extraConfig = ''
+## screens
+#output DP-3 scale 0.9
+#output DP-2 pos 0 0
+
+workspace 10 output DP-3
+for_window [class="Spotify"] scratchpad show
+
       ## Input configuration
       input "type:keyboard" {
         xkb_layout de,us
@@ -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

packages/sway/default.nix~

@@ -13,37 +13,26 @@
       
       startup = [
         # Launch Firefox on start
-	{command = "wpaperd";}
+#	      {command = "wpaperd";}
-	{command = "wl-paste --watch cliphist store";}
       ];
     };
 
 
     extraConfig = ''
+## screens
+#output DP-3 scale 0.9
+#output DP-2 pos 0 0
+
+workspace 10 output DP-3
+for_window [class="Spotify"] scratchpad show
+
       ## Input configuration
       input "type:keyboard" {
-        xkb_layout de,us
+        xkb_layout de, us
         xkb_variant "nodeadkeys"
         xkb_options grp:alt_shift_toggle
       }
 
-input "type:touchpad" {
-    tap enabled         # enables click-on-tap
-    tap_button_map lrm  # tap with 1 finger = left click, 2 fingers = right click, 3 fingers = middle click
-    dwt enabled         # disable (touchpad) while typing
-    dwtp disabled        # disable (touchpad) while track pointing
-}
-
-#touch {
-#    set along_the_top "20px x 1.0 @ .5 x 0"
-#    set bottom_half "1.0 x .5 @ 0 x .5"
-#    set right_half ".5 x 1.0 @ .5 x 0"
-
-#    gesture exec 'rofi -show drun'{
-#            down 1 $along_the_top
-#            horiz +100px < move
-#    }
-#}
 
       # Brightness
       bindsym XF86MonBrightnessDown exec light -U 10
@@ -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

packages/terminal/default.nix

@@ -29,6 +29,7 @@ programs.carapace = {
   enableNushellIntegration = true;
 };
 
+# programs.thefuck.enable = true;
 
 programs.starship.enable = true;
 
@@ -39,8 +40,7 @@ programs.zsh = {
   syntaxHighlighting.enable = true;
 
   shellAliases = {
-    # update = "sudo nixos-rebuild switch";
+    update = "sudo nixos-rebuild switch";
-    update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
     emacs = "emacs -nw";
     femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el";
     pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
@@ -59,15 +59,19 @@ programs.zsh = {
 
   oh-my-zsh = {
     enable = true;
-    plugins = [ ];
+    # plugins = [ "thefuck" ];
     # theme = "";
   };
 };
 
 
-programs.fzf = {
+
+programs.ghostty = {
   enable = true;
-  enableZshIntegration = true;
+};
+
+home.file."/home/nico/.config/ghostty/config" = {
+  source = ./ghostty-config;
 };
 
 programs.zoxide = {
@@ -75,15 +79,6 @@ programs.zoxide = {
   enableZshIntegration = true;
 };
 
-programs.ghostty = {
-  enable = true;
-};
-
-home.file."/home/n/.config/ghostty/config" = {
-  source = ./ghostty-config;
-};
-
-
 programs.kitty = {
   enable = true;
   

packages/waybar/config

@@ -3,9 +3,9 @@
   "position": "top",
   "height": 38,
   "spacing": 0,
-  "modules-left": ["clock", "niri/workspaces"],
+  "modules-left": ["clock", "niri/workspaces", "hyprland/submap"],
   "modules-center": [ ],
-  "modules-right": ["network", "battery", "cpu", "memory", "custom/notification", "pulseaudio", "tray"],
+  "modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],
 
 "custom/keyboard-layout": {
   "interval": 1,
@@ -41,22 +41,7 @@
   "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
-      }
   }
 
+
 }

packages/wpaperd/config.toml

@@ -1,4 +1,4 @@
 [any]
 duration = "10m"
 mode = "center"
-path = "/home/n/Documents/Wallpapers"
+path = "/home/nico/Documents/Wallpapers"

packages/wpaperd/default.nix

@@ -1,6 +1,7 @@
 { pkgs, config, lib,... }:
 {
   home.packages = with pkgs; [
+  wpaperd
   ];
 
   home.file =

packages/zed-editor/default.nix

@@ -1,54 +0,0 @@
-{pkgs, lib, ... }:
-
-{
-  home.file."/home/nico/.config/zed/settings.json" = {
-    source = ./settings.json;
-  };
-    programs.zed-editor = {
-        enable = true;
-    };
-    #     ## This populates the userSettings "auto_install_extensions"
-    #     extensions = ["nix" "Catppuccin"];
-    #
-    #     ## everything inside of these brackets are Zed options.
-    #     userSettings = {
-    #         assistant = {
-    #             enabled = false;
-    #         };
-    #
-    #         hour_format = "hour24";
-    #         auto_update = false;
-    #         lsp = {
-    #             rust-analyzer = {
-    #                 binary = {
-    #                     path_lookup = true;
-    #                 };
-    #             };
-    #             nix = { 
-    #                 binary = { 
-    #                     path_lookup = true; 
-    #                 }; 
-    #             };
-    #         };
-    #
-    #
-    #         languages = {
-    #         };
-    #
-    #         vim_mode = true;
-    #         ## tell zed to use direnv and direnv can use a flake.nix enviroment.
-    #         load_direnv = "shell_hook";
-    #         base_keymap = "VSCode";
-    #         theme = {
-    #             mode = "dark";
-    #             light = "Catppuccin frappe";
-    #             dark = "Catppuccin mocha";
-    #         };
-    #         show_whitespaces = "all" ;
-    #         ui_font_size = 16;
-    #         buffer_font_size = 16;
-    #
-    #     };
-    #
-    # };
-}

packages/zed-editor/settings.json

@@ -1,57 +0,0 @@
-{
-  "diagnostics": {
-        "include_warnings": true,
-        "inline": {
-            "enabled": true
-        }
-},
-  "git": {
-    "inline_blame": {
-        "enabled": false
-    }
-},
-  "ssh_connections": [
-    {
-      "host": "localhost",
-      "projects": [
-        {
-          "paths": [
-            "/home/dev/ids/prog"
-          ]
-        }
-      ]
-    }
-  ],
-  "agent": {
-    "enabled": true
-  },
-  "auto_update": false,
-  "base_keymap": "VSCode",
-  "buffer_font_size": 16,
-  "hour_format": "hour24",
-  "languages": {},
-  "load_direnv": "shell_hook",
-  "lsp": {
-    "nix": {
-      "binary": {
-        "path_lookup": true
-      }
-    },
-    "rust-analyzer": {
-      "binary": {
-        "path_lookup": true
-      }
-    }
-  },
-  "show_whitespaces": "all",
-  "theme": {
-    "dark": "Catppuccin Mocha",
-    "light": "Catppuccin frappe",
-    "mode": "system"
-  },
-  "features": {
-    "edit_prediction_provider": "none"
-  },
-  "ui_font_size": 16,
-  "vim_mode": true
-}

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";
-          };
-        };
-      }
-    )
-  ];
-}
-

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";
-          };
-        };
-      }
-    )
-  ];
-}
-

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

shells/arduino/flake.nix

@@ -1,53 +0,0 @@
-{
-  description = "Arduino";
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      in
-        {
-        devShell =
-          with pkgs; mkShell rec {
-            buildInputs = [
-              arduino-ide
-              arduino-cli
-              # arduino-language-server
-
-              # (vscode-with-extensions.override {
-              #   vscode = vscodium;
-              #   vscodeExtensions = with vscode-extensions; [
-              #     ms-vscode.cpptools
-              #   ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-              #     {
-              #       name = "vscode-arduino-community";
-              #       publisher = "vscode-arduino";
-              #       version = "0.7.2";
-              #       sha256 = "FvKCAHiebcBObSFXCftcFpsDrA1TUv7TqKftFNeLAPI=";
-              #     }
-              #     # {
-              #     #   name = "vscode-serial-monitor";
-              #     #   publisher = "microsoft";
-              #     #   version = "0.13.250616001";
-              #     #   sha256 = "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb";
-              #     # }
-              #   ];
-              # })
-            ];
-
-            shellHook = ''
-              zsh 
-
-              exit
-            '';
-          };
-      });
-}
-
-

shells/flutter/flake.nix

@@ -1,101 +1,43 @@
 {
-  inputs = {
+description = "Flutter 3.13.x";
-    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+inputs = {
-
+  nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-parts = {
+  flake-utils.url = "github:numtide/flake-utils";
-      url = "github:hercules-ci/flake-parts";
+};
-      inputs.nixpkgs-lib.follows = "nixpkgs";
+outputs = { self, nixpkgs, flake-utils }:
-    };
+  flake-utils.lib.eachDefaultSystem (system:
-
+    let
-    android-nixpkgs.url = "github:tadfisher/android-nixpkgs";
+      pkgs = import nixpkgs {
-  };
+        inherit system;
-
+        config = {
-
+          android_sdk.accept_license = true;
-  outputs = {
+          allowUnfree = true;
-    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;
       };
-    };
+      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
+          '';
+        };
+    });
 }

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

shells/go/flake.nix

@@ -18,7 +18,6 @@
             GOPATH="${go}";
             buildInputs = [
               go
-              gopls
             ];
 
             shellHook = ''

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
+            '';
+          };
+      });
+}
+
+

shells/rust/flake.nix

@@ -34,7 +34,6 @@
             gtk3
             librsvg
             xdotool
-            rustfmt
           ];
 
           # RUSTC_VERSION = overrides.toolchain.channel;

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";
+      };
+    });
+}