Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 93d98e3001 | |||
|
|
66767ebdfe | ||
|
|
2224c25e2b | ||
|
|
f60bf4608f | ||
|
|
e39404d44d | ||
|
|
3cb6e5d907 | ||
|
|
5b303353f5 | ||
|
|
20996e42e1 | ||
|
|
936064f3e7 | ||
|
|
32fe50e27c | ||
|
|
f85d945337 | ||
|
|
6c601333a0 | ||
|
|
9476766bb0 | ||
|
|
ca27831f4a | ||
|
|
cdc170770f | ||
|
|
b9e3afef79 | ||
|
|
a764ae7695 | ||
|
|
0b2e29fa76 | ||
|
|
6419427a05 | ||
|
|
25ab3a589b |
@@ -1,70 +1,67 @@
|
|||||||
# 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, ... }:
|
{ config, pkgs, inputs, ... }:
|
||||||
|
|
||||||
{
|
{ imports =
|
||||||
imports =
|
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
|
];
|
||||||
|
|
||||||
];
|
nix.settings.trusted-users = [ "root" "nico" ];
|
||||||
|
|
||||||
|
|
||||||
# home manager
|
# home manager
|
||||||
home-manager = {
|
home-manager = {
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = { inherit inputs; };
|
||||||
users = {
|
users = {
|
||||||
"n" = import ./home-nico.nix;
|
"nico" = import ./home-nico.nix;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"electron-33.4.11"
|
|
||||||
];
|
|
||||||
|
|
||||||
# hyprland
|
# hyprland
|
||||||
programs.hyprland = {
|
# programs.hyprland = {
|
||||||
enable = true;
|
# 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.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
boot.loader.grub.useOSProber = true;
|
||||||
|
|
||||||
boot.kernelParams = [ "ipv6.disable=1" ];
|
fileSystems."mnt/win" = {
|
||||||
networking.hostName = "nico-nixos-laptop"; # Define your hostname.
|
device = "/dev/disk/by-partuuid/8d0a8dd9-7a4c-4d3e-a5eb-98c0aed35db5";
|
||||||
networking.enableIPv6 = false;
|
fsType = "ntfs-3g";
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
options = ["rw" "uid=1000"];
|
||||||
|
};
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
# Flakes
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
|
# 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
|
# Enable networking
|
||||||
|
boot.kernelParams = [ "ipv6.disable=1" ];
|
||||||
networking.networkmanager.enable = true;
|
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.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
@@ -72,192 +69,174 @@
|
|||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
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.
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
|
||||||
# Enable the XFCE Desktop Environment.
|
xdg.portal = {
|
||||||
services.displayManager.sddm.enable = true;
|
enable = true;
|
||||||
services.desktopManager.plasma6.enable = true;
|
extraPortals = with pkgs; [
|
||||||
|
xdg-desktop-portal-gtk
|
||||||
environment.plasma6.excludePackages = with pkgs.kdePackages; [
|
xdg-desktop-portal-gnome
|
||||||
konsole
|
];
|
||||||
];
|
config = {
|
||||||
|
common = {
|
||||||
|
default = [ "gtk" ];
|
||||||
|
};
|
||||||
virtualisation.virtualbox.host.enable = true;
|
niri = {
|
||||||
virtualisation.docker.enable = true;
|
default = [
|
||||||
users.extraGroups.vboxusers.members = [ "n" ];
|
"gtk"
|
||||||
virtualisation.virtualbox.host.enableExtensionPack = true;
|
"gnome"
|
||||||
|
];
|
||||||
|
"org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
|
||||||
# Configure keymap in X11
|
"org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
|
||||||
services.xserver = {
|
};
|
||||||
xkb = {
|
|
||||||
variant = "";
|
|
||||||
layout = "de";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
# Enable the KDE Plasma Desktop Environment.
|
||||||
|
services.displayManager.sddm.enable = true;
|
||||||
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
|
# Configure keymap in X11
|
||||||
|
services.xserver = { xkb.layout = "us"; xkb.variant = "";
|
||||||
|
};
|
||||||
|
|
||||||
# Configure console keymap
|
# Configure console keymap
|
||||||
console.keyMap = "de";
|
console.keyMap = "us";
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
services.pulseaudio.enable = false;
|
services.pulseaudio.enable = false;
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
alsa.support32Bit = true;
|
alsa.support32Bit = true;
|
||||||
pulse.enable = 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
|
||||||
# no need to redefine it in your config for now)
|
# need to redefine it in your config for now)
|
||||||
#media-session.enable = true;
|
#media-session.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
systemd.user.services.orca.enable = false;
|
||||||
services.libinput.enable = true;
|
# Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable
|
||||||
|
# = true;
|
||||||
programs.light.enable = true;
|
services.mullvad-vpn.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’.
|
# 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 ];
|
||||||
|
programs.zsh.enable = true;
|
||||||
# Install firefox.
|
|
||||||
programs.firefox.enable = true;
|
|
||||||
services.flatpak.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfree = true;
|
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.spotify
|
|
||||||
pkgs.devenv
|
|
||||||
pkgs.vim
|
|
||||||
pkgs.wget
|
|
||||||
pkgs.git
|
|
||||||
# pkgs.kitty
|
|
||||||
pkgs.tree
|
|
||||||
pkgs.nodejs
|
|
||||||
pkgs.anki-bin
|
|
||||||
pkgs.unzip
|
|
||||||
pkgs.mullvad-vpn
|
|
||||||
pkgs.discord
|
|
||||||
# pkgs.musescore
|
|
||||||
# pkgs.butterfly
|
|
||||||
pkgs.btop
|
|
||||||
# pkgs.cura
|
|
||||||
# bitwarden-cli
|
|
||||||
|
|
||||||
|
|
||||||
# nvim
|
|
||||||
pkgs.gnumake
|
|
||||||
pkgs.python312Packages.pip
|
|
||||||
pkgs.python312
|
|
||||||
pkgs.cargo
|
|
||||||
pkgs.rustup
|
|
||||||
pkgs.rust-analyzer
|
|
||||||
pkgs.ripgrep
|
|
||||||
pkgs.gcc
|
|
||||||
pkgs.lua-language-server
|
|
||||||
pkgs.nil
|
|
||||||
|
|
||||||
# sway
|
|
||||||
pkgs.pavucontrol
|
|
||||||
pkgs.networkmanagerapplet
|
|
||||||
pkgs.wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
|
|
||||||
pkgs.go
|
|
||||||
pkgs.cliphist
|
|
||||||
pkgs.mako # notification system developed by swaywm maintainer
|
|
||||||
pkgs.waybar # bar
|
|
||||||
pkgs.pulseaudio # audiocontrols
|
|
||||||
pkgs.brightnessctl # brightness controls
|
|
||||||
pkgs.wpaperd # wallpaper manager
|
|
||||||
pkgs.onboard
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
# services.flatpak.enable = true;
|
||||||
|
programs.nix-ld.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
|
||||||
|
ntfs3g
|
||||||
|
heroic
|
||||||
|
wineWowPackages.stable
|
||||||
|
winetricks
|
||||||
|
spotify
|
||||||
|
#spicetify-cli
|
||||||
|
sshfs
|
||||||
|
freetube
|
||||||
|
# anydesk
|
||||||
|
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; [
|
fonts.packages = with pkgs; [
|
||||||
#iosevka
|
# iosevka
|
||||||
# (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
|
# (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; })
|
||||||
nerd-fonts.jetbrains-mono
|
nerd-fonts.jetbrains-mono
|
||||||
nerd-fonts.ubuntu-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 = 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:
|
# 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 = false;
|
||||||
|
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
enable = true;
|
enable = false;
|
||||||
allowedTCPPortRanges = [
|
allowedTCPPortRanges = [
|
||||||
{ from = 1714; to = 1764; } # KDE Connect
|
{ from = 1714; to = 1764; } # KDE Connect
|
||||||
];
|
];
|
||||||
@@ -267,12 +246,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?
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
228
flake.lock
generated
228
flake.lock
generated
@@ -3,15 +3,14 @@
|
|||||||
"ags": {
|
"ags": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"astal": "astal",
|
"astal": "astal",
|
||||||
"gnim": "gnim",
|
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754487835,
|
"lastModified": 1763165251,
|
||||||
"narHash": "sha256-GRCkm7a1odlN3hHR1iBIxwmBPWAw1CDOnOdpmZGSKkQ=",
|
"narHash": "sha256-HqprJ5e5+tLVbk3EuWnyiBkVfKTA149eHh+u2VzUrY0=",
|
||||||
"owner": "Aylur",
|
"owner": "Aylur",
|
||||||
"repo": "ags",
|
"repo": "ags",
|
||||||
"rev": "8e91fcd52b807f576a794ccc9533bdf720ef5af7",
|
"rev": "0cbca42b11d23aad8c0689fc7385e517bde94c61",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -28,11 +27,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752404970,
|
"lastModified": 1762012522,
|
||||||
"narHash": "sha256-XULTToDUkIshNXEO+YP2mAHdQv8bxWDvKjbamBfOC8E=",
|
"narHash": "sha256-ncEN4OVFM5M9VFc4oR3gOI5K8r99GcYxtU+Cf4Z8pbs=",
|
||||||
"owner": "aylur",
|
"owner": "aylur",
|
||||||
"repo": "astal",
|
"repo": "astal",
|
||||||
"rev": "2c5eb54f39e1710c6e2c80915a240978beb3269a",
|
"rev": "671d4229c798834190a50fb8b8d8addd19b529e9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -41,6 +40,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"crane": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1762538466,
|
||||||
|
"narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=",
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"rev": "0cea393fffb39575c46b7a0318386467272182fe",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -57,6 +71,21 @@
|
|||||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1761588595,
|
||||||
|
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
@@ -65,11 +94,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753121425,
|
"lastModified": 1760948891,
|
||||||
"narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
|
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
|
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -78,22 +107,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gnim": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1753090800,
|
|
||||||
"narHash": "sha256-6sS6KHong2cMGn+6xJwjiizZzwu2XUmp++DtiKZhFMU=",
|
|
||||||
"owner": "aylur",
|
|
||||||
"repo": "gnim",
|
|
||||||
"rev": "2f58f8444c4cb8fefeab7a9901a33e99cfa92457",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "aylur",
|
|
||||||
"repo": "gnim",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -101,11 +114,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754503522,
|
"lastModified": 1763416652,
|
||||||
"narHash": "sha256-V0iiDcYvNeMOP2FyfgC4H8Esx+JodXEl80lD4hFD4SI=",
|
"narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "13461dec40bf03d9196ff79d1abe48408268cc35",
|
"rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -122,11 +135,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755121891,
|
"lastModified": 1762964643,
|
||||||
"narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=",
|
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426",
|
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -137,11 +150,11 @@
|
|||||||
},
|
},
|
||||||
"mnw": {
|
"mnw": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748710831,
|
"lastModified": 1758834834,
|
||||||
"narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
|
"narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
|
||||||
"owner": "Gerg-L",
|
"owner": "Gerg-L",
|
||||||
"repo": "mnw",
|
"repo": "mnw",
|
||||||
"rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
|
"rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -152,11 +165,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753694789,
|
"lastModified": 1761907660,
|
||||||
"narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
|
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
|
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -168,11 +181,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754214453,
|
"lastModified": 1763421233,
|
||||||
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
|
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
|
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -184,11 +197,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753432016,
|
"lastModified": 1761880412,
|
||||||
"narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
|
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
|
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -200,11 +213,40 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727348695,
|
"lastModified": 1762977756,
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 315532800,
|
||||||
|
"narHash": "sha256-5CwQ80ucRHiqVbMEEbTFnjz70/axSJ0aliyzSaFSkmY=",
|
||||||
|
"rev": "f6b44b2401525650256b977063dbcf830f762369",
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre891648.f6b44b240152/nixexprs.tar.xz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_6": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1762977756,
|
||||||
|
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -223,11 +265,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754388740,
|
"lastModified": 1762622004,
|
||||||
"narHash": "sha256-6++6FDc/hcMpaJPgOrGzwmzCSgix3zIlcuTIy9+aNSs=",
|
"narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=",
|
||||||
"owner": "notashelf",
|
"owner": "notashelf",
|
||||||
"repo": "nvf",
|
"repo": "nvf",
|
||||||
"rev": "22fb0d22cc474e85f94c5aa95b6c550c81ca7278",
|
"rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -242,9 +284,51 @@
|
|||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nvf": "nvf",
|
"nvf": "nvf",
|
||||||
|
"spicetify-nix": "spicetify-nix",
|
||||||
|
"zed": "zed",
|
||||||
"zen-browser": "zen-browser"
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"zed",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1762915112,
|
||||||
|
"narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"spicetify-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs_4",
|
||||||
|
"systems": "systems_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1763267524,
|
||||||
|
"narHash": "sha256-CywB4iCpGr4CYZAD+WboFwBQ7Wnc7LdfSemFWuH/1Ro=",
|
||||||
|
"owner": "Gerg-L",
|
||||||
|
"repo": "spicetify-nix",
|
||||||
|
"rev": "cf33e39bd1a21993a28ffee8be433e212ecf346a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Gerg-L",
|
||||||
|
"repo": "spicetify-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
@@ -260,17 +344,53 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"zed": {
|
||||||
|
"inputs": {
|
||||||
|
"crane": "crane",
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"nixpkgs": "nixpkgs_5",
|
||||||
|
"rust-overlay": "rust-overlay"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1763568568,
|
||||||
|
"narHash": "sha256-PP4h13/BhOnqagvJUtILvnGIylQFm9EmIKeW6vzpWhY=",
|
||||||
|
"owner": "zed-industries",
|
||||||
|
"repo": "zed",
|
||||||
|
"rev": "f05eef58c46be2d6617847494b444ac442780367",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "zed-industries",
|
||||||
|
"repo": "zed",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"zen-browser": {
|
"zen-browser": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755184939,
|
"lastModified": 1763521945,
|
||||||
"narHash": "sha256-gxKs+3tfe5lNgu3hpiJmRUCkvri4vq2mUL6GL/+OCxM=",
|
"narHash": "sha256-Zcrafbe4niRJMbzaVOwg7+iedJhwBFttre2DpyCC6qA=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "884b88c3ff7f283aec14ecb0a2a35e2da7607eae",
|
"rev": "24d7381b9231c23daceec5d372cc28e877f7785d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -15,12 +15,16 @@
|
|||||||
|
|
||||||
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
zen-browser.url = "github:0xc000022070/zen-browser-flake";
|
||||||
|
|
||||||
|
spicetify-nix.url = "github:Gerg-L/spicetify-nix";
|
||||||
|
|
||||||
|
zed.url = "github:zed-industries/zed";
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nvf, zen-browser, ... }@inputs:
|
outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, ... }@inputs:
|
||||||
let system = "x86_64-linux"; in
|
let system = "x86_64-linux"; in
|
||||||
{
|
{
|
||||||
nixosConfigurations.my-nixos = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
@@ -29,6 +33,7 @@
|
|||||||
./configuration.nix
|
./configuration.nix
|
||||||
# inputs.zen-browser.packages."${system}".default
|
# inputs.zen-browser.packages."${system}".default
|
||||||
# nvf.homeManagerModules.default
|
# nvf.homeManagerModules.default
|
||||||
|
# inputs.zed.packages."${system}".default
|
||||||
inputs.home-manager.nixosModules.default
|
inputs.home-manager.nixosModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -8,18 +8,18 @@
|
|||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
[ (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.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{ device = "/dev/disk/by-uuid/1d64861a-3d30-4b76-8a19-9a68618ddf3a";
|
{ device = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" =
|
||||||
{ device = "/dev/disk/by-uuid/580D-111D";
|
{ device = "/dev/disk/by-uuid/CB01-5AA6";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
};
|
};
|
||||||
@@ -31,9 +31,8 @@
|
|||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# 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`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
networking.useDHCP = lib.mkDefault true;
|
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";
|
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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,16 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ config, pkgs, lib, system, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
home.username = "n";
|
home.username = "nico";
|
||||||
home.homeDirectory = "/home/n";
|
home.homeDirectory = "/home/nico";
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./packages
|
./packages
|
||||||
|
inputs.spicetify-nix.homeManagerModules.default
|
||||||
inputs.zen-browser.homeModules.default
|
inputs.zen-browser.homeModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
allowUnfreePredicate = (_: true);
|
allowUnfreePredicate = (_: true);
|
||||||
@@ -17,16 +18,77 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
floorp
|
# floorp
|
||||||
# freetube
|
|
||||||
];
|
];
|
||||||
programs.zen-browser = {
|
|
||||||
|
programs.zen-browser.enable = true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
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 = true;
|
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";
|
home.stateVersion = "24.05";
|
||||||
|
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
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
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
general.import = [
|
|
||||||
"/etc/nixos/packages/alacritty/catppuccin-mocha.toml"
|
|
||||||
]
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
general.import = [
|
|
||||||
"~/.config/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"
|
|
||||||
@@ -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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -2,22 +2,21 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
# ./ags
|
# ./ags
|
||||||
./fuzzel
|
|
||||||
./other
|
./other
|
||||||
|
# ./floorp
|
||||||
./sway
|
./sway
|
||||||
./swaync
|
./swaync
|
||||||
./waybar
|
./waybar
|
||||||
./wpaperd
|
./wpaperd
|
||||||
./nvim
|
./nvim
|
||||||
./emacs
|
# ./emacs
|
||||||
./terminal
|
./terminal
|
||||||
./rofi
|
./rofi
|
||||||
# ./alacritty
|
./fuzzel
|
||||||
# ./tmux
|
|
||||||
# ./mako
|
|
||||||
# ./qutebrowser
|
|
||||||
./hyprland
|
|
||||||
./niri
|
./niri
|
||||||
|
./hyprland
|
||||||
|
./zed-editor
|
||||||
|
# ./tmux
|
||||||
# ./vscode
|
# ./vscode
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
16
packages/default.nix~
Normal file
16
packages/default.nix~
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
# ./ags
|
||||||
|
./other
|
||||||
|
./sway
|
||||||
|
./waybar
|
||||||
|
./wpaperd
|
||||||
|
./nvim
|
||||||
|
./emacs
|
||||||
|
./kitty
|
||||||
|
./rofi
|
||||||
|
# ./hyprland
|
||||||
|
# ./vscode
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -12,7 +12,6 @@ in {
|
|||||||
(telephone-line-mode 1)
|
(telephone-line-mode 1)
|
||||||
(xterm-mouse-mode 1)
|
(xterm-mouse-mode 1)
|
||||||
|
|
||||||
|
|
||||||
(setq evil-want-C-u-scroll t)
|
(setq evil-want-C-u-scroll t)
|
||||||
|
|
||||||
(menu-bar--display-line-numbers-mode-relative)
|
(menu-bar--display-line-numbers-mode-relative)
|
||||||
@@ -233,14 +232,13 @@ in {
|
|||||||
|
|
||||||
(setq lsp-keymap-prefix "C-c l")
|
(setq lsp-keymap-prefix "C-c l")
|
||||||
(require 'lsp-mode)
|
(require 'lsp-mode)
|
||||||
(evil-set-undo-system 'undo-redo)
|
|
||||||
(flycheck-inline-mode nil)
|
(flycheck-inline-mode nil)
|
||||||
(global-evil-vimish-fold-mode 1)
|
|
||||||
'';
|
'';
|
||||||
package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
|
package = emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [
|
||||||
|
catppuccin-theme
|
||||||
])
|
])
|
||||||
++ (with epkgs.melpaPackages; [
|
++ (with epkgs.melpaPackages; [
|
||||||
catppuccin-theme
|
|
||||||
evil
|
evil
|
||||||
nix-mode
|
nix-mode
|
||||||
lsp-treemacs
|
lsp-treemacs
|
||||||
@@ -260,7 +258,6 @@ in {
|
|||||||
which-key
|
which-key
|
||||||
magit
|
magit
|
||||||
format-all
|
format-all
|
||||||
evil-vimish-fold
|
|
||||||
])
|
])
|
||||||
++ (with epkgs.elpaPackages; [
|
++ (with epkgs.elpaPackages; [
|
||||||
undo-tree
|
undo-tree
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
description = "Flutter 3.13.x";
|
description = "Flutter 3.13.x";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
};
|
};
|
||||||
outputs = { self, nixpkgs, flake-utils }:
|
outputs = { self, nixpkgs, flake-utils }:
|
||||||
@@ -14,18 +14,46 @@ outputs = { self, nixpkgs, flake-utils }:
|
|||||||
allowUnfree = true;
|
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
|
in
|
||||||
{
|
{
|
||||||
devShell =
|
devShell =
|
||||||
with pkgs; mkShell rec {
|
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";
|
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
flutter
|
flutter
|
||||||
androidSdk
|
androidSdk # The customized SDK that we've made above
|
||||||
jdk17
|
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=";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
60
packages/emacs/flutter/flake.nix~
Normal file
60
packages/emacs/flutter/flake.nix~
Normal file
@@ -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=";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
44
packages/floorp/default.nix
Normal file
44
packages/floorp/default.nix
Normal file
@@ -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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
home.file."/home/n/.config/fuzzel/fuzzel.ini" = {
|
home.file."/home/nico/.config/fuzzel/fuzzel.ini" = {
|
||||||
source = ./fuzzel.ini;
|
source = ./fuzzel.ini;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
dpi-aware=yes
|
dpi-aware=yes
|
||||||
font=RobotoMonoNerdFont-Thin:size=8
|
font=RobotoMonoNerdFont-Thin:size=12
|
||||||
terminal=ghostty
|
terminal=ghostty
|
||||||
width=30
|
|
||||||
layer=overlay
|
layer=overlay
|
||||||
exit-on-keyboard-focus-loss=no
|
exit-on-keyboard-focus-loss=no
|
||||||
inner-pad=15
|
inner-pad=15
|
||||||
|
|||||||
@@ -67,8 +67,6 @@ bindm = $mainMod, mouse:273, resizewindow
|
|||||||
bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%
|
bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%
|
||||||
bind = , XF86AudioLowerVolume, 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 = , 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
|
# will switch to a submap called resize
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
input {
|
input {
|
||||||
kb_layout = us,de
|
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
|
follow_mouse = 1
|
||||||
|
|
||||||
|
|||||||
@@ -45,14 +45,13 @@ programs.zsh = {
|
|||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
export PATH=$PATH:$HOME/Documents/Shells/flutter/flutter/bin
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
|
update = "sudo nixos-rebuild switch";
|
||||||
emacs = "emacs -nw";
|
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";
|
pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
|
||||||
};
|
};
|
||||||
zplug = {
|
zplug = {
|
||||||
@@ -72,7 +71,7 @@ programs.zsh = {
|
|||||||
|
|
||||||
|
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = false;
|
enable = true;
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
||||||
|
|||||||
@@ -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 = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
@@ -32,10 +13,6 @@ programs.starship = {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.carapace = {
|
|
||||||
enable = true;
|
|
||||||
enableNushellIntegration = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
@@ -51,7 +28,7 @@ programs.zsh = {
|
|||||||
shellAliases = {
|
shellAliases = {
|
||||||
update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
|
update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
|
||||||
emacs = "emacs -nw";
|
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";
|
pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
|
||||||
};
|
};
|
||||||
zplug = {
|
zplug = {
|
||||||
@@ -83,7 +60,6 @@ programs.kitty = {
|
|||||||
## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
|
## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
|
||||||
## blurb: Soothing pastel theme for the high-spirited!
|
## blurb: Soothing pastel theme for the high-spirited!
|
||||||
|
|
||||||
map ctrl+shift+w no_op
|
|
||||||
|
|
||||||
|
|
||||||
# The basic colors
|
# The basic colors
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
# Colors
|
|
||||||
|
|
||||||
background-color=#1e1e2e
|
|
||||||
text-color=#cdd6f4
|
|
||||||
border-color=#cba6f7
|
|
||||||
progress-color=over #313244
|
|
||||||
|
|
||||||
[urgency=high]
|
|
||||||
border-color=#fab387
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{ pkgs, config, lib, ...}:
|
|
||||||
{
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
mako
|
|
||||||
];
|
|
||||||
|
|
||||||
home.file = {
|
|
||||||
".config/mako/config" = {
|
|
||||||
source = "/etc/nixos/packages/mako/config" ;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,3 +1,11 @@
|
|||||||
|
cursor {
|
||||||
|
xcursor-theme "Banana-Blue"
|
||||||
|
xcursor-size 30
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// This config is in the KDL format: https://kdl.dev
|
// This config is in the KDL format: https://kdl.dev
|
||||||
// "/-" comments out the following node.
|
// "/-" comments out the following node.
|
||||||
// Check the wiki for a full description of the configuration:
|
// Check the wiki for a full description of the configuration:
|
||||||
@@ -13,8 +21,8 @@ input {
|
|||||||
// For more information, see xkeyboard-config(7).
|
// For more information, see xkeyboard-config(7).
|
||||||
|
|
||||||
// For example:
|
// For example:
|
||||||
layout "us,de"
|
// layout "us,ru"
|
||||||
options "grp:win_space_toggle"
|
// options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enable numlock on startup, omitting this setting disables it.
|
// Enable numlock on startup, omitting this setting disables it.
|
||||||
@@ -69,7 +77,7 @@ input {
|
|||||||
// Find more information on the wiki:
|
// Find more information on the wiki:
|
||||||
// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
|
// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
|
||||||
// Remember to uncomment the node by removing "/-"!
|
// Remember to uncomment the node by removing "/-"!
|
||||||
output "eDP-1" {
|
/-output "eDP-1" {
|
||||||
// Uncomment this line to disable this output.
|
// Uncomment this line to disable this output.
|
||||||
// off
|
// off
|
||||||
|
|
||||||
@@ -79,10 +87,10 @@ output "eDP-1" {
|
|||||||
// for the resolution.
|
// for the resolution.
|
||||||
// If the mode is omitted altogether or is invalid, niri will pick one automatically.
|
// 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.
|
// 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.
|
// 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:
|
// Transform allows to rotate the output counter-clockwise, valid values are:
|
||||||
// normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
|
// normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
|
||||||
@@ -97,7 +105,7 @@ output "eDP-1" {
|
|||||||
// so to put another output directly adjacent to it on the right, set its x to 1920.
|
// 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
|
// If the position is unset or results in an overlap, the output is instead placed
|
||||||
// automatically.
|
// automatically.
|
||||||
// position x=1280 y=0
|
position x=1280 y=0
|
||||||
}
|
}
|
||||||
|
|
||||||
// Settings that influence how windows are positioned and sized.
|
// Settings that influence how windows are positioned and sized.
|
||||||
@@ -363,8 +371,10 @@ binds {
|
|||||||
// Suggested binds for running programs: terminal, app launcher, screen locker.
|
// Suggested binds for running programs: terminal, app launcher, screen locker.
|
||||||
Mod+Return hotkey-overlay-title="Open a Terminal: ghostty" { spawn "ghostty"; }
|
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: 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+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+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 'ä\nö\nü\nß\nÄ\nÖ\nÜ' | fuzzel -d | wl-copy"; }
|
||||||
|
|
||||||
// You can also use a shell. Do this if you need pipes, multiple commands, etc.
|
// 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.
|
// Note: the entire command goes as a single argument in the end.
|
||||||
@@ -375,8 +385,6 @@ binds {
|
|||||||
XF86AudioRaiseVolume allow-when-locked=true { spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "+1%"; }
|
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%"; }
|
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"; }
|
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"; }
|
// 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.
|
// Open/close the Overview: a zoomed-out view of workspaces and windows.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
nautilus
|
nautilus
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file."/home/n/.config/niri/config.kdl" = {
|
home.file."/home/nico/.config/niri/config.kdl" = {
|
||||||
source = ./config.kdl;
|
source = ./config.kdl;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
gcc
|
gcc
|
||||||
# gopls
|
# gopls
|
||||||
stylua
|
stylua
|
||||||
# rustfmt
|
rustfmt
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
@@ -32,7 +32,8 @@ programs.neovim.plugins = [
|
|||||||
# ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
|
# ".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/blink-cmp.lua".source = ./lua/plugins/blink-cmp.lua;
|
||||||
".config/nvim/lua/plugins/lsp.lua".source = ./lua/plugins/lsp.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/treesitter.lua".source = ./lua/plugins/treesitter.lua;
|
||||||
".config/nvim/lua/plugins/catppuccin.lua".source = ./lua/plugins/catppuccin.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/telescope.lua".source = ./lua/plugins/telescope.lua;
|
||||||
@@ -44,7 +45,7 @@ programs.neovim.plugins = [
|
|||||||
".config/nvim/lua/plugins/trouble.lua".source = ./lua/plugins/trouble.lua;
|
".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/dap.lua".source = ./lua/plugins/dap.lua;
|
||||||
".config/nvim/lua/plugins/blankline.lua".source = ./lua/plugins/blankline.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/lazygit.lua".source = ./lua/plugins/lazygit.lua;
|
||||||
".config/nvim/lua/plugins/toggleterm.lua".source = ./lua/plugins/toggleterm.lua;
|
".config/nvim/lua/plugins/toggleterm.lua".source = ./lua/plugins/toggleterm.lua;
|
||||||
".config/nvim/lua/plugins/love.lua".source = ./lua/plugins/love.lua;
|
".config/nvim/lua/plugins/love.lua".source = ./lua/plugins/love.lua;
|
||||||
@@ -56,8 +57,11 @@ programs.neovim.plugins = [
|
|||||||
".config/nvim/lua/plugins/vim-suda.lua".source = ./lua/plugins/vim-suda.lua;
|
".config/nvim/lua/plugins/vim-suda.lua".source = ./lua/plugins/vim-suda.lua;
|
||||||
".config/nvim/lua/plugins/tiny-inline-diagnostic.lua".source = ./lua/plugins/tiny-inline-diagnostic.lua;
|
".config/nvim/lua/plugins/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/conform.lua".source = ./lua/plugins/conform.lua;
|
||||||
".config/nvim/lua/plugins/go.lua".source = ./lua/plugins/go.lua;
|
".config/nvim/lua/plugins/nvim-tree.lua".source = ./lua/plugins/nvim-tree.lua;
|
||||||
# ".config/nvim/lua/plugins/arduino.lua".source = ./lua/plugins/arduino.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;
|
||||||
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
31
packages/nvim/default.nix~
Normal file
31
packages/nvim/default.nix~
Normal file
@@ -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;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -38,7 +38,6 @@ vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
|
|||||||
-- jump to definition
|
-- jump to definition
|
||||||
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
|
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
|
||||||
|
|
||||||
|
|
||||||
-- code actions
|
-- code actions
|
||||||
vim.keymap.set("n", "<leader>ca", function()
|
vim.keymap.set("n", "<leader>ca", function()
|
||||||
require("tiny-code-action").code_action()
|
require("tiny-code-action").code_action()
|
||||||
@@ -47,7 +46,6 @@ end, { noremap = true, silent = true })
|
|||||||
-- Lazy
|
-- Lazy
|
||||||
require("config.lazy")
|
require("config.lazy")
|
||||||
|
|
||||||
-- require("flutter-tools").setup {} -- use defaults
|
|
||||||
require("catppuccin").setup({})
|
require("catppuccin").setup({})
|
||||||
vim.cmd.colorscheme("catppuccin")
|
vim.cmd.colorscheme("catppuccin")
|
||||||
|
|
||||||
@@ -62,6 +60,7 @@ require("ibl").setup()
|
|||||||
require("telescope").load_extension("flutter")
|
require("telescope").load_extension("flutter")
|
||||||
require("toggleterm").setup({})
|
require("toggleterm").setup({})
|
||||||
require("mini.animate").setup()
|
require("mini.animate").setup()
|
||||||
|
require('nvim-autopairs').enable()
|
||||||
|
|
||||||
vim.o.showtabline = 2
|
vim.o.showtabline = 2
|
||||||
require("tabby").setup({
|
require("tabby").setup({
|
||||||
@@ -77,7 +76,7 @@ require("conform").setup({})
|
|||||||
require("flutter-tools").setup({})
|
require("flutter-tools").setup({})
|
||||||
|
|
||||||
-- GO
|
-- GO
|
||||||
require("go").setup()
|
-- require("go").setup()
|
||||||
|
|
||||||
------------- -- Debugger
|
------------- -- Debugger
|
||||||
local dap, dapui = require("dap"), require("dapui")
|
local dap, dapui = require("dap"), require("dapui")
|
||||||
@@ -113,13 +112,8 @@ dap.configurations.rust = dap.configurations.gdb
|
|||||||
--------------------------------------------
|
--------------------------------------------
|
||||||
local builtin = require("telescope.builtin")
|
local builtin = require("telescope.builtin")
|
||||||
local conform = require("conform")
|
local conform = require("conform")
|
||||||
-- Rust binds
|
-- Love binds
|
||||||
vim.keymap.set("n", "<leader>rrr", ":RustRun<CR>", { desc = "Run rust program" })
|
vim.keymap.set("n", "<leader>lr", ":LoveRun<CR>", { desc = "Love run" })
|
||||||
vim.keymap.set("n", "<leader>rd", ":RustLsp debug<CR>", { desc = "Debug rust program" })
|
|
||||||
vim.keymap.set("n", "<leader>rh", ":RustLsp hover actions<CR>", { desc = "rust hover actions" })
|
|
||||||
vim.keymap.set("n", "<leader>re", ":RustLsp explainError<CR>", { desc = "explain rust error" })
|
|
||||||
vim.keymap.set("n", "<leader>rs", ":RustLsp openDocs<CR>", { desc = "open rust docs for symbol under cursor" })
|
|
||||||
vim.keymap.set("n", "<leader>rrn", ":RustLsp ssr ", { desc = "rust rename" })
|
|
||||||
-- Telescope binds
|
-- Telescope binds
|
||||||
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Telescope find files" })
|
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>fg", builtin.live_grep, { desc = "Telescope live grep" })
|
||||||
@@ -143,12 +137,15 @@ vim.keymap.set("n", "<leader>tf", ":ToggleTerm direction=float <CR>", { desc = "
|
|||||||
vim.keymap.set("n", "<leader>tt", ":ToggleTerm direction=tab size=50 <CR>", { desc = "Open terminal in new tab" })
|
vim.keymap.set("n", "<leader>tt", ":ToggleTerm direction=tab size=50 <CR>", { desc = "Open terminal in new tab" })
|
||||||
vim.keymap.set("n", "<leader>tv", ":ToggleTerm direction=vertical <CR>", { desc = "Open terminal vertical" })
|
vim.keymap.set("n", "<leader>tv", ":ToggleTerm direction=vertical <CR>", { desc = "Open terminal vertical" })
|
||||||
vim.keymap.set("n", "<leader>ts", ":ToggleTerm direction=vertical <CR>", { desc = "select open terminal" })
|
vim.keymap.set("n", "<leader>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" })
|
||||||
-- code actions
|
-- code actions
|
||||||
vim.keymap.set("n", "<leader>ca", function()
|
vim.keymap.set("n", "<leader>ca", function()
|
||||||
require("tiny-code-action").code_action()
|
require("tiny-code-action").code_action()
|
||||||
end, { desc = "Show code actions", noremap = true, silent = true })
|
end, { desc = "Show code actions", noremap = true, silent = true })
|
||||||
|
|
||||||
|
|
||||||
-- disable annoying inline type things
|
-- disable annoying inline type things
|
||||||
vim.lsp.inlay_hint.enable(false)
|
vim.lsp.inlay_hint.enable(false)
|
||||||
vim.diagnostic.config({virtual_text = false})
|
vim.diagnostic.config({virtual_text = false})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
113
packages/nvim/init.lua~
Normal file
113
packages/nvim/init.lua~
Normal file
@@ -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,
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
return{
|
|
||||||
"glebzlat/arduino-nvim",
|
|
||||||
config = {
|
|
||||||
function() require("arduino-nvim").setup() end,
|
|
||||||
filetype = "arduino",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
29
packages/nvim/lua/plugins/avante.lua
Normal file
29
packages/nvim/lua/plugins/avante.lua
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
return {
|
||||||
|
"yetone/avante.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
version = false, -- Never set this value to "*"! Never!
|
||||||
|
opts = {
|
||||||
|
-- add any opts here
|
||||||
|
-- for example
|
||||||
|
provider = "copilot",
|
||||||
|
},
|
||||||
|
build = "make",
|
||||||
|
dependencies = {
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
"stevearc/dressing.nvim",
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
"MunifTanjim/nui.nvim",
|
||||||
|
--- The below dependencies are optional,
|
||||||
|
"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
|
||||||
|
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
|
||||||
|
"zbirenbaum/copilot.lua", -- for providers='copilot'
|
||||||
|
{
|
||||||
|
-- Make sure to set this up properly if you have lazy=true
|
||||||
|
'MeanderingProgrammer/render-markdown.nvim',
|
||||||
|
opts = {
|
||||||
|
file_types = { "markdown", "Avante" },
|
||||||
|
},
|
||||||
|
ft = { "markdown", "Avante" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
6
packages/nvim/lua/plugins/copilot.lua
Normal file
6
packages/nvim/lua/plugins/copilot.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
return {
|
||||||
|
"zbirenbaum/copilot.lua",
|
||||||
|
config = function ()
|
||||||
|
require('copilot').setup({})
|
||||||
|
end
|
||||||
|
}
|
||||||
@@ -1,32 +1,70 @@
|
|||||||
return {
|
return {
|
||||||
'neovim/nvim-lspconfig',
|
'neovim/nvim-lspconfig',
|
||||||
dependencies = { 'saghen/blink.cmp' },
|
dependencies = { 'saghen/blink.cmp' },
|
||||||
|
config = function(_,_)
|
||||||
|
|
||||||
-- example using `opts` for defining servers
|
local vue_language_server_path = vim.fn.expand '$MASON/packages' .. '/vue-language-server' .. '/node_modules/@vue/language-server'
|
||||||
opts = {
|
|
||||||
servers = {
|
local tsserver_filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' }
|
||||||
lua_ls = {},
|
local vue_plugin = {
|
||||||
nil_ls = {},
|
name = '@vue/typescript-plugin',
|
||||||
-- rust_analyzer = {},
|
location = vue_language_server_path,
|
||||||
gopls = {},
|
languages = { 'vue' },
|
||||||
-- arduino_language_server = {},
|
configNamespace = 'typescript',
|
||||||
}
|
}
|
||||||
},
|
local vtsls_config = {
|
||||||
config = function(_, opts)
|
settings = {
|
||||||
local lspconfig = require('lspconfig')
|
vtsls = {
|
||||||
for server, config in pairs(opts.servers) do
|
tsserver = {
|
||||||
-- passing config.capabilities to blink.cmp merges with the capabilities in your
|
globalPlugins = {
|
||||||
-- `opts[server].capabilities, if you've defined it
|
vue_plugin,
|
||||||
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
|
end
|
||||||
|
|
||||||
-- -- example calling setup directly for each LSP
|
|
||||||
-- config = function()
|
-- opts = {
|
||||||
-- local capabilities = require('blink.cmp').get_lsp_capabilities()
|
-- servers = {
|
||||||
-- local lspconfig = require('lspconfig')
|
-- lua_ls = {},
|
||||||
--
|
-- nil_ls = {},
|
||||||
-- lspconfig['lua_ls'].setup({ capabilities = capabilities })
|
-- vstls = {},
|
||||||
-- end
|
-- vue_ls = {},
|
||||||
|
-- -- 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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
8
packages/nvim/lua/plugins/mason-lspconfig.lua
Normal file
8
packages/nvim/lua/plugins/mason-lspconfig.lua
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
return {
|
||||||
|
"mason-org/mason-lspconfig.nvim",
|
||||||
|
opts = {},
|
||||||
|
dependencies = {
|
||||||
|
{ "mason-org/mason.nvim", opts = {} },
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,37 +1,46 @@
|
|||||||
return {
|
return {
|
||||||
|
"mason-org/mason.nvim",
|
||||||
"williamboman/mason.nvim",
|
config = function ()
|
||||||
cmd = "Mason",
|
require("mason").setup()
|
||||||
keys = { { "<leader>cm", "<cmd>Mason<cr>", desc = "Mason" } },
|
end
|
||||||
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,
|
||||||
|
-- }
|
||||||
|
|
||||||
|
|||||||
6
packages/nvim/lua/plugins/notify.lua
Normal file
6
packages/nvim/lua/plugins/notify.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
return {
|
||||||
|
"rcarriga/nvim-notify",
|
||||||
|
config = function ()
|
||||||
|
vim.notify = require("notify")
|
||||||
|
end
|
||||||
|
}
|
||||||
@@ -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
|
|
||||||
}
|
|
||||||
15
packages/nvim/lua/plugins/nvim-tree.lua
Normal file
15
packages/nvim/lua/plugins/nvim-tree.lua
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
return {
|
||||||
|
"nvim-tree/nvim-tree.lua",
|
||||||
|
version = "*",
|
||||||
|
lazy = false,
|
||||||
|
dependencies = {
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require("nvim-tree").setup({
|
||||||
|
view = {
|
||||||
|
width = 30,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
7
packages/nvim/lua/plugins/plugins/autopair.lua
Normal file
7
packages/nvim/lua/plugins/plugins/autopair.lua
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
return {
|
||||||
|
'windwp/nvim-autopairs',
|
||||||
|
event = "InsertEnter",
|
||||||
|
config = true
|
||||||
|
-- use opts = {} for passing setup options
|
||||||
|
-- this is equivalent to setup({}) function
|
||||||
|
}
|
||||||
7
packages/nvim/lua/plugins/plugins/blankline.lua
Normal file
7
packages/nvim/lua/plugins/plugins/blankline.lua
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
return {
|
||||||
|
"lukas-reineke/indent-blankline.nvim",
|
||||||
|
main = "ibl",
|
||||||
|
---@module "ibl"
|
||||||
|
---@type ibl.config
|
||||||
|
opts = {},
|
||||||
|
}
|
||||||
48
packages/nvim/lua/plugins/plugins/blink-cmp.lua
Normal file
48
packages/nvim/lua/plugins/plugins/blink-cmp.lua
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
return {
|
||||||
|
'saghen/blink.cmp',
|
||||||
|
-- optional: provides snippets for the snippet source
|
||||||
|
dependencies = { 'rafamadriz/friendly-snippets' },
|
||||||
|
|
||||||
|
-- use a release tag to download pre-built binaries
|
||||||
|
version = '1.*',
|
||||||
|
-- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
|
||||||
|
-- build = 'cargo build --release',
|
||||||
|
-- If you use nix, you can build from source using latest nightly rust with:
|
||||||
|
-- build = 'nix run .#build-plugin',
|
||||||
|
|
||||||
|
---@module 'blink.cmp'
|
||||||
|
---@type blink.cmp.Config
|
||||||
|
opts = {
|
||||||
|
-- See :h blink-cmp-config-keymap for defining your own keymap
|
||||||
|
keymap = {
|
||||||
|
preset = 'enter',
|
||||||
|
-- map tap to cycle through
|
||||||
|
['<S-Tab>'] = { 'select_prev', 'fallback' },
|
||||||
|
['<Tab>'] = { 'select_next', 'fallback' },
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
appearance = {
|
||||||
|
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
|
||||||
|
-- Adjusts spacing to ensure icons are aligned
|
||||||
|
nerd_font_variant = 'mono'
|
||||||
|
},
|
||||||
|
|
||||||
|
-- (Default) Only show the documentation popup when manually triggered
|
||||||
|
completion = { documentation = { auto_show = false } },
|
||||||
|
|
||||||
|
-- Default list of enabled providers defined so that you can extend it
|
||||||
|
-- elsewhere in your config, without redefining it, due to `opts_extend`
|
||||||
|
sources = {
|
||||||
|
default = { 'lsp', 'path', 'snippets', 'buffer' },
|
||||||
|
},
|
||||||
|
|
||||||
|
-- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
|
||||||
|
-- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
|
||||||
|
-- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
|
||||||
|
--
|
||||||
|
-- See the fuzzy documentation for more information
|
||||||
|
fuzzy = { implementation = "prefer_rust_with_warning" }
|
||||||
|
},
|
||||||
|
opts_extend = { "sources.default" }
|
||||||
|
}
|
||||||
1
packages/nvim/lua/plugins/plugins/catppuccin.lua
Normal file
1
packages/nvim/lua/plugins/plugins/catppuccin.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
return { "catppuccin/nvim", name = "catppuccin", priority = 1000 }
|
||||||
6
packages/nvim/lua/plugins/plugins/comment.lua
Normal file
6
packages/nvim/lua/plugins/plugins/comment.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
return {
|
||||||
|
'numToStr/Comment.nvim',
|
||||||
|
opts = {
|
||||||
|
-- add any options here
|
||||||
|
}
|
||||||
|
}
|
||||||
0
packages/nvim/lua/plugins/plugins/comment.lua~
Normal file
0
packages/nvim/lua/plugins/plugins/comment.lua~
Normal file
30
packages/nvim/lua/plugins/plugins/coq.lua
Normal file
30
packages/nvim/lua/plugins/plugins/coq.lua
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
|
||||||
|
return {
|
||||||
|
"neovim/nvim-lspconfig", -- REQUIRED: for native Neovim LSP integration
|
||||||
|
lazy = false, -- REQUIRED: tell lazy.nvim to start this plugin at startup
|
||||||
|
dependencies = {
|
||||||
|
-- main one
|
||||||
|
{ "ms-jpq/coq_nvim", branch = "coq" },
|
||||||
|
|
||||||
|
-- 9000+ Snippets
|
||||||
|
{ "ms-jpq/coq.artifacts", branch = "artifacts" },
|
||||||
|
|
||||||
|
-- lua & third party sources -- See https://github.com/ms-jpq/coq.thirdparty
|
||||||
|
-- Need to **configure separately**
|
||||||
|
{ 'ms-jpq/coq.thirdparty', branch = "3p" }
|
||||||
|
-- - shell repl
|
||||||
|
-- - nvim lua api
|
||||||
|
-- - scientific calculator
|
||||||
|
-- - comment banner
|
||||||
|
-- - etc
|
||||||
|
},
|
||||||
|
init = function()
|
||||||
|
vim.g.coq_settings = {
|
||||||
|
auto_start = true, -- if you want to start COQ at startup
|
||||||
|
-- Your COQ settings here
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
config = function()
|
||||||
|
-- Your LSP settings here
|
||||||
|
end,
|
||||||
|
}
|
||||||
1
packages/nvim/lua/plugins/plugins/dap.lua
Normal file
1
packages/nvim/lua/plugins/plugins/dap.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
return { "rcarriga/nvim-dap-ui", dependencies = {"mfussenegger/nvim-dap", "nvim-neotest/nvim-nio"} }
|
||||||
10
packages/nvim/lua/plugins/plugins/flutter.lua
Normal file
10
packages/nvim/lua/plugins/plugins/flutter.lua
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
return {
|
||||||
|
|
||||||
|
'nvim-flutter/flutter-tools.nvim',
|
||||||
|
lazy = false,
|
||||||
|
dependencies = {
|
||||||
|
'nvim-lua/plenary.nvim',
|
||||||
|
'stevearc/dressing.nvim', -- optional for vim.ui.select
|
||||||
|
},
|
||||||
|
config = true,
|
||||||
|
}
|
||||||
1
packages/nvim/lua/plugins/plugins/highlight-colors.lua
Normal file
1
packages/nvim/lua/plugins/plugins/highlight-colors.lua
Normal file
@@ -0,0 +1 @@
|
|||||||
|
return { "brenoprata10/nvim-highlight-colors", name = "highlight-colotrs" }
|
||||||
33
packages/nvim/lua/plugins/plugins/lazydev.lua
Normal file
33
packages/nvim/lua/plugins/plugins/lazydev.lua
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
"folke/lazydev.nvim",
|
||||||
|
ft = "lua", -- only load on lua files
|
||||||
|
opts = {
|
||||||
|
library = {
|
||||||
|
-- See the configuration section for more details
|
||||||
|
-- Load luvit types when the `vim.uv` word is found
|
||||||
|
{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ -- optional blink completion source for require statements and module annotations
|
||||||
|
"saghen/blink.cmp",
|
||||||
|
build = 'cargo +nightly build --release',
|
||||||
|
|
||||||
|
opts = {
|
||||||
|
sources = {
|
||||||
|
-- add lazydev to your completion providers
|
||||||
|
default = { "lazydev", "lsp", "path", "snippets", "buffer" },
|
||||||
|
providers = {
|
||||||
|
lazydev = {
|
||||||
|
name = "LazyDev",
|
||||||
|
module = "lazydev.integrations.blink",
|
||||||
|
-- make lazydev completions top priority (see `:h blink.cmp`)
|
||||||
|
score_offset = 100,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
-- { "folke/neodev.nvim", enabled = false }, -- make sure to uninstall or disable neodev.nvim
|
||||||
|
}
|
||||||
0
packages/nvim/lua/plugins/plugins/lazydev.lua~
Normal file
0
packages/nvim/lua/plugins/plugins/lazydev.lua~
Normal file
21
packages/nvim/lua/plugins/plugins/lazygit.lua
Normal file
21
packages/nvim/lua/plugins/plugins/lazygit.lua
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
-- nvim v0.8.0
|
||||||
|
return {
|
||||||
|
"kdheepak/lazygit.nvim",
|
||||||
|
lazy = true,
|
||||||
|
cmd = {
|
||||||
|
"LazyGit",
|
||||||
|
"LazyGitConfig",
|
||||||
|
"LazyGitCurrentFile",
|
||||||
|
"LazyGitFilter",
|
||||||
|
"LazyGitFilterCurrentFile",
|
||||||
|
},
|
||||||
|
-- optional for floating window border decoration
|
||||||
|
dependencies = {
|
||||||
|
"nvim-lua/plenary.nvim",
|
||||||
|
},
|
||||||
|
-- setting the keybinding for LazyGit with 'keys' is recommended in
|
||||||
|
-- order to load the plugin when the command is run for the first time
|
||||||
|
keys = {
|
||||||
|
{ "<leader>lg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
|
||||||
|
}
|
||||||
|
}
|
||||||
30
packages/nvim/lua/plugins/plugins/lsp.lua
Normal file
30
packages/nvim/lua/plugins/plugins/lsp.lua
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
return {
|
||||||
|
'neovim/nvim-lspconfig',
|
||||||
|
dependencies = { 'saghen/blink.cmp' },
|
||||||
|
|
||||||
|
-- example using `opts` for defining servers
|
||||||
|
opts = {
|
||||||
|
servers = {
|
||||||
|
lua_ls = {},
|
||||||
|
nil_ls = {},
|
||||||
|
-- rust_analyzer = {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
config = function(_, opts)
|
||||||
|
local lspconfig = require('lspconfig')
|
||||||
|
for server, config in pairs(opts.servers) do
|
||||||
|
-- passing config.capabilities to blink.cmp merges with the capabilities in your
|
||||||
|
-- `opts[server].capabilities, if you've defined it
|
||||||
|
config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities)
|
||||||
|
lspconfig[server].setup(config)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- -- example calling setup directly for each LSP
|
||||||
|
-- config = function()
|
||||||
|
-- local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||||
|
-- local lspconfig = require('lspconfig')
|
||||||
|
--
|
||||||
|
-- lspconfig['lua_ls'].setup({ capabilities = capabilities })
|
||||||
|
-- end
|
||||||
|
}
|
||||||
13
packages/nvim/lua/plugins/plugins/lsp.lua~
Normal file
13
packages/nvim/lua/plugins/plugins/lsp.lua~
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
return
|
||||||
|
{
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
opts = function()
|
||||||
|
local keys = require("lazyvim.plugins.lsp.keymaps").get()
|
||||||
|
-- change a keymap
|
||||||
|
keys[#keys + 1] = { "K", "<cmd>echo 'hello'<cr>" }
|
||||||
|
-- disable a keymap
|
||||||
|
keys[#keys + 1] = { "K", false }
|
||||||
|
-- add a keymap
|
||||||
|
keys[#keys + 1] = { "H", "<cmd>echo 'hello'<cr>" }
|
||||||
|
end,
|
||||||
|
}
|
||||||
5
packages/nvim/lua/plugins/plugins/lualine.lua
Normal file
5
packages/nvim/lua/plugins/plugins/lualine.lua
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
return {
|
||||||
|
'nvim-lualine/lualine.nvim',
|
||||||
|
dependencies = { 'nvim-tree/nvim-web-devicons' }
|
||||||
|
|
||||||
|
}
|
||||||
0
packages/nvim/lua/plugins/plugins/lualine.lua~
Normal file
0
packages/nvim/lua/plugins/plugins/lualine.lua~
Normal file
37
packages/nvim/lua/plugins/plugins/mason.lua
Normal file
37
packages/nvim/lua/plugins/plugins/mason.lua
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
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,
|
||||||
|
}
|
||||||
5
packages/nvim/lua/plugins/plugins/rustaceanvim.lua
Normal file
5
packages/nvim/lua/plugins/plugins/rustaceanvim.lua
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
return {
|
||||||
|
'mrcjkb/rustaceanvim',
|
||||||
|
version = '^5', -- Recommended
|
||||||
|
lazy = false, -- This plugin is already lazy
|
||||||
|
}
|
||||||
44
packages/nvim/lua/plugins/plugins/tabout.lua
Normal file
44
packages/nvim/lua/plugins/plugins/tabout.lua
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
return {
|
||||||
|
{
|
||||||
|
'abecodes/tabout.nvim',
|
||||||
|
lazy = false,
|
||||||
|
config = function()
|
||||||
|
require('tabout').setup {
|
||||||
|
tabkey = '<Tab>', -- key to trigger tabout, set to an empty string to disable
|
||||||
|
backwards_tabkey = '<S-Tab>', -- key to trigger backwards tabout, set to an empty string to disable
|
||||||
|
act_as_tab = true, -- shift content if tab out is not possible
|
||||||
|
act_as_shift_tab = false, -- reverse shift content if tab out is not possible (if your keyboard/terminal supports <S-Tab>)
|
||||||
|
default_tab = '<C-t>', -- shift default action (only at the beginning of a line, otherwise <TAB> is used)
|
||||||
|
default_shift_tab = '<C-d>', -- reverse shift default action,
|
||||||
|
enable_backwards = true, -- well ...
|
||||||
|
completion = false, -- if the tabkey is used in a completion pum
|
||||||
|
tabouts = {
|
||||||
|
{ open = "'", close = "'" },
|
||||||
|
{ open = '"', close = '"' },
|
||||||
|
{ open = '`', close = '`' },
|
||||||
|
{ open = '(', close = ')' },
|
||||||
|
{ open = '[', close = ']' },
|
||||||
|
{ open = '{', close = '}' }
|
||||||
|
},
|
||||||
|
ignore_beginning = true, --[[ if the cursor is at the beginning of a filled element it will rather tab out than shift the content ]]
|
||||||
|
exclude = {} -- tabout will ignore these filetypes
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
dependencies = { -- These are optional
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
"L3MON4D3/LuaSnip",
|
||||||
|
"hrsh7th/nvim-cmp"
|
||||||
|
},
|
||||||
|
opt = true, -- Set this to true if the plugin is optional
|
||||||
|
event = 'InsertCharPre', -- Set the event to 'InsertCharPre' for better compatibility
|
||||||
|
priority = 1000,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"L3MON4D3/LuaSnip",
|
||||||
|
keys = function()
|
||||||
|
-- Disable default tab keybinding in LuaSnip
|
||||||
|
return {}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
4
packages/nvim/lua/plugins/plugins/telescope.lua
Normal file
4
packages/nvim/lua/plugins/plugins/telescope.lua
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
return {
|
||||||
|
"nvim-telescope/telescope-file-browser.nvim",
|
||||||
|
dependencies = { "nvim-telescope/telescope.nvim", "nvim-lua/plenary.nvim" }
|
||||||
|
}
|
||||||
15
packages/nvim/lua/plugins/plugins/treesitter.lua
Normal file
15
packages/nvim/lua/plugins/plugins/treesitter.lua
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
return {
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
build = ":TSUpdate",
|
||||||
|
config = function ()
|
||||||
|
local configs = require("nvim-treesitter.configs")
|
||||||
|
|
||||||
|
configs.setup({
|
||||||
|
ensure_installed = { "c", "lua", "html", "dart", "rust" },
|
||||||
|
sync_install = false,
|
||||||
|
highlight = { enable = true },
|
||||||
|
indent = { enable = true },
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
37
packages/nvim/lua/plugins/plugins/trouble.lua
Normal file
37
packages/nvim/lua/plugins/plugins/trouble.lua
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
return {
|
||||||
|
"folke/trouble.nvim",
|
||||||
|
opts = {}, -- for default options, refer to the configuration section for custom setup.
|
||||||
|
cmd = "Trouble",
|
||||||
|
keys = {
|
||||||
|
{
|
||||||
|
"<leader>xx",
|
||||||
|
"<cmd>Trouble diagnostics toggle<cr>",
|
||||||
|
desc = "Diagnostics (Trouble)",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>xX",
|
||||||
|
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
|
||||||
|
desc = "Buffer Diagnostics (Trouble)",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>cs",
|
||||||
|
"<cmd>Trouble symbols toggle focus=false<cr>",
|
||||||
|
desc = "Symbols (Trouble)",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>cl",
|
||||||
|
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
|
||||||
|
desc = "LSP Definitions / references / ... (Trouble)",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>xL",
|
||||||
|
"<cmd>Trouble loclist toggle<cr>",
|
||||||
|
desc = "Location List (Trouble)",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"<leader>xQ",
|
||||||
|
"<cmd>Trouble qflist toggle<cr>",
|
||||||
|
desc = "Quickfix List (Trouble)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
18
packages/nvim/lua/plugins/plugins/whichkey.lua
Normal file
18
packages/nvim/lua/plugins/plugins/whichkey.lua
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
return {
|
||||||
|
"folke/which-key.nvim",
|
||||||
|
event = "VeryLazy",
|
||||||
|
opts = {
|
||||||
|
-- your configuration comes here
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
},
|
||||||
|
keys = {
|
||||||
|
{
|
||||||
|
"<leader>?",
|
||||||
|
function()
|
||||||
|
require("which-key").show({ global = false })
|
||||||
|
end,
|
||||||
|
desc = "Buffer Local Keymaps (which-key)",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
0
packages/nvim/lua/plugins/plugins/whichkey.lua~
Normal file
0
packages/nvim/lua/plugins/plugins/whichkey.lua~
Normal file
@@ -1,5 +1,29 @@
|
|||||||
return {
|
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,
|
||||||
|
-- },
|
||||||
}
|
}
|
||||||
|
|||||||
6
packages/nvim/lua/plugins/typst.lua
Normal file
6
packages/nvim/lua/plugins/typst.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
return {
|
||||||
|
'chomosuke/typst-preview.nvim',
|
||||||
|
lazy = false, -- or ft = 'typst'
|
||||||
|
version = '1.*',
|
||||||
|
opts = {}, -- lazy.nvim will implicitly calls `setup {}`
|
||||||
|
}
|
||||||
@@ -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 = {
|
programs.git = {
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ set preview_images_method kitty
|
|||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Nico";
|
settings.user.name = "Nico";
|
||||||
userEmail = "nicovessen@gmail.com";
|
settings.user.email = "nico@getmemy.coffee";
|
||||||
extraConfig = {
|
settings.extraConfig = {
|
||||||
safe.directory = "/etc/nixos";
|
safe.directory = "/etc/nixos";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -28,7 +28,9 @@ services.kdeconnect = {
|
|||||||
indicator = true;
|
indicator = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.ladybird.enable = true;
|
programs.obsidian = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
rofi-screenshot
|
rofi-screenshot
|
||||||
rofi-power-menu
|
rofi-power-menu
|
||||||
bitwarden-menu
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
rofi-screenshot
|
rofi-screenshot
|
||||||
rofi-power-menu
|
rofi-power-menu
|
||||||
rofi-bluetooth
|
|
||||||
bitwarden-menu
|
bitwarden-menu
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
0
packages/settings.json
Normal file
0
packages/settings.json
Normal file
@@ -6,20 +6,26 @@
|
|||||||
config = rec {
|
config = rec {
|
||||||
modifier = "Mod4";
|
modifier = "Mod4";
|
||||||
# Use kitty as default terminal
|
# Use kitty as default terminal
|
||||||
terminal = "alacritty";
|
terminal = "kitty";
|
||||||
bars = [
|
bars = [
|
||||||
{command = "waybar";}
|
{command = "waybar";}
|
||||||
];
|
];
|
||||||
|
|
||||||
startup = [
|
startup = [
|
||||||
# Launch Firefox on start
|
# Launch Firefox on start
|
||||||
{command = "wpaperd";}
|
# {command = "wpaperd";}
|
||||||
{command = "wl-paste --watch cliphist store";}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
extraConfig = ''
|
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 configuration
|
||||||
input "type:keyboard" {
|
input "type:keyboard" {
|
||||||
xkb_layout de,us
|
xkb_layout de,us
|
||||||
@@ -27,23 +33,6 @@
|
|||||||
xkb_options grp:alt_shift_toggle
|
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
|
# Brightness
|
||||||
bindsym XF86MonBrightnessDown exec light -U 10
|
bindsym XF86MonBrightnessDown exec light -U 10
|
||||||
@@ -55,10 +44,10 @@ input "type:touchpad" {
|
|||||||
bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
|
bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
|
||||||
|
|
||||||
# app launcher
|
# 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+Shift+x exec 'rofi -show power-menu -modi power-menu:rofi-power-menu'
|
||||||
bindsym Mod4+Print exec 'rofi-screenshot'
|
bindsym Mod4+Print exec 'rofi-screenshot'
|
||||||
bindsym Mod4+Shift+v exec 'cliphist list | rofi -dmenu | cliphist decode | wl-copy'
|
|
||||||
bindsym Mod4+BackSpace kill
|
bindsym Mod4+BackSpace kill
|
||||||
|
|
||||||
# disable window border
|
# disable window border
|
||||||
|
|||||||
@@ -13,37 +13,26 @@
|
|||||||
|
|
||||||
startup = [
|
startup = [
|
||||||
# Launch Firefox on start
|
# Launch Firefox on start
|
||||||
{command = "wpaperd";}
|
# {command = "wpaperd";}
|
||||||
{command = "wl-paste --watch cliphist store";}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
extraConfig = ''
|
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 configuration
|
||||||
input "type:keyboard" {
|
input "type:keyboard" {
|
||||||
xkb_layout de,us
|
xkb_layout de, us
|
||||||
xkb_variant "nodeadkeys"
|
xkb_variant "nodeadkeys"
|
||||||
xkb_options grp:alt_shift_toggle
|
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
|
# Brightness
|
||||||
bindsym XF86MonBrightnessDown exec light -U 10
|
bindsym XF86MonBrightnessDown exec light -U 10
|
||||||
@@ -55,10 +44,10 @@ input "type:touchpad" {
|
|||||||
bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
|
bindsym XF86AudioMute exec 'pactl set-sink-mute @DEFAULT_SINK@ toggle'
|
||||||
|
|
||||||
# app launcher
|
# 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+Shift+x exec 'rofi -show power-menu -modi power-menu:rofi-power-menu'
|
||||||
bindsym Mod4+Print exec 'rofi-screenshot'
|
bindsym Mod4+Print exec 'rofi-screenshot'
|
||||||
bindsym Mod4+Shift+v exec 'cliphist list | rofi -dmenu | cliphist decode | wl-copy'
|
|
||||||
bindsym Mod4+BackSpace kill
|
bindsym Mod4+BackSpace kill
|
||||||
|
|
||||||
# disable window border
|
# disable window border
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ programs.carapace = {
|
|||||||
enableNushellIntegration = true;
|
enableNushellIntegration = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# programs.thefuck.enable = true;
|
||||||
|
|
||||||
programs.starship.enable = true;
|
programs.starship.enable = true;
|
||||||
|
|
||||||
@@ -39,8 +40,7 @@ programs.zsh = {
|
|||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
# update = "sudo nixos-rebuild switch";
|
update = "sudo nixos-rebuild switch";
|
||||||
update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos";
|
|
||||||
emacs = "emacs -nw";
|
emacs = "emacs -nw";
|
||||||
femacs = "emacs -nw --load /home/n/Documents/Shells/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";
|
pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el";
|
||||||
@@ -48,8 +48,11 @@ programs.zsh = {
|
|||||||
|
|
||||||
initContent = ''
|
initContent = ''
|
||||||
eval "$(starship init zsh)"
|
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')
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
||||||
zplug = {
|
zplug = {
|
||||||
enable = false;
|
enable = false;
|
||||||
plugins = [
|
plugins = [
|
||||||
@@ -59,15 +62,19 @@ programs.zsh = {
|
|||||||
|
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ ];
|
# plugins = [ "thefuck" ];
|
||||||
# theme = "";
|
# theme = "";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
programs.fzf = {
|
|
||||||
|
programs.ghostty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableZshIntegration = true;
|
};
|
||||||
|
|
||||||
|
home.file."/home/nico/.config/ghostty/config" = {
|
||||||
|
source = ./ghostty-config;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zoxide = {
|
programs.zoxide = {
|
||||||
@@ -75,15 +82,6 @@ programs.zoxide = {
|
|||||||
enableZshIntegration = true;
|
enableZshIntegration = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.ghostty = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
home.file."/home/n/.config/ghostty/config" = {
|
|
||||||
source = ./ghostty-config;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"spacing": 0,
|
"spacing": 0,
|
||||||
"modules-left": ["clock", "niri/workspaces", "hyprland/submap"],
|
"modules-left": ["clock", "niri/workspaces", "hyprland/submap"],
|
||||||
"modules-center": [ ],
|
"modules-center": [ ],
|
||||||
"modules-right": ["network", "battery", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],
|
"modules-right": ["network", "cpu", "memory", "custom/keyboard-layout", "custom/notification", "pulseaudio", "tray"],
|
||||||
|
|
||||||
"custom/keyboard-layout": {
|
"custom/keyboard-layout": {
|
||||||
"interval": 1,
|
"interval": 1,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[any]
|
[any]
|
||||||
duration = "10m"
|
duration = "10m"
|
||||||
mode = "center"
|
mode = "center"
|
||||||
path = "/home/n/Documents/Wallpapers"
|
path = "/home/nico/Documents/Wallpapers"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
{ pkgs, config, lib,... }:
|
{ pkgs, config, lib,... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
wpaperd
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file =
|
home.file =
|
||||||
|
|||||||
54
packages/zed-editor/default.nix
Normal file
54
packages/zed-editor/default.nix
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
{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;
|
||||||
|
#
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# };
|
||||||
|
}
|
||||||
57
packages/zed-editor/settings.json
Normal file
57
packages/zed-editor/settings.json
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
{
|
||||||
|
"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
|
||||||
|
}
|
||||||
2
push.sh
2
push.sh
@@ -9,4 +9,4 @@ fi
|
|||||||
sudo cp -r /etc/nixos/* .
|
sudo cp -r /etc/nixos/* .
|
||||||
git add *
|
git add *
|
||||||
git commit -m "$1"
|
git commit -m "$1"
|
||||||
git push origin laptop
|
git push origin pc
|
||||||
|
|||||||
@@ -1,53 +1,198 @@
|
|||||||
{
|
{
|
||||||
description = "Arduino";
|
description = "PlatformIO Development Environment with VSCodium";
|
||||||
|
|
||||||
inputs = {
|
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 {
|
outputs = { self, nixpkgs }:
|
||||||
# vscode = vscodium;
|
let
|
||||||
# vscodeExtensions = with vscode-extensions; [
|
system = "x86_64-linux";
|
||||||
# ms-vscode.cpptools
|
pkgs = import <nixpkgs> { inherit system; };
|
||||||
# ] ++ 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 = ''
|
platformioVsix = pkgs.fetchurl {
|
||||||
zsh
|
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;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
198
shells/flalingo/arduino/flake.nix
Normal file
198
shells/flalingo/arduino/flake.nix
Normal file
@@ -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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
103
shells/flalingo/devenv.lock
Normal file
103
shells/flalingo/devenv.lock
Normal file
@@ -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
|
||||||
|
}
|
||||||
24
shells/flalingo/devenv.nix
Normal file
24
shells/flalingo/devenv.nix
Normal file
@@ -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/
|
||||||
|
}
|
||||||
|
|
||||||
15
shells/flalingo/devenv.yaml
Normal file
15
shells/flalingo/devenv.yaml
Normal file
@@ -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
|
||||||
100
shells/flalingo/flake.lock
generated
Normal file
100
shells/flalingo/flake.lock
generated
Normal file
@@ -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
|
||||||
|
}
|
||||||
111
shells/flalingo/flake.nix
Normal file
111
shells/flalingo/flake.nix
Normal file
@@ -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";
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
43
shells/flalingo/flutter/flake.nix
Normal file
43
shells/flalingo/flutter/flake.nix
Normal file
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
109
shells/flalingo/flutter/flake.nix.bk
Normal file
109
shells/flalingo/flutter/flake.nix.bk
Normal file
@@ -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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
32
shells/flalingo/go/flake.nix
Normal file
32
shells/flalingo/go/flake.nix
Normal file
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
53
shells/flalingo/linguacafe/flake.nix
Normal file
53
shells/flalingo/linguacafe/flake.nix
Normal file
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
33
shells/flalingo/luckyshroom/flake.nix
Normal file
33
shells/flalingo/luckyshroom/flake.nix
Normal file
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
73
shells/flalingo/rust/flake.nix
Normal file
73
shells/flalingo/rust/flake.nix
Normal file
@@ -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/''
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
109
shells/flutter/flake.nix.bk
Normal file
109
shells/flutter/flake.nix.bk
Normal file
@@ -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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -18,7 +18,6 @@
|
|||||||
GOPATH="${go}";
|
GOPATH="${go}";
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
go
|
go
|
||||||
gopls
|
|
||||||
];
|
];
|
||||||
|
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
|
|||||||
53
shells/linguacafe/flake.nix
Normal file
53
shells/linguacafe/flake.nix
Normal file
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
33
shells/luckyshroom/flake.nix
Normal file
33
shells/luckyshroom/flake.nix
Normal file
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -34,7 +34,6 @@
|
|||||||
gtk3
|
gtk3
|
||||||
librsvg
|
librsvg
|
||||||
xdotool
|
xdotool
|
||||||
rustfmt
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# RUSTC_VERSION = overrides.toolchain.channel;
|
# RUSTC_VERSION = overrides.toolchain.channel;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user