diff --git a/flake.lock b/flake.lock index c832550..c6f2218 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1760692571, - "narHash": "sha256-SgqC+B7F7hHDKug+zRUL83vhibCSknzhRl0+OxUYjn4=", + "lastModified": 1761906071, + "narHash": "sha256-uq0X0KRzZkKGlkU1ARM+LWCAVvSYJZtTMpuzMO6LXRs=", "owner": "catppuccin", "repo": "nix", - "rev": "8a084b86b6a4b2a1575e8cc67e07c4a687fce276", + "rev": "fd1bc7b1af0a576edb13c166c4b1f7b5c7555a73", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1760658963, - "narHash": "sha256-+WZ5XSxe71G8bVxPsJGgEO/IA5une2lNPCKyS/ww0BM=", + "lastModified": 1761827347, + "narHash": "sha256-tIrTFSntAyXVrQE9GnauXzQxEZJCZA9TEp4jAENsgwA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1d768e4d3372f5b832a2d332997fe1e0e38edb67", + "rev": "0c234b99a8606b482d6644e1f2d26d41985fb85c", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1757962227, - "narHash": "sha256-BENROvRjnKLjCc1qwGgScfk6WIdHGwz4vZhsmfa///Q=", + "lastModified": 1761698061, + "narHash": "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ=", "owner": "Bali10050", "repo": "Darkly", - "rev": "c1446a049c4e2f78afbd90d8b642dc73a3027f1a", + "rev": "b9260d390fb8c673a37500f567b11e3b297216cc", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1760683279, - "narHash": "sha256-4XZVvUQEG5E+DdrOKXeZPD2uFQSYSK3YHBryHdZjpuU=", + "lastModified": 1761979010, + "narHash": "sha256-isqMvjTk3jdTHN6KA/BWQvOSVe7O35OQKAZNtLK76OY=", "owner": "nix-community", "repo": "fenix", - "rev": "4cb5a965947d39ce5b8cc10dbd581f07ee8cbd8a", + "rev": "3107255abfe4f2d1c3eee7a3e2f5a5eb6f2200fe", "type": "github" }, "original": { @@ -500,11 +500,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1761770832, + "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1760662441, - "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", + "lastModified": 1761878381, + "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", "owner": "nix-community", "repo": "home-manager", - "rev": "722792af097dff5790f1a66d271a47759f477755", + "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1760534924, - "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=", + "lastModified": 1761748321, + "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "100b4e000032b865563a9754e5bca189bc544764", + "rev": "533db5857c9e00ca352558a928417116ee08a824", "type": "github" }, "original": { @@ -664,11 +664,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760700290, - "narHash": "sha256-thtIzWn8YB/zXfXR0Cv7pQ0ID8YTc05d9eedk1lu+zI=", + "lastModified": 1761724527, + "narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b80575644cb2bf9eb0050974dcd988e781ffd340", + "rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", "type": "github" }, "original": { @@ -697,11 +697,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760524031, - "narHash": "sha256-hcyRViwdsrNUjHTcY0VGygcAawcyU4zYEq7ZZObFwkw=", + "lastModified": 1761721311, + "narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", "owner": "YaLTeR", "repo": "niri", - "rev": "2776005c5fc4fbb85636672213b8b84a319dfb01", + "rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1760536587, - "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", + "lastModified": 1761969132, + "narHash": "sha256-0me4+e+1VxNuvySSw0voqMCWU/eUmTuth7f4+Q2jbUY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", + "rev": "761582d6ab431549fe1396d2cd681e3fe9376020", "type": "github" }, "original": { @@ -815,11 +815,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": { @@ -843,11 +843,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1760700601, - "narHash": "sha256-lKoBZZQX7oFds0GhnJmbQ8TzjyTN9gW9X6hW4HHgXnI=", + "lastModified": 1761993804, + "narHash": "sha256-hAzNOwXGbmXcoHAoHhMKcm2A/QRoatYon7gjVcD4dNE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3d6695b9e8b58ee7d3330a39e89124449d609b1c", + "rev": "497be408195b0a64eb89f2ced3b70aec7268bbb2", "type": "github" }, "original": { @@ -859,11 +859,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760580664, - "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -875,11 +875,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1760692344, - "narHash": "sha256-kWyFvx8B1+cbmeGTt7kGAoOgPQfaf3xQnbNfNCGLvMw=", + "lastModified": 1761992524, + "narHash": "sha256-yNHj/YYnB+I2MV1rjvMzdMWJEx1vPYOac95oGPsVYaM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "31ec1e52d5702b73565a11f1c655c1256fc27967", + "rev": "7d6d8af114cb68bb99a55b7f4a3c0dffebd4c1c5", "type": "github" }, "original": { @@ -891,11 +891,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -955,11 +955,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1761373498, + "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "type": "github" }, "original": { @@ -980,11 +980,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1760714359, - "narHash": "sha256-SveT35nrv8qLnxKHp8MLXaY0rVd9BFhVOAn3WR79S84=", + "lastModified": 1761994152, + "narHash": "sha256-m4N7mX++iUY64gFVlW19jL311b+R8ejktJ64E6EzVLQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "bda54677e1724054c3676da8f049c61378790b3a", + "rev": "34a6947ad69ff9aec4960e0d1d618a0c041943ca", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1760315601, - "narHash": "sha256-cvguRikKX0yXZ7jaK4Gt3qB1I33T5TzYZQf0Ampx8ko=", + "lastModified": 1761897390, + "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "00858812f25b748d08b075a0d284093685fa3ffd", + "rev": "fc704e6b5d445899a1565955268c91942a4f263f", "type": "github" }, "original": { @@ -1085,11 +1085,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1760600226, - "narHash": "sha256-784DaL8oPeUWFIKzNJpwmBRdlO4ragb6BYqBBuL2+M0=", + "lastModified": 1761894503, + "narHash": "sha256-SreGV62DEv7kLJEcOBrw2V6Kup0siT4wS3Ye8PlFTdE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0138b8241ccfefbf37f253b15786819620ef75ec", + "rev": "2e2e3ebec91215078de9b754363fc9a7b0fdef13", "type": "github" }, "original": { @@ -1107,11 +1107,11 @@ ] }, "locked": { - "lastModified": 1760495781, - "narHash": "sha256-3OGPAQNJswy6L4VJyX3U9/z7fwgPFvK6zQtB2NHBV0Y=", + "lastModified": 1761758177, + "narHash": "sha256-MsVJG2gQTm6n2jIGu2KDT87AMeMx1GExOaEQqNkQKVE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11e0852a2aa3a65955db5824262d76933750e299", + "rev": "37f8f092415b444c3bed6eda6bcbee51cee22e5d", "type": "github" }, "original": { @@ -1127,11 +1127,11 @@ ] }, "locked": { - "lastModified": 1760448654, - "narHash": "sha256-cut3Y7R1rychkbC9O6y4jR9mas6ptmB6k9ozsV9wNLY=", + "lastModified": 1761064406, + "narHash": "sha256-8KLclb3V/13kqoxqSowA7dSBzbkzRS3JqtEplYb74Gs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bdcabcd1534d6a12147e29fbb126e344c75e7c6", + "rev": "b83b1a4a105bd3a255b8c0f339c7231fa8aad2e5", "type": "github" }, "original": { @@ -1162,11 +1162,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1760472212, - "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "lastModified": 1761840967, + "narHash": "sha256-alE8Vesztx3tPxXpJURtYWD8x1cXaU/x+10Q6hbgGBY=", "owner": "danth", "repo": "stylix", - "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "rev": "c33226f205aeab42a170913cd1f8bc3428b7e6b1", "type": "github" }, "original": { @@ -1321,11 +1321,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759707084, - "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", + "lastModified": 1761622056, + "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", + "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", "type": "github" }, "original": { @@ -1342,11 +1342,11 @@ ] }, "locked": { - "lastModified": 1760675007, - "narHash": "sha256-uzFK9GgP/6TiPyXmSXeNQld3pG1zeWsPfi+ut/vrkrI=", + "lastModified": 1761970869, + "narHash": "sha256-dlcxJTY+MwR9u3yTkBkzqfHY2+MKonDS7UzoOLlGpuw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "11308e8294b68cda466145d5982996c489c126bc", + "rev": "5855db6427f25672d7f02e19af418a38fe82e26e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5328220..3e1ea60 100644 --- a/flake.nix +++ b/flake.nix @@ -167,10 +167,10 @@ inputs.niri.overlays.niri inputs.fenix.overlays.default (final: prev: { - darkly-qt5 = inputs.darkly.packages.${final.system}.darkly-qt5; - darkly-qt6 = inputs.darkly.packages.${final.system}.darkly-qt6; + darkly-qt5 = inputs.darkly.packages.${final.stdenv.hostPlatform.system}.darkly-qt5; + darkly-qt6 = inputs.darkly.packages.${final.stdenv.hostPlatform.system}.darkly-qt6; - noctalia-shell = inputs.noctalia.packages.${final.system}.default; + noctalia-shell = inputs.noctalia.packages.${final.stdenv.hostPlatform.system}.default; }) (final: prev: { inherit lib; @@ -251,4 +251,4 @@ } ); }; -} +} \ No newline at end of file diff --git a/modules/cli/vcs/git.nix b/modules/cli/vcs/git.nix index 97f8a01..edc1a51 100644 --- a/modules/cli/vcs/git.nix +++ b/modules/cli/vcs/git.nix @@ -18,20 +18,22 @@ lib.my.makeHomeProgramConfig { extraConfig = { my.hm = { programs.git = { - userName = "${userfullname}"; - userEmail = "${useremail}"; - signing = { - format = "ssh"; - signByDefault = true; - key = "/home/${username}/.ssh/id_ed25519"; - }; - extraConfig = { - push.autoSetupRemote = true; + settings = { gpg.ssh.allowedSignersFile = (pkgs.writeText "allowed_signers" '' imxyy1soope1@gmail.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix imxyy@imxyy.top ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOEFLUkyeaK8ZPPZdVNEmtx8zvoxi7xqS2Z6oxRBuUPO imxyy@imxyy-nix '').outPath; + push.autoSetupRemote = true; + user = { + name = userfullname; + email = useremail; + }; + }; + signing = { + format = "ssh"; + signByDefault = true; + key = "/home/${username}/.ssh/id_ed25519"; }; }; programs.lazygit = { @@ -39,4 +41,4 @@ lib.my.makeHomeProgramConfig { }; }; }; -} +} \ No newline at end of file diff --git a/modules/desktop/style/default.nix b/modules/desktop/style/default.nix index efc9a8a..e113aaf 100644 --- a/modules/desktop/style/default.nix +++ b/modules/desktop/style/default.nix @@ -91,7 +91,7 @@ lib.my.makeSwitch { darker = pkgs.libsForQt5.qt5ct + /share/qt5ct/colors/darker.conf; }; "qt6ct/qt6ct.conf".source = pkgs.replaceVars ./qtct/qt6ct.conf { - darker = pkgs.qt6ct + /share/qt6ct/colors/darker.conf; + darker = pkgs.qt6Packages.qt6ct + /share/qt6ct/colors/darker.conf; }; }; }; diff --git a/modules/desktop/wine.nix b/modules/desktop/wine.nix index e25423f..e5f0f4a 100644 --- a/modules/desktop/wine.nix +++ b/modules/desktop/wine.nix @@ -13,7 +13,7 @@ lib.my.makeSwitch { ]; config' = { my.hm.home.packages = with pkgs; [ - wineWayland + wine-wayland proton-ge-custom bottles ]; diff --git a/modules/desktop/wm/niri/config.nix b/modules/desktop/wm/niri/config.nix index f6bad51..c1f612e 100644 --- a/modules/desktop/wm/niri/config.nix +++ b/modules/desktop/wm/niri/config.nix @@ -286,9 +286,11 @@ "Mod+Shift+Minus".action.set-window-height = "-10%"; "Mod+Shift+Equal".action.set-window-height = "+10%"; - "Ctrl+Alt+A".action = screenshot; + "Ctrl+Alt+A".action.screenshot = [ ]; + # "Ctrl+Alt+A".action = screenshot; "Print".action.screenshot-screen = [ ]; - "Alt+Print".action = screenshot-window; + "Alt+Print".action.screenshot-window = [ ]; + # "Alt+Print".action = screenshot-window; "Mod+Shift+E".action = quit; diff --git a/modules/fonts.nix b/modules/fonts.nix index 227c889..b0068b3 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -17,7 +17,7 @@ lib.my.makeSwitch { packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji jetbrains-mono diff --git a/modules/i18n/fcitx5.nix b/modules/i18n/fcitx5.nix index 5c500e5..05c011a 100644 --- a/modules/i18n/fcitx5.nix +++ b/modules/i18n/fcitx5.nix @@ -17,7 +17,8 @@ lib.my.makeSwitch { type = "fcitx5"; fcitx5 = { addons = with pkgs; [ - fcitx5-chinese-addons # fcitx5-mozc + qt6Packages.fcitx5-chinese-addons + # fcitx5-mozc fcitx5-lightly ]; waylandFrontend = true; diff --git a/overlays/default.nix b/overlays/default.nix index 7db5421..6c506ae 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -41,22 +41,22 @@ # by `pkgs.unstable`, `pkgs.stable` and `pkgs.master` unstable-packages = final: _prev: { unstable = import inputs.nixpkgs-unstable { - system = final.system; + system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }; stable-packages = final: _prev: { stable = import inputs.nixpkgs-stable { - system = final.system; + system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }; master-packages = final: _prev: { master = import inputs.nixpkgs-master { - system = final.system; + system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }; -} +} \ No newline at end of file