mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-05-26 09:29:48 +02:00
refactor: update niri, write config in kdl, remove niri-flake
• Updated input 'nixpkgs':
→ 'github:NixOS/nixpkgs/0254eab410b90ef2420c1059f908ae777e3b02f9?narHash=sha256-/US2Ei9JHXHVBAxV4FX49Q7H5s4UNBrIiOA6Xjzgq44%3D' (2025-12-06)
• Updated input 'home-manager':
'github:nix-community/home-manager/f4cb25928fafa9ae68660fe71f730fc820a59028?narHash=sha256-5xOuutXM7UPTUcn3uDAD8UlPQsXmqPrX81cXoDOAGcA%3D' (2025-11-26)
→ 'github:nix-community/home-manager/89c9508bbe9b40d36b3dc206c2483ef176f15173?narHash=sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs%2BzlQ07dGQFk4%3D' (2025-12-17)
• Updated input 'nixpkgs-master':
'github:nixos/nixpkgs/6812bcfd614abedbdb3f68d7b6554eda6ca3e014?narHash=sha256-sNF/PZcuzYBHKRBkerEiPf5mkZM15A3fWD%2BlqpwKc60%3D' (2025-12-15)
→ 'github:nixos/nixpkgs/e50ab9bb181f9fb3ce00e7a6007c70ddaa007203?narHash=sha256-acPMRCAPgPykzkwATwD1EfF7xgmbraAvIJyCeR6bKxc%3D' (2025-12-18)
Signed-off-by: Ryan Yin <xiaoyin_c@qq.com>
This commit is contained in:
@@ -13,11 +13,11 @@
|
||||
|
||||
zramSwap.memoryPercent = lib.mkForce 75;
|
||||
|
||||
# Workaround for Mesa 25.3.0 regression
|
||||
# Workaround for Mesa 25.3.1 regression
|
||||
# https://github.com/nix-community/nixos-apple-silicon/issues/380
|
||||
# https://github.com/NixOS/nixpkgs/pull/461866
|
||||
hardware.graphics.package =
|
||||
assert pkgs.mesa.version == "25.3.0";
|
||||
assert pkgs.mesa.version == "25.3.1";
|
||||
(import nixpkgs-mesa { localSystem = pkgs.stdenv.hostPlatform; }).mesa;
|
||||
|
||||
nix.settings = {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{ config, niri, ... }:
|
||||
{ config, ... }:
|
||||
let
|
||||
hostName = "shoukei"; # Define your hostname.
|
||||
mkSymlink = config.lib.file.mkOutOfStoreSymlink;
|
||||
in
|
||||
{
|
||||
programs.ssh.matchBlocks."github.com".identityFile =
|
||||
@@ -11,44 +12,6 @@ in
|
||||
"${config.home.homeDirectory}/nix-config/hosts/12kingdoms-shoukei/hypr-hardware.conf"
|
||||
];
|
||||
|
||||
modules.desktop.niri = {
|
||||
settings =
|
||||
let
|
||||
inherit (niri.lib.kdl)
|
||||
node
|
||||
plain
|
||||
leaf
|
||||
flag
|
||||
;
|
||||
in
|
||||
[
|
||||
(node "output" "eDP-1" [
|
||||
(leaf "scale" 1.5)
|
||||
(leaf "transform" "normal")
|
||||
(leaf "mode" "2560x1600@60")
|
||||
(leaf "position" {
|
||||
x = 0;
|
||||
y = 0;
|
||||
})
|
||||
])
|
||||
|
||||
# ============= Named Workspaces =============
|
||||
(node "workspace" "1terminal" [ (leaf "open-on-output" "eDP-1") ])
|
||||
(node "workspace" "2browser" [ (leaf "open-on-output" "eDP-1") ])
|
||||
(node "workspace" "3chat" [ (leaf "open-on-output" "eDP-1") ])
|
||||
(node "workspace" "4music" [ (leaf "open-on-output" "eDP-1") ])
|
||||
(node "workspace" "5mail" [ (leaf "open-on-output" "eDP-1") ])
|
||||
(node "workspace" "6file" [ (leaf "open-on-output" "eDP-1") ])
|
||||
(node "workspace" "0other" [ (leaf "open-on-output" "eDP-1") ])
|
||||
|
||||
# Settings for debugging. Not meant for normal use.
|
||||
# These can change or stop working at any point with little notice.
|
||||
(plain "debug" [
|
||||
# Override the DRM device that niri will use for all rendering.
|
||||
# Fix: niri fails to correctly detect the primary render device
|
||||
(leaf "render-drm-device" "/dev/dri/renderD128")
|
||||
])
|
||||
];
|
||||
};
|
||||
|
||||
xdg.configFile."niri/niri-hardware.kdl".source =
|
||||
mkSymlink "${config.home.homeDirectory}/nix-config/hosts/12kingdoms-shoukei/niri-hardware.kdl";
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
output "eDP-1" {
|
||||
scale 1.500000
|
||||
transform "normal"
|
||||
mode "2560x1600@60"
|
||||
position x=0 y=0
|
||||
}
|
||||
workspace "1terminal" { open-on-output "eDP-1"; }
|
||||
workspace "2browser" { open-on-output "eDP-1"; }
|
||||
workspace "3chat" { open-on-output "eDP-1"; }
|
||||
workspace "4music" { open-on-output "eDP-1"; }
|
||||
workspace "5mail" { open-on-output "eDP-1"; }
|
||||
workspace "6file" { open-on-output "eDP-1"; }
|
||||
workspace "0other" { open-on-output "eDP-1"; }
|
||||
debug { render-drm-device "/dev/dri/renderD128"; }
|
||||
|
||||
Reference in New Issue
Block a user