KptltD00M/nixy
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate Hyprland to Lua config, drop dead flake inputs, general cleanup

Browse Source 
Hyprland
- Switch wayland.windowManager.hyprland to configType = "lua" (Hyprland 0.56)
- Convert settings, env, monitors, window rules, gesture, animations
  (hl.curve/hl.animation) and all keybinds to hl.* calls
- Add home/system/hyprland/lib.nix with exec/bind/execOnce helpers;
  every exec-once now runs from a hyprland.start hook
- Drop hard-coded default_monitor = "eDP-2"

Flake
- Remove blog, awesome-wallpapers and default-creds inputs (their repos
  no longer ship a flake.nix and broke `nix flake update`), along with
  the server modules and Glance links that used them
- Update flake.lock
- Replace removed `gcr` with `gcr_4`

Fixes
- Point configDirectory at /etc/nixos/nixy on home-pc and thinkpad
- Fix home-pc git email typo
- Remove conflicting openpgp signing format, make pull.rebase a boolean,
  replace hx/peco in git aliases with nvim/sk
- Fix zsh NUL alias (2>&1) and stop forcing bat colors in the cat alias
- Require a password for sudo again (nixos-rebuild stays NOPASSWD)
- Remove duplicate hardware.graphics block from home-pc flake
- Delete unused zen .old files, run alejandra on host files
This commit is contained in:
kptltd00m
2026-09-28 18:15:30 +02:00
parent c4e3af21e3
commit fe508d9cd8
34 changed files with 578 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/home-pc/configuration.nix
+11 -11
View File
@@ -1,8 +1,8 @@
{config, ...}: {
imports = [
# ─────────────────────────────────────────────────────────────
# System configuration
# ─────────────────────────────────────────────────────────────
# System configuration
# ─────────────────────────────────────────────────────────────
../../nixos/audio.nix
../../nixos/docker.nix
../../nixos/bluetooth.nix
@@ -16,15 +16,15 @@
../../nixos/utils.nix
../../nixos/hyprland.nix
# ─────────────────────────────────────────────────────────────
# Graphics Card
# ─────────────────────────────────────────────────────────────
../../nixos/amd-graphics.nix
# ─────────────────────────────────────────────────────────────
# Graphics Card
# ─────────────────────────────────────────────────────────────
../../nixos/amd-graphics.nix
# ─────────────────────────────────────────────────────────────
# System integration for Steam
# ─────────────────────────────────────────────────────────────
../../nixos/steam.nix
# ─────────────────────────────────────────────────────────────
# System integration for Steam
# ─────────────────────────────────────────────────────────────
../../nixos/steam.nix
# You should let those lines as is
./hardware-configuration.nix
@@ -33,7 +33,7 @@
programs.nix-ld.enable = true; #Dynamic Linking
home-manager.users."${config.var.username}" = import ./home.nix;
services.flatpak.enable = true;
services.flatpak.enable = true;
# Don't touch this
system.stateVersion = "24.05";
}
hosts/home-pc/flake.nix
+8 -12
View File
@@ -3,7 +3,6 @@
nixpkgs,
...
}:
nixpkgs.lib.nixosSystem {
modules = [
{
@@ -13,19 +12,16 @@ nixpkgs.lib.nixosSystem {
};
}
({ config, pkgs, lib, ... }: {
({
config,
pkgs,
lib,
...
}: {
# ─────────────────────────────────────────────────────────────
# AMD Microcode
# ─────────────────────────────────────────────────────────────
# AMD Microcode
# ─────────────────────────────────────────────────────────────
hardware.cpu.amd.updateMicrocode = true;
# ─────────────────────────────────────────────────────────────
# Hardware accelaration
# ─────────────────────────────────────────────────────────────
hardware.graphics = {
enable = true;
enable32Bit = true;
};
})
inputs.home-manager.nixosModules.home-manager
hosts/home-pc/home.nix
+17 -7
View File
@@ -15,19 +15,19 @@
../../home/programs/spotatui
../../home/programs/yazi
# ─────────────────────────────────────────────────────────────
# ─────────────────────────────────────────────────────────────
# Gaming
# ─────────────────────────────────────────────────────────────
../../home/programs/steam
../../home/programs/steam
../../home/programs/star-citizen
# ─────────────────────────────────────────────────────────────
# ─────────────────────────────────────────────────────────────
# Groups
# ─────────────────────────────────────────────────────────────
../../home/programs/group/basic-apps.nix
../../home/programs/group/dev.nix
../../home/programs/group/misc.nix
../../home/programs/group/gaming-apps.nix
../../home/programs/group/gaming-apps.nix
../../home/programs/group/music-apps.nix
# ─────────────────────────────────────────────────────────────
@@ -46,7 +46,7 @@
home = {
inherit (config.var) username;
homeDirectory = "/home/" + config.var.username;
file.".face" = {
file.".face" = {
source = ./profile_picture.jpg;
};
@@ -55,8 +55,18 @@
};
wayland.windowManager.hyprland.settings.monitor = [
"DP-3,1920x1080@144.0,1920x0,1.0"
"HDMI-A-1,1920x1080@60.0,0x0,1.0"
{
output = "DP-3";
mode = "1920x1080@144.0";
position = "1920x0";
scale = 1;
}
{
output = "HDMI-A-1";
mode = "1920x1080@60.0";
position = "0x0";
scale = 1;
}
];
programs = {
hosts/home-pc/variables.nix
+2 -2
View File
@@ -11,7 +11,7 @@
config.var = {
hostname = "home-pc";
username = "andi";
configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
configDirectory = "/etc/nixos/nixy"; # The path of the nixos configuration directory
keyboardLayout = "de";
@@ -21,7 +21,7 @@
git = {
username = "kptltd00m";
email = "kptltd00m.doomlabs.de";
email = "kptltd00m@doomlabs.de";
};
autoUpgrade = false;
hosts/laptop/configuration.nix
+28 -29
View File
@@ -1,33 +1,32 @@
{ config, ... }: {
imports = [
# ─────────────────────────────────────────────────────────────
# System configuration
# ─────────────────────────────────────────────────────────────
../../nixos/audio.nix
../../nixos/bluetooth.nix
../../nixos/fonts.nix
../../nixos/home-manager.nix
../../nixos/nix.nix
../../nixos/systemd-boot.nix
../../nixos/tuigreet.nix
../../nixos/users.nix
../../nixos/utils.nix
../../nixos/hyprland.nix
{config, ...}: {
imports = [
# ─────────────────────────────────────────────────────────────
# System configuration
# ─────────────────────────────────────────────────────────────
../../nixos/audio.nix
../../nixos/bluetooth.nix
../../nixos/fonts.nix
../../nixos/home-manager.nix
../../nixos/nix.nix
../../nixos/systemd-boot.nix
../../nixos/tuigreet.nix
../../nixos/users.nix
../../nixos/utils.nix
../../nixos/hyprland.nix
# ─────────────────────────────────────────────────────────────
# System integration for Steam
# ─────────────────────────────────────────────────────────────
../../nixos/steam.nix
# ─────────────────────────────────────────────────────────────
# System integration for Steam
# ─────────────────────────────────────────────────────────────
../../nixos/steam.nix
# You should let those lines as is
./hardware-configuration.nix
./variables.nix
# You should let those lines as is
./hardware-configuration.nix
./variables.nix
];
];
programs.nix-ld.enable = true; #Dynamic Linking
home-manager.users."${config.var.username}" = import ./home.nix;
services.flatpak.enable = true;
# Don't touch this
system.stateVersion = "24.05";
programs.nix-ld.enable = true; #Dynamic Linking
home-manager.users."${config.var.username}" = import ./home.nix;
services.flatpak.enable = true;
# Don't touch this
system.stateVersion = "24.05";
}
hosts/laptop/home.nix
+10 -4
View File
@@ -16,12 +16,12 @@
../../home/programs/yazi
../../home/programs/zen
# ─────────────────────────────────────────────────────────────
# ─────────────────────────────────────────────────────────────
# Gaming
# ─────────────────────────────────────────────────────────────
../../home/programs/steam
../../home/programs/steam
# ─────────────────────────────────────────────────────────────
# ─────────────────────────────────────────────────────────────
# Groups
# ─────────────────────────────────────────────────────────────
../../home/programs/group/basic-apps.nix
@@ -60,7 +60,13 @@
};
wayland.windowManager.hyprland.settings.monitor = [
"eDP-1,1920x1080,0x0,1.5" # My internal laptop screen
# My internal laptop screen
{
output = "eDP-1";
mode = "1920x1080";
position = "0x0";
scale = 1.5;
}
];
programs = {
hosts/laptop/variables.nix
+1 -1
View File
@@ -11,7 +11,7 @@
config.var = {
hostname = "thinkpad";
username = "andi";
configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
configDirectory = "/etc/nixos/nixy"; # The path of the nixos configuration directory
keyboardLayout = "de";
hosts/server/configuration.nix
-3
View File
@@ -15,15 +15,12 @@
../../server-modules/glance
../../server-modules/adguardhome.nix
../../server-modules/arr.nix
../../server-modules/blog.nix
../../server-modules/awesome-wallpapers.nix
../../server-modules/iknowyou.nix
../../server-modules/stirling-pdf.nix
../../server-modules/cyberchef.nix
../../server-modules/mazanoke.nix
../../server-modules/kernel-hardening.nix
../../server-modules/fail2ban.nix
../../server-modules/default-creds.nix
../../server-modules/umami.nix
../../server-modules/gitea.nix
../../server-modules/mealie.nix
hosts/server/flake.nix
-1
View File
@@ -11,7 +11,6 @@ nixpkgs.lib.nixosSystem {
inputs.sops-nix.nixosModules.sops
inputs.nixarr.nixosModules.default
inputs.nix-index-database.nixosModules.default
inputs.default-creds.nixosModules.default
./configuration.nix
];
}
hosts/work/home.nix
+6 -1
View File
@@ -41,7 +41,12 @@
};
wayland.windowManager.hyprland.settings.monitor = [
"desc:Philips Consumer Electronics Company PHL 221B8L ZV02144013987,highres,0x0,1"
{
output = "desc:Philips Consumer Electronics Company PHL 221B8L ZV02144013987";
mode = "highres";
position = "0x0";
scale = 1;
}
];
programs = {
hosts/work/secrets/default.nix
+3 -1
View File
@@ -4,8 +4,10 @@
inputs,
pkgs,
config,
lib,
...
}: let
hl = import ../../../home/system/hyprland/lib.nix {inherit lib;};
home = config.home.homeDirectory;
in {
imports = [inputs.sops-nix.homeManagerModules.sops];
@@ -54,5 +56,5 @@ in {
age
];
wayland.windowManager.hyprland.settings.exec-once = ["systemctl --user start sops-nix"];
wayland.windowManager.hyprland.settings.on = hl.execOnce ["systemctl --user start sops-nix"];
}