emmet/nixos-config
0
1
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Updated system

Browse Source
This commit is contained in:
Emmet
2025-06-07 17:26:14 -05:00
parent 95fa63e7f2
commit 46e06d4d55
5 changed files with 130 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
flake.lock generated
View File

@ -70,11 +70,11 @@
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736852337, "lastModified": 1748408240,
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,11 +103,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748393754, "lastModified": 1749290797,
"narHash": "sha256-KS+bKVQk0S7pCiz1ftHPr/bTgCU+4Lv9YvUVLXAbuJU=", "narHash": "sha256-+evSN4xiZQkuUaXkdt3Kggc3PAjL2b4lC0mw5mjqcow=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "4f663aa0f0b247f3a455577b096e121e2976215d", "rev": "b5c9188aeeb38a4746600be0507fb7478e3533f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +125,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1748632668, "lastModified": 1749319758,
"narHash": "sha256-wcYVyHdwpWvYMsOWeTi++WjSbhHaUij8murCDUlRWoc=", "narHash": "sha256-vjB3/Sk1+gH7E4fjmYLo5+KZFvFeR2X/13mZwvwp2ds=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "9bd47ad150a1730824e295a016ea221428e6d22b", "rev": "11addac79e748c4517b6508c09038d82e2df04a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +146,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1748683021, "lastModified": 1749318443,
"narHash": "sha256-UH5ryKT2spnt86NPwasOlHVS9IVMrj6UESwCpEISzd4=", "narHash": "sha256-SMTpYzZbb3QMSepq+5f+2zkFpi8Y6q/c/VrF4rtl/rU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "0abe78b79df5a7d4d1f952b0d9eca17ba2399dd8", "rev": "b313b010b457ab15ac323975b10bf418a9de074c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -168,11 +168,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1748500877, "lastModified": 1749278330,
"narHash": "sha256-j4gxE8pBB5OzwuQYpX0+uhoT3KPYDTf1lEnxH/5UOhw=", "narHash": "sha256-8NKf1rHaKg+7MRoj7hhPlS048upmpwSXsUx2+6phePI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "8c0499eb59f1c2c07b3734c210480623e1fe90a1", "rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744642301, "lastModified": 1748383148,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
}, },
"flake-compat_2": { "flake-compat_2": {
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1747046372,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +236,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1743550720,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +292,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742649964, "lastModified": 1747372754,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -374,11 +374,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748489961, "lastModified": 1749243446,
"narHash": "sha256-uGnudxMoQi2c8rpPoHXuQSm80NBqlOiNF4xdT3hhzLM=", "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "95c988cf08e9a5a8fe7cc275d5e3f24e9e87bd51", "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748668774, "lastModified": 1749243446,
"narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -416,11 +416,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747763032, "lastModified": 1748737919,
"narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +503,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743953322, "lastModified": 1749145600,
"narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", "narHash": "sha256-v2kY5RDk9oyo1x9m8u83GdklC96xlJ7ka1rrvZoYL78=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", "rev": "80b754e38e836777ad3a9d5d1ffc3491b0332471",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -686,11 +686,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744468525, "lastModified": 1749145882,
"narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -711,11 +711,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1747635830, "lastModified": 1749162391,
"narHash": "sha256-IypoV7crmhQ4llD0n4qqO4XTRNAAbHfA+2oiTiq2qpk=", "narHash": "sha256-aCiNnE26qIAxEBP6SRXjLBlIGOB18TViDreoPe96p6Q=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "da1d076d849fc0f298c1d287bddd04802bf7d0f9", "rev": "f9d8dfab7ae0aec625e7814e16f626fabec3641b",
"revCount": 368, "revCount": 371,
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprlock.git" "url": "https://code.hyprland.org/hyprwm/hyprlock.git"
}, },
@ -761,11 +761,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743950287, "lastModified": 1749135356,
"narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -811,11 +811,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739870480, "lastModified": 1749145760,
"narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,11 +833,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748411314, "lastModified": 1749312278,
"narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=", "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "9d69aed9023082af370b71bffdfcd414b6b61593", "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,11 +871,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748460289, "lastModified": 1749143949,
"narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -887,11 +887,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1748421225, "lastModified": 1748995628,
"narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -903,11 +903,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1748421225, "lastModified": 1748995628,
"narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -918,11 +918,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1748460289, "lastModified": 1749143949,
"narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -949,11 +949,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1747542820, "lastModified": 1748460289,
"narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -976,11 +976,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746056780, "lastModified": 1748730660,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167", "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1054,11 +1054,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748424207, "lastModified": 1749194353,
"narHash": "sha256-Ji0QYOigZOi/w2f3BigbGQIAkaELsvCQbgPGi8pkVFE=", "narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "ed608f592e0a038db4d03ed4af58fd171bd3b3c0", "rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1073,11 +1073,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1748658947, "lastModified": 1749263796,
"narHash": "sha256-F+nGITu6D7RswJlm8qCuU1PCuOSgDeAqaDKWW1n1jmQ=", "narHash": "sha256-m52UsUrcNjAzgc0cwcg94INkiFyVPTn6KbFGr4x4cu8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "fc82ce758cc5df6a6d5d24e75710321cdbdc787a", "rev": "6e1d910306edfe6e4b718878f222c5672500d6b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1128,11 +1128,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1748699906, "lastModified": 1749236315,
"narHash": "sha256-pu2UKagKKysJ7EYeOcm8vWoZq1lcxfwfu3/C1Y3OFz8=", "narHash": "sha256-Ndtdvwz8D4WOYHl5mj9d5F5iC8WPH6uPNF7RcU3QzmE=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "8762da957b8b04b8b73248144f1c0ff7a88924b5", "rev": "29d006198ee05143cca8b4b89f37025823da1bcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1222,11 +1222,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744974599, "lastModified": 1748180480,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1238,11 +1238,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745111349, "lastModified": 1748740859,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
hosts/snowfire/configuration.nix
View File

@ -54,7 +54,6 @@
supergfxctl supergfxctl
]; ];
users.users.emmet.description = "Emmet"; users.users.emmet.description = "Emmet";
home-manager.users.emmet.userSettings = { home-manager.users.emmet.userSettings = {
name = "Emmet"; name = "Emmet";

6
modules/user/hyprland/default.nix
View File

@ -52,6 +52,7 @@ in
settings = { settings = {
env = [ env = [
"AQ_DRM_DEVICES,${config.home.sessionVariables.AQ_DRM_DEVICES}" "AQ_DRM_DEVICES,${config.home.sessionVariables.AQ_DRM_DEVICES}"
"AW_NO_MODIFIERS,1"
]; ];
exec-once = [ exec-once = [
"hyprctl setcursor ${config.gtk.cursorTheme.name} ${builtins.toString config.gtk.cursorTheme.size}" "hyprctl setcursor ${config.gtk.cursorTheme.name} ${builtins.toString config.gtk.cursorTheme.size}"
@ -68,7 +69,7 @@ in
"alacritty --class scratch_term" "alacritty --class scratch_term"
"kitty --class scratch_yazi -e yazi" "kitty --class scratch_yazi -e yazi"
"alacritty --class scratch_numbat -e numbat" "alacritty --class scratch_numbat -e numbat"
"kitty --class scratch_music -e ncmpcpp" "kitty --class scratch_music -e kew"
"alacritty --class scratch_btm -e btm" "alacritty --class scratch_btm -e btm"
"element-desktop" "element-desktop"
]; ];
@ -245,7 +246,7 @@ in
"SUPER,F,togglespecialworkspace,scratch_yazi" "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,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,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,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,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" "SUPER,B,togglespecialworkspace,scratch_btm"
@ -384,6 +385,7 @@ in
home.packages = (with pkgs; [ home.packages = (with pkgs; [
hyprland-monitor-attached hyprland-monitor-attached
kew
alacritty alacritty
kitty kitty
killall killall

72
modules/user/stylix/default.nix
View File

@ -33,16 +33,16 @@ in
stylix.fonts = { stylix.fonts = {
# TODO abstract fonts into an option # TODO abstract fonts into an option
monospace = { monospace = {
name = "Source Code Pro"; name = "Fira Code Nerd Font";
package = pkgs.source-code-pro; package = pkgs.fira-code-nerdfont;
}; };
serif = { serif = {
name = "Source Serif Pro"; name = "Fira";
package = pkgs.source-serif-pro; package = pkgs.fira;
}; };
sansSerif = { sansSerif = {
name = "Source Sans Pro"; name = "Fira Sans";
package = pkgs.source-sans-pro; package = pkgs.fira-sans;
}; };
emoji = { emoji = {
name = "Twitter Color Emoji"; name = "Twitter Color Emoji";
@ -57,36 +57,36 @@ in
}; };
# move into alacritty config # move into alacritty config
stylix.targets.alacritty.enable = false; stylix.targets.alacritty.enable = true;
programs.alacritty.settings = { #programs.alacritty.settings = {
colors = { # colors = {
# TODO revisit these color mappings # # TODO revisit these color mappings
# these are just the default provided from stylix # # these are just the default provided from stylix
# but declared directly due to alacritty v3.0 breakage # # but declared directly due to alacritty v3.0 breakage
primary.background = "#"+config.lib.stylix.colors.base00; # primary.background = "#"+config.lib.stylix.colors.base00;
primary.foreground = "#"+config.lib.stylix.colors.base07; # primary.foreground = "#"+config.lib.stylix.colors.base07;
cursor.text = "#"+config.lib.stylix.colors.base00; # cursor.text = "#"+config.lib.stylix.colors.base00;
cursor.cursor = "#"+config.lib.stylix.colors.base07; # cursor.cursor = "#"+config.lib.stylix.colors.base07;
normal.black = "#"+config.lib.stylix.colors.base00; # normal.black = "#"+config.lib.stylix.colors.base00;
normal.red = "#"+config.lib.stylix.colors.base08; # normal.red = "#"+config.lib.stylix.colors.base08;
normal.green = "#"+config.lib.stylix.colors.base0B; # normal.green = "#"+config.lib.stylix.colors.base0B;
normal.yellow = "#"+config.lib.stylix.colors.base0A; # normal.yellow = "#"+config.lib.stylix.colors.base0A;
normal.blue = "#"+config.lib.stylix.colors.base0D; # normal.blue = "#"+config.lib.stylix.colors.base0D;
normal.magenta = "#"+config.lib.stylix.colors.base0E; # normal.magenta = "#"+config.lib.stylix.colors.base0E;
normal.cyan = "#"+config.lib.stylix.colors.base0B; # normal.cyan = "#"+config.lib.stylix.colors.base0B;
normal.white = "#"+config.lib.stylix.colors.base05; # normal.white = "#"+config.lib.stylix.colors.base05;
bright.black = "#"+config.lib.stylix.colors.base03; # bright.black = "#"+config.lib.stylix.colors.base03;
bright.red = "#"+config.lib.stylix.colors.base09; # bright.red = "#"+config.lib.stylix.colors.base09;
bright.green = "#"+config.lib.stylix.colors.base01; # bright.green = "#"+config.lib.stylix.colors.base01;
bright.yellow = "#"+config.lib.stylix.colors.base02; # bright.yellow = "#"+config.lib.stylix.colors.base02;
bright.blue = "#"+config.lib.stylix.colors.base04; # bright.blue = "#"+config.lib.stylix.colors.base04;
bright.magenta = "#"+config.lib.stylix.colors.base06; # bright.magenta = "#"+config.lib.stylix.colors.base06;
bright.cyan = "#"+config.lib.stylix.colors.base0F; # bright.cyan = "#"+config.lib.stylix.colors.base0F;
bright.white = "#"+config.lib.stylix.colors.base07; # bright.white = "#"+config.lib.stylix.colors.base07;
}; # };
font.size = config.stylix.fonts.sizes.terminal; # font.size = config.stylix.fonts.sizes.terminal;
font.normal.family = config.stylix.fonts.monospace.name; # font.normal.family = config.stylix.fonts.monospace.name;
}; #};
# move into kitty config # move into kitty config
stylix.targets.kitty.enable = true; stylix.targets.kitty.enable = true;

4
modules/user/terminal/default.nix
View File

@ -10,7 +10,7 @@
}; };
config = { config = {
userSettings.alacritty.enable = lib.mkDefault (config.userSettings.browser == "brave"); userSettings.alacritty.enable = lib.mkDefault (config.userSettings.terminal == "alacritty");
userSettings.kitty.enable = lib.mkDefault (config.userSettings.browser == "librewolf"); userSettings.kitty.enable = lib.mkDefault (config.userSettings.terminal == "kitty");
}; };
} }