diff --git a/flake.lock b/flake.lock index 2474791..a2f19e9 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1745523430, - "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "58bfe2553d937d8af0564f79d5b950afbef69717", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -67,34 +67,14 @@ "type": "github" } }, - "betterfox-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745154287, - "narHash": "sha256-kOYbNDnaP/1rQxeRu7e71yap4+aQFeObr29GFJou/jo=", - "owner": "HeitorAugustoLN", - "repo": "betterfox-nix", - "rev": "f76d3767f46c0d5536b911d3453ef76e186b344a", - "type": "github" - }, - "original": { - "owner": "HeitorAugustoLN", - "repo": "betterfox-nix", - "type": "github" - } - }, "bt-tracker": { "flake": false, "locked": { - "lastModified": 1745683860, - "narHash": "sha256-WYvZhHXVZuinCiLuYzPvSqMJ96SkATjinC9Ifs/0jfY=", + "lastModified": 1744647042, + "narHash": "sha256-QVfymxcal71Eus9bDob+L2aocWngrd0SxJudml3YPkc=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "fd8a43e0cffe6aef96de5c5041cf499ce0e4c67e", + "rev": "c8f564ce38a41f9cf42dd384ac0f8ee6ef5a2891", "type": "github" }, "original": { @@ -157,11 +137,11 @@ ] }, "locked": { - "lastModified": 1745502102, - "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", + "lastModified": 1744145203, + "narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "owner": "nix-community", "repo": "disko", - "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", + "rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "type": "github" }, "original": { @@ -173,11 +153,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1743774811, + "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e", "type": "github" }, "original": { @@ -352,11 +332,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1745607661, - "narHash": "sha256-72OO+/vP4h7uiZ1gdGmFf1z+17NxCt8dhrRD+mltW44=", + "lastModified": 1744655344, + "narHash": "sha256-FMn7XnSvaKMXMHhoI1bdhAMcDohzblHnL0Fwd5Pgzm8=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "38445dca2ac2af176c7f3b205d88d697cf8c89c8", + "rev": "8bab8f7d648fe654f52a99f2bed6d4247296a22e", "type": "github" }, "original": { @@ -441,11 +421,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1745684178, - "narHash": "sha256-SnYTNyXGRng1qHmRtbOG9K31c5h6p77hlGPZK5oKgqE=", + "lastModified": 1744385517, + "narHash": "sha256-pqiSmtbquoBM3cVHELcXHl8CLT8moXVkwbtc5xd5Br0=", "owner": "helix-editor", "repo": "helix", - "rev": "2ec59f8ff6d43f5ac72e745ec614c26de192aedd", + "rev": "340934db92aea902a61b9f79b9e6f4bd15111044", "type": "github" }, "original": { @@ -462,11 +442,11 @@ ] }, "locked": { - "lastModified": 1745627989, - "narHash": "sha256-mOCdFmxocBPae7wg7RYWOtJzWMJk34u9493ItY0dVqw=", + "lastModified": 1744663884, + "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d2d32231797bfa7213ae5e8ac89d25f8caaae82", + "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", "type": "github" }, "original": { @@ -486,11 +466,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745634143, - "narHash": "sha256-9MopKYFjE+4URe/ZmBt4i3g9cvdAJ6MJ4LM21DDXqzc=", + "lastModified": 1744592850, + "narHash": "sha256-t/vPNGc/xqB/vm8Yjd+nxbqtbyunACbJNpeY3SLmDmM=", "owner": "jj-vcs", "repo": "jj", - "rev": "13477940af42a74a58caaaaeafdbd322cfebb81d", + "rev": "26ffaf4ac2fefad6b789908cd0c127ce4c96d287", "type": "github" }, "original": { @@ -550,11 +530,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745668007, - "narHash": "sha256-xYf6xz8WOW9ztBi356dHdqLsTCoxVS8Iapfpwosrn7Q=", + "lastModified": 1744480072, + "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fdaf610c455d0b5b70374a21392a717be513b0f", + "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9", "type": "github" }, "original": { @@ -583,11 +563,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745663376, - "narHash": "sha256-mGQyB+Epl87ZCZZCcBkjUrdR1aJt8Ybiqr4h0yUkgQI=", + "lastModified": 1744475937, + "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=", "owner": "YaLTeR", "repo": "niri", - "rev": "78e3daf5f82b5870e998faf0e1efeaa048730976", + "rev": "95eafba346a17104a9af71021011fcdc9e13776b", "type": "github" }, "original": { @@ -604,11 +584,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1745665695, - "narHash": "sha256-oUFoPmT2/ww1bIU0Vmifx9BdarVqlv9MyEIxUTqYJnM=", + "lastModified": 1744628957, + "narHash": "sha256-g1lGl2j5b6sjAdfLXHyIQh8gvKBKnDuwYTR4EMexdP0=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "48280c3737fee2db3a1226c297c86428417f552d", + "rev": "e9da1352e4b3ad6778ae3166fbe10c6a3a879c21", "type": "github" }, "original": { @@ -619,11 +599,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745503349, - "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -635,11 +615,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -682,11 +662,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1744309437, + "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", "type": "github" }, "original": { @@ -698,11 +678,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1745487689, - "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -714,11 +694,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -738,11 +718,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745459908, - "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", + "lastModified": 1743884191, + "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=", "owner": "nix-community", "repo": "NUR", - "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", + "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c", "type": "github" }, "original": { @@ -754,11 +734,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1745419403, - "narHash": "sha256-pQOOn4UntLSwnL3xZ1JAr3IDhXpL+kTS7Zw8ll59K9Q=", + "lastModified": 1744660304, + "narHash": "sha256-F1+LEM7+v6jxosXETYPPmM/qpmTQsSy0K/s4exMBxQk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "346899a4b3b651ab447c61e0c8e9d8a1454cda72", + "rev": "d49b80147f0869b39bad3f74d85a4d2b92cdb0cb", "type": "gitlab" }, "original": { @@ -787,7 +767,6 @@ }, "root": { "inputs": { - "betterfox-nix": "betterfox-nix", "bt-tracker": "bt-tracker", "dae": "dae", "deploy-rs": "deploy-rs", @@ -859,11 +838,11 @@ ] }, "locked": { - "lastModified": 1745634793, - "narHash": "sha256-8AuOyfLNlcbLy0AqERSNUUoDdY+3THZI7+9VrXUfGqg=", + "lastModified": 1744599145, + "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f1aeaeb91ba9c88f235ab82bd23d7a4931fe736c", + "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4", "type": "github" }, "original": { @@ -879,11 +858,11 @@ ] }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1744518500, + "narHash": "sha256-lv52pnfiRGp5+xkZEgWr56DWiRgkMFXpiGba3eJ3krE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "7e147a1ae90f0d4a374938cdc3df3cdaecb9d388", "type": "github" }, "original": { @@ -920,11 +899,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745618823, - "narHash": "sha256-WGKSI0+CY3Ep2YnRASmBRU8oMIvTW4ngFyjA0dVcKgQ=", + "lastModified": 1744572782, + "narHash": "sha256-CFNluxLqxmDPQYxi37nBd4wrpB0lI4Os8nRA7UWAJK0=", "owner": "danth", "repo": "stylix", - "rev": "11ceb2fde1901dc227421bbbef2d0800339f5126", + "rev": "042db377bccc99b1a724b076c89ba803e411d889", "type": "github" }, "original": { @@ -1000,11 +979,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1742851696, + "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77", "type": "github" }, "original": { @@ -1016,11 +995,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1743296873, + "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a", "type": "github" }, "original": { @@ -1087,11 +1066,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1745372360, - "narHash": "sha256-5DX9lYmEbkdANCzME2v3coV0EnWOhS7NsTlGBQuqmjM=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "c31679aa41966ee9272bb240703755cb1e7c72e3", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f262c5..1b08915 100644 --- a/flake.nix +++ b/flake.nix @@ -43,15 +43,6 @@ flake = false; }; - betterfox-nix = { - type = "github"; - owner = "HeitorAugustoLN"; - repo = "betterfox-nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; - niri-flake = { type = "github"; owner = "sodiboo"; diff --git a/home/david/modules/default.nix b/home/david/modules/default.nix index 49c46bb..07b1b99 100644 --- a/home/david/modules/default.nix +++ b/home/david/modules/default.nix @@ -10,7 +10,6 @@ spacer devenv just - showmethekey ]; }; } diff --git a/home/david/modules/programs/niri/config.kdl b/home/david/modules/programs/niri/config.kdl index ffb1ba5..3cd3a74 100644 --- a/home/david/modules/programs/niri/config.kdl +++ b/home/david/modules/programs/niri/config.kdl @@ -139,32 +139,6 @@ window-rule { geometry-corner-radius 12 clip-to-geometry true } -window-rule { - match app-id="^showmethekey-gtk$" - geometry-corner-radius 0 - clip-to-geometry false - open-floating true - open-focused false - default-column-width { - fixed 300 - } - default-window-height { - fixed 70 - } - draw-border-with-background false - default-floating-position x=20 y=20 relative-to="bottom-right" - focus-ring { - off - } - border { - off - } - shadow { - off - } - tiled-state false - baba-is-float true -} window-rule { match app-id="^org\\.keepassxc\\.KeePassXC$" match app-id="^org\\.gnome\\.World\\.Secrets$" @@ -247,9 +221,6 @@ binds { Mod+Q { close-window } - Mod+O { - toggle-overview - } Mod+Left { focus-column-left } diff --git a/home/modules/default.nix b/home/modules/default.nix index f817748..d4fca85 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -6,7 +6,6 @@ imports = (with inputs; [ sops-nix.homeManagerModules.sops - betterfox-nix.homeManagerModules.betterfox ]) ++ [ ./programs diff --git a/home/modules/programs/firefox.nix b/home/modules/programs/firefox.nix index 79d7e24..269fac4 100644 --- a/home/modules/programs/firefox.nix +++ b/home/modules/programs/firefox.nix @@ -21,18 +21,11 @@ in ]; programs.firefox = { enable = true; - betterfox = { - enable = true; - }; languagePacks = [ "zh-CN" "en-US" ]; profiles.default = { - betterfox = { - enable = true; - enableAllSections = true; - }; name = "default"; isDefault = true; extensions.packages = with outputs.packages."${system}"; [ diff --git a/home/modules/programs/helix/config.toml b/home/modules/programs/helix/config.toml index 0f1705e..b2f176a 100644 --- a/home/modules/programs/helix/config.toml +++ b/home/modules/programs/helix/config.toml @@ -1,4 +1,4 @@ -theme = "ayu_dark" +# theme = "ayu_evolve" # avoid conflicting with stylix [editor] line-number = "relative" diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index eeafe47..9c9c855 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -29,7 +29,6 @@ cfg = config.youthlic.programs.helix; in { - stylix.targets.helix.enable = false; programs.helix = lib.mkIf cfg.enable { enable = true; package = outputs.packages."${pkgs.system}".helix; diff --git a/home/modules/programs/niri.nix b/home/modules/programs/niri.nix index c6f8757..d80faa6 100644 --- a/home/modules/programs/niri.nix +++ b/home/modules/programs/niri.nix @@ -2,12 +2,10 @@ pkgs, config, lib, - osConfig ? null, ... }: let cfg = config.youthlic.programs.niri; - niri = osConfig.programs.niri.package; in { options = { @@ -23,24 +21,24 @@ in }; }; config = lib.mkIf cfg.enable { - home.packages = - (with pkgs; [ - swaynotificationcenter - swaybg - xwayland-satellite - kdePackages.polkit-kde-agent-1 - wl-clipboard - cliphist - ]) - ++ [ niri ]; + home.packages = with pkgs; [ + swaynotificationcenter + swaybg + xwayland-satellite + niri-unstable + kdePackages.polkit-kde-agent-1 + wl-clipboard + cliphist + ]; qt = { enable = true; }; xdg.portal = { - configPackages = [ niri ]; + configPackages = [ pkgs.niri-unstable ]; enable = true; extraPortals = lib.mkIf ( - !niri.cargoBuildNoDefaultFeatures || builtins.elem "xdp-gnome-screencast" niri.cargoBuildFeatures + !pkgs.niri-unstable.cargoBuildNoDefaultFeatures + || builtins.elem "xdp-gnome-screencast" pkgs.niri-unstable.cargoBuildFeatures ) [ pkgs.xdg-desktop-portal-gnome ]; }; xdg.configFile = @@ -71,7 +69,7 @@ in }; programs.niri = { config = builtins.readFile cfg.config; - package = niri; + package = pkgs.niri-unstable; }; }; } diff --git a/home/modules/programs/waybar.nix b/home/modules/programs/waybar.nix index eb07712..e3d8287 100644 --- a/home/modules/programs/waybar.nix +++ b/home/modules/programs/waybar.nix @@ -37,6 +37,7 @@ in "custom/notification" ]; "wlr/taskbar" = { + # on-click = "${lib.getExe pkgs.niri-unstable} msg action focus-window --id {app_id}"; on-click = "activate"; }; diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 7cb57b5..b29ad1d 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -92,7 +92,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-04-22", + "date": "2025-04-06", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,12 +104,12 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2", - "sha256": "sha256-N7EDvQX598jxNILzwTwAeu/BY9wWVBRUuTApamf4nAY=", + "rev": "51777daedbe4783c3b79f0246d775e4b6d978cbc", + "sha256": "sha256-cFaFgChhpgEiJw+dHl3Hr3T2UQF+Vy6u36JWY+cYBNo=", "sparseCheckout": [], "type": "github" }, - "version": "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2" + "version": "51777daedbe4783c3b79f0246d775e4b6d978cbc" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index e8936d6..d563e20 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -65,15 +65,15 @@ }; rime-ice = { pname = "rime-ice"; - version = "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2"; + version = "51777daedbe4783c3b79f0246d775e4b6d978cbc"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2"; + rev = "51777daedbe4783c3b79f0246d775e4b6d978cbc"; fetchSubmodules = false; - sha256 = "sha256-N7EDvQX598jxNILzwTwAeu/BY9wWVBRUuTApamf4nAY="; + sha256 = "sha256-cFaFgChhpgEiJw+dHl3Hr3T2UQF+Vy6u36JWY+cYBNo="; }; - date = "2025-04-22"; + date = "2025-04-06"; }; tree-sitter-idris = { pname = "tree-sitter-idris";