From f12f8d30b459d898fb6d40a93fdb372c1924569d Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 4 Oct 2024 13:21:28 -0500 Subject: [PATCH] update mac, fix dconf --- flake.lock | 84 ++++++++++++++++++++-------------------- hosts/mac-nixos/home.nix | 9 ++--- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 25c96e6..2c909f1 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727734424, - "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "lastModified": 1728001451, + "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", + "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727832939, - "narHash": "sha256-D6GX9ryYbP3Ocdo+6XMl5d81q1rLq1PGZ4ko4/l9ieQ=", + "lastModified": 1728055563, + "narHash": "sha256-Z4TdoiJYxRoVsGp0FFUxAE8VMAulu8Q7uffaAxGWxv8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "aa19665f9be0a5c30b97646b15c42366f8fa7cc1", + "rev": "a40f901f40a69e9d13903cf86cf562b6cdb1b126", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727591515, - "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "lastModified": 1727937235, + "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", "owner": "nix-community", "repo": "fenix", - "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", + "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -502,11 +502,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1727707210, - "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "lastModified": 1727999297, + "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -626,11 +626,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -674,11 +674,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1727836449, - "narHash": "sha256-+t0jCdN1AFWLpi+XwHK4r/Jp+pJfo9ePHIy+4/BUCI4=", + "lastModified": 1728011170, + "narHash": "sha256-L/U/OCeiQCFG2Gg8IQaj1KB4lwoNXkvyjPYLxy9swy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "35d02934a17a4fdc53a8857826ed35f3694e5f1c", + "rev": "7f8bae4f304f2b6e60466ce1d562f4af258a4c79", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -893,11 +893,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727465975, - "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "lastModified": 1727778987, + "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", + "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", "type": "github" }, "original": { @@ -915,11 +915,11 @@ ] }, "locked": { - "lastModified": 1727749966, - "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", + "lastModified": 1727922550, + "narHash": "sha256-pJoN5Qd83coaoEJmpkxw+cuh89IJORvLm8qyw3GMLIQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", + "rev": "5e3eee4bc42a2504653bedfe95bceda9a1e85ae7", "type": "github" }, "original": { diff --git a/hosts/mac-nixos/home.nix b/hosts/mac-nixos/home.nix index a5c1831..6b151f0 100644 --- a/hosts/mac-nixos/home.nix +++ b/hosts/mac-nixos/home.nix @@ -91,12 +91,12 @@ in settings = { "org/gnome/desktop/interface".clock-format = "12h"; "org/gnome/desktop/interface".color-scheme = "prefer-dark"; - "org/gnome/desktop/interface".cursor-theme = "macOS-Monterey"; + "org/gnome/desktop/interface".cursor-theme = "macOS"; "org/gnome/desktop/interface".enable-hot-corners = false; "org/gnome/desktop/interface".font-antialiasing = "grayscale"; "org/gnome/desktop/interface".font-hinting = "slight"; - "org/gnome/desktop/interface".icon-theme = iconTheme; - "org/gnome/desktop/interface".gtk-theme = gtkTheme; + "org/gnome/desktop/interface".icon-theme = "Colloid-Nord-Dark"; + "org/gnome/desktop/interface".gtk-theme = "Colloid-Dark"; "org/gnome/desktop/peripherals/mouse".accel-profile = "flat"; "org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true; "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; @@ -105,10 +105,9 @@ in "variable-refresh-rate" ]; "org/gnome/tweaks".show-extensions-notice = false; - "org/gnome/shell/extensions/user-theme".name = gtkTheme; + "org/gnome/shell/extensions/user-theme".name = "Colloid-Dark"; "org/gnome/shell".enabled-extensions = [ "appindicatorsupport@rgcjonas.gmail.com" - "arcmenu@arcmenu.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "dash-to-dock@micxgx.gmail.com" "tiling-assistant@leleat-on-github"