diff --git a/flake.lock b/flake.lock index 7732a32a..2091aa16 100644 --- a/flake.lock +++ b/flake.lock @@ -70,11 +70,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1748393754, - "narHash": "sha256-KS+bKVQk0S7pCiz1ftHPr/bTgCU+4Lv9YvUVLXAbuJU=", + "lastModified": 1749290797, + "narHash": "sha256-+evSN4xiZQkuUaXkdt3Kggc3PAjL2b4lC0mw5mjqcow=", "owner": "StevenBlack", "repo": "hosts", - "rev": "4f663aa0f0b247f3a455577b096e121e2976215d", + "rev": "b5c9188aeeb38a4746600be0507fb7478e3533f7", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748632668, - "narHash": "sha256-wcYVyHdwpWvYMsOWeTi++WjSbhHaUij8murCDUlRWoc=", + "lastModified": 1749319758, + "narHash": "sha256-vjB3/Sk1+gH7E4fjmYLo5+KZFvFeR2X/13mZwvwp2ds=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9bd47ad150a1730824e295a016ea221428e6d22b", + "rev": "11addac79e748c4517b6508c09038d82e2df04a5", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748683021, - "narHash": "sha256-UH5ryKT2spnt86NPwasOlHVS9IVMrj6UESwCpEISzd4=", + "lastModified": 1749318443, + "narHash": "sha256-SMTpYzZbb3QMSepq+5f+2zkFpi8Y6q/c/VrF4rtl/rU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0abe78b79df5a7d4d1f952b0d9eca17ba2399dd8", + "rev": "b313b010b457ab15ac323975b10bf418a9de074c", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1748500877, - "narHash": "sha256-j4gxE8pBB5OzwuQYpX0+uhoT3KPYDTf1lEnxH/5UOhw=", + "lastModified": 1749278330, + "narHash": "sha256-8NKf1rHaKg+7MRoj7hhPlS048upmpwSXsUx2+6phePI=", "owner": "nix-community", "repo": "fenix", - "rev": "8c0499eb59f1c2c07b3734c210480623e1fe90a1", + "rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -292,11 +292,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1748489961, - "narHash": "sha256-uGnudxMoQi2c8rpPoHXuQSm80NBqlOiNF4xdT3hhzLM=", + "lastModified": 1749243446, + "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "95c988cf08e9a5a8fe7cc275d5e3f24e9e87bd51", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1748668774, - "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", + "lastModified": 1749243446, + "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -503,11 +503,11 @@ ] }, "locked": { - "lastModified": 1743953322, - "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", + "lastModified": 1749145600, + "narHash": "sha256-v2kY5RDk9oyo1x9m8u83GdklC96xlJ7ka1rrvZoYL78=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", + "rev": "80b754e38e836777ad3a9d5d1ffc3491b0332471", "type": "github" }, "original": { @@ -686,11 +686,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1749145882, + "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1747635830, - "narHash": "sha256-IypoV7crmhQ4llD0n4qqO4XTRNAAbHfA+2oiTiq2qpk=", + "lastModified": 1749162391, + "narHash": "sha256-aCiNnE26qIAxEBP6SRXjLBlIGOB18TViDreoPe96p6Q=", "ref": "refs/heads/main", - "rev": "da1d076d849fc0f298c1d287bddd04802bf7d0f9", - "revCount": 368, + "rev": "f9d8dfab7ae0aec625e7814e16f626fabec3641b", + "revCount": 371, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprlock.git" }, @@ -761,11 +761,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1749135356, + "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", "type": "github" }, "original": { @@ -811,11 +811,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1749145760, + "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", "type": "github" }, "original": { @@ -833,11 +833,11 @@ ] }, "locked": { - "lastModified": 1748411314, - "narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=", + "lastModified": 1749312278, + "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9d69aed9023082af370b71bffdfcd414b6b61593", + "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "type": "github" }, "original": { @@ -871,11 +871,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -887,11 +887,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1748995628, + "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", "type": "github" }, "original": { @@ -903,11 +903,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1748421225, - "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", + "lastModified": 1748995628, + "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", + "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b", "type": "github" }, "original": { @@ -918,11 +918,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -949,11 +949,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -976,11 +976,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1748424207, - "narHash": "sha256-Ji0QYOigZOi/w2f3BigbGQIAkaELsvCQbgPGi8pkVFE=", + "lastModified": 1749194353, + "narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ed608f592e0a038db4d03ed4af58fd171bd3b3c0", + "rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598", "type": "github" }, "original": { @@ -1073,11 +1073,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1748658947, - "narHash": "sha256-F+nGITu6D7RswJlm8qCuU1PCuOSgDeAqaDKWW1n1jmQ=", + "lastModified": 1749263796, + "narHash": "sha256-m52UsUrcNjAzgc0cwcg94INkiFyVPTn6KbFGr4x4cu8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fc82ce758cc5df6a6d5d24e75710321cdbdc787a", + "rev": "6e1d910306edfe6e4b718878f222c5672500d6b2", "type": "github" }, "original": { @@ -1128,11 +1128,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748699906, - "narHash": "sha256-pu2UKagKKysJ7EYeOcm8vWoZq1lcxfwfu3/C1Y3OFz8=", + "lastModified": 1749236315, + "narHash": "sha256-Ndtdvwz8D4WOYHl5mj9d5F5iC8WPH6uPNF7RcU3QzmE=", "owner": "danth", "repo": "stylix", - "rev": "8762da957b8b04b8b73248144f1c0ff7a88924b5", + "rev": "29d006198ee05143cca8b4b89f37025823da1bcc", "type": "github" }, "original": { @@ -1222,11 +1222,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -1238,11 +1238,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { diff --git a/hosts/snowfire/configuration.nix b/hosts/snowfire/configuration.nix index fdc87c71..dd55faa6 100644 --- a/hosts/snowfire/configuration.nix +++ b/hosts/snowfire/configuration.nix @@ -54,7 +54,6 @@ supergfxctl ]; - users.users.emmet.description = "Emmet"; home-manager.users.emmet.userSettings = { name = "Emmet"; diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index e1c70983..77b3fe1b 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -52,6 +52,7 @@ in settings = { env = [ "AQ_DRM_DEVICES,${config.home.sessionVariables.AQ_DRM_DEVICES}" + "AW_NO_MODIFIERS,1" ]; exec-once = [ "hyprctl setcursor ${config.gtk.cursorTheme.name} ${builtins.toString config.gtk.cursorTheme.size}" @@ -68,7 +69,7 @@ in "alacritty --class scratch_term" "kitty --class scratch_yazi -e yazi" "alacritty --class scratch_numbat -e numbat" - "kitty --class scratch_music -e ncmpcpp" + "kitty --class scratch_music -e kew" "alacritty --class scratch_btm -e btm" "element-desktop" ]; @@ -245,7 +246,7 @@ in "SUPER,F,togglespecialworkspace,scratch_yazi" ''SUPER,N,exec,if hyprctl clients | grep scratch_numbat; then echo "scratch_numbat respawn not needed"; else alacritty --class scratch_numbat -e numbat; fi'' "SUPER,N,togglespecialworkspace,scratch_numbat" - ''SUPER,M,exec,if hyprctl clients | grep scratch_music; then echo "scratch_music respawn not needed"; else kitty --class scratch_music -e ncmpcpp; fi'' + ''SUPER,M,exec,if hyprctl clients | grep scratch_music; then echo "scratch_music respawn not needed"; else kitty --class scratch_music -e kew; fi'' "SUPER,M,togglespecialworkspace,scratch_music" ''SUPER,B,exec,if hyprctl clients | grep scratch_btm; then echo "scratch_yazi respawn not needed"; else alacritty --class scratch_btm -e btm; fi'' "SUPER,B,togglespecialworkspace,scratch_btm" @@ -384,6 +385,7 @@ in home.packages = (with pkgs; [ hyprland-monitor-attached + kew alacritty kitty killall diff --git a/modules/user/stylix/default.nix b/modules/user/stylix/default.nix index a00053e2..22ab5e32 100644 --- a/modules/user/stylix/default.nix +++ b/modules/user/stylix/default.nix @@ -33,16 +33,16 @@ in stylix.fonts = { # TODO abstract fonts into an option monospace = { - name = "Source Code Pro"; - package = pkgs.source-code-pro; + name = "Fira Code Nerd Font"; + package = pkgs.fira-code-nerdfont; }; serif = { - name = "Source Serif Pro"; - package = pkgs.source-serif-pro; + name = "Fira"; + package = pkgs.fira; }; sansSerif = { - name = "Source Sans Pro"; - package = pkgs.source-sans-pro; + name = "Fira Sans"; + package = pkgs.fira-sans; }; emoji = { name = "Twitter Color Emoji"; @@ -57,36 +57,36 @@ in }; # move into alacritty config - stylix.targets.alacritty.enable = false; - programs.alacritty.settings = { - colors = { - # TODO revisit these color mappings - # these are just the default provided from stylix - # but declared directly due to alacritty v3.0 breakage - primary.background = "#"+config.lib.stylix.colors.base00; - primary.foreground = "#"+config.lib.stylix.colors.base07; - cursor.text = "#"+config.lib.stylix.colors.base00; - cursor.cursor = "#"+config.lib.stylix.colors.base07; - normal.black = "#"+config.lib.stylix.colors.base00; - normal.red = "#"+config.lib.stylix.colors.base08; - normal.green = "#"+config.lib.stylix.colors.base0B; - normal.yellow = "#"+config.lib.stylix.colors.base0A; - normal.blue = "#"+config.lib.stylix.colors.base0D; - normal.magenta = "#"+config.lib.stylix.colors.base0E; - normal.cyan = "#"+config.lib.stylix.colors.base0B; - normal.white = "#"+config.lib.stylix.colors.base05; - bright.black = "#"+config.lib.stylix.colors.base03; - bright.red = "#"+config.lib.stylix.colors.base09; - bright.green = "#"+config.lib.stylix.colors.base01; - bright.yellow = "#"+config.lib.stylix.colors.base02; - bright.blue = "#"+config.lib.stylix.colors.base04; - bright.magenta = "#"+config.lib.stylix.colors.base06; - bright.cyan = "#"+config.lib.stylix.colors.base0F; - bright.white = "#"+config.lib.stylix.colors.base07; - }; - font.size = config.stylix.fonts.sizes.terminal; - font.normal.family = config.stylix.fonts.monospace.name; - }; + stylix.targets.alacritty.enable = true; + #programs.alacritty.settings = { + # colors = { + # # TODO revisit these color mappings + # # these are just the default provided from stylix + # # but declared directly due to alacritty v3.0 breakage + # primary.background = "#"+config.lib.stylix.colors.base00; + # primary.foreground = "#"+config.lib.stylix.colors.base07; + # cursor.text = "#"+config.lib.stylix.colors.base00; + # cursor.cursor = "#"+config.lib.stylix.colors.base07; + # normal.black = "#"+config.lib.stylix.colors.base00; + # normal.red = "#"+config.lib.stylix.colors.base08; + # normal.green = "#"+config.lib.stylix.colors.base0B; + # normal.yellow = "#"+config.lib.stylix.colors.base0A; + # normal.blue = "#"+config.lib.stylix.colors.base0D; + # normal.magenta = "#"+config.lib.stylix.colors.base0E; + # normal.cyan = "#"+config.lib.stylix.colors.base0B; + # normal.white = "#"+config.lib.stylix.colors.base05; + # bright.black = "#"+config.lib.stylix.colors.base03; + # bright.red = "#"+config.lib.stylix.colors.base09; + # bright.green = "#"+config.lib.stylix.colors.base01; + # bright.yellow = "#"+config.lib.stylix.colors.base02; + # bright.blue = "#"+config.lib.stylix.colors.base04; + # bright.magenta = "#"+config.lib.stylix.colors.base06; + # bright.cyan = "#"+config.lib.stylix.colors.base0F; + # bright.white = "#"+config.lib.stylix.colors.base07; + # }; + # font.size = config.stylix.fonts.sizes.terminal; + # font.normal.family = config.stylix.fonts.monospace.name; + #}; # move into kitty config stylix.targets.kitty.enable = true; diff --git a/modules/user/terminal/default.nix b/modules/user/terminal/default.nix index 426beac7..93cd6c5e 100644 --- a/modules/user/terminal/default.nix +++ b/modules/user/terminal/default.nix @@ -10,7 +10,7 @@ }; config = { - userSettings.alacritty.enable = lib.mkDefault (config.userSettings.browser == "brave"); - userSettings.kitty.enable = lib.mkDefault (config.userSettings.browser == "librewolf"); + userSettings.alacritty.enable = lib.mkDefault (config.userSettings.terminal == "alacritty"); + userSettings.kitty.enable = lib.mkDefault (config.userSettings.terminal == "kitty"); }; }