From 2c9999907f3cd0ee4d9c6d683bffb7598a586387 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Wed, 2 Apr 2025 23:27:39 +0800 Subject: [PATCH] clean pkgs --- flake.lock | 19 ++++++++++--------- flake.nix | 4 ++-- home/programs/coding/nixvim/default.nix | 1 + modules/home-manager/colorscheme.nix | 14 -------------- pkgs/customColorSchemes/default.nix | 3 +++ pkgs/fiz.nix | 2 +- pkgs/fonts/hugmetight.nix | 2 +- pkgs/fonts/kose.nix | 4 ++-- pkgs/swhkd.nix | 1 - pkgs/wallpapers.nix | 3 +++ pkgs/zju-connect.nix | 2 +- 11 files changed, 24 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 714e80c..f64ab8f 100644 --- a/flake.lock +++ b/flake.lock @@ -582,17 +582,18 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1742919954, - "narHash": "sha256-uog87uhRIOmJAaWbF+cP3x8TGX4uSqPYncPjKo5YA5U=", - "ref": "refs/heads/wlroots-0.19", - "rev": "ed7e8bf93afc3d428a93501de53d581a8eb53218", - "revCount": 228, - "type": "git", - "url": "file:///home/eden/Repos/maomaowm-test" + "lastModified": 1743518755, + "narHash": "sha256-Kclqxi3ocB0xYVljlrbbmc1Z32lZ5OxZ3v2ikFRqVFQ=", + "owner": "DreamMaoMao", + "repo": "maomaowm", + "rev": "d77fe3a2475b8f9189cb32db3e803ef4ce0ef087", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/eden/Repos/maomaowm-test" + "owner": "DreamMaoMao", + "ref": "wlroots-0.19", + "repo": "maomaowm", + "type": "github" } }, "mmsg": { diff --git a/flake.nix b/flake.nix index 5dec779..74437f6 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,7 @@ nh.url = "github:viperML/nh"; treefmt-nix.url = "github:numtide/treefmt-nix"; agenix.url = "github:ryantm/agenix"; - # maomaowm.url = "github:EdenQwQ/maomaowm/wlroots-0.19"; - maomaowm.url = "git+file:///home/eden/Repos/maomaowm-test"; + maomaowm.url = "github:DreamMaoMao/maomaowm/wlroots-0.19"; + # maomaowm.url = "git+file:///home/eden/Repos/maomaowm-orig"; }; } diff --git a/home/programs/coding/nixvim/default.nix b/home/programs/coding/nixvim/default.nix index faa61c6..f4b29ad 100644 --- a/home/programs/coding/nixvim/default.nix +++ b/home/programs/coding/nixvim/default.nix @@ -40,6 +40,7 @@ Boolean.fg = base0E; String.italic = true; String.fg = base0B; + StatusLine.bg = base00; }; opts = { number = true; diff --git a/modules/home-manager/colorscheme.nix b/modules/home-manager/colorscheme.nix index 4ad3394..bff6430 100644 --- a/modules/home-manager/colorscheme.nix +++ b/modules/home-manager/colorscheme.nix @@ -2,20 +2,6 @@ with lib; with types; let - matugenOptions = submodule { - options = { - image = mkOption { - type = either str path; - description = "Path to the image"; - }; - scheme = mkOption { - type = str; - description = "The material you scheme to use"; - default = "scheme-tonal-spot"; - }; - }; - }; - fromImageOptions = submodule { options = { enable = mkEnableOption "Enable generating colorscheme from image"; diff --git a/pkgs/customColorSchemes/default.nix b/pkgs/customColorSchemes/default.nix index 4603299..9dc3dde 100644 --- a/pkgs/customColorSchemes/default.nix +++ b/pkgs/customColorSchemes/default.nix @@ -6,4 +6,7 @@ stdenvNoCC.mkDerivation { mkdir -p $out/share/themes cp *.yaml $out/share/themes ''; + meta = { + description = "Custom base16 color schemes that are not included in the base16 repository"; + }; } diff --git a/pkgs/fiz.nix b/pkgs/fiz.nix index dddb810..3276eac 100644 --- a/pkgs/fiz.nix +++ b/pkgs/fiz.nix @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/CrazySpottedDove/fiz"; changelog = "https://github.com/CrazySpottedDove/fiz/releases/tag/app-v${version}"; - description = "高速简洁的学在浙大第三方"; + description = "Third-party app for Learning in ZJU"; mainProgram = "fiz"; license = lib.licenses.mit; }; diff --git a/pkgs/fonts/hugmetight.nix b/pkgs/fonts/hugmetight.nix index 7d8e933..6d09c6d 100644 --- a/pkgs/fonts/hugmetight.nix +++ b/pkgs/fonts/hugmetight.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation { meta = with lib; { description = "The Hug Me Tight font"; - maintainers = with maintainers; [ EdenQwQ ]; + homepage = "https://mistifonts.com/hug-me-tight"; platforms = platforms.all; }; } diff --git a/pkgs/fonts/kose.nix b/pkgs/fonts/kose.nix index 41839f1..e5f72da 100644 --- a/pkgs/fonts/kose.nix +++ b/pkgs/fonts/kose.nix @@ -39,8 +39,8 @@ stdenvNoCC.mkDerivation { ''; meta = with lib; { - description = "The Kose font"; - maintainers = with maintainers; [ EdenQwQ ]; + description = "The Kose font by LXGW"; + homepage = "https://github.com/lxgw/kose-font"; platforms = platforms.all; }; } diff --git a/pkgs/swhkd.nix b/pkgs/swhkd.nix index 851609c..8f6fe1e 100644 --- a/pkgs/swhkd.nix +++ b/pkgs/swhkd.nix @@ -39,6 +39,5 @@ rustPlatform.buildRustPackage { description = "A drop-in replacement for sxhkd that works with wayland"; homepage = "https://github.com/waycrate/swhkd"; license = licenses.bsd2; - maintainers = with maintainers; [ EdenQwQ ]; }; } diff --git a/pkgs/wallpapers.nix b/pkgs/wallpapers.nix index 44feec5..d0bdbf3 100644 --- a/pkgs/wallpapers.nix +++ b/pkgs/wallpapers.nix @@ -71,4 +71,7 @@ stdenvNoCC.mkDerivation { map (wallpaper: "ln -s ${wallpaper} $out/${wallpaper.name}") wallpaperSrcs |> builtins.concatStringsSep "\n" ); + meta = { + description = "My wallpapers"; + }; } diff --git a/pkgs/zju-connect.nix b/pkgs/zju-connect.nix index 1720a9d..f17d72a 100644 --- a/pkgs/zju-connect.nix +++ b/pkgs/zju-connect.nix @@ -23,7 +23,7 @@ buildGoModule rec { ]; meta = { - description = "ZJU RVPN 客户端的 Go 语言实现"; + description = "ZJU RVPN client implemented in GO"; homepage = "https://github.com/Mythologyli/zju-connect"; license = lib.licenses.agpl3Only; mainProgram = "zju-connect";