From df38983ef5e247fc8eab1097e12eb1b3f061591f Mon Sep 17 00:00:00 2001 From: Tigor Hutasuhut Date: Sun, 24 Nov 2024 11:02:56 +0700 Subject: [PATCH] nixos: update to 24.11 Notes: - Hyprland now uses the Nixpkgs version to minimize building. - Java is broken on build, disabled all java apps for now. --- flake.lock | 481 +++--------------------- flake.nix | 7 +- hardware-configuration/castle.nix | 5 +- home/modules/hyprland/default.nix | 2 +- home/modules/hyprland/dunst.nix | 4 +- home/modules/hyprland/gnome-keyring.nix | 2 +- home/modules/hyprland/hyprland.nix | 4 - home/programs/zsh.nix | 6 +- profiles/castle.nix | 2 +- system/keyboard.nix | 40 +- system/modules/font.nix | 2 +- system/modules/hyprland.nix | 10 +- system/services/telemetry/alloy.nix | 9 +- 13 files changed, 99 insertions(+), 475 deletions(-) diff --git a/flake.lock b/flake.lock index a7b7e95..67371a2 100644 --- a/flake.lock +++ b/flake.lock @@ -42,39 +42,6 @@ "url": "https://git.tigor.web.id/tigor/AGS" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728902391, - "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "astal": { "inputs": { "nixpkgs": [ @@ -129,22 +96,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -153,11 +104,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -189,8 +140,8 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -201,11 +152,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { @@ -215,28 +166,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-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" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "neovim-nightly-overlay", @@ -267,11 +196,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1730903510, + "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "type": "github" }, "original": { @@ -287,78 +216,20 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732319136, + "narHash": "sha256-wpmPl6FkAF9Jj5C/rzANgpUjfzQrUYOn267LnzKU2uI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f8831cc700030e11fc91da9ef6270593e6440edc", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1729378105, - "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=", - "ref": "refs/heads/main", - "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", - "revCount": 5362, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, "hyprland-contrib": { "inputs": { "nixpkgs": [ @@ -366,11 +237,11 @@ ] }, "locked": { - "lastModified": 1729224425, - "narHash": "sha256-w9dNUedNe2qnhHuhcRf7A1l29+/6DxdMfwN6g4U3c/w=", + "lastModified": 1730743354, + "narHash": "sha256-gU4NySYyXeAzVaF5bI6BKmj2CdgiwGFnuPjXUId3Dx0=", "owner": "hyprwm", "repo": "contrib", - "rev": "d72bc8b1cd30d448bd438e8328f8eeb4c0f2ddb6", + "rev": "792f6b83dc719214e0e2a0b380c34f147b28ece2", "type": "github" }, "original": { @@ -379,125 +250,21 @@ "type": "github" } }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729147490, - "narHash": "sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s=", + "lastModified": 1732406787, + "narHash": "sha256-5c1DQGdD0wZl+Ps05M4A7xWbb9b5KBdH3Z7td4UanYk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e2047498667aeb24e8493ff430a20cff713915f4", + "rev": "6f95702c4fc3ff51b4cd1a626e958fbad50bfc3a", "type": "github" }, "original": { @@ -509,11 +276,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1732402479, + "narHash": "sha256-TR8ZCOq4v8ChQMZ0/WEq8Inr3pb7cAgvNpd9W2QqSSw=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "d9b08c58c34ba6c8083f533d5f7a0fd21e262d00", "type": "github" }, "original": { @@ -524,11 +291,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1729025406, - "narHash": "sha256-uYbDN6JikC19WfD3zg0kpOpJVZFvBhHXYo3YJo28vOs=", + "lastModified": 1732304879, + "narHash": "sha256-/DOW8VadE//HA6tuV2++NowYWi7Wa/FmJHXRJoTQnfQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8d1193a959c7810f01610c10a055b0020390bf4e", + "rev": "c84579946c03c996916be0fb6e1340f444c277af", "type": "github" }, "original": { @@ -544,11 +311,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1731814505, + "narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132", "type": "github" }, "original": { @@ -573,45 +340,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -622,27 +357,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1731890469, + "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "5083ec887760adfe12af64830a66807423a859a7", "type": "github" }, "original": { @@ -652,22 +371,22 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -685,11 +404,11 @@ }, "nur": { "locked": { - "lastModified": 1729392836, - "narHash": "sha256-f9eTg3d2WqvmEndg+gVJsOSgAAgwbdCmqE0uChRn+NY=", + "lastModified": 1732414488, + "narHash": "sha256-pdoqPZslw7gG3oFPbwLeVyIBQwoN4MG6AvU9ImR7TjY=", "owner": "nix-community", "repo": "NUR", - "rev": "16477276162556c0b59016bb07e79ed04dd6565c", + "rev": "e2a9a9fccb6e4f442e58156d485d286919a710c9", "type": "github" }, "original": { @@ -698,40 +417,15 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "ags-agenda": "ags-agenda", "home-manager": "home-manager", - "hyprland": "hyprland", "hyprland-contrib": "hyprland-contrib", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rust-overlay": "rust-overlay", @@ -746,11 +440,11 @@ ] }, "locked": { - "lastModified": 1729391507, - "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -763,82 +457,25 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_2" - }, - "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" ] }, "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", + "owner": "Mic92", + "repo": "sops-nix", "type": "github" } }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1727721329, diff --git a/flake.nix b/flake.nix index a41aed5..07df06b 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,10 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - "https://hyprland.cachix.org" "https://nixpkgs-wayland.cachix.org" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" ]; }; @@ -25,11 +23,10 @@ url = "github:hyprwm/contrib"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "nixpkgs/nixos-24.05"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/hardware-configuration/castle.nix b/hardware-configuration/castle.nix index a3a5283..84325d8 100644 --- a/hardware-configuration/castle.nix +++ b/hardware-configuration/castle.nix @@ -25,10 +25,9 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; extraPackages = with pkgs; [ amdvlk ]; }; diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix index d2346fc..8aabd37 100644 --- a/home/modules/hyprland/default.nix +++ b/home/modules/hyprland/default.nix @@ -42,7 +42,7 @@ in home.pointerCursor = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; size = 24; x11 = { enable = true; diff --git a/home/modules/hyprland/dunst.nix b/home/modules/hyprland/dunst.nix index 65ab056..664e9fd 100644 --- a/home/modules/hyprland/dunst.nix +++ b/home/modules/hyprland/dunst.nix @@ -25,8 +25,8 @@ in services.dunst = { enable = true; iconTheme = { - name = "Adwait"; - package = pkgs.gnome.adwaita-icon-theme; + name = "Adwaita"; + package = pkgs.adwaita-icon-theme; }; # https://dunst-project.org/documentation/ settings = { diff --git a/home/modules/hyprland/gnome-keyring.nix b/home/modules/hyprland/gnome-keyring.nix index 1b3838e..5b2c865 100644 --- a/home/modules/hyprland/gnome-keyring.nix +++ b/home/modules/hyprland/gnome-keyring.nix @@ -12,7 +12,7 @@ let in { config = mkIf cfg.enable { - home.packages = with pkgs; [ gnome.gnome-keyring ]; + home.packages = with pkgs; [ gnome-keyring ]; sops.secrets.${secretKey} = { }; wayland.windowManager.hyprland.settings.exec-once = diff --git a/home/modules/hyprland/hyprland.nix b/home/modules/hyprland/hyprland.nix index 07b37f3..bea6c84 100644 --- a/home/modules/hyprland/hyprland.nix +++ b/home/modules/hyprland/hyprland.nix @@ -120,10 +120,6 @@ in "$mod SHIFT, J, movewindow, d" "$mod SHIFT, k, movewindow, u" "$mod SHIFT, l, movewindow, r" - - # Language Input - "$mod, I, exec, fcitx5-remote -t" - ]; binde = [ diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix index 0aafc92..9608422 100644 --- a/home/programs/zsh.nix +++ b/home/programs/zsh.nix @@ -36,9 +36,9 @@ in shellAliases = { ls = "${pkgs.eza}/bin/eza -lah"; cat = "${pkgs.bat}/bin/bat"; - update = "nh os switch"; - superupdate = "nh os switch --update"; - uptest = "nh os test"; + update = "nh os switch -- --accept-flake-config"; + superupdate = "nh os switch --update -- --accept-flake-config"; + uptest = "nh os test -- --accept-flake-config"; lg = "${pkgs.lazygit}/bin/lazygit"; g = "${pkgs.lazygit}/bin/lazygit"; du = "${pkgs.dust}/bin/dust"; diff --git a/profiles/castle.nix b/profiles/castle.nix index ca87fc4..644e306 100644 --- a/profiles/castle.nix +++ b/profiles/castle.nix @@ -113,7 +113,7 @@ in zoom.enable = true; elisa.enable = true; obsidian.enable = true; - jetbrains.idea.enable = true; + jetbrains.idea.enable = false; java.enable = true; }; diff --git a/system/keyboard.nix b/system/keyboard.nix index f45abfe..4eea1b3 100644 --- a/system/keyboard.nix +++ b/system/keyboard.nix @@ -8,24 +8,24 @@ let cfg = config.profile.keyboard; in lib.mkMerge [ - { - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.waylandFrontend = true; - }; - } - { - i18n.inputMethod = lib.mkIf cfg.language.japanese ({ - fcitx5.addons = with pkgs; [ - fcitx5-mozc - fcitx5-gtk - ]; - }); - } - { - environment.variables = lib.mkIf (config.i18n.inputMethod.enabled == "fcitx5") { - # Integration with some tools and binaries like kitty. - GLFW_IM_MODULE = "ibus"; - }; - } + # { + # i18n.inputMethod = { + # enabled = "fcitx5"; + # fcitx5.waylandFrontend = true; + # }; + # } + # { + # i18n.inputMethod = lib.mkIf cfg.language.japanese ({ + # fcitx5.addons = with pkgs; [ + # fcitx5-mozc + # fcitx5-gtk + # ]; + # }); + # } + # { + # environment.variables = lib.mkIf (config.i18n.inputMethod.enabled == "fcitx5") { + # # Integration with some tools and binaries like kitty. + # GLFW_IM_MODULE = "ibus"; + # }; + # } ] diff --git a/system/modules/font.nix b/system/modules/font.nix index d73e847..28b1b37 100644 --- a/system/modules/font.nix +++ b/system/modules/font.nix @@ -7,7 +7,7 @@ # normal fonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji noto-fonts-color-emoji diff --git a/system/modules/hyprland.nix b/system/modules/hyprland.nix index 933b656..4bdcfdd 100644 --- a/system/modules/hyprland.nix +++ b/system/modules/hyprland.nix @@ -1,5 +1,4 @@ { - inputs, config, lib, pkgs, @@ -7,14 +6,12 @@ }: let cfg = config.profile.hyprland; - hyprlandPkg = inputs.hyprland.packages."${pkgs.system}".hyprland; in { config = lib.mkIf cfg.enable { programs.xfconf.enable = true; programs.hyprland = { enable = true; - package = hyprlandPkg; xwayland.enable = true; }; services.gvfs.enable = true; # Mount, trash, and other functionalities @@ -32,7 +29,7 @@ in poppler # .pdf filees ffmpegthumbnailer # video thumbnailer mcomix # comicbook archives - gnome.nautilus # file manager + nautilus # file manager gwenview @@ -46,8 +43,8 @@ in dunst libnotify - gnome.gnome-keyring - gnome.seahorse + gnome-keyring + seahorse greetd.tuigreet @@ -79,7 +76,6 @@ in extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; }; - programs.file-roller.enable = true; services.greetd = lib.mkIf (cfg.displayManager == "tuigreet") { diff --git a/system/services/telemetry/alloy.nix b/system/services/telemetry/alloy.nix index 970e42c..dc18d5b 100644 --- a/system/services/telemetry/alloy.nix +++ b/system/services/telemetry/alloy.nix @@ -1,7 +1,6 @@ { config, lib, - inputs, unstable, ... }: @@ -13,10 +12,10 @@ let domain = "alloy.tigor.web.id"; in { - imports = [ - # Grafana Alloy is still in unstable options. - "${inputs.nixpkgs-unstable}/nixos/modules/services/monitoring/alloy.nix" - ]; + # imports = [ + # # Grafana Alloy is still in unstable options. + # "${inputs.nixpkgs-unstable}/nixos/modules/services/monitoring/alloy.nix" + # ]; config = lib.mkIf cfg.enable { services.alloy = {