From 06efdfb847410a35935461002673040fda9bb2b9 Mon Sep 17 00:00:00 2001 From: Joshua Yuen Date: Mon, 19 Jan 2026 16:44:40 -0500 Subject: [PATCH] Update flake --- flake.lock | 129 +++++++++++------------------ modules/core/fonts.nix | 2 +- modules/core/stylix.nix | 2 +- modules/home/hyprland/binds.nix | 57 ++++++------- modules/home/hyprland/hyprland.nix | 2 - scripts/_template/flake.lock | 6 +- scripts/install-system/flake.lock | 6 +- 7 files changed, 86 insertions(+), 118 deletions(-) diff --git a/flake.lock b/flake.lock index dfb46fa..6a54316 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1746562888, - "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { @@ -21,27 +21,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1622559957, - "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -70,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1748383148, - "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -91,11 +92,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -104,24 +105,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -141,18 +124,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -162,11 +147,11 @@ ] }, "locked": { - "lastModified": 1755755322, - "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", + "lastModified": 1768836546, + "narHash": "sha256-nJZkTamcXXMW+SMYiGFB6lB8l0aJw0xjssfN8xYd/Fs=", "owner": "nix-community", "repo": "home-manager", - "rev": "282b4c98de97da6667cb03de4f427371734bc39c", + "rev": "b56c5ad14fcf8b5bc887463552483bf000ca562a", "type": "github" }, "original": { @@ -194,17 +179,16 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1756259830, - "narHash": "sha256-Xe9BcrvCc9uw7mcMQC8sFPPp5+eY521ovorHSbB/uzg=", + "lastModified": 1768789193, + "narHash": "sha256-EWIj+tZSvbi3e43tBwc6xvNwEWEVwPQkuGim2tvxP/E=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "77b0a9f94092ac2a262c750a56b32d6e296f4a1f", + "rev": "7e5664fa1e2051630b5e9e976cfd462f21a94abb", "type": "github" }, "original": { @@ -215,11 +199,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -241,11 +225,11 @@ ] }, "locked": { - "lastModified": 1751906969, - "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -276,7 +260,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_2", + "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -284,11 +268,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755708361, - "narHash": "sha256-RmqBx2EamhIk0WVhQSNb8iehaVhilO7D0YAnMoFPqJQ=", + "lastModified": 1768744881, + "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", "owner": "danth", "repo": "stylix", - "rev": "2355da455d7188228aaf20ac16ea9386e5aa6f0c", + "rev": "06684f00cfbee14da96fd4307b966884de272d3a", "type": "github" }, "original": { @@ -313,21 +297,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -364,11 +333,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1750770351, - "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -380,11 +349,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1751159871, - "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -396,11 +365,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1751158968, - "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix index 1bd374e..66f6ffe 100644 --- a/modules/core/fonts.nix +++ b/modules/core/fonts.nix @@ -12,7 +12,7 @@ font-awesome montserrat nerd-fonts.jetbrains-mono - noto-fonts-emoji + noto-fonts-color-emoji ] ++ (if config.modules.zsh.enable then [ nerd-fonts.meslo-lg ] else [ ]); }; diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix index ee622af..9386220 100644 --- a/modules/core/stylix.nix +++ b/modules/core/stylix.nix @@ -11,7 +11,7 @@ fonts = { emoji = { - package = pkgs.noto-fonts-emoji; + package = pkgs.noto-fonts-color-emoji; name = "Noto Color Emoji"; }; monospace = { diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index e4a76b0..5627f43 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -7,51 +7,52 @@ let in { wayland.windowManager.hyprland.settings = { + "$mod" = "SUPER"; bind = [ # Misc - "$modifier,Return,exec,${cfg.terminal}" + "$mod,Return,exec,${cfg.terminal}" # Window management - "$modifier,C,killactive" - "$modifier,F,fullscreen, 1" - "$modifier,Space,togglefloating" + "$mod,C,killactive" + "$mod,F,fullscreen, 1" + "$mod,Space,togglefloating" # Focus - "$modifier,H,movefocus,l" - "$modifier,L,movefocus,r" - "$modifier,K,movefocus,u" - "$modifier,J,movefocus,d" + "$mod,H,movefocus,l" + "$mod,L,movefocus,r" + "$mod,K,movefocus,u" + "$mod,J,movefocus,d" # Move windows - "$modifier SHIFT,H,movewindow,l" - "$modifier SHIFT,L,movewindow,r" - "$modifier SHIFT,K,movewindow,u" - "$modifier SHIFT,J,movewindow,d" + "$mod SHIFT,H,movewindow,l" + "$mod SHIFT,L,movewindow,r" + "$mod SHIFT,K,movewindow,u" + "$mod SHIFT,J,movewindow,d" # Resize windows - "$modifier CTRL,H,resizeactive,-20 0" - "$modifier CTRL,L,resizeactive,20 0" - "$modifier CTRL,K,resizeactive,0 -20" - "$modifier CTRL,J,resizeactive,0 20" + "$mod CTRL,H,resizeactive,-20 0" + "$mod CTRL,L,resizeactive,20 0" + "$mod CTRL,K,resizeactive,0 -20" + "$mod CTRL,J,resizeactive,0 20" # Workspaces - "$modifier,1,workspace,1" - "$modifier,2,workspace,2" - "$modifier,3,workspace,3" - "$modifier,4,workspace,4" - "$modifier,5,workspace,5" + "$mod,1,workspace,1" + "$mod,2,workspace,2" + "$mod,3,workspace,3" + "$mod,4,workspace,4" + "$mod,5,workspace,5" # Move to workspace - "$modifier SHIFT,1,movetoworkspace,1" - "$modifier SHIFT,2,movetoworkspace,2" - "$modifier SHIFT,3,movetoworkspace,3" - "$modifier SHIFT,4,movetoworkspace,4" - "$modifier SHIFT,5,movetoworkspace,5" + "$mod SHIFT,1,movetoworkspace,1" + "$mod SHIFT,2,movetoworkspace,2" + "$mod SHIFT,3,movetoworkspace,3" + "$mod SHIFT,4,movetoworkspace,4" + "$mod SHIFT,5,movetoworkspace,5" ]; bindm = [ - "$modifier,mouse:272,movewindow" - "$modifier,mouse:273,resizewindow" + "$mod,mouse:272,movewindow" + "$mod,mouse:273,resizewindow" ]; }; } diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 3a86e1c..e4b3f5a 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -18,8 +18,6 @@ in monitor = cfg.monitor; general = { - "$modifier" = "SUPER"; - gaps_in = 5; gaps_out = 20; border_size = 2; diff --git a/scripts/_template/flake.lock b/scripts/_template/flake.lock index 1615c89..ab429ce 100644 --- a/scripts/_template/flake.lock +++ b/scripts/_template/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { diff --git a/scripts/install-system/flake.lock b/scripts/install-system/flake.lock index 1615c89..ab429ce 100644 --- a/scripts/install-system/flake.lock +++ b/scripts/install-system/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": {