diff --git a/flake.lock b/flake.lock index e80e996..eb6c869 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -21,16 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, @@ -141,11 +142,11 @@ ] }, "locked": { - "lastModified": 1756733629, - "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=", + "lastModified": 1763651264, + "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", "owner": "nix-community", "repo": "disko", - "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1", + "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", "type": "github" }, "original": { @@ -162,11 +163,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1756872219, - "narHash": "sha256-KsX15cRMZzJlwkwgTf7JwnFqEaU80SekgHLu/3xcX10=", + "lastModified": 1763885608, + "narHash": "sha256-eFRbKKMaEHC5EaL7sxfPVFPFsr0Plzx03e1VkJkcsBA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5512d414aa6ccd07d5c7145a85ca9bd4608f845e", + "rev": "c94982d5890f4ff0737d57ed97503c1c8d40195c", "type": "gitlab" }, "original": { @@ -179,11 +180,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -211,11 +212,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -263,11 +264,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -281,11 +282,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -364,11 +365,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -497,27 +498,29 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "hardware": { "locked": { - "lastModified": 1756925795, - "narHash": "sha256-kUb5hehaikfUvoJDEc7ngiieX88TwWX/bBRX9Ar6Tac=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "ba6fab29768007e9f2657014a6e134637100c57d", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -577,11 +580,11 @@ ] }, "locked": { - "lastModified": 1756903364, - "narHash": "sha256-vZh/YH2D7oDFek10r0TbGn3qJrqGv69sSP+oF8PFDqQ=", + "lastModified": 1763869804, + "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6159629d05a0e92bb7fb7211e74106ae1d552401", + "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd", "type": "github" }, "original": { @@ -656,11 +659,11 @@ ] }, "locked": { - "lastModified": 1756692364, - "narHash": "sha256-EOJPoJfw8E+EVdGcKyVYntHnUovu6f/LhZNYWoaSdd0=", + "lastModified": 1763863406, + "narHash": "sha256-jwQjXTRMyz5c7aMIzMJWuzxv88iKjmzsU15Gsm57psM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "23deedafada335ffa29d4adccebbb491cf55e3f0", + "rev": "9890b7495c78d7729b11f831d7f0f39252b47fb1", "type": "github" }, "original": { @@ -676,11 +679,11 @@ ] }, "locked": { - "lastModified": 1756612744, - "narHash": "sha256-/glV6VAq8Va3ghIbmhET3S1dzkbZqicsk5h+FtvwiPE=", + "lastModified": 1763870992, + "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "3fe768e1f058961095b4a0d7a2ba15dc9736bdc6", + "rev": "d7423982c7a26586aa237d130b14c8b302c7a367", "type": "github" }, "original": { @@ -698,11 +701,11 @@ ] }, "locked": { - "lastModified": 1756864213, - "narHash": "sha256-eHgsQ9eoJZGnZLJtrYnCynEb5nYhysvMtFrPiTwjHA0=", + "lastModified": 1763776632, + "narHash": "sha256-mvumw4Djwi6BgMKVKw5cpNt8a80+h/LvPy2AHOtzBzE=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "da421c0fb247d3b1956b0cc68e73a27bcdcf77b5", + "rev": "e6d3b589d9f1f869e68142f44654e59fcb47390c", "type": "github" }, "original": { @@ -717,11 +720,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755261305, - "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", + "lastModified": 1763738061, + "narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "203a7b463f307c60026136dd1191d9001c43457f", + "rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f", "type": "github" }, "original": { @@ -732,11 +735,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -748,11 +751,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -778,11 +781,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -804,11 +807,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -913,11 +916,11 @@ ] }, "locked": { - "lastModified": 1757239136, - "narHash": "sha256-3LPKuZ26NK+UrOnB/d34iM651D9lASep71i/uDWx8fs=", + "lastModified": 1762705707, + "narHash": "sha256-741N/dCDUmyhSHE3jlefkDKVGeNKmaLNRNnBm3+R4nY=", "owner": "xunuwu", "repo": "sobercookie", - "rev": "d6dcc68b71584725bbd074ca1d3f37000a6eb985", + "rev": "d67fbf33df1f5a37b630075301b66b4167cec10a", "type": "github" }, "original": { @@ -933,11 +936,11 @@ ] }, "locked": { - "lastModified": 1754988908, - "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=", + "lastModified": 1763870012, + "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48", + "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", "type": "github" }, "original": { @@ -967,11 +970,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1756811338, - "narHash": "sha256-fwgklhY9kJSTDMGuwHJUVBCuJDVvxxljjGOLhxC84ko=", + "lastModified": 1763845141, + "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", "owner": "nix-community", "repo": "stylix", - "rev": "989312ab49e6eb1d076f9d194d43f9f9c513087e", + "rev": "adc650610085adbe130b9860d5bdb869f96050af", "type": "github" }, "original": { @@ -1091,11 +1094,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -1107,11 +1110,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -1123,11 +1126,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -1178,11 +1181,11 @@ }, "vpn-confinement": { "locked": { - "lastModified": 1749672087, - "narHash": "sha256-j8LG0s0QcvNkZZLcItl78lvTZemvsScir0dG3Ii4B1c=", + "lastModified": 1759956062, + "narHash": "sha256-NUZu0Rb0fwUjfdp51zMm0xM3lcK8Kw4c97LLog7+JjA=", "owner": "Maroka-chan", "repo": "VPN-Confinement", - "rev": "880b3bd2c864dce4f6afc79f6580ca699294c011", + "rev": "fabe7247b720b5eb4c3c053e24a2b3b70e64c52b", "type": "github" }, "original": { diff --git a/home/cli/git.nix b/home/cli/git.nix index 6da3149..92c1229 100644 --- a/home/cli/git.nix +++ b/home/cli/git.nix @@ -7,9 +7,13 @@ git-credential-oauth ]; + programs.delta = { + enable = true; + enableGitIntegration = true; + }; + programs.git = { enable = true; - delta.enable = true; lfs.enable = true; ignores = ["*~" ".direnv"]; @@ -19,14 +23,15 @@ signByDefault = true; }; - extraConfig = { + settings = { gpg.format = "ssh"; push.autoSetupRemote = true; pull.rebase = true; rebase.autostash = true; + user = { + name = "xunuwu"; + email = "xunuwu@gmail.com"; + }; }; - - userEmail = "xunuwu@gmail.com"; - userName = "xunuwu"; }; } diff --git a/home/cli/jujutsu.nix b/home/cli/jujutsu.nix index 4ec43ff..5fc7b61 100644 --- a/home/cli/jujutsu.nix +++ b/home/cli/jujutsu.nix @@ -3,8 +3,8 @@ enable = true; settings = { user = { - email = config.programs.git.userEmail; - name = config.programs.git.userName; + email = config.programs.git.settings.user.email; + name = config.programs.git.settings.user.name; }; signing = { behavior = "own"; diff --git a/home/develop/langs/haskell.nix b/home/develop/langs/haskell.nix index bb60a69..50b0935 100644 --- a/home/develop/langs/haskell.nix +++ b/home/develop/langs/haskell.nix @@ -4,6 +4,6 @@ haskell-language-server cabal-install hlint - haskellPackages.retrie + # haskellPackages.retrie ]; } diff --git a/home/programs/beets.nix b/home/programs/beets.nix index 68bc089..3d68631 100644 --- a/home/programs/beets.nix +++ b/home/programs/beets.nix @@ -4,7 +4,7 @@ in { programs.beets = { enable = true; - package = pkgs.beets-unstable; + package = pkgs.beets; settings = { directory = "${musicDir}/beets"; library = "${beetsDir}/beets.db"; diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix index e02d16b..c5b2a1a 100644 --- a/home/programs/firefox/default.nix +++ b/home/programs/firefox/default.nix @@ -30,6 +30,7 @@ ]; }; profiles.xun = { + # extensions.force = true; extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [ ublock-origin # (lib.mkIf (config.xun.desktop.colorscheme == "dark") darkreader) diff --git a/home/themes/dark/default.nix b/home/themes/dark/default.nix index 09fc7ea..e1d4685 100644 --- a/home/themes/dark/default.nix +++ b/home/themes/dark/default.nix @@ -12,11 +12,12 @@ }; targets = { + firefox.enable = true; + # firefox.colorTheme.enable = true; firefox.profileNames = ["xun"]; gtk.enable = true; qt.enable = true; foot.enable = true; - firefox.enable = true; swaync.enable = true; }; }; diff --git a/pkgs/binaryninja-personal/default.nix b/pkgs/binaryninja-personal/default.nix index 9bf7cdd..c18d59a 100644 --- a/pkgs/binaryninja-personal/default.nix +++ b/pkgs/binaryninja-personal/default.nix @@ -46,8 +46,8 @@ in unzip wayland libGL - qt6.full qt6.qtbase + qt6.qttools stdenv.cc.cc.lib glib fontconfig diff --git a/sys/profiles/programs/fonts.nix b/sys/profiles/programs/fonts.nix index f023102..a469f60 100644 --- a/sys/profiles/programs/fonts.nix +++ b/sys/profiles/programs/fonts.nix @@ -9,7 +9,7 @@ dejavu_fonts font-awesome noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji source-code-pro noto-fonts-cjk-sans iosevka