From 57c72d9ac7e5a0ded45cc8fcdec6372ee8822570 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Mon, 11 Nov 2024 18:51:58 +0000 Subject: [PATCH] fix: fix typo in gtk theme name --- computers/python/configs/default.nix | 1 - .../python/configs/qutebrowser/config.py | 4 +- computers/python/configs/river/init | 2 +- computers/python/river.nix | 1 - computers/python/theme.nix | 4 +- flake.lock | 110 ++++++------------ overlays/default.nix | 4 +- 7 files changed, 45 insertions(+), 81 deletions(-) diff --git a/computers/python/configs/default.nix b/computers/python/configs/default.nix index 345a96c..8b9f9af 100644 --- a/computers/python/configs/default.nix +++ b/computers/python/configs/default.nix @@ -5,6 +5,5 @@ "L+ ${hcfg}/kanshi/ - - - - ${./kanshi}" "L+ ${hcfg}/fuzzel/ - - - - ${./fuzzel}" "L+ ${hcfg}/river/ - - - - ${./river}" - "L+ ${hcfg}/foot/ - - - - ${./foot}" ]) "%h/.config"; } diff --git a/computers/python/configs/qutebrowser/config.py b/computers/python/configs/qutebrowser/config.py index 69c1372..e68a05b 100644 --- a/computers/python/configs/qutebrowser/config.py +++ b/computers/python/configs/qutebrowser/config.py @@ -1,5 +1,5 @@ import rosepine - config.load_autoconfig() - rosepine.setup(c, 'rose-pine', True) + +config.set('colors.webpage.preferred_color_scheme', 'dark') diff --git a/computers/python/configs/river/init b/computers/python/configs/river/init index acd5181..882e00c 100755 --- a/computers/python/configs/river/init +++ b/computers/python/configs/river/init @@ -6,7 +6,7 @@ riverctl spawn "swaybg -i /tmp/wallpapers/rose_pine/04.png -m fill" riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river" -riverctl map normal Super+Shift Return spawn foot +riverctl map normal Super+Shift Return spawn emacs riverctl map normal Super R spawn fuzzel riverctl map normal Super Q close riverctl map normal Super+Shift E exit diff --git a/computers/python/river.nix b/computers/python/river.nix index d021670..34f1c59 100644 --- a/computers/python/river.nix +++ b/computers/python/river.nix @@ -13,7 +13,6 @@ slurp wf-recorder wl-clipboard - foot fuzzel swaybg kanshi diff --git a/computers/python/theme.nix b/computers/python/theme.nix index d7b9de7..6c425e6 100644 --- a/computers/python/theme.nix +++ b/computers/python/theme.nix @@ -13,8 +13,8 @@ in { color-scheme = "prefer-dark"; cursor-size = lib.gvariant.mkUint32 24; cursor-theme = "BreezeX-RosePine-Linux"; - gtk-theme = "Rose-pine"; - icon-theme = "Rose-pine"; + gtk-theme = "rose-pine"; + icon-theme = "rose-pine"; }; }; } diff --git a/flake.lock b/flake.lock index 08e03d4..70d8e61 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1730190761, - "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=", + "lastModified": 1731274291, + "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=", "owner": "nix-community", "repo": "disko", - "rev": "3979285062d6781525cded0f6c4ff92e71376b55", + "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc", "type": "github" }, "original": { @@ -20,16 +20,15 @@ }, "emacs": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1730513067, - "narHash": "sha256-0MHc5yR4qmQK4O8MzraisT3gnv907fn813Qb2J134CU=", + "lastModified": 1731290007, + "narHash": "sha256-E8Caw6l/73iVFEYGch8Yc31fXCtSY30xxb+CsTN1gG0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6afb2183cef03dcfce47c3bf22b2d44ded54ace0", + "rev": "e94b9aef9633ffb9ea2bebe8c9b999618ec15109", "type": "github" }, "original": { @@ -40,7 +39,7 @@ }, "emacs_2": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "pankomacs", "nixpkgs" @@ -121,24 +120,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1637014545, "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", @@ -153,9 +134,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -179,11 +160,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -215,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1730958623, + "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "85f7e662eda4fa3a995556527c87b2524b691933", "type": "github" }, "original": { @@ -237,11 +218,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1730515778, - "narHash": "sha256-hUFauDDcElIHo9l+jmSnnl+Zh6dNgAVPO06YFfnmm0M=", + "lastModified": 1731293493, + "narHash": "sha256-dxWngrt8JJJE9NW80Nt76TKL4X0mVcJ+n7YPcxjbRGE=", "owner": "moni-dz", "repo": "nixpkgs-f2k", - "rev": "43acb8a488a618f01f1dc46c984acbbad6989085", + "rev": "f3a41057c8364b4ced448057bf24fe39e262a947", "type": "github" }, "original": { @@ -253,7 +234,7 @@ "nixpkgs-fmt": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs-f2k", "nixpkgs" @@ -287,11 +268,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -303,11 +284,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1730963269, + "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc", "type": "github" }, "original": { @@ -335,11 +316,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1730768919, + "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", "type": "github" }, "original": { @@ -351,11 +332,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -367,11 +348,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -383,11 +364,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1730513553, - "narHash": "sha256-ZzI3i+mB2k4DWnEv8LXeQk70Bmbwmy0Mkpks8O8EhIE=", + "lastModified": 1731293007, + "narHash": "sha256-Bj1KS+MI2Ts3i1hqTznD7xtxuR0Tb8xXMzuVMG/U2vg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edd7f434421aa1d00795cd77cdb404aa8839f00d", + "rev": "f03a58a929b4fc126a61df34c5c1ccc93a1a4c97", "type": "github" }, "original": { @@ -564,25 +545,10 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "wallpkgs": { "inputs": { "nixpkgs": "nixpkgs_7", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1730262671, diff --git a/overlays/default.nix b/overlays/default.nix index 50764c2..d309805 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,5 @@ {inputs, ...}: { - flake.overlays.default = final: _prev: { + flake.overlays.default = final: prev: { fairfax = final.callPackage ./derivations/fairfax.nix {}; }; perSystem = { @@ -15,7 +15,7 @@ }; packages = { - inherit (pkgs) i-found-my-sddm-theme fairfax; + inherit (pkgs) fairfax; }; }; }