update flake, maomao->mango

This commit is contained in:
EdenQwQ 2025-08-06 22:24:33 +08:00
parent 40e8577af0
commit 01c25a82c8
16 changed files with 158 additions and 154 deletions

203
flake.lock generated
View file

@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1750173260,
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
"lastModified": 1754433428,
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
"owner": "ryantm",
"repo": "agenix",
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1748408240,
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
"lastModified": 1752979451,
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
"type": "github"
},
"original": {
@ -178,11 +178,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"lastModified": 1754420989,
"narHash": "sha256-3e4wHzNwTMg7GaeLH9A091DMaO9AfFxUjpfqbddCUeo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"rev": "7f38f25a44023a21a504bd3fd9d4f41c4a39f55c",
"type": "github"
},
"original": {
@ -253,11 +253,11 @@
]
},
"locked": {
"lastModified": 1751413152,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"lastModified": 1754091436,
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
"type": "github"
},
"original": {
@ -402,11 +402,11 @@
"zon2nix": "zon2nix"
},
"locked": {
"lastModified": 1752875735,
"narHash": "sha256-ie+Qr1L2LXdWOMPjaU+Iw1w9lsrh57QgQ+BVN+hSjec=",
"lastModified": 1754450053,
"narHash": "sha256-Ex4vYChLUmVIvL0O/m4QWwjPVUOszxfLI3o1DTVQpt8=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "39f4cf3d19d49eecdb03cf963ec5818fd83d2fe7",
"rev": "1ec8188b5c012338f140c4be53dfa1be787f9eb9",
"type": "github"
},
"original": {
@ -460,11 +460,11 @@
]
},
"locked": {
"lastModified": 1752814804,
"narHash": "sha256-irfg7lnfEpJY+3Cffkluzp2MTVw1Uq9QGxFp6qadcXI=",
"lastModified": 1754457347,
"narHash": "sha256-QN9yZ1L5EmR16NNM+hNNzMjARk+FPjUeSE/ds4Kms0E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d0300c8808e41da81d6edfc202f3d3833c157daf",
"rev": "ad5d2b4aa770fdc74c80fd682fee0b00a8ad7991",
"type": "github"
},
"original": {
@ -508,11 +508,11 @@
"nixpkgs-lib": "nixpkgs-lib_5"
},
"locked": {
"lastModified": 1752408939,
"narHash": "sha256-FlX55V+xe3rV025aecfJOoukfzCD9Mfp/nXoQweMldI=",
"lastModified": 1754223384,
"narHash": "sha256-pewBF80b4slivTMSeONyOPceyzUUlBLpVOxlGf0hFEY=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "134d1f1febcc56bfaff3d0a33cc51a5571b3cb19",
"rev": "2d6fee65844e851060a6817984248bcf8358c6b0",
"type": "github"
},
"original": {
@ -521,7 +521,7 @@
"type": "github"
}
},
"maomaowm": {
"mangowc": {
"inputs": {
"flake-parts": "flake-parts_2",
"mmsg": "mmsg",
@ -529,16 +529,16 @@
"scenefx": "scenefx"
},
"locked": {
"lastModified": 1752815525,
"narHash": "sha256-75LIesfaAp1zQrCHzuuHRliFASFd1i/qgxCIWc6I9oI=",
"lastModified": 1754453133,
"narHash": "sha256-3AwYWyCt6mHDfyHPviOLSvn3f+bWQrWo/j+wIzSqpfs=",
"owner": "DreamMaoMao",
"repo": "maomaowm",
"rev": "f8403ea7ff6a61ee5589206e94f70ea60a1e2548",
"repo": "mangowc",
"rev": "f9dcaaae777b2d15c2a6802344d97fc34ed9580f",
"type": "github"
},
"original": {
"owner": "DreamMaoMao",
"repo": "maomaowm",
"repo": "mangowc",
"type": "github"
}
},
@ -546,7 +546,7 @@
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": [
"maomaowm",
"mangowc",
"nixpkgs"
]
},
@ -569,11 +569,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1752886220,
"narHash": "sha256-Zai80nM6l7Iko+pXNzrvtCWNX6UHip3aRifquecKXl8=",
"lastModified": 1754215936,
"narHash": "sha256-aIk3DNwa9s0cGkeKOtQq/2iMyfhgf+kgmpJflX7sn/A=",
"owner": "viperML",
"repo": "nh",
"rev": "51573073dc83af10583cd3074ad00871b853df13",
"rev": "a38e84e3c51904810189979f6a0ef4439352d65d",
"type": "github"
},
"original": {
@ -589,11 +589,11 @@
]
},
"locked": {
"lastModified": 1752799399,
"narHash": "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=",
"lastModified": 1753661392,
"narHash": "sha256-fK4INnIJQNAA8cyjcDRZSPleA+N/STI6I0oBDMZ2r+E=",
"owner": "oxalica",
"repo": "nil",
"rev": "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f",
"rev": "cd7a6f6d5dc58484e62a8e85677e06e47cf2bd4d",
"type": "github"
},
"original": {
@ -614,11 +614,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1752878399,
"narHash": "sha256-Kc4+stiqZP5+CUVVJNca8Xyye76hmRAVPK3cza1BXuk=",
"lastModified": 1754403288,
"narHash": "sha256-FdI2tV45ChVgwly2JRx1lA68gHIdZ38yyzHJeHHYTSc=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "1663b8f450988a64d9777f377efbd2fd8f3f243b",
"rev": "a5151e16afa09a01ef7b360d87956730d0534da7",
"type": "github"
},
"original": {
@ -647,11 +647,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1752870529,
"narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=",
"lastModified": 1754400448,
"narHash": "sha256-tP4wYaIKlhMTzNp0S9ouU5Key0+41Z5KkjP9zO6bIQU=",
"owner": "YalTeR",
"repo": "niri",
"rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2",
"rev": "52c579d5567d0b16ae68177fad05c612baba38af",
"type": "github"
},
"original": {
@ -668,11 +668,11 @@
]
},
"locked": {
"lastModified": 1752851107,
"narHash": "sha256-BDXnVFHRO2zTFPZ8+YrD5gS0Uaw4Poi5Bha7w8KZ38w=",
"lastModified": 1754406208,
"narHash": "sha256-liUId61xGKvxEkk4KcrMunJU2gPePCzpjsHcU5xjG/k=",
"owner": "doronbehar",
"repo": "nix-matlab",
"rev": "5a90bf95c922a30c0cf9f66c690fc61af8be7d00",
"rev": "b38f8b79af583185c68002a7603d31d8986911cc",
"type": "gitlab"
},
"original": {
@ -691,11 +691,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1749437307,
"narHash": "sha256-sSeplJJBnGKa/PLXZN1OVhD40DvgZjnFeVrreq31llg=",
"lastModified": 1754193386,
"narHash": "sha256-FHD7fXA77RIF0J/eQHL0MS2+E3sZeiKN1BWC2UpY6xE=",
"owner": "nix-community",
"repo": "nixd",
"rev": "474df09a7af97baa71250dc8527b4cfd143fb7e8",
"rev": "89332c35fe968902f582e5c1a3b409f6da5f9315",
"type": "github"
},
"original": {
@ -706,27 +706,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1745391562,
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
"lastModified": 1754028485,
"narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
"rev": "59e69648d345d6e8fef86158c555730fa12af9de",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1751159883,
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"lastModified": 1753579242,
"narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
"rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
"type": "github"
},
"original": {
@ -779,11 +779,11 @@
},
"nixpkgs-lib_5": {
"locked": {
"lastModified": 1752369545,
"narHash": "sha256-jj/HBJFSapTk4LfeJgNLk2wEE2BO6dgBYVRbXMNOCeM=",
"lastModified": 1754184128,
"narHash": "sha256-AjhoyBL4eSyXf01Bmc6DiuaMrJRNdWopmdnMY0Pa/M0=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "65d21753676aaf55d8e67249138ab1286599a62b",
"rev": "02e72200e6d56494f4a7c0da8118760736e41b60",
"type": "github"
},
"original": {
@ -794,11 +794,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1752620740,
"narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
"lastModified": 1754292888,
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
"type": "github"
},
"original": {
@ -810,11 +810,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1752620740,
"narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
"lastModified": 1754292888,
"narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
"rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
"type": "github"
},
"original": {
@ -831,11 +831,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1752893821,
"narHash": "sha256-i8DEEzc/Br4uO2UF1WusAvo+X8plNPY91fe1FViUMQs=",
"lastModified": 1754459064,
"narHash": "sha256-0edf+wA3aFEMD3Xn0FhveBcE1UsAlNsIvWZvIAoknKk=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "d7eddeb0402fd2876c03d1903fac9729b07d6ed1",
"rev": "886afff215c4504c46ec840e283cedb7c79870bb",
"type": "github"
},
"original": {
@ -875,11 +875,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1752436162,
"narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
"lastModified": 1753749649,
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
"type": "github"
},
"original": {
@ -891,11 +891,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1752687322,
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"lastModified": 1754214453,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github"
},
"original": {
@ -907,11 +907,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1752823602,
"narHash": "sha256-VVEVf5hfsRFVIunyACxv1YbzjPGSEkUy9LvPNe398ks=",
"lastModified": 1754454387,
"narHash": "sha256-ViCy7RR3EhFC8Fj6CPrwiuM/M/jdqTsUVxX3XyKlo5w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad20a3585a3402af241cfb2f758711945d0a725c",
"rev": "2bca8a5647e6aad5902777da1122855474a89b0d",
"type": "github"
},
"original": {
@ -923,11 +923,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1752687322,
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"lastModified": 1754214453,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github"
},
"original": {
@ -939,11 +939,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1752687322,
"narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
"lastModified": 1754214453,
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
"rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376",
"type": "github"
},
"original": {
@ -973,21 +973,22 @@
"inputs": {
"flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
"nixpkgs-stable"
],
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_5"
},
"locked": {
"lastModified": 1752762787,
"narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=",
"lastModified": 1754262585,
"narHash": "sha256-Yz5dJ0VzGRzSRHdHldsWQbuFYmtP3NWNreCvPfCi9CI=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04",
"rev": "ab1b5962e1ca90b42de47e1172e0d24ca80e6256",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-25.05",
"repo": "nixvim",
"type": "github"
}
@ -998,11 +999,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1752898173,
"narHash": "sha256-bAKQC5PoLDFLv80bILwSRlPzcXw4g2Iz735Vi/RhoAA=",
"lastModified": 1754474936,
"narHash": "sha256-5isFM/P8BUOJvHnloh3WNg9HEJKUdNVyIjmCAzaanQY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "b6552f1157702fc0904252e2e68110cca8bae4d4",
"rev": "5f01257d6fa49cde9d57e7992b9872136a283c5c",
"type": "github"
},
"original": {
@ -1046,11 +1047,11 @@
]
},
"locked": {
"lastModified": 1749730855,
"narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
"lastModified": 1754301638,
"narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=",
"owner": "NuschtOS",
"repo": "search",
"rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
"rev": "a60091045273484c040a91f5c229ba298f8ecc27",
"type": "github"
},
"original": {
@ -1065,7 +1066,7 @@
"flake-parts": "flake-parts",
"ghostty": "ghostty",
"home-manager": "home-manager_2",
"maomaowm": "maomaowm",
"mangowc": "mangowc",
"nh": "nh",
"nil": "nil",
"niri": "niri",
@ -1084,7 +1085,7 @@
"scenefx": {
"inputs": {
"nixpkgs": [
"maomaowm",
"mangowc",
"nixpkgs"
]
},
@ -1123,11 +1124,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1752750082,
"narHash": "sha256-NoVAqy+Wj4tgkvrYB8zWncl8Z6Hb80aX3t/TYGdsfaM=",
"lastModified": 1754438321,
"narHash": "sha256-sRRV9FAZyCbq91IXc6gokBGNe0mF3DPbX/ceY8vUvw0=",
"owner": "nix-community",
"repo": "stylix",
"rev": "03699ed214f6e8195bc7199d6ae3aeccf9732b08",
"rev": "8410296a30e62e06305020cb74d3247cfa45d9cc",
"type": "github"
},
"original": {
@ -1333,11 +1334,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1752055615,
"narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=",
"lastModified": 1754061284,
"narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9",
"rev": "58bd4da459f0a39e506847109a2a5cfceb837796",
"type": "github"
},
"original": {
@ -1366,11 +1367,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1752338000,
"narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=",
"lastModified": 1754367142,
"narHash": "sha256-U0gbn4Qe2NfdaQHvSerzjn3iLhrH+Ah0DMBJfRh1OT8=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "ba78881a68182ce338041846164cbfed0d70935c",
"rev": "ecbe57e7be12452d6fe477f2154a6d93f60c41e0",
"type": "github"
},
"original": {

View file

@ -68,8 +68,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
url = "github:nix-community/nixvim/nixos-25.05";
inputs.nixpkgs.follows = "nixpkgs-stable";
};
nil = {
url = "github:oxalica/nil";
@ -82,7 +82,7 @@
nh.url = "github:viperML/nh";
treefmt-nix.url = "github:numtide/treefmt-nix";
agenix.url = "github:ryantm/agenix";
maomaowm.url = "github:DreamMaoMao/maomaowm";
mangowc.url = "github:DreamMaoMao/mangowc";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nix-matlab = {
url = "gitlab:doronbehar/nix-matlab";

View file

@ -1,3 +1,4 @@
{ inputs, pkgs, ... }:
{
programs.firefox = {
enable = true;

View file

@ -7,7 +7,7 @@
./niri
./swhkd.nix
./scroll
./maomaowm
./mango
];
home.packages = with pkgs; [
swww

View file

@ -5,7 +5,7 @@
./waybar.nix
];
wayland.windowManager.maomaowm = {
wayland.windowManager.mango = {
enable = true;
settings =
with config.lib.stylix.colors;
@ -337,14 +337,14 @@
killall swhkd
killall swhks
swhks &
doas swhkd -c ~/.config/maomao/swhkdrc &
doas swhkd -c ~/.config/mango/swhkdrc &
swww kill
swww-daemon --namespace background &
killall clash-meta
clash-meta -d ~/.config/clash &
wlsunset -s 00:00 -S 00:00 -t 5000 -T 5001 &
killall .waybar-wrapped
waybar -c ~/.config/maomao/waybar/config.jsonc -s ~/.config/maomao/waybar/style.css &
waybar -c ~/.config/mango/waybar/config.jsonc -s ~/.config/mango/waybar/style.css &
killall .nm-applet-wrap
killall .blueman-applet
fcitx5 -d -r &

View file

@ -1,6 +1,6 @@
{ user, ... }:
{
xdg.configFile."maomao/swhkdrc".text = ''
xdg.configFile."mango/swhkdrc".text = ''
include /home/${user}/.config/swhkd/basic.swhkdrc
include /home/${user}/.config/swhkd/tofi.swhkdrc
'';

View file

@ -136,7 +136,7 @@ in
};
};
home.file = {
".config/maomao/waybar/config.jsonc".text =
".config/mango/waybar/config.jsonc".text =
let
otherMonitorsConfig =
map (
@ -188,19 +188,19 @@ in
]
'';
".config/maomao/waybar/colors.css".text =
".config/mango/waybar/colors.css".text =
# css
(builtins.mapAttrs (name: value: "@define-color ${name} ${value};") colors)
|> builtins.attrValues
|> builtins.concatStringsSep "\n";
".config/maomao/waybar/tray.css".text =
".config/mango/waybar/tray.css".text =
# css
''
#tray {
background: shade(alpha(${trayBackgroundColor}, 0.9), 1);
}
'';
".config/maomao/waybar/style.css".text =
".config/mango/waybar/style.css".text =
# css
''
@import "animation.css";
@ -383,9 +383,9 @@ in
#tray > .needs-attention {
-gtk-icon-effect: highlight;
}
'';
".config/maomao/waybar/animation.css".text =
'';
".config/mango/waybar/animation.css".text =
# css
''
@keyframes gradient {

View file

@ -11,6 +11,7 @@ in
autoEnable = false;
targets.gtk.enable = true;
targets.gtk.flatpakSupport.enable = true;
polarity = "dark";
cursor = {
package = pkgs.graphite-cursors;
name = "graphite-dark";

View file

@ -10,7 +10,7 @@ let
../nix
inputs.stylix.nixosModules.stylix
inputs.niri.nixosModules.niri
inputs.maomaowm.nixosModules.maomaowm
inputs.mangowc.nixosModules.mango
];
sharedHomeModules = [
@ -18,10 +18,10 @@ let
../nix/nixpkgs.nix
inputs.stylix.homeModules.stylix
inputs.niri.homeModules.niri
inputs.nixvim.homeManagerModules.nixvim
inputs.nixvim.homeModules.nixvim
inputs.agenix.homeManagerModules.default
../secrets/age.nix
inputs.maomaowm.hmModules.maomaowm
inputs.mangowc.hmModules.mango
] ++ (builtins.attrValues self.homeManagerModules);
mkHost =

View file

@ -1,8 +0,0 @@
{
services.ollama = {
enable = true;
};
services.nextjs-ollama-llm-ui = {
enable = true;
};
}

View file

@ -3,10 +3,10 @@
./basic.nix
./doas.nix
./niri.nix
./ai.nix
./swhkd.nix
./maomaowm.nix
./mango.nix
./matlab.nix
./misc.nix
./tuigreet.nix
];
}

5
os/programs/mango.nix Normal file
View file

@ -0,0 +1,5 @@
{
programs = {
mango.enable = true;
};
}

View file

@ -1,5 +0,0 @@
{
programs = {
maomaowm.enable = true;
};
}

29
os/programs/tuigreet.nix Normal file
View file

@ -0,0 +1,29 @@
{ config, pkgs, ... }:
{
services.greetd = {
enable = true;
settings.default_session = {
command = # bash
let
inherit (config.services.displayManager.sessionData) desktops;
in
# bash
''
${pkgs.greetd.tuigreet}/bin/tuigreet --time \
--sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions \
--remember --remember-user-session --asterisks --cmd niri-session \
--user-menu --greeting "Who TF Are You?" --window-padding 2'';
user = "greeter";
};
};
systemd.services.greetd.serviceConfig = {
Type = "idle";
StandardInput = "tty";
StandardOutput = "tty";
StandardError = "journal";
TTYReset = true;
TTYVHangup = true;
TTYVTDisallocate = true;
};
}

View file

@ -1,6 +1,5 @@
{
pkgs,
config,
user,
...
}:
@ -43,24 +42,6 @@
xkb.variant = "";
};
greetd = {
enable = true;
vt = 3;
settings.default_session = {
command = # bash
let
inherit (config.services.displayManager.sessionData) desktops;
in
# bash
''
${pkgs.greetd.tuigreet}/bin/tuigreet --time \
--sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions \
--remember --remember-user-session --asterisks --cmd niri-session \
--user-menu --greeting "Who TF Are You?" --window-padding 2'';
user = "greeter";
};
};
fprintd = {
enable = true;
};

View file

@ -16,7 +16,6 @@ rustPlatform.buildRustPackage {
hash = "sha256-+cxF/aWy2OLs1s+vQIXXsTx4hVAfJGenEdxOSgsmcqk=";
};
useFetchCargoVendor = true;
cargoHash = "sha256-LBbmFyddyw7vV5voctXq3L4U3Ddbh428j5XbI+td/dg=";
nativeBuildInputs = [