From 755869208959623c29c4b75878abdc8731c812d2 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 02:35:28 -0800 Subject: [PATCH 01/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9?narHash=sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c%3D' (2024-12-04) → 'github:hercules-ci/flake-parts/f2f7418ce0ab4a5309a4596161d154cfc877af66?narHash=sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq%2BraipRI%3D' (2025-01-01) • Updated input 'home-manager': 'github:nix-community/home-manager/10e99c43cdf4a0713b4e81d90691d22c6a58bdf2?narHash=sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4%3D' (2024-12-28) → 'github:nix-community/home-manager/5ad12b6ea06b84e48f6b677957c74f32d47bdee0?narHash=sha256-uTstP36WaFrw%2BTEHb8nLF14hFPzQBOhmIxzioHCDaL8%3D' (2025-01-05) • Updated input 'homebrew-cask': 'github:homebrew/homebrew-cask/0a747d6c1d6d1221ae4afa0adee7756a59c3ce8a?narHash=sha256-VjoUHegId5FaY7vvjFpvmcIs5cDit7xIy33W8hQEWNA%3D' (2024-12-31) → 'github:homebrew/homebrew-cask/47763d9672b0ac07a50e9a8d79eacf4c1ca10f81?narHash=sha256-ZiNnUlGucuZqCPuFOULkvIrN0n3OuEscsi1nToRxoXA%3D' (2025-01-05) • Updated input 'homebrew-core': 'github:homebrew/homebrew-core/06c5a3b8359fab9e83f7e71aeba76e35553458b5?narHash=sha256-NlSZW9TA4xzWoJFdOPnSVnySfMh67xOVo4unpZ4Ml90%3D' (2024-12-31) → 'github:homebrew/homebrew-core/e659870d95c95e81a34f03723b9ddad536b3b3ef?narHash=sha256-clLQ%2B/%2B7or412/UUzldghCMpW4QYsghbK9kJWjSlYEs%3D' (2025-01-05) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/71a3a075e3229a7518d76636bb762aef2bcb73ac?narHash=sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A%3D' (2024-12-29) → 'github:LnL7/nix-darwin/a464e5ba8cfb10a81599dbd422f30f5d37997916?narHash=sha256-anoVvML2D%2BnLfHlBfhEcCMjTou/9SRrrlqQN%2BUg39ws%3D' (2025-01-04) • Updated input 'nix-flatpak': 'github:gmodena/nix-flatpak/c31b6cbd11707fe2c74ad805ef085d59d75116ae?narHash=sha256-5qmX6YYjYfVYBbsmd2XxbTi7A59YuuN9IwfXU7qFquQ%3D' (2024-12-29) → 'github:gmodena/nix-flatpak/78ed84ff81e8d8510926e7165d508bcacef49ff1?narHash=sha256-370z%2BWLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o%3D' (2025-01-03) • Updated input 'nix-homebrew': 'github:zhaofengli-wip/nix-homebrew/ac3945ee614f69ab89c6935b3f0567028de5f012?narHash=sha256-VRQh/lvCSko9YV7haXyPt7DSp%2BEkgjjBv/9U4cY9c50%3D' (2024-11-20) → 'github:zhaofengli-wip/nix-homebrew/a6d99cc7436fc18c097b3536d9c45c0548c694c8?narHash=sha256-Kk/cVtkxwfHNoB6nINUarMLTtyAEvH%2BohzxKBptMzzg%3D' (2025-01-05) • Removed input 'nix-homebrew/flake-utils' • Removed input 'nix-homebrew/flake-utils/systems' • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/55ab1e1df5daf2476e6b826b69a82862dcbd7544?narHash=sha256-AydPpRBh8%2BNOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8%3D' (2024-12-29) → 'github:nix-community/nix-index-database/816a6ae88774ba7e74314830546c29e134e0dffb?narHash=sha256-hutd85FA1jUJhhqBRRJ%2Bu7UHO9oFGD/RVm2x5w8WjVQ%3D' (2025-01-05) • Updated input 'spicetify': 'github:Gerg-L/spicetify-nix/2da20133b52ac69a1f348c08dc801c8638261548?narHash=sha256-Aqhp0PcsoEn4FRWZYJZHbHeB%2BFOJDQcbsaEsXv0iA9k%3D' (2024-12-31) → 'github:Gerg-L/spicetify-nix/78c9ace8b9e1d7b64b4d797a066047c2332d24f6?narHash=sha256-wscvKDsyIES59ltENnOw7Hz8WKU8hg5m7dYbcJN2u6A%3D' (2025-01-05) • Updated input 'stylix': 'github:danth/stylix/a4ed4168fb83289374f24cb8a039c6983637a076?narHash=sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54%3D' (2024-12-30) → 'github:danth/stylix/7dfcdb410118dcd02ba1d85a2179a6f1c877403f?narHash=sha256-8gmk/i9ZA5C6LGRnqHb5sZ8UKaqT5GnS6XxeSPMSz%2Bs%3D' (2025-01-04) • Added input 'stylix/git-hooks': 'github:cachix/git-hooks.nix/cd1af27aa85026ac759d5d3fccf650abe7e1bbf0?narHash=sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf%2BInnSMT4jlMU%3D' (2024-11-11) • Added input 'stylix/git-hooks/flake-compat': follows 'stylix/flake-compat' • Added input 'stylix/git-hooks/gitignore': 'github:hercules-ci/gitignore.nix/637db329424fd7e46cf4185293b9cc8c88c95394?narHash=sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs%3D' (2024-02-28) • Added input 'stylix/git-hooks/gitignore/nixpkgs': follows 'stylix/git-hooks/nixpkgs' • Added input 'stylix/git-hooks/nixpkgs': follows 'stylix/nixpkgs' • Added input 'stylix/git-hooks/nixpkgs-stable': follows 'stylix/git-hooks/nixpkgs' • Updated input 'stylix/home-manager': 'github:nix-community/home-manager/c1fee8d4a60b89cae12b288ba9dbc608ff298163?narHash=sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ%2BGN0r8%3D' (2024-12-01) → 'github:nix-community/home-manager/5f6aa268e419d053c3d5025da740e390b12ac936?narHash=sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg%3D' (2025-01-01) • Updated input 'zen-browser': 'github:youwen5/zen-browser-flake/48130c8dd35a0f65c6b2eac5b54889ebf58cb9eb?narHash=sha256-5kaPvKkWx5okEePzI3KvDpBYn9CGJ/1QUhIX44R5Ny0%3D' (2024-12-31) → 'github:youwen5/zen-browser-flake/4e8e40a78eb6532d30690d975805be5dbba98255?narHash=sha256-88Pl16zxKqGEFbw6U04R9AXU0j12EVvYHFRgPQ/4o3g%3D' (2025-01-04) --- flake.lock | 162 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 91 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 28f506f..6f08589 100644 --- a/flake.lock +++ b/flake.lock @@ -333,11 +333,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1735774679, + "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", "type": "github" }, "original": { @@ -382,24 +382,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -416,6 +398,37 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -438,6 +451,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -484,11 +519,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1736066484, + "narHash": "sha256-uTstP36WaFrw+TEHb8nLF14hFPzQBOhmIxzioHCDaL8=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "5ad12b6ea06b84e48f6b677957c74f32d47bdee0", "type": "github" }, "original": { @@ -505,11 +540,11 @@ ] }, "locked": { - "lastModified": 1733085484, - "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", + "lastModified": 1735774425, + "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", + "rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "type": "github" }, "original": { @@ -521,11 +556,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1735621293, - "narHash": "sha256-VjoUHegId5FaY7vvjFpvmcIs5cDit7xIy33W8hQEWNA=", + "lastModified": 1736071688, + "narHash": "sha256-ZiNnUlGucuZqCPuFOULkvIrN0n3OuEscsi1nToRxoXA=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "0a747d6c1d6d1221ae4afa0adee7756a59c3ce8a", + "rev": "47763d9672b0ac07a50e9a8d79eacf4c1ca10f81", "type": "github" }, "original": { @@ -537,11 +572,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1735622950, - "narHash": "sha256-NlSZW9TA4xzWoJFdOPnSVnySfMh67xOVo4unpZ4Ml90=", + "lastModified": 1736072692, + "narHash": "sha256-clLQ+/+7or412/UUzldghCMpW4QYsghbK9kJWjSlYEs=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "06c5a3b8359fab9e83f7e71aeba76e35553458b5", + "rev": "e659870d95c95e81a34f03723b9ddad536b3b3ef", "type": "github" }, "original": { @@ -586,11 +621,11 @@ ] }, "locked": { - "lastModified": 1735478292, - "narHash": "sha256-Ys9pSP9ch0SthhpbjnkCSJ9ZLfaNKnt/dcy7swjmS1A=", + "lastModified": 1736002328, + "narHash": "sha256-anoVvML2D+nLfHlBfhEcCMjTou/9SRrrlqQN+Ug39ws=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "71a3a075e3229a7518d76636bb762aef2bcb73ac", + "rev": "a464e5ba8cfb10a81599dbd422f30f5d37997916", "type": "github" }, "original": { @@ -619,11 +654,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1735500379, - "narHash": "sha256-5qmX6YYjYfVYBbsmd2XxbTi7A59YuuN9IwfXU7qFquQ=", + "lastModified": 1735913600, + "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "c31b6cbd11707fe2c74ad805ef085d59d75116ae", + "rev": "78ed84ff81e8d8510926e7165d508bcacef49ff1", "type": "github" }, "original": { @@ -635,18 +670,17 @@ "nix-homebrew": { "inputs": { "brew-src": "brew-src", - "flake-utils": "flake-utils_3", "nix-darwin": "nix-darwin_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1732145543, - "narHash": "sha256-VRQh/lvCSko9YV7haXyPt7DSp+EkgjjBv/9U4cY9c50=", + "lastModified": 1736041957, + "narHash": "sha256-Kk/cVtkxwfHNoB6nINUarMLTtyAEvH+ohzxKBptMzzg=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "ac3945ee614f69ab89c6935b3f0567028de5f012", + "rev": "a6d99cc7436fc18c097b3536d9c45c0548c694c8", "type": "github" }, "original": { @@ -662,11 +696,11 @@ ] }, "locked": { - "lastModified": 1735443188, - "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", + "lastModified": 1736047960, + "narHash": "sha256-hutd85FA1jUJhhqBRRJ+u7UHO9oFGD/RVm2x5w8WjVQ=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", + "rev": "816a6ae88774ba7e74314830546c29e134e0dffb", "type": "github" }, "original": { @@ -929,11 +963,11 @@ ] }, "locked": { - "lastModified": 1735618543, - "narHash": "sha256-Aqhp0PcsoEn4FRWZYJZHbHeB+FOJDQcbsaEsXv0iA9k=", + "lastModified": 1736050526, + "narHash": "sha256-wscvKDsyIES59ltENnOw7Hz8WKU8hg5m7dYbcJN2u6A=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2da20133b52ac69a1f348c08dc801c8638261548", + "rev": "78c9ace8b9e1d7b64b4d797a066047c2332d24f6", "type": "github" }, "original": { @@ -952,22 +986,23 @@ "flake-utils": [ "flake-utils" ], + "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1735524788, - "narHash": "sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54=", + "lastModified": 1736011580, + "narHash": "sha256-8gmk/i9ZA5C6LGRnqHb5sZ8UKaqT5GnS6XxeSPMSz+s=", "owner": "danth", "repo": "stylix", - "rev": "a4ed4168fb83289374f24cb8a039c6983637a076", + "rev": "7dfcdb410118dcd02ba1d85a2179a6f1c877403f", "type": "github" }, "original": { @@ -1036,21 +1071,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1198,11 +1218,11 @@ ] }, "locked": { - "lastModified": 1735617939, - "narHash": "sha256-5kaPvKkWx5okEePzI3KvDpBYn9CGJ/1QUhIX44R5Ny0=", + "lastModified": 1735963510, + "narHash": "sha256-88Pl16zxKqGEFbw6U04R9AXU0j12EVvYHFRgPQ/4o3g=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "48130c8dd35a0f65c6b2eac5b54889ebf58cb9eb", + "rev": "4e8e40a78eb6532d30690d975805be5dbba98255", "type": "github" }, "original": { From 1276812b45e22eb965512b92512409f6f5751fc9 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 02:36:22 -0800 Subject: [PATCH 02/11] Revert "fix: use safe nixpkgs revision" This reverts commit b931893cdfcbb002cf91d8afad7c96fc802cf201. --- flake.lock | 8 ++++---- flake.nix | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6f08589..f3f8972 100644 --- a/flake.lock +++ b/flake.lock @@ -779,17 +779,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734978744, - "narHash": "sha256-R80xsDCKZOPJv5T+fB5G1ZVgS/51tJgUenGmGFjZat4=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "b74a56e2acce8fe88a575287a20ac196d8d01938", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 349e9d1..3f92452 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System configuration flake."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/b74a56e2acce8fe88a575287a20ac196d8d01938"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # bleedingpkgs.url = "github:nixos/nixpkgs/master"; # nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; @@ -66,6 +66,7 @@ viminal = { url = "git+https://code.youwen.dev/youwen5/viminal2"; + inputs.nixpkgs.follows = "nixpkgs"; }; vesktop-bin = { From e27c55bde165b1d5c901cac6402026e163437e85 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 02:36:57 -0800 Subject: [PATCH 03/11] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/88195a94f390381c6afcdaa933c2f6ff93959cb4?narHash=sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs%3D' (2024-12-29) → 'github:nixos/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02) • Updated input 'viminal/nixpkgs': 'github:nixos/nixpkgs/7cc0bff31a3a705d3ac4fdceb030a17239412210?narHash=sha256-7QEFnKkzD13SPxs%2BUFR5bUFN2fRw%2BGlL0am72ZjNre4%3D' (2024-12-27) → follows 'nixpkgs' --- flake.lock | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index f3f8972..5b6eba8 100644 --- a/flake.lock +++ b/flake.lock @@ -779,11 +779,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -793,22 +793,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1735268880, - "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "plugins-blink-ripgrep": { "flake": false, "locked": { @@ -1193,7 +1177,9 @@ "viminal": { "inputs": { "nixCats": "nixCats", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "plugins-blink-ripgrep": "plugins-blink-ripgrep", "plugins-pomo-nvim": "plugins-pomo-nvim" }, From 5ea2421cb1450596f95b5c7c6d5f658b6958cb41 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 02:41:53 -0800 Subject: [PATCH 04/11] chore: use services.pulseaudio instead of hardware.pulseaudio --- modules/linux/audio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/linux/audio/default.nix b/modules/linux/audio/default.nix index c91d9aa..b846d21 100755 --- a/modules/linux/audio/default.nix +++ b/modules/linux/audio/default.nix @@ -13,7 +13,7 @@ in config = { services.playerctld.enable = lib.mkIf cfg.enable true; - hardware.pulseaudio.enable = lib.mkIf cfg.enable false; + services.pulseaudio.enable = lib.mkIf cfg.enable false; services.pipewire = lib.mkIf cfg.enable { enable = true; alsa.enable = true; From 7a661a9ee811900a76101d508019ed8d777566d9 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 03:58:27 -0800 Subject: [PATCH 05/11] refactor: remove unnecessary pipewire enable = false --- modules/linux/audio/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/linux/audio/default.nix b/modules/linux/audio/default.nix index b846d21..a2c6f0b 100755 --- a/modules/linux/audio/default.nix +++ b/modules/linux/audio/default.nix @@ -11,10 +11,9 @@ in ''; }; - config = { - services.playerctld.enable = lib.mkIf cfg.enable true; - services.pulseaudio.enable = lib.mkIf cfg.enable false; - services.pipewire = lib.mkIf cfg.enable { + config = lib.mkIf cfg.enable { + services.playerctld.enable = true; + services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; From 86029cc6049c88c5f437924ad13c2bb0dede1020 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 04:16:41 -0800 Subject: [PATCH 06/11] feat: use supreme asahi --- flake.lock | 35 +++++++++-------------------------- flake.nix | 3 ++- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 5b6eba8..c750089 100644 --- a/flake.lock +++ b/flake.lock @@ -71,20 +71,19 @@ "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" + ] }, "locked": { - "lastModified": 1735172763, - "narHash": "sha256-a6n8RsiAolz6p24Fsr/gTndx9xr9USpKqKK6kzBeXQc=", - "owner": "tpwrules", - "repo": "nixos-apple-silicon", - "rev": "3daf0637409689d7a1304cedc50d20542bc47905", + "lastModified": 1735528724, + "narHash": "sha256-SGiClFwaEBidAOksU9YCFhwto6CTd9o34Qto3Qv5Iro=", + "owner": "zzywysm", + "repo": "nixos-asahi", + "rev": "a801d9cbbe75915041985918c0953bfa753add89", "type": "github" }, "original": { - "owner": "tpwrules", - "repo": "nixos-apple-silicon", + "owner": "zzywysm", + "repo": "nixos-asahi", "type": "github" } }, @@ -597,7 +596,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1718178907, @@ -899,22 +898,6 @@ } }, "rust-overlay_2": { - "flake": false, - "locked": { - "lastModified": 1686795910, - "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": [ "lanzaboote", diff --git a/flake.nix b/flake.nix index 3f92452..9e87ec9 100755 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,8 @@ ucode.url = "github:e-tho/ucodenix"; apple-silicon = { - url = "github:tpwrules/nixos-apple-silicon"; + # url = "github:tpwrules/nixos-apple-silicon"; + url = "github:zzywysm/nixos-asahi"; inputs.nixpkgs.follows = "nixpkgs"; }; From fa3f4f1880c7b4911998f5edb6c89fc823e6081b Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 20:42:40 -0800 Subject: [PATCH 07/11] feat: add adrastea keys and rekey --- reference/secrets/authorized_keys.nix | 3 ++ .../secrets/nixos/github_ssh_priv_key.age | Bin 3364 -> 5004 bytes .../secrets/nixos/nix_config_github_pat.age | Bin 883 -> 1758 bytes .../youwen/secrets/gallium_server_ssh.age | 38 ++++++++++++------ .../secrets/github_cli_secret_config.age | Bin 636 -> 1263 bytes .../youwen/secrets/github_ssh_priv_key.age | Bin 3034 -> 4529 bytes .../youwen/secrets/tincan_app_password.age | 25 +++++++----- .../users/youwen/secrets/wakatime_cfg.age | Bin 611 -> 1198 bytes .../secrets/youwen_dev_ssh_priv_key.age | Bin 3034 -> 4521 bytes .../youwen/secrets/youwen_ucsb_client_id.age | Bin 505 -> 930 bytes .../secrets/youwen_ucsb_client_secret.age | 26 +++++++----- .../youwen/secrets/youwenw_app_password.age | 26 +++++++----- 12 files changed, 79 insertions(+), 39 deletions(-) diff --git a/reference/secrets/authorized_keys.nix b/reference/secrets/authorized_keys.nix index dd9c65a..37fd2af 100644 --- a/reference/secrets/authorized_keys.nix +++ b/reference/secrets/authorized_keys.nix @@ -4,6 +4,8 @@ rec { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwqDFdb/cs5K9gsgP0ogyuq5pv9hSxsyPnDcWc5wRKs"; "youwen@callisto" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA+0w7l4jWN+b3Cqs9pjzjxUt2tRXk8HPIB3sqfUQMdx"; + "youwen@adrastea" = + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX6RaulzFkoS4bqH3ngtOsRyZkWZyaBErhC1ZoE6wz7"; runner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEBFBqlbHn3gMuV0i8U48xctZUWXkmHsCK1O6LRpXpj"; }; @@ -11,6 +13,7 @@ rec { demeter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP4BRdoxPnmlhMD1kI7qXwVE//6h1XWUnkwpzDuJaAyC"; gallium = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJzDKscmZIz7GF0nfKpnKHq63/fwzx2PXir0mUtRDOgu"; callisto = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7CqpsBe6+pAQa5CC8m2quJdDg6hRCJlTbVEcHN2xxV"; + adrastea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPzbEyvHr8aXbga6zg6bY+8ad/d+fHIKKD/Qpr8N440P"; }; all = users ++ systems; diff --git a/reference/secrets/nixos/github_ssh_priv_key.age b/reference/secrets/nixos/github_ssh_priv_key.age index 24dde100108a0d6d49b1d05ec34b44a990dc089f..4b67bf56d5f5ebb3eb3d56c91cef265c37ff3774 100644 GIT binary patch literal 5004 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 K2KRpt+Wrly*l&&i literal 3364 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 diff --git a/reference/secrets/nixos/nix_config_github_pat.age b/reference/secrets/nixos/nix_config_github_pat.age index f88bd1db493c94477be23ded34c10a3c53a6ce23..480829ba0c47ae95d7e28b36df13e5e284de19f9 100644 GIT binary patch literal 1758 zcmZ{l!IGmq5`^zO#oQ+*T7c;o9~)Z&gAt8{1n35cHAVu{Hf{q?zs&x(-C5lfim1w{ zFO~J{*LGa!o$!wj5B`AoK#I>49)F4G)Yhl^{!L`#@SC~apb_~iX>VDOY&n@kdFO&+tbF4PnhV2aV~0K2*ByRhv$iF20nz#zTJ?)A(@^zjj8g^@hHj(} zo^>t{Nj?fAOK#KW)m>}rGKnl%aLVR*8&J5mD(3K#dHbne+h+krK^Vy!eVbFDY-a7j z*?It@Fxyh9>5Ibv@FP4m3f=1PCMKe*oZ9C ztNR&;RvQ;82pUh~zvG)<+!nWlx{s!BCz)bXD)VT_90l0pEXpR203H>cV5#{5BK6vx zEp!vgbfp!|6+r7jiCOkYMXRQ@MU*gu&fs8LB;t9TGdr}kD}1;RSgczIO?&g24j4t* znyI|xiWh9_*{wy`o z4Pv2zZ9yV1XO+TJ>DR9&O}?9+neHtMP@yG6LAKg;={|@%o3J@n87v zl8syU`og^yQM2vJ9Op?Mt#R(o4I+M#l7SvwO8&SPa>u~y$1M1E1*awI&3BfJX^|or z!`Yz_^MX#>h$X9mxK=5Dq;$HKxissH1Qp=Dkyy$iR_lVPm;E_$jF0tZqN)ZIt-j`!)7HDM+`4EH^(m0 z0bnZF8BvakME#zrPd4Z2A+lN~kvtHSeV1wSS9}q2Rb&V5M$a~=Wir{hQvs5NbjqYF zyqDK~g4KL4`}QcU$I`I<_PyLg2!tb6!njsps-hQN-O<3g7^1ZWn2iwuaAk_EwQlbT zXswjDpJJ_-GDAKdBAcfCRsDmH)&Nd?fRiEYKo>dI2Q@`$>WUf$VV%2>!FDIKNVy#> z)I?t-bKYY%4NZ3fO%8X7MMSnyGsy9>@NDE5jY9?JD;v;ma~M}?!$l41Ipr)wek`W- zz09xPo3VQx2mQWS(iiq*IuHFO-qz>!ZMytCoCD{$z;wsIFLOMqr|;#;ny2x=Lcyyi zpO0iQ@^g6&b@=nud@R2uE#sbSS#TaMzyI~@Dbj3^4JWycG-_pk@}<7dssw?)6c*Q#@>_seJa8u^*MuWz5IFH5*@-@XE8=)+xvK(YV; literal 883 zcmZY4&8yo4003|=?-D&IC>vhP*g!PY=DP`VgEX%%Y0{=`k|u2!Vw;cVvq_WY69fg} z$#a(p>JCG}3D4U+=wu#L#34+c4n=XW4Tk;&dJ=r#{rMOC_$^j;%U+vloou~${ZgE+ z+64l%E`nL+wrmR}2!saXT#n`wFwckGMUau!02`%SjmIdfTyQj_uh1wqg%F)OddRy` ze|HGLFiQ*SZh>f*WAagn zP)>tv;gVa21UGF486uObYQ`f@7~>v=^nvz7UAm~tCz1z2si$;t0usXAWrwfz+7oS5 zM@AcOPsAGYq!uQ6;WFSr((1NEnDNl(#;lI?v~ia9am-f7O77z1%<>_eXS|vn0upH` ztV5z{?!Z}R%`v?aoh|&vpd7u|muCf*r1X?Yv%Ggw3vxlQN-#j&jhI00Hrm@v<&mI| zmQ-ja1ujRBlZ+7Cp$Mt1Z;)~VklkUa)69HkP+AbjG7(F?8m4Bbqsl>3hhAi|ve%y* z?Eh|}DGbsQq+_2*Y}faTs2l`nTi%G(NL+duUuvG5<4Tr|1XJTEh5_7ag@&%oB$I9< zaEy{wv{$iBNbW^!L{ub>IqAAX(Db5z@&=DBEM-8hTgR0aJ5jo#7Uaev^QdtJ8c}(# z-AUKgSTS4@BDyLw1bVwmXkHnjkTjw!qaMUhw~0WmE6V6uiC8slv0!qZV3ZPQwOZg7 z8?QBK0{gXO&7_QLAR|c7O>M7~sscJ6HA(zV?oPy;i*U>6Kdn zeD2{Z&po{U{mzXGUmiaGjr;1O>#e7b|Lxp*=ZEvR|9(dDpS^tb{)hB^`1~??mpZ)p z;M7MuA7B0!dCWii^G|~#`Hv@v`Dymv=iQqx)TiG1{jVe97vx|*KJ&DFczoe2_3bB5 ukq#BZRbCYdNgeS diff --git a/reference/users/youwen/secrets/gallium_server_ssh.age b/reference/users/youwen/secrets/gallium_server_ssh.age index 1c94071..edd79dc 100644 --- a/reference/users/youwen/secrets/gallium_server_ssh.age +++ b/reference/users/youwen/secrets/gallium_server_ssh.age @@ -1,12 +1,26 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ Oq5tmnpqpsHQWUzTAGQx4fILRx37H37+bvp/LKTURmo -odIZBDn724I2980yVFU1cc/YIgo+PxVpIK9Ir8aSn6A --> ssh-ed25519 T+8d9Q Qb+zzkxUGwSp3/etMORdosrOJxDf+wEKXKcqgV3p22M -FC6uixXld1qKv5bB5upITUhtia+6Vf/iOFTVP0XxCas --> ssh-ed25519 lpWvhA ZCd0HMrCf0dnwWEbAlSd84nkqi1JLEWR3f8y+0ui20I -UPT5u+zrFGPKON2Akxcf0bha1MQMFsbUNFy1W32ut9I ---- DfTM37B+lqx+Ohucv/YjZKtsyO6CyBEF9YA2TXhnzo0 -$dQP2TLeHv967lw U?*0IT%`Kvp-ͽ(*΋pL67XoqӔ}3˴~9Gᑮy?X\\e`Ya8e8VdbZ#~E GUT良ёu -8tK_eڕj{~Ӆ]p E:zwggV@zL }2  -}u_]IDѰuWli/,bRˮA:&=@cb36o䗫h'>tBR77Iӝ/ዬbC`ߦb)X -'#g8_/Kζ|2m#~R#xl.P `OTZl@U`ʞ"6H|Zv'=B%-sk8*#^C?8@5"/A ŢX% \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBrcTJN +Q1FjMWlHTEY0aU5NUFZ6NVFQOTlYem9PZ052T25OWWNTTit3VGhvClpKWDYyOWlq +VmgrOTF5a2NRRWxRUi8vbUdXODZSd3Q5ZWF3aFBNVkJrOTQKLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IHA4RHBUT3JnY09aejFsNHovT0x4SWxpa2I4OXdodERSdzExY0sz +TlluWGsKVW1XcWN5WmxnZXZoUTJPQ1FodXBkTWdSRU9WdzR5TzFiOW5PVnUwRHFk +RQotPiBzc2gtZWQyNTUxOSBUKzhkOVEgRXpxR0lLQXVDYmVZaGdmN1FDUE01dGpu +RDhzM1JxcEVkRnlDTFJRU3JFSQovekl1RytDU2pRS1MyZEdISmdOdTd6SDNXR0dr +Y2c3RDlUaGxsN3NNZXdNCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBCSmQwd1JxNDhi +QXViT0xhaDhDMlRBbGtWRmdmRitvT3U2aVhGMWhqL213ClNCb29hWVhsdmRLYnJE +b0hqcm52VmhiVUhFZnBaekxySzFweG5LSTVGNDQKLT4gX2lkfD0tZ3JlYXNlCmgx +WVZrbFRkMnViSEcrdnRsNDZwR1ZlVEttS3hNV1FLd3FYSVVyS0ljWGhxcE1vZmxX +SFU3MnNYdGl5UTlvSFcKL25pcUJ3cTNnaTNlR0JXSkppaFlLZwotLS0geXJuQUtB +bEJuVXRNOEJsQzB2cU9jYUlFdjA2S3RRcDNkOVpsYmJPRW5URQpuHYZgoJ+4eVUv +VdLIPy/KEFfBbjI9qrMCoRHYawLHYhIYwUNgKEj38Hy8KBp9Zgag3eLvKBpnFQfI +LFekughiTWVacAw7W3OhBy3Z6C7zFMXWIDQGIdYHY8NehH9mNPUPG6pPBJh2eQBx +C00IIHlBm4u1eFHwos845dlhtqzdd9xTH3VV3+/REbOHQ1/nI2uRIm9HX0YmU2P+ +ANfk9TW4JwO1DE11A/aNogVN3BkAYeVeGzif0H4mTGL+mx5eqkeH0fBPQzunkx4Z +eoAMNhp3+YltyUnrkB3OBVZyGS9YtAG1Dc3P5ljvnyvo5pNzh0BginhVbZ/7T/A9 +2UEuLIXFTeMuZ6EUOjrj+GT7GwjBeCf+vXAbyJzI3ZGvHLTlUzi3JykHvzVKeUP1 +C5+lnB9DxVas/X9dAQhlezkJ1rGqSO+w3lCrRaNN2gI2FY6/qFJPrQLQl6MMK9Pz +1T3ukiNXqZ4Hs36GaZSLybgPfVRMizSibuAaoa2oNg4S+VNS4f8McjIfLR2nhgc3 +tgMAIuIfiOYVKnyF61NL/vWLr1Z/8J1AjX+cYYXwxxIntcO8sQao67lMbIxhCpR/ +JTlbv22qCSY4WIV7ul8Q15YUgXQbs18je0OLrjQSOE+VN4kppCGZnUPBm11+m8o7 +Y8CvOz2A +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/github_cli_secret_config.age b/reference/users/youwen/secrets/github_cli_secret_config.age index 24892986042206ae69f3dfbc7b8b1c82a2044423..ca104369b4a49cc39fb5159cdccb0946568a26d6 100644 GIT binary patch literal 1263 zcmZ{kNps>#5QOjg6>}#X)`l^MIUv-ny`guhZ=jY1S}~Rl=+_T3=l3e2PIbx1{3>5w zp5uWaLccZv_yy3G6nh5zUoc9+-`k5(NZqAUd>2lg=5_!mK+T4giK3jBV7Y z0tKi=eMh#fc+i2g+|;>In5PLhf|Nn|C>-!$Oploq%R|>)NuW^Ci$J&hMgq}RU7MuL ztxE@uPt|SKaLdS8TVvij)KX3aN=sYnqIhOzLfayYSvII#4%){Y4ICB^x}6F+2*54u z?1I=gm`_k>h9rbuJpW2-OH4W7^aTG*g8cK!^q6e<#;3h0&9w1@{u{KxcsJ(LV zO#|IBh_8$<-#EUws?nk5T|q*RX7a8$gje3HtFWFvIocHiei*2Yt^^2Pb;x7#;_RgB z{&#%$n{d>KsW)YTRU8;O>45BvqZQpSBcGLAM_7`H%Vmm9?ud3=(%BoO-`y(T8%W=& zZ9BRdkBcJ5HtN*@=b2-mLBlf8sA^zC+HNA22uo?@YVKeKp^1f0bkmEKyh_rTJ7edlw`Tc`7w^E0%_q zbft~>L_m9@t?x*Za4U8J`=e?(OuoBiiv9q)0rdP^8CjcP4dh1|p+cGCJc zM|_kQ(+-1o@sT^*ZE<~lOOiIJp07v?N;h+~7WYLBY`uGb1-*AOMxRFVa!U3SOb#wWh5 PfB!cA6&67L|906QavG3r literal 636 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 J`+r|!{sBYH$xi?P literal 3034 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 diff --git a/reference/users/youwen/secrets/tincan_app_password.age b/reference/users/youwen/secrets/tincan_app_password.age index c333b3c..3a4a32b 100644 --- a/reference/users/youwen/secrets/tincan_app_password.age +++ b/reference/users/youwen/secrets/tincan_app_password.age @@ -1,9 +1,16 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ z1+svKMUnI1N5eewzBIW9bE+qvZCWn6RpdOdnrpug1Q -zne0Xho17J5xNXxYxtlM5co615IQ8QDaE+PfJn32Uz0 --> ssh-ed25519 T+8d9Q kjEffTlxGdcnb70nXSHdTPSvklzB8Cjhx/3/3Jh6WR4 -gK3jX9r0sZjVjEGfPwvZpNo0NroMZkeBj7rNj3khkGg --> ssh-ed25519 lpWvhA B7oq1HTF93sZRuxkbgUWl9WszHFHPP75Ibjx/r2RnmU -odWZzhkSGf5kDdN7Rk/EIKIi42feWMSv+ZnT4+NXJFI ---- ASffGuHTVEG5QGbe0KETZyi+TfoxV9IqxZs3cLbSZWg -gAWOЌB݊;D6Ja&f}㭩YU:5 \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBYdXF3 +dFBmc2lXUG16MEtVMnlSdUVwZHcrbVlseDNCM2ZBMzQ1ZVRQY1RrCjJpd0lZZXI3 +TFBIQ1ppN0VSMFp5N3c0TlhWbDlFZGh2bXR0VHpwN3FXWm8KLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IER6U3BvRGR5cHgzNUhtN2VydFFVNC9Gb2cwNWczalBsenFXUXRo +Z3BoZ0UKbUI1Y3YvUjhNaUtHcTQ2NXZ0VGdaTXp0dTFsR3NrMnJMejR6NFRnOVhn +awotPiBzc2gtZWQyNTUxOSBUKzhkOVEgMDRBejZXY0NVRnZYN3FKa3cxRXhXOXFE +MDNnUlNWcno0YUFsRExVKzkyVQp0NjZYU1BPUW1oeituK3BNazh2Q2RsdTlST0FH +cnNMV2RPbGNOanhCWTBrCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSB0dHZmb2Z3N2Yy +T09qU0lrcHVJbXNtbHE3TmthK1BqS1NrUlZrWXUvd1VVCnpGNjVhb3lxN0hvbWlw +eXY5YlNCQ1hYenMyNk04WUNlbEFRbnVxUlRIMlUKLT4gMzs6JSsiWC1ncmVhc2Ug +egptSS9XOVFUc25UVFRzejJuUFVvNm5DMEtGcFBKL2EzM2lqc3pQbW9oclRrd0da +dUJYNXBhZlFldUxMakR0bmdTCmxPVWc5b2NQL3dLRUZKVlp1V3dxSUEKLS0tIDda +N1FnMGxIZWRXQmIwY1A3eEVOaVYxa2REVW5kZEhZQy8wT3Y0amtqNW8KfZtPqD8R +E45F18wrFcuhdoVPnUhLD6iI5E2FqC6qadSNW/NI0aFNkr4um2OEBQZQVSup7Q== +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/wakatime_cfg.age b/reference/users/youwen/secrets/wakatime_cfg.age index ff19a374da47694ba4e430109ab48df48876182e..d225cc1a95aafd7b2b42268b4cc3c32b2da82c76 100644 GIT binary patch literal 1198 zcmZ{k&627*0EG8E#o1d^!;d(+I13R11QLfp639*n2NY05RN(3F+_S#7x4r1D{;K-p z<42a``uNx0b$&VcK(g<|v3~(SbpG`|l#I(ZpIoE8oM* z>7cd3_BEV1rtj`F+G&Eu)>(q$rJx1(>>~7xWiM(Agt?%sfoTpfJ-VgLFtN-p)8Xm!ZqU79D+I_LhxDIHFr4r2oXCAN!+ z*w%|tsw3yE($q0YgCD1N|3uCRkKSHOba9al7*W?Qv0bN`#tuX;UZTNVDL~)F2{KCn z-|~u4;?~Q5fECTx*}yV4%2Coq)a;HhdsQ{fp11 z+dkxS791=hwi-G=Cgo3BweRDFMg0t=6QYLvaB*X3<1caA(bk(7QMDggoQ|0^|acxIcc1 zf-qJ`#dqZ~T53}|+l3iy$gk807fF(9YfG<U-?2vD~SSC9n6d~n}bJ-daQ;ryrrfNGe!oDP{ZZ?8!3WK@hV=mLs(fIWDw)_l zP#t}K!<7ipJ-_SATva>se9mg~;%1{KagpjNBIV|51Mg-rSjPT)x2wP0XLJq}t=X)u zXYl6R;B;@xN>lg4!Tk!rQ#5JJFE3}=dYes5)aJpw4o_D3(DBXx+36F0qEdmdH0M>i a87578>UU-$vaO=uzm>m#<6!%Lujn6Iw1Fl7 literal 611 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCU7FAd6#3{-F_$S5~S zPc8K+39rcTsnquLC^B@6O7t}=2uRB|O?5Y{D$fY>4s=h6@a0PO%#H}L@UJK{&d$iH z^7F~}5AiGssthg3a5W4zF%0ue%(5&pFfs7X^F+5TMB5_8GEkvBH^0)PAlt*zEhN9f z%gNn8q`WfOJg>ac)gsH)pfDn$*eEzBB+WU`z=W$J$27;+BgNRv-K5An#L?K70$RaQOC{KOglA!RyDi4>?5ECwo;=<&x%&Lp>^|STPU%B{wETl92luS2 z)(@C;=*C(7X4N?d)oV7M4ANXb@!-0eliOD{YHu%X&Z?M@wy3wfc1z*&VqP|%Th9cK zUfhtgf1~tagO&wHIs$Gazldk>_FTUuJ^p|RW3B2Ldx0Mrt;^Of?3~|_pwe~pugAm6 eQ~%#N&F?KZ82IFE*s*g{nAd#1KO^c}(=GrZ4Db&C diff --git a/reference/users/youwen/secrets/youwen_dev_ssh_priv_key.age b/reference/users/youwen/secrets/youwen_dev_ssh_priv_key.age index 4055155149dae860c15dac4e4ed6a47915b956dd..dc925f54eb18d0f4d561247f0b8069662c311128 100644 GIT binary patch literal 4521 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 E0DYOl`Tzg` literal 3034 zcmV<03nlbnXJsvAZewzJaCB*JZZ21gHFG4dpVMKH>Ff}!0cxqEwXEQlVNH7XdS3z@3Qc_lS zD`j&-Q80E+b~$A)csEd0NmEi(ctLnDWm+$Gby0RvZcz#?J|J^*Xf0)AGBq_ZIUrOk zIAl3dAY*1sbzxINcxppvFl8$^Ol)v7S$Z~cGAndLQd)0xO>#DFc~EF*ZDB=O3R8Mv zNJ(@_Omr)CK}}XdXmUYiZbNTlLS}L@Re4Q0RAo?da7R&bF-1mi3N1b$b8~1dWn?ln zH8D9LY;ae0Xh9%zbY@0JLRmz4ZE!5^DS{4^hxEfbjYPmVCghST}f z%|2!EbQp~Z{w+qtVqM;+zwl_;)BBy5SKk+`Lwt&pM$!hx)~K1OH)jP;6ys=$J#5yO z;Hh!A7y9^pGIf45tt~hST-F>U{y(oXT}By)q=xJ%76c19#9s z_}nj*fb`CC3D&2Yk1ryIEyPlLd_L}Y+TctRb9)m8@)#7~rr(zF7z}3m_4Ky?CuT!Q zFg$rLZ7aIFEH<+aH#Wm4h(CJ1fv zTeu=*uSybnv9{lBj+1rdxH6WJFoEm zZEPG69Bn7=KuWV3ZxrZqUYn1i6|3`4s4IywM`{ghD!caOJm+_({T=Q;T+kmGW8({VSC)3_u0`_Bm!M*op{=*0Vu|F%s6QTYdk_~wVBGoBZ0GWqwy!5!!xZ}sRN zqE5I+N<*i;Ds6^H4aiMhyFyA16~58g5WQWL5&pjB1^B74Q0yOGljb4nOxVZ(jR7_g zi^yL}_~J6ryqif;U>M*=rfR>jKa&d%EKAgCq0yahPbWBA$^&D8i7&A=yB#KumIQHe z9tUvZ8alDi8wT6od$`{NozB%3?b@RmnKrzuL_EbsVdJFKGX05@Y*%m0zDTU?7@tc_ zT*|X$@j=6A_U}Dpo3)qd=+>3%v<LrS<(ck@|7(F04KJyhW~fb$`;NwV zk52jiceG>yKPrEW(R4O3$1z}wx@UTPVzADDI9V@ES@UVO=^KDGerxJ$4#nN5`QXTc z^%zQ~g7vY(&!GH?1m#Y_=SBXJSdpp^5k%FK^ZEvE-5F@iGTkDnCr`zVJ_|GT8*q>x zM3yVcBt_pIcfHii+r^ed`#u=`Vg}+c`>R`*W-;=oU0T%qY-9V+#F^$%@g-Y$gk-2X zOSv_n>W~EZrL^_`Z6!|&3;e~DD$*nZz0OaJIelnf1o|1hMd{Ju9@#eV!mscZumdZz z_X~VGpS@X0JlnkS+1Tj|< zNwo>?#&Qsqka>CSr)xGan19GLb(&Hr^a-0A?!bLpy|XhM{P0`B`=o)1i{jAmY-*%o zj=%_Vr;X@m^Vq|LN_d56Sw$eWZdG;sYABoqe2@hC&62S0jE+D$U3vh<4fJ8S;T3&> zlh;~#gyb1xnGZo@s8*d8mmhJM5o%w&bN~q4yyS+&)FFli*FSnOP~RB$ZO(IOp$bMj z;6li|GF~!!(c5J*RF9-m8tN$F#90C}1h!ha`_kU=HN+2r;MHNMn_)hjJtxSDTh(rcjKw<|q3qW4MZ>-oa@?-2U?lWJLh6#;i8#O*{RY5a=SG=X%2j?RinvEb;>++guu7aoEG&mQR>?&S7(aW9nm+^k9&2q)DJtB|b6+npl)28EHp_}XDYWh*)wYR)o1 z)WHN5;^ArQRVUYpK>r3PzxZK;0=#4<i1P}+1?g~qzuy2~Gt z9C`;0jAEMdti$}741+}uQX|U$#)_9Jna`hUO>#L209PjR1-^W{wi?CDw|I{dSAU;udwz^?!w4s*J{cyU z?J<_H1Qs4~d~xlOSFm;P3L_pO@L590EC$XP1Gx$}Vh;ixdmA0C`SnluHRnQL7SxW% cjbx>hG{jNHq#V(nRVuH9Wo=?H6=G4-9mP3)ApigX diff --git a/reference/users/youwen/secrets/youwen_ucsb_client_id.age b/reference/users/youwen/secrets/youwen_ucsb_client_id.age index 863920acd2fc04bde90246af95a22c728495692b..00ad1d673fad706674310d3d44c7a93eb488d8bf 100644 GIT binary patch literal 930 zcmZ{jOLL(yXW1xPEGgJ*VXUu z>lnzg>D%5yZ-|<{xP<8NhV2vjvwK%Wl((md{|L>|v!maq>h>qqoZCqgvv~y@`$(6> zgsnW-kcLRNtsP_?lq@i4sA5y`S_VSQ6Jk9dNi_dR=x-TvCaT$^59yepe0x$6^ln@Y zqvsqV0?f8Q2QjaFi$R68&X^oWB(Rd<($XWKw$L{(6~{p(P=mMX{Sd%MD8iv zmYGJs*RLB=uL2}&N{=;K0HtQ53DUY6GFYk{H?vpglMJPhz-e=cmK6G7hO5DEbc1vQ z$#`BX0cg#nBd)9Bm4XCkaO&PU%MP3}nmbRLV>O5V;xG-X!qxhj`Z z&81n(DzdgCUBo0+?g?(RN?2C`V{?*YqZ3RQInoc=(hh{pMqy>3=wLv3^EW7d@1YYtH#ewbM51BC$;46nO9oY*i=6anQfZ;WjySw9-f|0Io)8C-m|C2U$3=e c{ZZNeeC~$%{DIse+e~w){OuT`hyT{^H$b5(HUIzs literal 505 zcmZ9|J&%)M003YoErWDKFS9F($LLV*@&YYPPmI<@5mTA)y9q1;X9;As3h zjWNdDs7^PWCb!(6<`!K|jElKjoUC!VMWfF53!dcZI{*cfVVp;^Q8+1tv4f>02wjJh z#6^LHlVpj8!?_ZeGQ6l+Sg)9h9!)W3Etn=PH`O%HQ1ysbfO*4le57UqG1~B;D6d*W ztJSs~z&0#K)pEX};{c!bu_{O_iK`n6#CH4!#hlhuq+-!BEOpCa59>=Aua5~$=n^cZ z+5uVh#$XtZICp)~Ah@ zN1WFDsF%77>?2*4&SPt|#tn@D)skbv`JXYJG|C)XiS5_}xV`9fQze8*m+F@kqaBWe zEbIv2rtM|!aLxgDreiW*5+Wx{=bFz635233Y}Ge>Mho~30s^im@>2{Exw_=Ck|Q_m z1o4F+8U>Wm9E8xXovW+t?B(%6VeodePTYO4{Ql(2wpX}){@d@}7hgY*Wc&=Y{r>3n zor@oSyj#gP{|Hy0m3y1_uc33i@bUShH@gpiN|#@qJ(=wDk9R&j+dJMrcWJptbPo^1 Q>% ssh-ed25519 ouRmYQ wTfEjois29npFhLpSxvIQV5tCZ2JwISnauU4TYupNAM -9iUvGSHq/lCrpHv7WR6Jz9ukZdiOx0ZM2pDGUKIVNQQ --> ssh-ed25519 T+8d9Q SAiJq5ojy/SGH3kEYX3IQUZdYkdiMvGYdu88W9I8fV0 -OqeyOakmHteRAZbcYptwu6BGXDOa/v4a+8uVY5wia28 --> ssh-ed25519 lpWvhA 4BPe70ZFYdfH9Etuq46XutSKo4tP7B66Kg8s8t04+Qk -nX+9QWUgtzaYtXwjuw4PRIpOxQslP0DJzVPbHCo4++Y ---- Xgm7UZUBQMN0HdcqSwLwDustfDUOkyF2Plzobm0Anfw -oYC%L([~GN-0-ﾠPr%ĩwW;.S;PTlbo&UL:! \ No newline at end of file +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG91Um1ZUSBuSnNZ +NFdBV1JUbGNidnlFRExSU0pYUVJ4UDYzRE9pc2lMaDFjbUxpSDBjCmFOUUo1d3lB +TGxUYmUzSCswSzBlOTBTbVdRdXBxb1RZeVZ5d0xuKys0a3cKLT4gc3NoLWVkMjU1 +MTkgQUk3S1Z3IEpTTzA0VThyeDI4Mm5WOGc2MG82YUk5c3FBK2E1YytCektHcTR5 +cC9GQVUKU2pvQ3EvZnVTZ2hKQ3g5VWpYQUlUREVlUThJYUJpaDJpVjdoVHl0M1Rx +TQotPiBzc2gtZWQyNTUxOSBUKzhkOVEgOVB5cklzNHY4cERtbHFIcDEwQmJaYmFi +OHRWVXVOYXJXVGtNd3FZZkdIRQowaWJPS3RZSVJ0TWlPYlNodTgzT2NWRTdYY1dE +SzdmWHBoVjFGbXVQZ0NzCi0+IHNzaC1lZDI1NTE5IGxwV3ZoQSBRUUk2eFNyZXZ0 +R2RkU1VlNzgyeWkvbzlLYmNNWWs0TUJQZGFXUVNNVVRrCkNjazl1Z0ovc0sxaEpj +T2ExYnp3TVI5K25iYUtWbW5URGtWVGcxRTlRb1EKLT4gWygmP1tCWS1ncmVhc2Ug +a3NHUzJhICkyY2IicApEcmQ1YUVrYXhJV2ZlVFEzanBJVUZTVGNWSlVIMkYxMjkx +c25MVG5tZXRpanZ4Mld4VHBESW9DL0UwSjlQTndMCm9KT3AxSlN3RUZRQmZ0K2pt +azlQUUFIUVZLZk1xaEk0bENqVFI1SQotLS0gUVR6VHAxMTFTMEtUdUtTMVVQb0dw +SjE3ekpISFRqRmpFVDBSb2tKclVaNArEYURvve80HWRWrn805d1au1Awo/whCz5c +uqqlsuCMliGASMNebPJ7omfr97E4YASyw+v/vK0VYQDwpuMGNjLjCO7xsA== +-----END AGE ENCRYPTED FILE----- diff --git a/reference/users/youwen/secrets/youwenw_app_password.age b/reference/users/youwen/secrets/youwenw_app_password.age index aa8115c..07ae932 100644 --- a/reference/users/youwen/secrets/youwenw_app_password.age +++ b/reference/users/youwen/secrets/youwenw_app_password.age @@ -1,9 +1,17 @@ -age-encryption.org/v1 --> ssh-ed25519 ouRmYQ tbwaMoL5eIqWyB4W/iREdxLEkdZ86pvf5x2aFYVDsEo -fnm2IQKdTJznUOQWIWALoBSA07PRL1oQ6EmrwQNQysI --> ssh-ed25519 T+8d9Q 47ulo/C+9MkBKv7+kRG2agjApE+R64daXDX2Q99IAAE -V7Jx/+oI7GcebYKbFYr0IuZSf8fUZwHLyAwwW9yK3eY --> ssh-ed25519 lpWvhA RZr1XWsdWZQA0ggAoxW0Qr70ji8fc67Wb53HHOJu/y0 -L1+1zFnWNMGFTlCNmnHtsIcj03C8Grk2V+BoqXnH5P4 ---- n0pdCgIvJ79wLetQ1bGU6+gpZ4UwoN3XhbilyOREuDk -bƖH CL Date: Sun, 5 Jan 2025 21:20:31 -0800 Subject: [PATCH 08/11] feat: migrate adrastea to new liminalOS configuration scheme --- flake.nix | 10 +- reference/hosts/adrastea/configuration.nix | 231 ++++-------------- reference/hosts/adrastea/default.nix | 40 +-- .../default.nix => home.nix} | 13 +- 4 files changed, 71 insertions(+), 223 deletions(-) rename reference/hosts/adrastea/{home-manager-extras/default.nix => home.nix} (73%) diff --git a/flake.nix b/flake.nix index 9e87ec9..1b3c5fd 100755 --- a/flake.nix +++ b/flake.nix @@ -141,9 +141,13 @@ ./reference/hosts/callisto ]; }; - adrastea = buildLiminalOS { - inherit inputs nixpkgs; - systemModule = ./reference/hosts/adrastea; + adrastea = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs self; + }; + modules = [ + ./reference/hosts/adrastea + ]; }; cassini = buildLiminalOS { inherit inputs nixpkgs; diff --git a/reference/hosts/adrastea/configuration.nix b/reference/hosts/adrastea/configuration.nix index 13483a2..4099128 100755 --- a/reference/hosts/adrastea/configuration.nix +++ b/reference/hosts/adrastea/configuration.nix @@ -3,61 +3,50 @@ # and in the NixOS manual (accessible by running ‘nixos-help’). { config, - inputs, pkgs, - lib, + inputs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ ./hardware-configuration.nix ]; - # Bootloader. + networking.hostName = "adrastea"; + + liminalOS = { + flakeLocation = "/home/youwen/.config/liminalOS"; + config.allowUnfree = true; + defaultEditor = inputs.viminal.packages.${pkgs.system}.default; + formFactor = "desktop"; + system = { + audio.prod.enable = true; + networking = { + firewallPresets.vite = true; + cloudflareNameservers.enable = true; + }; + graphics.nvidia.enable = true; + }; + extras.gaming = { + enable = true; + roblox.enable = true; + utilities.gamemode = { + enable = true; + gamemodeUsers = [ "youwen" ]; + }; + }; + extras.distrobox.enable = true; + }; boot = { - plymouth = { - enable = true; - # theme = "rings"; - # themePackages = with pkgs; [ - # # By default we would install all themes - # (adi1090x-plymouth-themes.override { - # selected_themes = [ "rings" ]; - # }) - # ]; - font = "${config.stylix.fonts.monospace.package}/share/fonts/truetype/NerdFonts/CaskaydiaCove/CaskaydiaCoveNerdFontMono-Regular.ttf"; - }; - - # Enable "Silent Boot" - consoleLogLevel = 3; - initrd.verbose = false; - kernelParams = [ - "quiet" - "splash" - "boot.shell_on_fail" - "rd.systemd.show_status=false" - "rd.udev.log_level=3" - "udev.log_priority=3" - # "display=HDMI-A-1:2560x1440@144D" - ]; - # Hide the OS choice for bootloaders. - # It's still possible to open the bootloader list by pressing any key - # It will just not appear on screen unless a key is pressed loader = { efi.canTouchEfiVariables = true; - # timeout = 15; - # Lanzaboote currently replaces the systemd-boot module. - # This setting is usually set to true in configuration.nix - # generated at installation time. So we force it to false - # for now. - # timeout = 0; systemd-boot = { enable = true; consoleMode = "auto"; }; }; - initrd.systemd.enable = true; + kernelPackages = pkgs.linuxPackages_zen; + initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = + "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c"; }; services.ucodenix = { @@ -65,101 +54,28 @@ cpuModelId = "00A50F00"; }; - # boot.lanzaboote = { - # enable = false; - # pkiBundle = "/etc/secureboot"; - # }; - - # services.keyd = { - # enable = true; - # keyboards = { - # default = { - # ids = [ "*" ]; - # settings = { - # main = { - # capslock = "esc"; - # leftalt = "leftcontrol"; - # leftcontrol = "leftalt"; - # }; - # }; - # }; - # }; - # }; - - boot.initrd.luks.devices."luks-52d1be6d-b32f-41e0-a6d7-2ff52599fe7c".device = - "/dev/disk/by-uuid/52d1be6d-b32f-41e0-a6d7-2ff52599fe7c"; - services.tlp.enable = true; - powerManagement = { - powerDownCommands = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock"; - cpuFreqGovernor = "performance"; - }; + powerManagement.cpuFreqGovernor = "performance"; - networking.hostName = "adrastea"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # select kernel - boot.kernelPackages = pkgs.linuxPackages_zen; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. time.timeZone = "America/Los_Angeles"; - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - systemd.services = { - NetworkManager-wait-online.enable = false; - }; - - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = false; - - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - icu - xorg.libXtst - xorg.libXi - ]; - }; - - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - powerManagement.finegrained = false; - nvidiaSettings = true; - open = true; - # prime = { - # amdgpuBusId = "PCI:4:0:0"; - # nvidiaBusId = "PCI:1:0:0"; - # # offload = { - # # enable = true; - # # enableOffloadCmd = true; - # # }; - # sync.enable = true; - # }; - }; + # hardware.nvidia = { + # modesetting.enable = true; + # powerManagement.enable = true; + # powerManagement.finegrained = false; + # nvidiaSettings = true; + # open = true; + # # prime = { + # # amdgpuBusId = "PCI:4:0:0"; + # # nvidiaBusId = "PCI:1:0:0"; + # # # offload = { + # # # enable = true; + # # # enableOffloadCmd = true; + # # # }; + # # sync.enable = true; + # # }; + # }; hardware.graphics.enable = true; @@ -167,61 +83,8 @@ services.xserver.videoDrivers = [ "nvidia" ]; - # services.desktopManager.plasma6.enable = true; - - # Configure keymap in X11 - services.xserver = { - xkb.layout = "us"; - xkb.variant = ""; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.youwen = { - isNormalUser = true; - description = "Youwen Wu"; - extraGroups = [ "networkmanager" ]; - }; - - nix.settings = { - trusted-users = [ - "root" - "youwen" - ]; - }; - - services.udev.extraRules = '' - KERNEL=="cpu_dma_latency", GROUP="realtime" - ''; - - # Allow unfree packages nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - wget - git - curl - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - programs.dconf.enable = true; - - programs.hyprland.enable = true; - - programs.zsh.enable = false; - programs.fish.enable = true; - users.users.youwen.shell = pkgs.fish; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/reference/hosts/adrastea/default.nix b/reference/hosts/adrastea/default.nix index 927177b..d571dd7 100644 --- a/reference/hosts/adrastea/default.nix +++ b/reference/hosts/adrastea/default.nix @@ -1,50 +1,24 @@ { inputs, + self, ... }: { imports = [ ./configuration.nix - ../../modules/linux/gaming - ../../modules/linux/audio - ../../modules/linux/networking - ../../modules/linux/fonts - ../../modules/linux/greeter - ../../modules/linux/core - ../../modules/linux/desktop-portal - ../../modules/linux/audio-prod - ../../modules/linux/wine - ../../modules/linux/stylix - ../../modules/linux/distrobox - ../../modules/linux/flatpak - ../../overlays + ../../modules + self.nixosModules.liminalOS { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { - inherit inputs; - }; home-manager.users.youwen = { - imports = - [ - ./home-manager-extras - ../../users/youwen/linux/laptop - ../../users/youwen/linux/packages/x86_64 - ../../users/youwen/linux/programs - ../../users/youwen/common - ../../users/youwen/linux/spicetify - (import ../../users/youwen/common/fastfetch { }) - ] - ++ (with inputs; [ - nix-index-database.hmModules.nix-index - ]); + imports = [ + ./home.nix + self.homeManagerModules.default + ]; }; } ] ++ (with inputs; [ - home-manager.nixosModules.home-manager ucode.nixosModules.default ]); } diff --git a/reference/hosts/adrastea/home-manager-extras/default.nix b/reference/hosts/adrastea/home.nix similarity index 73% rename from reference/hosts/adrastea/home-manager-extras/default.nix rename to reference/hosts/adrastea/home.nix index c80b8fe..51b3365 100644 --- a/reference/hosts/adrastea/home-manager-extras/default.nix +++ b/reference/hosts/adrastea/home.nix @@ -1,6 +1,12 @@ -{ pkgs, lib, ... }: +{ lib, ... }: { - wayland.windowManager.hyprland.settings.monitor = pkgs.lib.mkForce [ + imports = [ + ../../users/youwen/hm.nix + ]; + + home.stateVersion = "24.05"; + + wayland.windowManager.hyprland.settings.monitor = lib.mkForce [ # "eDP-1,2560x1440@165,0x0,1.6" "eDP-1, disable" "HDMI-A-1,2560x1440@144,0x0,1.0" @@ -16,5 +22,6 @@ ]; programs.waybar.settings.mainBar.output = "HDMI-A-1"; - programs.hyprlock.settings.background.monitor = lib.mkForce "HDMI-A-1"; + + liminalOS.desktop.hyprland.screenlocker.monitor = "DP-1"; } From a18a91ed48be6353a174d32f7d4a3504e97e7b89 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 22:34:40 -0800 Subject: [PATCH 09/11] fix(adrastea): use correct hyprland configuration --- reference/hosts/adrastea/home.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/reference/hosts/adrastea/home.nix b/reference/hosts/adrastea/home.nix index 51b3365..4bb0337 100644 --- a/reference/hosts/adrastea/home.nix +++ b/reference/hosts/adrastea/home.nix @@ -11,7 +11,6 @@ "eDP-1, disable" "HDMI-A-1,2560x1440@144,0x0,1.0" ]; - wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true; # since we are using this as a "desktop" of sorts, we have no need to save # power by using optimus. poor performance on external display, so we add @@ -23,5 +22,5 @@ programs.waybar.settings.mainBar.output = "HDMI-A-1"; - liminalOS.desktop.hyprland.screenlocker.monitor = "DP-1"; + liminalOS.desktop.hyprland.screenlocker.monitor = "HDMI-A-1"; } From 220eacc9542074d0c171fb35d669d4c42c2bbba9 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sun, 5 Jan 2025 23:41:01 -0800 Subject: [PATCH 10/11] fix: use correct waybar icons for new binds --- .../desktop-environment/waybar/default.nix | 77 +++++++++++-------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/hm/modules/linux/desktop-environment/waybar/default.nix b/hm/modules/linux/desktop-environment/waybar/default.nix index aac16d5..756b4cf 100644 --- a/hm/modules/linux/desktop-environment/waybar/default.nix +++ b/hm/modules/linux/desktop-environment/waybar/default.nix @@ -251,39 +251,54 @@ in "hyprland/workspaces" = { show-special = true; - # persistent-workspaces = { - # "*" = [ - # 1 - # 2 - # 3 - # 4 - # 5 - # 6 - # 7 - # 8 - # 9 - # 10 - # ]; - # }; format = "{icon}"; on-click = "activate"; - format-icons = { - "1" = ""; - "2" = ""; - "3" = "󰰊"; - "4" = "󰰍"; - "5" = ""; - "6" = ""; - "7" = "󰰨"; - "8" = ""; - "9" = ""; - "10" = ""; - active = ""; - empty = ""; - default = ""; - urgent = ""; - special = "󰠱"; - }; + format-icons = + { + "1" = ""; + "2" = ""; + "3" = "󰯵"; + "4" = "󰯻"; + "5" = "󰯾"; + "6" = "󰰴"; + "7" = "󰰨"; + "8" = "󰰄"; + "9" = ""; + "10" = ""; + active = ""; + empty = ""; + default = ""; + urgent = ""; + special = "󰠱"; + } + // ( + if (config.liminalOS.desktop.hyprland.useAdvancedBindings) then + { + "1" = ""; + "2" = ""; + "3" = "󰯵"; + "4" = "󰯻"; + "5" = "󰯾"; + "6" = "󰰴"; + "7" = "󰰨"; + "8" = ""; + "9" = ""; + "10" = ""; + } + else + { + "1" = ""; + "2" = ""; + "3" = "󰰊"; + "4" = "󰰍"; + "5" = ""; + "6" = ""; + "7" = "󰰨"; + "8" = ""; + "9" = ""; + "10" = ""; + } + ); sort-by-number = true; }; From 2881edad71b3c348569951529239ac310fa0494f Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 6 Jan 2025 00:00:02 -0800 Subject: [PATCH 11/11] feat: shorten alexa -> ale --- reference/users/youwen/hm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/users/youwen/hm.nix b/reference/users/youwen/hm.nix index a4467e3..4319f7a 100644 --- a/reference/users/youwen/hm.nix +++ b/reference/users/youwen/hm.nix @@ -81,7 +81,7 @@ end ''; - alexa = '' + ale = '' set vault_dir $HOME/Documents/alexandria/content if test -d $vault_dir