imxyy1soope1/nixos-dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Activity

Compare commits

base: imxyy1soope1:0267058530f61005ba5669b0c7b23ea1b526cb31
Branches Tags
imxyy1soope1:master imxyy1soope1:quickshell
...
compare: imxyy1soope1:f231663fe95c822fcf01f22dde5080144357b730
Branches Tags
imxyy1soope1:master imxyy1soope1:quickshell

8 Commits
0267058530 ... f231663fe9

Author SHA1 Message Date
imxyy_soope_
f231663fe9 Merge branch 'master' of ssh://git.imxyy.top:2222/imxyy1soope1/nixos-dotfiles 2025-06-14 16:51:03 +08:00
imxyy_soope_
ca45d3da81 chore(Makefile): use-remote-sudo -> sudo 2025-06-14 16:50:48 +08:00
imxyy_soope_
985cd8aa9d fix(niri): fractional scaling 
This works in latest unstable niri
 2025-06-14 16:50:25 +08:00
imxyy_soope_
1b6cf3b07f chore: update flake.lock 2025-06-14 16:49:53 +08:00
imxyy_soope_
16cddf0335 chore(stylix): tidy 2025-06-14 13:55:26 +08:00
imxyy_soope_
91a0e56ef1 chore: update secrets 2025-06-14 13:54:02 +08:00
imxyy_soope_
e5b07a6fbe feat(niri): gnome-keyring 2025-06-08 09:58:48 +08:00
imxyy_soope_
506ca711b5 feat: ttf-wps-fonts 2025-06-08 09:58:20 +08:00
10 changed files with 109 additions and 83 deletions
Expand all files Collapse all files

4
Makefile
View File

@@ -2,11 +2,11 @@ all: fmt switch
switch: switch:
@echo "Rebuilding NixOS..." @echo "Rebuilding NixOS..."
@nixos-rebuild switch --flake . --use-remote-sudo --json |& nom @nixos-rebuild switch --flake . --sudo --json |& nom
boot: boot:
@echo "Rebuilding NixOS..." @echo "Rebuilding NixOS..."
@nixos-rebuild boot --flake . --use-remote-sudo --json |& nom @nixos-rebuild boot --flake . --sudo --json |& nom
vm: vm:
@echo "Building NixOS VM..." @echo "Building NixOS VM..."

14
config/hosts/imxyy-nix/home.nix
View File

@@ -14,6 +14,7 @@
wpsoffice-cn wpsoffice-cn
wps-office-fonts wps-office-fonts
ttf-wps-fonts
evince evince
anki anki
@@ -85,11 +86,14 @@
} }
{ {
command = [ command = [
"sh" (toString (
"-c" pkgs.writeShellScript "xsettingsd" ''
"sleep 3; ${lib.getExe pkgs.xsettingsd} -c ${pkgs.writeText "xsettingsd.conf" '' while :
Xft/DPI 122880 do
''}" ${lib.getExe pkgs.xsettingsd} -c ${pkgs.writeText "xsettingsd.conf" "Xft/DPI 122880\n"}
done
''
))
]; ];
} }
]; ];

104
flake.lock generated
View File

@@ -148,11 +148,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1749192146, "lastModified": 1749710537,
"narHash": "sha256-ZEpmRS5m692wzUhRSdBgSojaWR0EU0lqT9x0Bsb+2xY=", "narHash": "sha256-Jte1NonRzaKF6UpPL5FujKHVTVvc8CAIj8fK+X/0qVM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "167c053888748278d52fba3c4bf3b8abaee72929", "rev": "b8fda10da7629d856086bbc1e21164c2d55691e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -196,11 +196,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1747046372,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -522,11 +522,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749243446, "lastModified": 1749821119,
"narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "rev": "79dfd9aa295e53773aad45480b44c131da29f35b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -669,11 +669,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1749242294, "lastModified": 1749801447,
"narHash": "sha256-kRoYNsL0fwNVXFAr5dl/7esQK8vtJUJYnU+P5/w+ZJQ=", "narHash": "sha256-cfrRFN9j340Wlgwe3k2oWB/0LI63JyUZab7apN72xd8=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "2b3bd97df72f2d0b021afcb7a6077e7f71fc2f8d", "rev": "fba861e81d6fe8c0a8ba9fb2ed8d5e6df4a6ad78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -702,11 +702,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749112952, "lastModified": 1749797708,
"narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=", "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a", "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -782,11 +782,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746453552, "lastModified": 1749574455,
"narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", "narHash": "sha256-fm2/8KPOYvvIAnNVtjDlTt/My00lIbZQ+LMrfQIWVzs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "be618645aa0adf461f778500172b6896d5ab2d01", "rev": "917af390377c573932d84b5e31dd9f2c1b5c0f09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -825,11 +825,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1749263255, "lastModified": 1749879625,
"narHash": "sha256-N57WqGFUUDJ7QVR4YPRttp4YuTA4oN/KdXHY4OEXGFk=", "narHash": "sha256-MtqGUE9dPX64saUYudgYxeH2yPSSnNlvPmyiKHISJ3M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "067a39e41a125985e061199452c900b0305f4c42", "rev": "f117875f61620e81e0412d3f1d2ab7971d88912d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -841,11 +841,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1749246182, "lastModified": 1749866762,
"narHash": "sha256-0q80SLtfhrtZAzLGpwAQjqaTE+HAwmOjoX4Q3M5mB/s=", "narHash": "sha256-WWUjx/6D+xmE6boM31L31nM/8csI79BuLgGytZHByz4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5908ad2494520214a309e74d5c3f33623a593ecd", "rev": "6a06b272523a606c55f7bac29477a091c775d89b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -857,11 +857,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1749201760, "lastModified": 1749809936,
"narHash": "sha256-LEZbj+VD/AR/dWL5ns1gMwzMvp4mLlv4WalxmZTKy5Y=", "narHash": "sha256-WPGRaj7CKfZukjcpxiacp29uYfMl3S9zFiEsVFv/HWM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ebd3748a6b97de45844aa62701b81df35c5c1269", "rev": "ec4c48ddcd5718cc1312f432b800fbbfe63ee2fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -905,11 +905,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1749143949, "lastModified": 1749285348,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -926,11 +926,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1749268187, "lastModified": 1749874339,
"narHash": "sha256-vvyoGq0DMwmNwJ4hNDkXdlMPjT7ZaJoaYcx/JTxENxI=", "narHash": "sha256-QKj0+WJm9LiZulDdQI8duXAckKVmj6952C9gww/flB0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6e40eba6340c0787c694800c443e3f70c7c2dd60", "rev": "c70ec5f29a4642d6f412186a9f4d68f536089814",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -994,11 +994,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748598934, "lastModified": 1749772873,
"narHash": "sha256-c8o4KJPda4HNj/jWwjrWip7QZmfnuOQxKiAadzu/Ibs=", "narHash": "sha256-ZsFQIs3ZpUud1QmR1TyhAW0LGbjHzCkA79YCLBbJ12A=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "aa547bad843439615bc0a7f97a55d81058b2e9c8", "rev": "517143adf97fb0df7e9a7584061deecdffb19faf",
"revCount": 565, "revCount": 576,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell" "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
}, },
@@ -1034,11 +1034,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749133384, "lastModified": 1749671345,
"narHash": "sha256-nKbHae8x2v2IMg1Rd3e5OrRPk5lxAqcvPkIM3fYtB90=", "narHash": "sha256-ewwoJOGE6sMnfXQkydmmjT6ixo1JetBZO0tDEENjOb8=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "d5665e5ca79135a753f853b5a0e2f33f8f263a0b", "rev": "5b2c8bc9ae90b4ad92dbeb7e52a7f5cbf5ba4d53",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1055,11 +1055,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747603214, "lastModified": 1749592509,
"narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "rev": "50754dfaa0e24e313c626900d44ef431f3210138",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1092,11 +1092,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1749236315, "lastModified": 1749824792,
"narHash": "sha256-Ndtdvwz8D4WOYHl5mj9d5F5iC8WPH6uPNF7RcU3QzmE=", "narHash": "sha256-fhEA3GngWkfktSI/7dLdlirgUS9nmXmJGisOs5ozTMw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "29d006198ee05143cca8b4b89f37025823da1bcc", "rev": "c79ad485612a0277c1e25a0bcc562eea11b563d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1294,11 +1294,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748488455, "lastModified": 1749315541,
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1315,11 +1315,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749227189, "lastModified": 1749875058,
"narHash": "sha256-bToj/0wPCkay4LCDKKRNup9oyt9IwiFyEaCG0ljvlb8=", "narHash": "sha256-LGeVwJLNJ+QPsuQMGsm5atAkFZgrRG3t62bB0+loOi4=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "37608b352c9def5aafad3a819fe02ef120c1cb08", "rev": "12fbcbb395776b50a848f87434bb786ef4f09b9d",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/desktop/style/default.nix
View File

@@ -29,10 +29,6 @@ lib.my.makeSwitch {
dark = "Win11"; dark = "Win11";
light = "Win11"; light = "Win11";
}; };
targets = {
nixos-icons.enable = false;
gnome-text-editor.enable = false;
};
}; };
# GTK # GTK

15
modules/desktop/wm/niri/config.nix
View File

@@ -5,20 +5,6 @@
... ...
}: }:
{ {
my.home.systemd.user.services.xwayland-satellite = {
Unit = {
Description = "xwayland-satellite";
After = [ "niri.service" ];
};
Service = {
ExecStart = "${lib.getExe pkgs.xwayland-satellite-unstable}";
Restart = "on-failure";
};
Install.WantedBy = [
"niri.service"
];
};
my.home.programs.niri.settings = { my.home.programs.niri.settings = {
input = { input = {
focus-follows-mouse = { focus-follows-mouse = {
@@ -95,7 +81,6 @@
XDG_CURRENT_DESKTOP = "niri"; XDG_CURRENT_DESKTOP = "niri";
XDG_SESSION_DESKTOP = "niri"; XDG_SESSION_DESKTOP = "niri";
QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_AUTO_SCREEN_SCALE_FACTOR = "1";
DISPLAY = ":0";
}; };
spawn-at-startup = map (c: { command = c; }) [ spawn-at-startup = map (c: { command = c; }) [

8
modules/desktop/wm/niri/default.nix
View File

@@ -19,6 +19,13 @@ in
]; ];
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
security.pam.services.login.enableGnomeKeyring = true;
my.persist.homeDirs = [
{
directory = ".local/share/keyrings";
mode = "0700";
}
];
xdg.portal = { xdg.portal = {
enable = true; enable = true;
config = { config = {
@@ -63,6 +70,7 @@ in
cliphist cliphist
swaynotificationcenter swaynotificationcenter
nemo-with-extensions nemo-with-extensions
xwayland-satellite-unstable
]; ];
programs.wofi.enable = true; programs.wofi.enable = true;
xdg.configFile."wofi" = { xdg.configFile."wofi" = {

1
pkgs/default.nix
View File

@@ -7,6 +7,7 @@ let
"fcitx5-lightly" "fcitx5-lightly"
"fluent-fcitx5" "fluent-fcitx5"
"wps-office-fonts" "wps-office-fonts"
"ttf-wps-fonts"
"translate-shell" "translate-shell"
]; ];
in in

34
pkgs/ttf-wps-fonts.nix Normal file
View File

@@ -0,0 +1,34 @@
{
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "ttf-wps-fonts";
version = "unstable-2024-08-29";
src = fetchFromGitHub {
owner = "dv-anomaly";
repo = "ttf-wps-fonts";
rev = "8c980c24289cb08e03f72915970ce1bd6767e45a";
hash = "sha256-x+grMnpEGLkrGVud0XXE8Wh6KT5DoqE6OHR+TS6TagI=";
};
phases = [
"unpackPhase"
"installPhase"
];
installPhase = ''
runHook preInstall
mkdir -p $out/share/fonts/ttf-wps-fonts
cp *.ttf *.TTF $out/share/fonts/ttf-wps-fonts
runHook postInstall
'';
meta = {
description = "Symbol fonts required by wps-office. ";
homepage = "https://github.com/dv-anomaly/ttf-wps-fonts/tree/8c980c24289cb08e03f72915970ce1bd6767e45a";
};
}

2
pkgs/wps-office-fonts.nix
View File

@@ -1,5 +1,4 @@
{ {
lib,
stdenvNoCC, stdenvNoCC,
fetchurl, fetchurl,
}: }:
@@ -29,6 +28,5 @@ stdenvNoCC.mkDerivation rec {
meta = { meta = {
description = "The wps-office-fonts package contains Founder Chinese fonts"; description = "The wps-office-fonts package contains Founder Chinese fonts";
homepage = "https://github.com/Universebenzene/wps-office-fonts"; homepage = "https://github.com/Universebenzene/wps-office-fonts";
license = lib.licenses.unlicense;
}; };
} }

6
secrets/dae-imxyy-nix.dae
View File

File diff suppressed because one or more lines are too long