Weckyy702/nix-config
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to NixOS 26.05

Browse Source 
Had to redo hyprland config since they use lua in the newest versions
This commit is contained in:
Weckyy702
2026-06-18 13:50:32 +02:00
parent f3724fee3a
commit 24146bede1
15 changed files with 205 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/factory/autologin.nix
+1 -1
View File
@@ -15,7 +15,7 @@
programs.zsh.profileExtra = ''
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
exec hyprland
exec start-hyprland
fi
'';
};
modules/hosts/tux/users/weckyy702/backlight.nix
-8
View File
@@ -1,8 +0,0 @@
{ inputs, ... }: {
flake.modules.nixos.tux = {
imports = with inputs.self.modules.nixos; [
backlight
];
users.users.weckyy702.extraGroups = [ "video" ];
};
}
modules/hosts/tux/users/weckyy702/hyprland.nix
+8 -5
View File
@@ -3,10 +3,13 @@
imports = with inputs.self.modules.homeManager; [
ashell
];
wayland.windowManager.hyprland.settings = {
monitor = [
"eDP-1,preferred,0x0,1.066666667"
];
};
wayland.windowManager.hyprland.extraConfig = ''
hl.monitor({
output = "eDP-1",
mode = "preferred",
position = "0x0",
scale = 1.066666667,
})
'';
};
}
modules/hosts/tux/users/weckyy702/wallpaper.nix
+3 -3
View File
@@ -32,8 +32,8 @@
})
];
wayland.windowManager.hyprland.settings.bind = [
"$mod, i, exec, wpaperctl next"
];
# wayland.windowManager.hyprland.settings.bind = {
# _args "$mod, i, exec, wpaperctl next"
# };
};
}
modules/hosts/tux/users/weckyy702/weckyy702.nix
+1
View File
@@ -16,6 +16,7 @@
randomized-aghpb-wallpaper
nm-applet
blueman-applet
backlight
];
};
};
modules/nix/tools/home-manager.nix
+1 -1
View File
@@ -4,7 +4,7 @@
}: {
# Add home-manager input
flake-file.inputs = {
home-manager.url = "github:nix-community/home-manager/release-25.11";
home-manager.url = "github:nix-community/home-manager/release-26.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
};
modules/programs/catppuccin.nix
+4 -4
View File
@@ -1,6 +1,6 @@
{ inputs, ... }: {
flake-file.inputs = {
catppuccin.url = "github:catppuccin/nix/release-25.11";
catppuccin.url = "github:catppuccin/nix/release-26.05";
catppuccin.inputs.nixpkgs.follows = "nixpkgs";
};
@@ -38,9 +38,9 @@
hyprcursor.size = size;
};
wayland.windowManager.hyprland.settings.exec-once = [
"hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
];
# wayland.windowManager.hyprland.settings.exec-once = [
# "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
# ];
catppuccin.enable = true;
# Required for QT apps to use the catppuccin colors
modules/programs/hyprland/config.lua
+121
View File
@@ -0,0 +1,121 @@
-- environment variables
hl.env("XCURSOR_SIZE", "24")
hl.env("HYPRCURSOR_SIZE", "24")
-- General config
hl.config({
general = {
border_size = 2,
gaps_in = 0,
gaps_out = 5,
layout = "dwindle",
allow_tearing = false,
resize_on_border = true,
},
decoration = {
shadow = { enabled = false, },
blur = { enabled = true, },
active_opacity = 0.8,
inactive_opacity = 0.8,
},
animations = {
enabled = false,
},
misc = {
disable_hyprland_logo = true;
},
cursor = {
inactive_timeout = 3,
},
ecosystem = {
no_update_news = true,
no_donation_nag = true,
},
})
local mod = "SUPER"
local term = "kitty"
local browser = "zen"
-- Input config
hl.config({
input = {
kb_layout = "de",
follow_mouse = 1,
}
})
-- Keybinds
--- Apps
hl.bind(mod .. " + Return", hl.dsp.exec_cmd(term))
hl.bind(mod .. " + D", hl.dsp.exec_cmd("rofi -show drun -modes drun,calc"))
hl.bind(mod .. " + F2", hl.dsp.exec_cmd(browser))
--- Window manipulation
hl.bind(mod .. " + C", hl.dsp.window.close())
hl.bind(mod .. " + f", hl.dsp.window.fullscreen({ mode = 'fullscreen', action = 'toggle'}))
hl.bind(mod .. " + SHIFT + Space", hl.dsp.window.float({ action = "toggle" }))
hl.bind(mod .. " + H", hl.dsp.focus({ direction = "left" }))
hl.bind(mod .. " + L", hl.dsp.focus({ direction = "right" }))
hl.bind(mod .. " + K", hl.dsp.focus({ direction = "up" }))
hl.bind(mod .. " + J", hl.dsp.focus({ direction = "down" }))
hl.bind(mod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
hl.bind(mod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
--- Workspace handling
for i = 1, 10 do
local key = i % 10 -- 10 maps to key 0
hl.bind(mod .. " + " .. key, hl.dsp.focus({ workspace = i}))
hl.bind(mod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i }))
end
hl.gesture({
fingers = 3,
direction = "horizontal",
action = "workspace"
})
--- Media handling
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), { locked = true, repeating = true })
hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), { locked = true, repeating = true })
hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { locked = true, repeating = true })
hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
-- Window rules
hl.window_rule({
-- Ignore maximize requests from all apps. You'll probably like this.
name = "suppress-maximize-events",
match = { class = ".*" },
suppress_event = "maximize",
})
hl.window_rule({
-- Fix some dragging issues with XWayland
name = "fix-xwayland-drags",
match = {
class = "^$",
title = "^$",
xwayland = true,
float = true,
fullscreen = false,
pin = false,
},
no_focus = true,
})
-- Monitor handling
-- automatically add new monitors and lay them out horizontally
hl.monitor({ output = "", mode = "preferred", position = "auto", scale = 1 })
modules/programs/hyprland/settings.nix
+2 -81
View File
@@ -1,85 +1,6 @@
{
flake.modules.homeManager.hyprland = {
wayland.windowManager.hyprland.settings = {
"$mod" = "SUPER";
"$browser" = "zen";
"$term" = "kitty";
general = {
border_size = 2;
gaps_in = 0;
gaps_out = 5;
layout = "dwindle";
allow_tearing = false;
resize_on_border = true;
};
snap = { };
input = {
kb_layout = "de";
follow_mouse = 1;
};
bind =
[
"$mod, Q, exit"
"$mod, Return, exec, $term"
"$mod, D, exec, rofi -show drun -modes drun,calc"
"$mod, F2, exec, $browser"
"$mod, c, killactive"
"$mod, f, fullscreen"
"$mod, h, movefocus, l"
"$mod, j, movefocus, d"
"$mod, k, movefocus, u"
"$mod, l, movefocus, r"
"$mod+SHIFT, h, movewindow, l"
"$mod+SHIFT, j, movewindow, d"
"$mod+SHIFT, k, movewindow, u"
"$mod+SHIFT, l, movewindow, r"
", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
"$mod+SHIFT, s, exec, hyprlock"
]
++
# Switch workspaces
(map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [ 0 1 2 3 4 5 6 7 8 9 ])
++ (map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [ 0 1 2 3 4 5 6 7 8 9 ]);
bindm = [
"$mod, mouse:272, movewindow"
];
bindel = [
", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
];
bindl = [
", XF86AudioNext, exec, playerctl position 5+"
", XF86AudioPrev, exec, playerctl position 5-"
", XF86AudioPlay, exec, playerctl play-pause"
];
bindo = [
", XF86AudioNext, exec, playerctl next"
", XF86AudioPrev, exec, playerctl previous"
];
decoration = {
shadow.enabled = false;
blur.enabled = true;
active_opacity = 0.8;
inactive_opacity = 0.8;
};
animations.enabled = false;
misc.disable_hyprland_logo = true;
cursor.inactive_timeout = 3;
ecosystem.no_update_news = true;
ecosystem.no_donation_nag = true;
};
wayland.windowManager.hyprland.configType = "lua";
wayland.windowManager.hyprland.extraConfig = builtins.readFile ./config.lua;
};
}
modules/programs/nixvim/nixvim.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ inputs, ... }: {
flake-file.inputs = {
nixvim.url = "github:nix-community/nixvim/nixos-25.11";
nixvim.url = "github:nix-community/nixvim/nixos-26.05";
nixvim.inputs.nixpkgs.follows = "nixpkgs";
};
modules/services/backlight.nix
+10 -16
View File
@@ -1,18 +1,12 @@
{ inputs, ... }: {
flake.modules.nixos.backlight = { pkgs, ... }: {
environment.systemPackages = with pkgs; [
brightnessctl
];
home-manager.sharedModules = [
inputs.self.modules.homeManager.backlight
];
};
flake.modules.homeManager.backlight = {
wayland.windowManager.hyprland.settings.bind = [
", code:232, exec, brightnessctl set 5%-"
", code:233, exec, brightnessctl set +5%"
];
};
flake.modules.homeManager.backlight = { pkgs, ... }:
let
brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
in
{
wayland.windowManager.hyprland.extraConfig = ''
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("${brightnessctl} -e4 -n2 set 5%+"), { locked = true, repeating = true })
hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("${brightnessctl} -e4 -n2 set 5%-"), { locked = true, repeating = true })
'';
};
}
modules/system-settings/home-vpn.nix
+6 -5
View File
@@ -5,10 +5,11 @@
resolved
];
services.resolved.extraConfig = ''
[Resolve]
DNS=10.10.0.1
Domains=~veltnet
'';
services.resolved.settings = {
Resolve = {
DNS = "10.10.0.1";
Domains = "~veltnet";
};
};
};
}
modules/system-types/base/nixos.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ inputs, ... }: {
flake-file.inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
};