This commit is contained in:
2026-05-29 19:01:21 +02:00
parent 7101cd0860
commit bc1dae3cee
8 changed files with 255 additions and 379 deletions
+83 -47
View File
@@ -1,9 +1,14 @@
# Edit this configuration file to define what should be installed on your system. Help is available # Edit this configuration file to define what should be installed on your system. Help is available
# in the configuration.nix(5) man page and in the NixOS manual (accessible by running nixos-help). # in the configuration.nix(5) man page and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, inputs, ... }: {
config,
{ imports = pkgs,
[ # Include the results of the hardware scan. inputs,
nix2511,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
@@ -79,11 +84,28 @@ powerManagement.enable = true;
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8"; i18n.extraLocaleSettings = {
LC_MEASUREMENT = "en_US.UTF-8"; LC_MONETARY = "en_US.UTF-8"; LC_NAME = "en_US.UTF-8"; LC_NUMERIC = LC_ADDRESS = "en_US.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_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
}; };
#hardware.opengl = {
# enable = true;
# driSupport32Bit = true;
# extraPackages = with pkgs; [
# vulkan-loader
# vulkan-validation-layers
# vulkan-extension-layer
# ];
#};
# Enable the X11 windowing system. You can disable this if you're only using the Wayland session. # Enable the X11 windowing system. You can disable this if you're only using the Wayland session.
services.xserver = { services.xserver = {
enable = true; enable = true;
@@ -114,15 +136,17 @@ powerManagement.enable = true;
}; };
}; };
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
services.displayManager.sddm.enable = true; services.displayManager.enable = true;
services.displayManager.ly.enable = false; services.displayManager.logToJournal = true;
services.displayManager.sddm.enable = false;
services.displayManager.ly.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
# Configure keymap in X11 # Configure keymap in X11
services.xserver = { xkb.layout = "us"; xkb.variant = ""; services.xserver = {
xkb.layout = "us";
xkb.variant = "";
}; };
# Configure console keymap # Configure console keymap
@@ -152,8 +176,18 @@ powerManagement.enable = true;
services.mullvad-vpn.enable = true; services.mullvad-vpn.enable = true;
services.mullvad-vpn.package = pkgs.mullvad-vpn; services.mullvad-vpn.package = pkgs.mullvad-vpn;
# 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.nico = { isNormalUser = true; description = "nico"; extraGroups = [ "networkmanager" users.users.nico = {
"wheel" "adbusers" "docker" "input" "dialout"]; packages = with pkgs; [ isNormalUser = true;
description = "nico";
extraGroups = [
"networkmanager"
"wheel"
"adbusers"
"docker"
"input"
"dialout"
];
packages = with pkgs; [
]; ];
}; };
@@ -171,36 +205,36 @@ services.mullvad-vpn.enable = true;
# services.flatpak.enable = true; # services.flatpak.enable = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
# List packages installed in system profile. To search, run: $ nix search wget # List packages installed in system profile. To search, run: $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = [
nix2511.lutris
# grayjay # grayjay
signal-desktop pkgs.signal-desktop
obsidian pkgs.obsidian
# anki pkgs.anki
grayjay pkgs.grayjay
lutris # pkgs.vim
vim pkgs.wget
wget pkgs.git
git pkgs.tree
tree pkgs.ntfs3g
ntfs3g pkgs.heroic
heroic pkgs.wineWow64Packages.stable
wineWow64Packages.stable pkgs.sshfs
sshfs pkgs.devenv
devenv pkgs.logiops
logiops pkgs.btop
# sway # pkgs.sway
networkmanager pkgs.networkmanager
networkmanagerapplet pkgs.networkmanagerapplet
# wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout # pkgs.wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
cliphist pkgs.cliphist
# mako # notification system developed by swaywm maintainer # pkgs. mako # notification system developed by swaywm maintainer
waybar # bar pkgs.waybar # bar
pulseaudio pkgs.pulseaudio
pavucontrol pkgs.pavucontrol
brightnessctl # brightness controls pkgs.brightnessctl # brightness controls
# wpaperd # wallpaper manager # wpaperd # wallpaper manager
]; ];
@@ -223,13 +257,11 @@ hardware.amdgpu.opencl.enable = true;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
}; };
# programs.hyprland = { # programs.hyprland = {
# enable = true; # enable = true;
# package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
# }; # };
# Some programs need SUID wrappers, can be configured further or are started in user sessions. # Some programs need SUID wrappers, can be configured further or are started in user sessions.
# programs.mtr.enable = true; programs.gnupg.agent = { # programs.mtr.enable = true; programs.gnupg.agent = {
# enable = true; enableSSHSupport = true; # enable = true; enableSSHSupport = true;
@@ -251,19 +283,23 @@ hardware.amdgpu.opencl.enable = true;
networking.firewall = { networking.firewall = {
enable = false; enable = false;
allowedTCPPortRanges = [ allowedTCPPortRanges = [
{ from = 1714; to = 1764; } # KDE Connect {
from = 1714;
to = 1764;
} # KDE Connect
]; ];
allowedUDPPortRanges = [ allowedUDPPortRanges = [
{ from = 1714; to = 1764; } # KDE Connect {
from = 1714;
to = 1764;
} # KDE Connect
]; ];
}; };
# This value determines the NixOS release from which the default settings for stateful data, like # This value determines the NixOS release from which the default settings for stateful data, like
# file locations and database versions on your system were taken. Its perfectly fine and # file locations and database versions on your system were taken. Its perfectly fine and
# recommended to leave this value at the release version of the first install of this system. Before # recommended to leave this value at the release version of the first install of this system. Before
# changing this value read the documentation for this option (e.g. man configuration.nix or on # changing this value read the documentation for this option (e.g. man configuration.nix or on
# https://nixos.org/nixos/options.html). # https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "24.11"; # Did you read the comment?
} }
Generated
+41 -201
View File
@@ -45,11 +45,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1775938181, "lastModified": 1778836894,
"narHash": "sha256-3VRl7wTV2guWBI1kYT2OZEAMYU5nUZMo6um9UH+HYHE=", "narHash": "sha256-vZSADE7rkRw5D5BpyXf5W4/zNJ8GvqiSeFibetYNEto=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "8d8b4fd30aecbf30eef6b1d1977670a597d29494", "rev": "ec7044e195df9e00236190f13f573017d2771a26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -73,44 +73,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1751685974,
"narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
"ref": "refs/heads/main",
"rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
"revCount": 92,
"type": "git",
"url": "https://git.lix.systems/lix-project/flake-compat.git"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/flake-compat.git"
}
},
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nvf",
"nixpkgs"
]
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@@ -135,11 +98,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775900011, "lastModified": 1778954430,
"narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", "narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", "rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -156,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1774991950, "lastModified": 1778805320,
"narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -169,43 +132,6 @@
"type": "github" "type": "github"
} }
}, },
"mnw": {
"locked": {
"lastModified": 1770419553,
"narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "mnw",
"type": "github"
}
},
"ndg": {
"inputs": {
"nixpkgs": [
"nvf",
"nixpkgs"
]
},
"locked": {
"lastModified": 1768214250,
"narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
"owner": "feel-co",
"repo": "ndg",
"rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
"type": "github"
},
"original": {
"owner": "feel-co",
"ref": "refs/tags/v2.6.0",
"repo": "ndg",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1775423009, "lastModified": 1775423009,
@@ -239,11 +165,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1775423009, "lastModified": 1778443072,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -255,11 +181,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1778869304,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -270,35 +196,6 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1775036866,
"narHash": "sha256-ByAX1LkhCwZ94+KnFAmnJSMAvui7kgCxjHgUHsWAbfI=",
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
"type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre972949.6201e203d095/nixexprs.tar.xz"
},
"original": {
"type": "tarball",
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1769789167, "lastModified": 1769789167,
"narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=", "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
@@ -314,13 +211,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1774709303, "lastModified": 1778443072,
"narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -330,26 +227,19 @@
"type": "github" "type": "github"
} }
}, },
"nvf": { "pkgs-nix2511": {
"inputs": {
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": "nixpkgs_4",
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1775892726, "lastModified": 1767313136,
"narHash": "sha256-1TK1pe33cEHNvGW41TP5xAzrbG1Gp7LfyFL6c3+xf+I=", "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
"owner": "notashelf", "owner": "nixos",
"repo": "nvf", "repo": "nixpkgs",
"rev": "5ab359ee7dfd3fa09a5c6f863efaf810bb9a9436", "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "notashelf", "owner": "nixos",
"repo": "nvf", "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
@@ -359,8 +249,7 @@
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nvf": "nvf", "pkgs-nix2511": "pkgs-nix2511",
"spicetify-nix": "spicetify-nix",
"zed": "zed", "zed": "zed",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
} }
@@ -373,11 +262,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775013181, "lastModified": 1777346187,
"narHash": "sha256-zPrt6oNM1r/RO5bWYaZ3hthfG9vzkr6kQdoqDd5x4Qw=", "narHash": "sha256-oVxyGjpiIsrXhWTJVUOs38fZQkLjd0nZGOY9K7Kfot8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e8046c1d9ccadd497c2344d8fa49dab62f22f7be", "rev": "146e7bf7569b8288f24d41d806b9f584f7cfd5b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -386,68 +275,19 @@
"type": "github" "type": "github"
} }
}, },
"spicetify-nix": {
"inputs": {
"nixpkgs": "nixpkgs_5",
"systems": "systems_2"
},
"locked": {
"lastModified": 1775421933,
"narHash": "sha256-JkEbzFDFTsUlVtHEzA8Y4r3O9LInhb96eOCbtGjGnbM=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "ec8d73085fdf807d55765335dc8126e14e7b2096",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "spicetify-nix",
"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"
}
},
"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": { "zed": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1775935959, "lastModified": 1778959176,
"narHash": "sha256-0dfWUEdfn/QEi3Myl0T75qkGfN92d9Bv0waHaWGH0Xc=", "narHash": "sha256-Xev9VeXyQ27gEcJvj4fr4xXNsUu6exCTEU7tLzhocuY=",
"owner": "zed-industries", "owner": "zed-industries",
"repo": "zed", "repo": "zed",
"rev": "5a47e9825babb293a4e4aea3359fb860085ab63f", "rev": "f7ca86e6eeabd135645c4f25aa1ae83f5cf0231b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -459,14 +299,14 @@
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1775933978, "lastModified": 1778919017,
"narHash": "sha256-I1ju8FT1J9nNUSw8DDMGCLLUweDAkr45D2HQn3bW43o=", "narHash": "sha256-P2+aRay2sPQGVXzNmiD4yYlhy4ytxqBvT4A2OLOvkoU=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "d1c71822cb8e861345c7ab6a9f841ac99d59d74a", "rev": "7c41a80acc12ab012448b84aec90ca9b4bf8b9ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
+9 -5
View File
@@ -4,6 +4,8 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
pkgs-nix2511.url = "github:nixos/nixpkgs/nixos-25.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -11,23 +13,25 @@
ags.url = "github:Aylur/ags"; ags.url = "github:Aylur/ags";
nvf.url = "github:notashelf/nvf"; #nvf.url = "github:notashelf/nvf";
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"; zed.url = "github:zed-industries/zed";
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
}; };
outputs = { self, nixpkgs, nvf, zen-browser, spicetify-nix, zed, catppuccin, ... }@inputs: outputs = { self, nixpkgs, pkgs-nix2511, zen-browser, zed, catppuccin, ... }@inputs:
let system = "x86_64-linux"; in let
system = "x86_64-linux";
nix2511 = import pkgs-nix2511 { system = system; config.allowUnfree = true; };
in
{ {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit nix2511;
inherit inputs; inherit inputs;
}; };
modules = [ modules = [
+21 -22
View File
@@ -6,7 +6,6 @@
imports = [ imports = [
./packages ./packages
inputs.spicetify-nix.homeManagerModules.default
inputs.zen-browser.homeModules.default inputs.zen-browser.homeModules.default
inputs.catppuccin.homeModules.catppuccin inputs.catppuccin.homeModules.catppuccin
]; ];
@@ -57,27 +56,27 @@
programs.spicetify = # programs.spicetify =
let # let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; # spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in # in
{ # {
enable = false; # enable = false;
theme = spicePkgs.themes.catppuccin; # theme = spicePkgs.themes.catppuccin;
colorScheme = "mocha"; # colorScheme = "mocha";
#
enabledExtensions = with spicePkgs.extensions; [ # enabledExtensions = with spicePkgs.extensions; [
keyboardShortcut # keyboardShortcut
wikify # wikify
songStats # songStats
betterGenres # betterGenres
hidePodcasts # hidePodcasts
fullScreen # fullScreen
]; # ];
enabledCustomApps = with spicePkgs.apps; [ # enabledCustomApps = with spicePkgs.apps; [
lyricsPlus # lyricsPlus
]; # ];
}; # };
home.stateVersion = "24.05"; home.stateVersion = "24.05";
+7 -3
View File
@@ -3,6 +3,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
lua-language-server lua-language-server
alejandra
nil nil
ripgrep ripgrep
lldb lldb
@@ -18,8 +19,11 @@ programs.neovim = {
vimAlias = true; vimAlias = true;
withRuby = false; withRuby = false;
withPython3 = false; withPython3 = false;
initLua = builtins.readFile ./init.lua;
}; };
catppuccin.nvim.enable = false;
# catppuccin.nvim.enable = true;
programs.neovim.plugins = [ programs.neovim.plugins = [
pkgs.vimPlugins.lazy-nvim pkgs.vimPlugins.lazy-nvim
@@ -28,7 +32,7 @@ programs.neovim.plugins = [
home.file = home.file =
lib.mkMerge [ lib.mkMerge [
{ {
".config/nvim/init.lua".source = ./init.lua; # ".config/nvim/init.lua".source = ./init.lua;
".config/nvim/lua/config/lazy.lua".source = ./lua/config/lazy.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/flutter.lua".source = ./lua/plugins/flutter.lua;
# ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua; # ".config/nvim/lua/plugins/coq.lua".source = ./lua/plugins/coq.lua;
@@ -50,7 +54,7 @@ programs.neovim.plugins = [
# ".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;
".config/nvim/lua/plugins/code-action.lua".source = ./lua/plugins/code-action.lua; ".config/nvim/lua/plugins/code-action.lua".source = ./lua/plugins/code-action.lua;
".config/nvim/lua/plugins/tabby.lua".source = ./lua/plugins/tabby.lua; ".config/nvim/lua/plugins/tabby.lua".source = ./lua/plugins/tabby.lua;
".config/nvim/lua/plugins/tabout.lua".source = ./lua/plugins/tabout.lua; ".config/nvim/lua/plugins/tabout.lua".source = ./lua/plugins/tabout.lua;
+1
View File
@@ -5,6 +5,7 @@ vim.opt.shiftwidth = 2 -- insert 4 spaces on a tab
vim.opt.expandtab = true -- tabs are spaces, mainly because of python vim.opt.expandtab = true -- tabs are spaces, mainly because of python
-- UI config -- UI config
-- vim.lsp.document_color.enable = true
vim.opt.number = true -- show absolute number vim.opt.number = true -- show absolute number
vim.opt.relativenumber = true -- add numbers to each line on the left side vim.opt.relativenumber = true -- add numbers to each line on the left side
vim.opt.splitbelow = true -- open new vertical split bottom vim.opt.splitbelow = true -- open new vertical split bottom
+1 -9
View File
@@ -65,7 +65,7 @@ return {
focus_on_open = true, -- focus on the newly opened log window focus_on_open = true, -- focus on the newly opened log window
}, },
dev_tools = { dev_tools = {
autostart = true, -- autostart devtools server if not detected autostart = false, -- autostart devtools server if not detected
auto_open_browser = false, -- Automatically opens devtools in the browser auto_open_browser = false, -- Automatically opens devtools in the browser
}, },
outline = { outline = {
@@ -73,14 +73,6 @@ return {
auto_open = false -- if true this will open the outline automatically when it is first populated auto_open = false -- if true this will open the outline automatically when it is first populated
}, },
lsp = { lsp = {
color = { -- show the derived colours for dart variables
enabled = true, -- whether or not to highlight color variables at all, only supported on flutter >= 2.10
background = true, -- highlight the background
background_color = nil, -- required, when background is transparent (i.e. background_color = { r = 19, g = 17, b = 24},)
foreground = false, -- highlight the foreground
virtual_text = true, -- show the highlight using virtual text
virtual_text_str = "", -- the virtual text character to highlight
},
-- see the link below for details on each option: -- see the link below for details on each option:
-- https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md#client-workspace-configuration -- https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md#client-workspace-configuration
settings = { settings = {
+1 -1
View File
@@ -26,6 +26,6 @@ programs.git = {
services.kdeconnect = { services.kdeconnect = {
enable = false; enable = false;
indicator = true; indicator = false;
}; };
} }