simplify nixvim setup to not require direnv

This commit is contained in:
lucy 2026-03-07 10:29:24 +01:00
parent 2553c86e72
commit cd7060f923
10 changed files with 53 additions and 27 deletions

View File

@ -19,12 +19,15 @@
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts noto-fonts
nerd-fonts._0xproto nerd-fonts._0xproto
gnome-tweaks material-symbols
]; ];
}; };
services.displayManager.gdm.enable = true; services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true; services.desktopManager.gnome.enable = false;
programs.hyprland.enable = true; programs.hyprland.enable = true;
nixpkgs.config.permittedInsecurePackages = [
"ventoy-1.1.10"
];
boot = { boot = {
@ -76,7 +79,23 @@
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
services.power-profiles-daemon.enable = false; services.power-profiles-daemon.enable = false;
services.upower.enable = true; services.upower.enable = true;
services.tlp.enable = true; services.tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "balanced";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "balanced";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 20;
START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
PCIE_ASPM_ON_BAT = "powersupersave";
PCIE_ASPM_ON_AC = "default";
};
};
services.auto-cpufreq.enable = true; services.auto-cpufreq.enable = true;
networking.hostName = "wired"; # Define your hostname. networking.hostName = "wired"; # Define your hostname.
@ -113,7 +132,6 @@
console.keyMap = "us"; console.keyMap = "us";
# 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.
programs.direnv.enable = true;
programs.zsh.enable = true; programs.zsh.enable = true;
users.users.lucy = { users.users.lucy = {
isNormalUser = true; isNormalUser = true;
@ -140,6 +158,11 @@
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
gnomeExtensions.appindicator gnomeExtensions.appindicator
gnomeExtensions.just-perfection gnomeExtensions.just-perfection
quickshell
flashrom
usbutils
clang-tools
clang
]; ];
programs.steam = { programs.steam = {

View File

@ -74,7 +74,6 @@
home.stateVersion = "24.05"; # Please read the comment before changing. home.stateVersion = "24.05"; # Please read the comment before changing.
home.shell.enableShellIntegration = true; home.shell.enableShellIntegration = true;
home.shellAliases = { home.shellAliases = {
nrs = "sudo nixos-rebuild switch --flake /home/lucy/nixos-conf/"; nrs = "doas nixos-rebuild switch --flake /home/lucy/nixos/";
}; };
} }

View File

@ -12,7 +12,7 @@
}; };
decoration = { decoration = {
rounding = 15; rounding = 24;
blur = { blur = {
enabled = true; enabled = true;
size = 3; size = 3;
@ -29,18 +29,18 @@
bezier = [ bezier = [
"smoothIn, 0.25, 1, 0.5, 1" "smoothIn, 0.25, 1, 0.5, 1"
"smoothOut, 0.25, 1, 0.5, 1" "smoothOut, 0.25, 1, 0.5, 1"
"overshot, 0.4, 0.8, 0.5, 1" "overshot, 0.23, 0.5, 0.36, 1.1"
"candy, 0.68, -0.6, 0.32, 1.5" "candy, 0.68, -0.6, 0.32, 1.5"
]; ];
animation = [ animation = [
"fade, 1, 10, overshot" "fade, 1, 6, overshot"
"fadeIn, 1, 5, overshot" "fadeIn, 1, 5, overshot"
"fadeOut, 1, 5, overshot" "fadeOut, 1, 5, overshot"
"fadeDim, 1, 5, overshot" "fadeDim, 1, 5, overshot"
"windows, 1, 1, smoothIn, popin" "windows, 1, 3, overshot, popin 80%"
"border, 1, 10, default" "border, 1, 6, default"
"workspaces, 1, 6, overshot, slide" "workspaces, 1, 6, overshot, fade"
"specialWorkspace, 1, 8, smoothOut, slidevert" "specialWorkspace, 1, 8, smoothOut, slidevert"
]; ];
}; };

View File

@ -13,7 +13,8 @@
servers = { servers = {
bashls.enable = true; bashls.enable = true;
pyright.enable = true; pyright.enable = true;
clangd.package = null; clangd.package = pkgs.clang-tools;
qmlls.enable = true;
clangd.enable = true; clangd.enable = true;
clangd.cmd = [ clangd.cmd = [
"clangd" "clangd"

View File

@ -17,6 +17,7 @@
nixpkgs-fmt nixpkgs-fmt
stylua stylua
black black
clang
]; ];
globals.mapleader = " "; globals.mapleader = " ";
defaultEditor = true; defaultEditor = true;

View File

@ -1,3 +1,4 @@
{ pkgs, ... }:
let let
button = shortcut: text: action: { button = shortcut: text: action: {
type = "button"; type = "button";
@ -29,15 +30,13 @@ in
treesitter = { treesitter = {
enable = true; enable = true;
highlight.enable = true;
indent.enable = true;
settings = { settings = {
highlighting.enable = true; install_dir.__raw = "vim.fs.joinpath(vim.fn.stdpath('data'), 'site')";
auto_install = true;
ignore_install = [ "ipkg" ];
}; };
}; };
nvim-tree.enable = true;
alpha = { alpha = {
enable = true; enable = true;
settings.layout = [ settings.layout = [
@ -134,5 +133,6 @@ in
bufferline.enable = true; bufferline.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
nvim-tree.enable = true;
}; };
} }

View File

@ -23,6 +23,8 @@
element-desktop element-desktop
gnome-tweaks gnome-tweaks
btop btop
ventoy
obsidian
(discord.override { (discord.override {
withOpenASAR = true; # can do this here too withOpenASAR = true; # can do this here too
withVencord = true; withVencord = true;

View File

@ -10,8 +10,9 @@
foot.enable = true; foot.enable = true;
hyprland.hyprpaper.enable = false; hyprland.hyprpaper.enable = false;
gnome.image.enable = false; gnome.image.enable = false;
gnome.enable = true; gnome.enable = false;
spicetify.enable = true; kde.enable = false;
spicetify.enable = false;
fuzzel.enable = true; fuzzel.enable = true;
dunst.enable = true; dunst.enable = true;
vencord.enable = true; vencord.enable = true;

View File

@ -12,14 +12,14 @@
window#waybar { window#waybar {
background-color: transparent; background-color: transparent;
border-radius: ${builtins.toString config.wayland.windowManager.hyprland.settings.decoration.rounding}; border-radius: ${toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
} }
#workspaces button { #workspaces button {
all: unset; all: unset;
padding: 1px 3px; padding: 1px 3px;
color: alpha(@base05, 0.5); color: alpha(@base05, 0.5);
border-radius: 1em; border-radius: ${toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
} }
@ -31,7 +31,7 @@
margin: 0px; margin: 0px;
padding: 2px 6px; padding: 2px 6px;
background-color: @base00; background-color: @base00;
border-radius: 1em; border-radius: ${toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
} }
#mpris, #mpris,
#backlight, #backlight,
@ -44,7 +44,7 @@
padding: 2px 10px; padding: 2px 10px;
background-color: @base00; background-color: @base00;
color: @base05; color: @base05;
border-radius: ${builtins.toString config.wayland.windowManager.hyprland.settings.decoration.rounding}; border-radius: ${toString config.wayland.windowManager.hyprland.settings.decoration.rounding};
} }
#tray { #tray {
@ -96,7 +96,7 @@
"tray" = { "tray" = {
icon-size = 14; icon-size = 14;
spacing = 5; spacing = 5;
}; };
"hyprland/workspaces" = { "hyprland/workspaces" = {

View File

@ -19,13 +19,12 @@
stylix = { stylix = {
enable = true; enable = true;
autoEnable = true; autoEnable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
polarity = "dark"; polarity = "dark";
image = ./home/wallpaper.png; image = ./home/wallpaper.png;
targets = { targets = {
qt.platform = lib.mkForce "qtct"; qt.platform = lib.mkForce "qtct";
gnome.enable = true; gnome.enable = true;
gtk.enable = true;
gtksourceview.enable = false; gtksourceview.enable = false;
}; };
fonts = { fonts = {