From 5970d4ac0a5156cbc33b3ed28ecaf300bd888942 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 7 Jul 2024 20:25:57 +0800 Subject: [PATCH] flake: update lock file --- flake.lock | 78 +++++++++---------- home/applications/nautilus/default.nix | 2 +- hosts/aristotle/default.nix | 8 +- .../common/graphical/home/default.nix | 17 ++-- .../profiles/common/graphical/home/theme.nix | 4 +- overlays/default.nix | 32 ++++---- 6 files changed, 67 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 6810da2..7a7cbe0 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1719675517, - "narHash": "sha256-QXMYL1ay66M7T/JdaO4wR8K58GkV5CNN8U15gwifdbY=", + "lastModified": 1720211568, + "narHash": "sha256-Uph6rcbiuOD6bGEySonDFozdO+mznTug08x27WG4BIg=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "4688aa9f107d6d7ac46a98a01f7105cac8e7dbe6", + "rev": "ce7e02b20fe45425bbdbebc6fe0fdcc018c9efc6", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1719880336, - "narHash": "sha256-VnUCaGI7FEh7tLVsD6OsychPmqjDYXqJEdFG4jK86zs=", + "lastModified": 1720226507, + "narHash": "sha256-yHVvNsgrpyNTXZBEokL8uyB2J6gB1wEx0KOJzoeZi1A=", "owner": "ipetkov", "repo": "crane", - "rev": "047c929ad65d8378f18de95ca66769ca04161caf", + "rev": "0aed560c5c0a61c9385bddff471a13036203e11c", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1719864345, - "narHash": "sha256-e4Pw+30vFAxuvkSTaTypd9zYemB/QlWcH186dsGT+Ms=", + "lastModified": 1720056646, + "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", "owner": "nix-community", "repo": "disko", - "rev": "544a80a69d6e2da04e4df7ec8210a858de8c7533", + "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1719877454, - "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1719827439, - "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", + "lastModified": 1720327769, + "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", "owner": "nix-community", "repo": "home-manager", - "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", + "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1719845423, - "narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", + "lastModified": 1720337362, + "narHash": "sha256-9TNQtlwu97NPaJYsKkdObOsy0MLN4NAOBz0pqwH3KnA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "ec12b88104d6c117871fad55e931addac4626756", + "rev": "0f89b73f41eaa1dde67b291452c181d9a75f10dd", "type": "github" }, "original": { @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1719869943, - "narHash": "sha256-MDd7osBHV/kk2jGyd7v29CKQVVexus4bGSbzUBer63U=", + "lastModified": 1720301939, + "narHash": "sha256-yP2+IPhcUscJbwbuAaHQRAIKrrnF1ePQBwwzGFlfqmE=", "owner": "jacekszymanski", "repo": "nixcasks", - "rev": "e41da9d30fc57349150dc9fb39e029f761ce0d9e", + "rev": "b3ebbbc306d051edb9bc2fa9dc791dabfd3d106b", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719826879, - "narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -390,11 +390,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nur": { "locked": { - "lastModified": 1719894733, - "narHash": "sha256-T/zofRVToXkbvjBX+wnEOLCpaX3BbvMh9ZN6cKFydaA=", + "lastModified": 1720352738, + "narHash": "sha256-S/FwaFfzUaGv81QxJJFWbrWhAAlR+L3S5i2MIujqmcE=", "owner": "nix-community", "repo": "NUR", - "rev": "b978045baa040e6953fbe0a18c111749931673af", + "rev": "18a4856920ac463d8ed386d9830a7742e2cf2c2c", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1719886738, - "narHash": "sha256-6eaaoJUkr4g9J/rMC4jhj3Gv8Sa62rvlpjFe3xZaSjM=", + "lastModified": 1720318855, + "narHash": "sha256-w3CCVK9LJ5aznXGkO1IyAlbvMNJfyA+dBF7Z1Zwx1LA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "db12d0c6ef002f16998723b5dd619fa7b8997086", + "rev": "3eed08a074cd2000884a69d448d70da2843f7103", "type": "github" }, "original": { @@ -566,11 +566,11 @@ ] }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720321395, + "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", "type": "github" }, "original": { @@ -586,11 +586,11 @@ ] }, "locked": { - "lastModified": 1719835186, - "narHash": "sha256-o0FB8SQVLOnbsYTk2Bt6gXwsfqEv4ZHsGP50/kM/gR0=", + "lastModified": 1720190661, + "narHash": "sha256-51aPk6VqCSEuQeGvi/j5pdRyx8UxvqBeph+sXsj94EU=", "owner": "nix-community", "repo": "srvos", - "rev": "14b3b0aa48fa291f1be26ab8948d5b9eadaed0b8", + "rev": "27dbc690931cc30f2c4bb2ff39e46490c3b6421d", "type": "github" }, "original": { diff --git a/home/applications/nautilus/default.nix b/home/applications/nautilus/default.nix index 53c8f1d..d3377e2 100644 --- a/home/applications/nautilus/default.nix +++ b/home/applications/nautilus/default.nix @@ -1,5 +1,5 @@ {pkgs, ...}: { - home.packages = [pkgs.gnome.nautilus]; + home.packages = [pkgs.nautilus]; dconf.settings = { "org/gnome/nautilus/list-view".default-zoom-level = "small"; "org/gnome/nautilus/preferences".default-folder-viewer = "list-view"; diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix index 8507c1a..fe52a01 100644 --- a/hosts/aristotle/default.nix +++ b/hosts/aristotle/default.nix @@ -35,14 +35,14 @@ "ydict" ]; - home.packages = with pkgs; - [ + home.packages = + (with pkgs; [ amberol fractal - gnome.gnome-calculator + gnome-calculator hyperfine mousai - ] + ]) ++ (with inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.scripts; [ lofi ]); diff --git a/nixos/profiles/common/graphical/home/default.nix b/nixos/profiles/common/graphical/home/default.nix index fa81efd..23cb77c 100644 --- a/nixos/profiles/common/graphical/home/default.nix +++ b/nixos/profiles/common/graphical/home/default.nix @@ -23,16 +23,13 @@ end ''; - home.packages = - (with pkgs; [ - loupe - ]) - ++ (with pkgs.gnome; [ - seahorse - file-roller - gnome-calculator - dconf-editor - ]); + home.packages = with pkgs; [ + loupe + gnome-calculator + seahorse + file-roller + dconf-editor + ]; services = { ssh-agent.enable = true; diff --git a/nixos/profiles/common/graphical/home/theme.nix b/nixos/profiles/common/graphical/home/theme.nix index c938329..3666771 100644 --- a/nixos/profiles/common/graphical/home/theme.nix +++ b/nixos/profiles/common/graphical/home/theme.nix @@ -6,7 +6,7 @@ }: { home.pointerCursor = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; size = 24; gtk.enable = true; }; @@ -21,7 +21,7 @@ iconTheme = { name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; }; theme = { diff --git a/overlays/default.nix b/overlays/default.nix index f56a27c..b9a26a8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -5,26 +5,22 @@ let }); in { patches = _final: prev: { - gnome = - prev.gnome - // { - # https://aur.archlinux.org/pkgbase/nautilus-typeahead - nautilus = prev.gnome.nautilus.overrideAttrs { - src = prev.fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "albertvaka"; - repo = "nautilus"; - rev = "f5f593bf36c41756a29d5112a10cf7ec70b8eafb"; - hash = "sha256-PfkCY2gQ8jfPIgTRC9Xzxh4N3f2oB339Hym5RCbKwkw="; - }; - - # Enable type-ahead behavior by default - postPatch = '' - awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml - ''; - }; + # https://aur.archlinux.org/pkgbase/nautilus-typeahead + nautilus = prev.nautilus.overrideAttrs { + src = prev.fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "albertvaka"; + repo = "nautilus"; + rev = "f5f593bf36c41756a29d5112a10cf7ec70b8eafb"; + hash = "sha256-PfkCY2gQ8jfPIgTRC9Xzxh4N3f2oB339Hym5RCbKwkw="; }; + # Enable type-ahead behavior by default + postPatch = '' + awk -i inplace '/type-ahead-search/{c++;} c==1 && /true/{sub("true", "false"); c++;} 1' data/org.gnome.nautilus.gschema.xml + ''; + }; + sway-unwrapped = addPatches prev.sway-unwrapped [ # text_input: Implement input-method popups # https://github.com/swaywm/sway/pull/7226