diff --git a/flake.lock b/flake.lock index 99616d0..11a55cc 100644 --- a/flake.lock +++ b/flake.lock @@ -76,16 +76,20 @@ "devenv" ], "git-hooks": [ - "devenv" + "devenv", + "git-hooks" ], - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "devenv", + "nixpkgs" + ] }, "locked": { - "lastModified": 1744206633, - "narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=", + "lastModified": 1748883665, + "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=", "owner": "cachix", "repo": "cachix", - "rev": "8a60090640b96f9df95d1ab99e5763a586be1404", + "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe", "type": "github" }, "original": { @@ -101,14 +105,14 @@ "flake-compat": "flake-compat", "git-hooks": "git-hooks", "nix": "nix", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1749934215, - "narHash": "sha256-Swrogzm+bzLVNG6tVyOGf1uuTGkatURhQXxly9FlyWY=", + "lastModified": 1750615580, + "narHash": "sha256-8ucRXBCG5vA1nHCH1agRDBZaiuPKuqb/RsPxQEsHeVk=", "owner": "cachix", "repo": "devenv", - "rev": "0ad2d684f722b41578b34670428161d996382e64", + "rev": "e5dfaa34eed24f1ec79e99624666b15f51c4be97", "type": "github" }, "original": { @@ -124,11 +128,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1750680230, + "narHash": "sha256-kD88T/NqmcgfOBFAwphN30ccaUdj6K6+LG0XdM2w2LA=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "8fd2d6c75009ac75f9a6fb18c33a239806778d01", "type": "github" }, "original": { @@ -156,11 +160,11 @@ "flake-compat": { "flake": false, "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": { @@ -209,11 +213,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -262,7 +266,8 @@ "git-hooks": { "inputs": { "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ @@ -271,11 +276,10 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1749636823, "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -320,7 +324,6 @@ }, "locked": { "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", @@ -394,11 +397,11 @@ }, "hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -414,11 +417,11 @@ ] }, "locked": { - "lastModified": 1750033262, - "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=", + "lastModified": 1750654717, + "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", "owner": "nix-community", "repo": "home-manager", - "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0", + "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", "type": "github" }, "original": { @@ -448,51 +451,36 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, "nix": { "inputs": { "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "flake-parts": "flake-parts", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_2", + "git-hooks-nix": [ + "devenv", + "git-hooks" + ], + "nixpkgs": "nixpkgs", "nixpkgs-23-11": [ "devenv" ], "nixpkgs-regression": [ "devenv" - ], - "pre-commit-hooks": [ - "devenv" ] }, "locked": { - "lastModified": 1745930071, - "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", - "owner": "domenkozar", + "lastModified": 1750117611, + "narHash": "sha256-LTwASICtyN3AjzlF9l2ZNAIVZqclio3yRcwwZy3QSJA=", + "owner": "cachix", "repo": "nix", - "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", + "rev": "9e4fc95c388e2223d47da865503dee20d179776a", "type": "github" }, "original": { - "owner": "domenkozar", - "ref": "devenv-2.24", + "owner": "cachix", + "ref": "devenv-2.30", "repo": "nix", "type": "github" } @@ -504,11 +492,11 @@ ] }, "locked": { - "lastModified": 1749873626, - "narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=", + "lastModified": 1750618568, + "narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "2f140d6ac8840c6089163fb43ba95220c230f22b", + "rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5", "type": "github" }, "original": { @@ -526,11 +514,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750035576, - "narHash": "sha256-XVufBYlBlrJI1+5uGKb0NOOl99AfUui/MI+T8eWpZeY=", + "lastModified": 1750640498, + "narHash": "sha256-cT1xmlmS4DkfZQQfZ+ZimWxG39epZVhf3+bztjVwKHI=", "owner": "nix-community", "repo": "nix4vscode", - "rev": "d6ed265d97a7cae0ece0c7648ae4ee57f1f0bdf2", + "rev": "9e04eb8290c75bdf3e74d1371269966a63398f89", "type": "github" }, "original": { @@ -541,11 +529,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -557,11 +545,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -573,11 +561,11 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1749969005, - "narHash": "sha256-/9nV8EHPPifDcF9sy4WXhQIk1g5CGdbykMgYyStABzY=", + "lastModified": 1750357784, + "narHash": "sha256-x0Jghc0S9UqdXP5424EIt8ap4vIeM6OnOOFYbuoU9wU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7373a508bb8648a57e8432251fb4f41d58dbae8", + "rev": "da4640c92b11c8aab1587588734fcd76037d71fe", "type": "github" }, "original": { @@ -589,11 +577,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749995256, - "narHash": "sha256-LEGfcombb0otUf23oAmYCXR4+lMQKa49XmU0G5HItGI=", + "lastModified": 1750330365, + "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "daa45f10955cc2207ac9c5f0206774d2f757c162", + "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "type": "github" }, "original": { @@ -605,11 +593,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -620,22 +608,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1717432640, - "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1746807397, "narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=", @@ -651,7 +623,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1736320768, "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=", @@ -667,13 +639,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -740,7 +712,7 @@ "nix-darwin": "nix-darwin", "nix4vscode": "nix4vscode", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", @@ -751,7 +723,7 @@ }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1742178793, @@ -791,11 +763,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750023464, - "narHash": "sha256-gBsstni5rgh1vt2SNThh51GNvxMDCjEBfpPksS0ig/c=", + "lastModified": 1750562714, + "narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", "owner": "danth", "repo": "stylix", - "rev": "a14e525723c1c837b2ceacd8a37cba1f0b5e76c2", + "rev": "100b968012804d6526c5f48a32c30680916bc474", "type": "github" }, "original": { @@ -948,11 +920,11 @@ ] }, "locked": { - "lastModified": 1750069366, - "narHash": "sha256-5ZKc3cZfaY4/IOf1nnoLjaHofh0dFsXlWoG9K0/rvC4=", + "lastModified": 1750649182, + "narHash": "sha256-beNAQ63SY8HxBsFdMGv/fdLzjQMYgifMh1DcmaIzMjo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f3c46305c056af518615cdf97c720a9bcf22fa04", + "rev": "c0785a69fe3988b4ef44c74575f4a2f698f91f32", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e9d272a..26c2461 100644 --- a/flake.nix +++ b/flake.nix @@ -186,4 +186,13 @@ }; */ }; + + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + ]; + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; + }; } diff --git a/home/panotaka/common/optional/coding/vscode/default.nix b/home/panotaka/common/optional/coding/vscode/default.nix index c4bab96..8b3a0cd 100644 --- a/home/panotaka/common/optional/coding/vscode/default.nix +++ b/home/panotaka/common/optional/coding/vscode/default.nix @@ -55,6 +55,9 @@ ## SVG "jock.svg" + + ## YAML + "redhat.vscode-yaml" ]; # Settings userSettings = { @@ -63,6 +66,11 @@ "continue.enableTabAutocomplete" = true; "window.menuBarVisibility" = "toggle"; + "window.commandCenter" = false; + "window.titleBarStyle" = "native"; + "workbench.navigationControl.enabled" = false; + "workbench.layoutControl.enabled" = false; + #"github.copilot.editor.enableAutoCompletions" = true; "redhat.telemetry.enabled" = false; }; diff --git a/home/ta/common/optional/desktops/fonts.nix b/home/ta/common/optional/desktops/fonts.nix deleted file mode 100644 index cf5b09a..0000000 --- a/home/ta/common/optional/desktops/fonts.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - - # TODO add ttf-font-awesome or font-awesome for waybar - fontProfiles = { - enable = true; - monospace = { - family = "FiraCode Nerd Font"; - package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; }; - }; - regular = { - family = "Fira Sans"; - package = pkgs.fira; - }; - }; -} diff --git a/hosts/common/optional/kde.nix b/hosts/common/optional/kde.nix index d99a5c1..04be650 100644 --- a/hosts/common/optional/kde.nix +++ b/hosts/common/optional/kde.nix @@ -1,5 +1,5 @@ -# NOTE(starter): This is just a basic enabling of the XFCE windows manager for simplicity { services.desktopManager.plasma6.enable = true; - environment.variables.GTK_USE_PORTAL = 1; + environment.sessionVariables.GTK_USE_PORTAL = "1"; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; } diff --git a/hosts/common/optional/theming/themes/tokyonight/default.nix b/hosts/common/optional/theming/themes/tokyonight/default.nix index 679cf53..d219dfa 100644 --- a/hosts/common/optional/theming/themes/tokyonight/default.nix +++ b/hosts/common/optional/theming/themes/tokyonight/default.nix @@ -2,18 +2,41 @@ pkgs, system, inputs, + config, ... -}: { +}: let + inherit (config.stylix.inputs) tinted-schemes; +in { stylix.enable = true; stylix.image = ./wallpaper.jpg; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-dark.yaml"; + stylix.base16Scheme = "${tinted-schemes}/base16/tokyo-city-dark.yaml"; stylix.fonts = { + serif = { + package = pkgs.noto-fonts; + name = "Noto Serif"; + }; + + sansSerif = { + package = pkgs.noto-fonts; + name = "Noto Sans"; + }; monospace = { - package = pkgs.fira-code-nerdfont; + package = pkgs.nerd-fonts.fira-code; name = "Fira Code Nerd Font"; }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + + sizes = { + applications = 10; + desktop = 10; + popups = 10; + terminal = 10; + }; }; }