diff --git a/flake.lock b/flake.lock index eb6c869..81ade3e 100644 --- a/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1763885608, - "narHash": "sha256-eFRbKKMaEHC5EaL7sxfPVFPFsr0Plzx03e1VkJkcsBA=", + "lastModified": 1764389080, + "narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c94982d5890f4ff0737d57ed97503c1c8d40195c", + "rev": "897437c09bf22ce59efb3370f0783d0c662dba31", "type": "gitlab" }, "original": { @@ -516,11 +516,11 @@ }, "hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -580,11 +580,11 @@ ] }, "locked": { - "lastModified": 1763869804, - "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -659,11 +659,11 @@ ] }, "locked": { - "lastModified": 1763863406, - "narHash": "sha256-jwQjXTRMyz5c7aMIzMJWuzxv88iKjmzsU15Gsm57psM=", + "lastModified": 1764294866, + "narHash": "sha256-Kn0+e5avInNAX7Rf3qKlUGunpcc8ryutoZLRXzQa6BY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9890b7495c78d7729b11f831d7f0f39252b47fb1", + "rev": "f189ee5932ef2e0fcc4f63d12a698a968b8450e8", "type": "github" }, "original": { @@ -701,11 +701,11 @@ ] }, "locked": { - "lastModified": 1763776632, - "narHash": "sha256-mvumw4Djwi6BgMKVKw5cpNt8a80+h/LvPy2AHOtzBzE=", + "lastModified": 1764208886, + "narHash": "sha256-voOx8RsK3miw3EHw05nwuOS4ltzeH8tKJnVr+mxtTPQ=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "e6d3b589d9f1f869e68142f44654e59fcb47390c", + "rev": "7da8a2d675f9cc56b3f6d654b4cccdca5016ac8e", "type": "github" }, "original": { @@ -720,11 +720,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1763738061, - "narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=", + "lastModified": 1764072830, + "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f", + "rev": "c7832dd786175e20f2697179e0e03efadffe4201", "type": "github" }, "original": { @@ -735,11 +735,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -781,11 +781,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -828,11 +828,11 @@ ] }, "locked": { - "lastModified": 1757846692, - "narHash": "sha256-v4jhDzZIGbDoDayO/SBIxg//MdU40y90ShLmXywdVfU=", + "lastModified": 1765486064, + "narHash": "sha256-6KDAsBszRoYAv5A16/o7R6rcHbMX/xIaN6a1JKj2LKk=", "owner": "xunuwu", "repo": "nvim-config", - "rev": "6f4dfee3d36837b0a684ced51d83e38811fc2bef", + "rev": "b0e52d97eecb8c871d836d9f47fe5227f1e76abf", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1763870012, - "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", + "lastModified": 1764021963, + "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", + "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "type": "github" }, "original": { @@ -970,11 +970,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763845141, - "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", + "lastModified": 1764451865, + "narHash": "sha256-d4tfTm3ccp4rx7W1WW1BzSkTgEeMd4cZvhAJ7lP145M=", "owner": "nix-community", "repo": "stylix", - "rev": "adc650610085adbe130b9860d5bdb869f96050af", + "rev": "8a096ccec828c68bfb870295d186ad994ea0ae2c", "type": "github" }, "original": { diff --git a/home/desktop/sway/__waybar.nix b/home/desktop/sway/__waybar.nix index 4e31ec5..4ac9618 100644 --- a/home/desktop/sway/__waybar.nix +++ b/home/desktop/sway/__waybar.nix @@ -22,6 +22,7 @@ ]; modules-right = [ "custom/keyboard-state" + "custom/miao-battery-percentage" "tray" "clock" ]; @@ -31,6 +32,11 @@ "sway/window" = { max-length = 80; }; + "custom/miao-battery-percentage" = { + return-type = "json"; + exec = "${lib.getExe self.packages.${pkgs.system}.miao-battery-percentage}"; + restart-interval = "60"; + }; "custom/keyboard-state" = { return-type = "json"; exec = "${lib.getExe self.packages.${pkgs.system}.keyboard-state}"; diff --git a/home/develop/langs/python.nix b/home/develop/langs/python.nix new file mode 100644 index 0000000..e8e4533 --- /dev/null +++ b/home/develop/langs/python.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + basedpyright + ]; +} diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix index 35ba620..90e1475 100644 --- a/hosts/nixdesk/default.nix +++ b/hosts/nixdesk/default.nix @@ -41,7 +41,7 @@ core.tools core.compat core.boot - # core.docs + core.docs core.gvfs nix.nix diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix index e31e92e..f8c5216 100644 --- a/hosts/nixdesk/home.nix +++ b/hosts/nixdesk/home.nix @@ -45,6 +45,7 @@ develop.langs.js develop.langs.rust develop.langs.elixir + develop.langs.python develop.langs.nix develop.langs.zig develop.langs.lua diff --git a/pkgs/default.nix b/pkgs/default.nix index 12662d5..14e3fbf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,5 +5,6 @@ cartograph-cf = pkgs.callPackage ./cartograph-cf {}; keyboard-state = pkgs.callPackage ./keyboard-state {}; audio-abtest = pkgs.callPackage ./audio-abtest {}; + miao-battery-percentage = pkgs.callPackage ./miao-battery-percentage {}; }; } diff --git a/pkgs/miao-battery-percentage/default.nix b/pkgs/miao-battery-percentage/default.nix new file mode 100644 index 0000000..6a6fe14 --- /dev/null +++ b/pkgs/miao-battery-percentage/default.nix @@ -0,0 +1,23 @@ +{ + rustPlatform, + pkg-config, + udev, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "miao-battery-percentage"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "xunuwu"; + repo = "miao-battery-percentage"; + rev = "e14e72dce9d946503676121759ce6130e42bb637"; + hash = "sha256-NXJv8dChKPv695XMvmm+Xh0VJ1jdRhbdGMCM0LVIiD8="; + }; + cargoLock.lockFile = "${src}/Cargo.lock"; + + nativeBuildInputs = [pkg-config]; + buildInputs = [udev]; + + meta.mainProgram = "miao-battery-percentage"; +} diff --git a/sys/profiles/core/docs.nix b/sys/profiles/core/docs.nix index 576e099..ccb1e12 100644 --- a/sys/profiles/core/docs.nix +++ b/sys/profiles/core/docs.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { documentation = { dev.enable = true; - # man.generateCaches = true; # this does slow down builds by quite a lot + man.generateCaches = false; # this does slow down builds by quite a lot }; environment.systemPackages = with pkgs; [ linux-manual