From 3bef1ca9d19b1ae4496cac753aa74dedf8540071 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 29 Apr 2024 21:35:32 +0200 Subject: [PATCH 1/3] fix: remove flake-utils from flake.lock --- flake.lock | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/flake.lock b/flake.lock index c3ab1c9..b2a27c6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -70,26 +52,10 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nur": "nur" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", From 3c37eda13b9f2e532e8d38cabfea0d88705ca20f Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 29 Apr 2024 23:56:21 +0200 Subject: [PATCH 2/3] fix: rework DPI configuration on all devices Allow better font size on all screen --- modules/home-manager/application/foot/default.nix | 1 - .../home-manager/desktop/sway/includes/fuzzel.nix | 2 +- .../home-manager/desktop/sway/includes/kanshi.nix | 15 ++++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/home-manager/application/foot/default.nix b/modules/home-manager/application/foot/default.nix index b241ef8..18496b2 100644 --- a/modules/home-manager/application/foot/default.nix +++ b/modules/home-manager/application/foot/default.nix @@ -12,7 +12,6 @@ in enable = true; settings = { main = { - dpi-aware = "yes"; font = "Fira Code Nerd Font Mono:size=10"; }; mouse = { diff --git a/modules/home-manager/desktop/sway/includes/fuzzel.nix b/modules/home-manager/desktop/sway/includes/fuzzel.nix index 76cb7fb..a788c7e 100644 --- a/modules/home-manager/desktop/sway/includes/fuzzel.nix +++ b/modules/home-manager/desktop/sway/includes/fuzzel.nix @@ -5,7 +5,7 @@ with lib; programs.fuzzel = { settings = { main = { - font = "Fira Code Nerd Font Mono:size=9"; + font = "Fira Code Nerd Font Mono:size=12"; icon-theme = "Papirus-Dark"; width = 60; show-actions = "yes"; diff --git a/modules/home-manager/desktop/sway/includes/kanshi.nix b/modules/home-manager/desktop/sway/includes/kanshi.nix index 389df08..d212c4b 100644 --- a/modules/home-manager/desktop/sway/includes/kanshi.nix +++ b/modules/home-manager/desktop/sway/includes/kanshi.nix @@ -5,20 +5,29 @@ with lib; services.kanshi = { enable = config.modules.desktop.sway.kanshi ; profiles = { + standalone = { + outputs = [ + { + criteria = "eDP-1"; + scale = 1.33; + status = "enable"; + } + ]; + }; home = { outputs = [ { criteria = "Iiyama North America PL2792UH 1166310803122"; mode = "3840x2160"; - position = "1080,0"; - scale = 2.0; + position = "1235,0"; + scale = 1.75; } { criteria = "Iiyama North America PL2792UH 1176923201598"; mode = "3840x2160"; position = "0,0"; transform = "90"; - scale = 2.0; + scale = 1.75; } { criteria = "eDP-1"; From 1f599ab18f022a15d5dd6f7782e4da43163eb5d9 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 29 Apr 2024 23:59:25 +0200 Subject: [PATCH 3/3] test(typos): ignore colors definition --- _typos.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_typos.toml b/_typos.toml index e5c26af..a2f7f59 100644 --- a/_typos.toml +++ b/_typos.toml @@ -1,3 +1,7 @@ +[default] +# Ignore string that look like colors definitions +extend-ignore-re = ['[a-fA-F0-9]{6}'] + [default.extend-words] doas = "doas" edn = "edn"