diff --git a/devenv.lock b/devenv.lock index c82778e..f6ce5bb 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,10 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1734441494, + "lastModified": 1735557386, "owner": "cachix", "repo": "devenv", - "rev": "bdc1a2cefdda8f89e31b1a0f3771786ba9e5d052", + "rev": "1cd2afada1b407d1f7d2eca91984ed5c85ffb2f7", "type": "github" }, "original": { @@ -24,10 +24,10 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1734503722, + "lastModified": 1735626869, "owner": "nix-community", "repo": "fenix", - "rev": "07f1f47c8f634a5ec52a2ad1d14e7cc7521d9a4f", + "rev": "120e688c881f2233f053dca5a5ddb8945d8ca5d7", "type": "github" }, "original": { @@ -88,10 +88,10 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734202038, + "lastModified": 1735286948, "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d", + "rev": "31ac92f9628682b294026f0860e14587a09ffb4b", "type": "github" }, "original": { @@ -111,10 +111,10 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1734425854, + "lastModified": 1734797603, "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -134,10 +134,10 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1734386068, + "lastModified": 1735570005, "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "0a706f7d2ac093985eae317781200689cfd48b78", + "rev": "1c6b83852b0d3bc129a3558386663373f126337e", "type": "github" }, "original": { diff --git a/flake.lock b/flake.lock index 7bb0d09..ace5233 100644 --- a/flake.lock +++ b/flake.lock @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1734343412, - "narHash": "sha256-b7G8oFp0Nj01BYUJ6ENC9Qf/HsYAIZvN9k/p0Kg/PFU=", + "lastModified": 1735468753, + "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", "owner": "nix-community", "repo": "disko", - "rev": "a08bfe06b39e94eec98dd089a2c1b18af01fef19", + "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", "type": "github" }, "original": { @@ -218,15 +218,16 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -331,11 +332,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1734486856, - "narHash": "sha256-+DI4DiwcS3Zp1OUuEi38Tb5gpVt+c8eDpQHy6MAHPzo=", + "lastModified": 1735609563, + "narHash": "sha256-u/Z6gFnvDo+mRieCTQGWA/6vHc15/pMZGvgGUAD2Vb0=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "94a50a7dc9b4be928f36544d1538c6bae93f6f94", + "rev": "eb0c27c9d94c4bd66de874c4a72deb620a72d9d2", "type": "github" }, "original": { @@ -346,11 +347,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734352517, - "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -409,27 +410,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -457,11 +458,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -516,11 +517,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734526336, - "narHash": "sha256-qI+dxxvmYNLhus/4CCE6QjjjPOjTz2olmnc5nZv0SE8=", + "lastModified": 1735648437, + "narHash": "sha256-cVc5Bn/oznCvRFDpCZEpQVo3FmpgQKGZEZ5RW4xvRu8=", "owner": "nix-community", "repo": "NUR", - "rev": "409fe7866b2171633d7be0b7de262d861c61a726", + "rev": "1bb7310d7d1eeaa33d1d009ac493bc2b38acef40", "type": "github" }, "original": { @@ -575,11 +576,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110168, - "narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", + "lastModified": 1735524788, + "narHash": "sha256-R4i8VCdSGLWHt6cL5p2Cmlh9MRodZsYO8moUjvxYb54=", "owner": "danth", "repo": "stylix", - "rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", + "rev": "a4ed4168fb83289374f24cb8a039c6983637a076", "type": "github" }, "original": { @@ -694,11 +695,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1734230023, - "narHash": "sha256-T3TmoayT+3E4ihv6M/096L4EUitYi0c0DM6txVcId1Q=", + "lastModified": 1735154760, + "narHash": "sha256-mDkeJ+EJFq8R49fwQwldbKEQ6tHeplJN2LPjpZ3bA4E=", "owner": "omarcresp", "repo": "zen-browser-flake", - "rev": "64fddabc77b53cbe48217b3e62d890fb9444ec0c", + "rev": "1144e12d9ac3d469a8735970b4715992c538ebbf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2c91b69..1e7b25f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ nixConfig = {experimental-features = ["nix-command" "flakes"];}; inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; # Nix-on-droid nix-on-droid = { @@ -25,7 +25,7 @@ # Home Manager home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/applications/vscode/extensions.lock b/home/applications/vscode/extensions.lock index da6c01d..7d1a040 100644 --- a/home/applications/vscode/extensions.lock +++ b/home/applications/vscode/extensions.lock @@ -37,8 +37,8 @@ merge "mechatroner"."rainbow-csv" = vscode-utils.extensionFromVscodeMarketplace { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.13.0"; - sha256 = "1wa9q8fvy8kf98lahx7sklfq6q3j08pnkjar3xy0q3akdqqg1mf1"; + version = "3.12.0"; + sha256 = "1i453fdwjcbhn0zl8h8hmcbzf18m7r30v6qbnhlsxqfs6arxlwd6"; }; "mhutchie"."git-graph" = vscode-utils.extensionFromVscodeMarketplace { name = "git-graph"; @@ -61,8 +61,8 @@ merge "bradlc"."vscode-tailwindcss" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.13.62"; - sha256 = "146p3bms8cn1h0p0yqjfid7hgf6093mgfjalrw7c9948v68xxc8p"; + version = "0.13.64"; + sha256 = "14962pavlbdmqki6m7y7k9nvz1pcicrn3dw10lrcq8vxbj2bc416"; }; "zignd"."html-css-class-completion" = vscode-utils.extensionFromVscodeMarketplace { name = "html-css-class-completion"; @@ -85,14 +85,14 @@ merge "usernamehw"."errorlens" = vscode-utils.extensionFromVscodeMarketplace { name = "errorlens"; publisher = "usernamehw"; - version = "3.21.0"; - sha256 = "0687py53zrkh1vch1knif8949n6fpfcd85md6hdayfq0m9lm4jqk"; + version = "3.22.0"; + sha256 = "17bpn6f6clh9nm9jxfdyn50ib5q54wn3bgf2fjcj1iv0pqkb5vaj"; }; "james-yu"."latex-workshop" = vscode-utils.extensionFromVscodeMarketplace { name = "latex-workshop"; publisher = "james-yu"; - version = "10.7.0"; - sha256 = "0m4y6lfq26l8xfzdwdfx7i1803i6vxdifh2ly21z7d5q0w65wmqm"; + version = "10.7.1"; + sha256 = "0jidvsqx78haf8mfwdnhjzcbad0fsa54sfvggakfv9cvbynm0k88"; }; "mgmcdermott"."vscode-language-babel" = vscode-utils.extensionFromVscodeMarketplace { name = "vscode-language-babel"; @@ -109,8 +109,8 @@ merge "tamasfe"."even-better-toml" = vscode-utils.extensionFromVscodeMarketplace { name = "even-better-toml"; publisher = "tamasfe"; - version = "0.19.2"; - sha256 = "0q9z98i446cc8bw1h1mvrddn3dnpnm2gwmzwv2s3fxdni2ggma14"; + version = "0.21.2"; + sha256 = "0208cms054yj2l8pz9jrv3ydydmb47wr4i0sw8qywpi8yimddf11"; }; "svelte"."svelte-vscode" = vscode-utils.extensionFromVscodeMarketplace { name = "svelte-vscode"; @@ -193,8 +193,8 @@ merge "saoudrizwan"."claude-dev" = vscode-utils.extensionFromVscodeMarketplace { name = "claude-dev"; publisher = "saoudrizwan"; - version = "2.2.2"; - sha256 = "1168mlabaqx3bwiygf0ir1s9xxj27nhhcglvh9jiq5visvfqpmwg"; + version = "3.0.9"; + sha256 = "05v16yai6nr5w6h0b6bkv2vwxnd6hcf5qbqf0lg32wvrv78dfmvw"; }; "liamhammett"."inline-parameters" = vscode-utils.extensionFromVscodeMarketplace { name = "inline-parameters"; @@ -243,22 +243,22 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.23.2024121801"; - sha256 = "03fg1gm6whfzd8xkcavqz03ba543ca8593p65cmh93cs59f834xs"; + version = "2024.23.2024121901"; + sha256 = "01wfhbaq9v2wvnndh6dphq1f6c04dg0yx9p7637v9bl124zm0qw7"; arch = "linux-x64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.11.2024102401"; - sha256 = "1cq1xp70bgpl2gmz544y5vrpqg0wsy0ziyk4wg2pbs0g5vw38n7j"; + version = "2024.10.2024100401"; + sha256 = "14nivp7f3cb2ma8npm8c430i5qs6wjlbffmr6kycgwmrw7k7ihx1"; arch = "linux-x64"; }; "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2222"; - sha256 = "0w8izafvy3mx5y6w44z7vd2wsb7im6wyis5zx2zz4nkpfrxhvf2g"; + version = "0.4.2238"; + sha256 = "0ld6h7y9j80m03a4v8a9lmjn1lfj9pyi3mw8ws80rjynpcr4rls3"; arch = "linux-x64"; }; "astro-build"."astro-vscode" = vscode-utils.extensionFromVscodeMarketplace { @@ -271,8 +271,8 @@ merge "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { name = "continue"; publisher = "continue"; - version = "0.9.246"; - sha256 = "0gdpyx2vsw8n9p8m3ivpanvyphkhr6dbqm8hd9dn3nf41xrin1g0"; + version = "0.9.248"; + sha256 = "0sf3a4an1fb2mi5cab8rzpi79pwfx8h7w4vwnjij33l5qcrw9dmi"; arch = "linux-x64"; }; })) @@ -280,22 +280,22 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.23.2024121801"; - sha256 = "1w0cp8df8zgxrw0vs012agg3shhxzg5ws1bjnhgm7zgg8x0nv5bi"; + version = "2024.23.2024121901"; + sha256 = "1qs14aca323yqc93rrnwvp7v40k9z2500lj9pkh5sa2pfm9cl68x"; arch = "linux-arm64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.11.2024102401"; - sha256 = "1fd9xhssnqgglc9mim5lmdzkn0drvb43164myv76x0s67av8ca0v"; + version = "2024.10.2024100401"; + sha256 = "00dvzd0qfmisxnrhw18bscg42l2wdwsxnviv8kgcaj197yxq2ci7"; arch = "linux-arm64"; }; "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2222"; - sha256 = "0d7qad2ngqj3rzyk5vfj999xbbklmnl5l421g1xy4m0b3gfvb5yd"; + version = "0.4.2238"; + sha256 = "09gqqrckyy8jmryy0726lj1svgf9zc1b86fxg1ybdzc6apj1dsiz"; arch = "linux-arm64"; }; "astro-build"."astro-vscode" = vscode-utils.extensionFromVscodeMarketplace { @@ -308,8 +308,8 @@ merge "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { name = "continue"; publisher = "continue"; - version = "0.9.246"; - sha256 = "0s5bl36brdjxz90jaj1r1lsr3wqjhmqkwnirxvahn82dkxl792yb"; + version = "0.9.248"; + sha256 = "0snmz3jd6gfkfmr82qm886yyljgl375xksfkkzkm3i902x1k1l25"; arch = "linux-arm64"; }; })) @@ -317,22 +317,22 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.23.2024121801"; - sha256 = "0qrvxq1mib0jxn3m2ywlpxqrrgmk8is9g63j2hac69h14xln3dmm"; + version = "2024.23.2024121901"; + sha256 = "0jh7rkh5j2l8irb2d43hy9n5kw59czyijsiq5f9641rfl6yvakzh"; arch = "darwin-x64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.11.2024102401"; - sha256 = "1102mkq6920ywwpjafmzcyyznax53kb38dx8rgdkr2c0hg7hnvbn"; + version = "2024.10.2024100401"; + sha256 = "1mfj1wvcgzf5xy0m5y75qxp3p6wnhybals46scb1ivxzqv0smgd7"; arch = "darwin-x64"; }; "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2222"; - sha256 = "0nxs85ypm84dmyaxa0ia46yi4x6mfp04l1y3jz1a5mvxpyplscw5"; + version = "0.4.2238"; + sha256 = "1q9mv78i2yhimp37g7acz4bvksimhl1qncsrm93mq7wc8562j7zi"; arch = "darwin-x64"; }; "astro-build"."astro-vscode" = vscode-utils.extensionFromVscodeMarketplace { @@ -345,8 +345,8 @@ merge "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { name = "continue"; publisher = "continue"; - version = "0.9.246"; - sha256 = "04cgxrqp1a8p0pkcvm50q8a488nzbqfm3rfl54flzrrz47vfwkx5"; + version = "0.9.248"; + sha256 = "109icqcbfbmlbd60gbvhvjryb2g4im5bz7zlrjsw5jfibhy9z6jq"; arch = "darwin-x64"; }; })) @@ -354,22 +354,22 @@ merge "ms-python"."python" = vscode-utils.extensionFromVscodeMarketplace { name = "python"; publisher = "ms-python"; - version = "2024.23.2024121801"; - sha256 = "0k6ly2kdlrcfm7fsrxhnilasd60c4wwjg7g072y0568gq1ar29zl"; + version = "2024.23.2024121901"; + sha256 = "1d0w7ih58bg1smmjp3i798qbf08maqa3m263ygvllyawy3kl03qr"; arch = "darwin-arm64"; }; "ms-toolsai"."jupyter" = vscode-utils.extensionFromVscodeMarketplace { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.11.2024102401"; - sha256 = "0v69n4qzqg5dx783xhlzq6wci0gvmarip3v9696wm0gjdwsl2rv2"; + version = "2024.10.2024100401"; + sha256 = "0p122zxxaj55gnyb8zianpn6w1piashmxs05s72g3hdxmqcz35mk"; arch = "darwin-arm64"; }; "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2222"; - sha256 = "1djicp2lwbjhw44qrhrzwnvjr8zapsrnswz5pjkz79k7x72mqrk8"; + version = "0.4.2238"; + sha256 = "0229vmsn8apfdas2lvmdxsrv7n0rzlg6wbr5lrzxf4a1g88fsv7c"; arch = "darwin-arm64"; }; "astro-build"."astro-vscode" = vscode-utils.extensionFromVscodeMarketplace { @@ -382,8 +382,8 @@ merge "continue"."continue" = vscode-utils.extensionFromVscodeMarketplace { name = "continue"; publisher = "continue"; - version = "0.9.246"; - sha256 = "0xkh09l3ksnga20550m31is97dgl75kyi93zzkwmwkzrdwn2hjpa"; + version = "0.9.248"; + sha256 = "03y31qia8gmj2q4xg0l1z0jyi89vwblymvvxbz4jw0f7ar20zqpx"; arch = "darwin-arm64"; }; }) diff --git a/home/applications/vscode/extensions.toml b/home/applications/vscode/extensions.toml index b583215..9ad038d 100644 --- a/home/applications/vscode/extensions.toml +++ b/home/applications/vscode/extensions.toml @@ -1,4 +1,4 @@ -vscode_version = "1.95.3" +vscode_version = "1.94.2" [[extensions]] publisher_name = "ms-toolsai" diff --git a/home/desktops/gnome/default.nix b/home/desktops/gnome/default.nix index 05f2884..b469f42 100644 --- a/home/desktops/gnome/default.nix +++ b/home/desktops/gnome/default.nix @@ -5,8 +5,6 @@ home.packages = with pkgs; [ apostrophe - bottles - boxes collision contrast curtail @@ -14,7 +12,7 @@ eyedropper fragments gnome-decoder - gnome-extension-manager + #gnome-extension-manager gnome-graphs gnome-obfuscate identity @@ -25,7 +23,7 @@ paper-clip parabolic pika-backup - pitivi + #pitivi pods ptyxis tangram diff --git a/home/shell/starship/default.nix b/home/shell/starship/default.nix index 1faf82b..849e34b 100644 --- a/home/shell/starship/default.nix +++ b/home/shell/starship/default.nix @@ -1,6 +1,6 @@ {...}: { programs.starship = { - enable = true; + enable = false; settings = builtins.fromTOML (builtins.readFile ./theme.toml); }; } diff --git a/home/shell/starship/theme.toml b/home/shell/starship/theme.toml index a7ed292..803afc8 100644 --- a/home/shell/starship/theme.toml +++ b/home/shell/starship/theme.toml @@ -1,168 +1,315 @@ -"$schema" = 'https://starship.rs/config-schema.json' +# version: 1.0.0 -format = """ -[](color_orange)\ +add_newline = true +continuation_prompt = "[▸▹ ](dimmed white)" + +format = """($nix_shell$container$fill$git_metrics\n)$cmd_duration\ +$hostname\ +$localip\ +$shlvl\ +$shell\ +$env_var\ +$jobs\ +$sudo\ $username\ -[](bg:color_yellow fg:color_orange)\ +$character""" + +right_format = """ +$singularity\ +$kubernetes\ $directory\ -[](fg:color_yellow bg:color_aqua)\ +$vcsh\ +$fossil_branch\ $git_branch\ +$git_commit\ +$git_state\ $git_status\ -[](fg:color_aqua bg:color_blue)\ -$c\ -$rust\ -$golang\ -$nodejs\ -$php\ -$java\ -$kotlin\ -$haskell\ -$python\ -[](fg:color_blue bg:color_bg3)\ +$hg_branch\ +$pijul_channel\ $docker_context\ +$package\ +$c\ +$cmake\ +$cobol\ +$daml\ +$dart\ +$deno\ +$dotnet\ +$elixir\ +$elm\ +$erlang\ +$fennel\ +$golang\ +$guix_shell\ +$haskell\ +$haxe\ +$helm\ +$java\ +$julia\ +$kotlin\ +$gradle\ +$lua\ +$nim\ +$nodejs\ +$ocaml\ +$opa\ +$perl\ +$php\ +$pulumi\ +$purescript\ +$python\ +$raku\ +$rlang\ +$red\ +$ruby\ +$rust\ +$scala\ +$solidity\ +$swift\ +$terraform\ +$vlang\ +$vagrant\ +$zig\ +$buf\ $conda\ -[](fg:color_bg3 bg:color_bg1)\ -$time\ -[ ](fg:color_bg1)\ -$line_break$character""" +$meson\ +$spack\ +$memory_usage\ +$aws\ +$gcloud\ +$openstack\ +$azure\ +$crystal\ +$custom\ +$status\ +$os\ +$battery\ +$time""" -palette = 'gruvbox_dark' +[fill] +symbol = ' ' -[palettes.gruvbox_dark] -color_fg0 = '#fbf1c7' -color_bg1 = '#3c3836' -color_bg3 = '#665c54' -color_blue = '#458588' -color_aqua = '#689d6a' -color_green = '#98971a' -color_orange = '#d65d0e' -color_purple = '#b16286' -color_red = '#cc241d' -color_yellow = '#d79921' +[character] +format = "$symbol " +success_symbol = "[◎](bold italic bright-yellow)" +error_symbol = "[○](italic purple)" +vimcmd_symbol = "[■](italic dimmed green)" +# not supported in zsh +vimcmd_replace_one_symbol = "◌" +vimcmd_replace_symbol = "□" +vimcmd_visual_symbol = "▼" -[os] +[env_var.VIMSHELL] +format = "[$env_value]($style)" +style = 'green italic' + +[sudo] +format = "[$symbol]($style)" +style = "bold italic bright-purple" +symbol = "⋈┈" disabled = false -style = "bg:color_orange fg:color_fg0" - -[os.symbols] -Windows = "󰍲" -Ubuntu = "󰕈" -SUSE = "" -Raspbian = "󰐿" -Mint = "󰣭" -Macos = "󰀵" -Manjaro = "" -Linux = "󰌽" -Gentoo = "󰣨" -Fedora = "󰣛" -Alpine = "" -Amazon = "" -Android = "" -Arch = "󰣇" -Artix = "󰣇" -EndeavourOS = "" -CentOS = "" -Debian = "󰣚" -Redhat = "󱄛" -RedHatEnterprise = "󱄛" -Pop = "" [username] -show_always = true -style_user = "bg:color_orange fg:color_fg0" -style_root = "bg:color_orange fg:color_fg0" -format = '[ $user ]($style)' +style_user = "bright-yellow bold italic" +style_root = "purple bold italic" +format = "[⭘ $user]($style) " +disabled = false +show_always = false [directory] -style = "fg:color_fg0 bg:color_yellow" -format = "[ $path ]($style)" -truncation_length = 3 -truncation_symbol = "…/" +home_symbol = "⌂" +truncation_length = 2 +truncation_symbol = "□ " +read_only = " ◈" +use_os_path_sep = true +style = "italic blue" +format = '[$path]($style)[$read_only]($read_only_style)' +repo_root_style = 'bold blue' +repo_root_format = '[$before_root_path]($before_repo_root_style)[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) [△](bold bright-blue)' -[directory.substitutions] -"Documents" = "󰈙 " -"Downloads" = " " -"Music" = "󰝚 " -"Pictures" = " " -"Developer" = "󰲋 " +[cmd_duration] +format = "[◄ $duration ](italic white)" -[git_branch] -symbol = "" -style = "bg:color_aqua" -format = '[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)' +[jobs] +format = "[$symbol$number]($style) " +style = "white" +symbol = "[▶](blue italic)" -[git_status] -style = "bg:color_aqua" -format = '[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)' - -[nodejs] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[c] -symbol = " " -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[rust] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[golang] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[php] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[java] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[kotlin] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[haskell] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[python] -symbol = "" -style = "bg:color_blue" -format = '[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)' - -[docker_context] -symbol = "" -style = "bg:color_bg3" -format = '[[ $symbol( $context) ](fg:#83a598 bg:color_bg3)]($style)' - -[conda] -style = "bg:color_bg3" -format = '[[ $symbol( $environment) ](fg:#83a598 bg:color_bg3)]($style)' +[localip] +ssh_only = true +format = " ◯[$localipv4](bold magenta)" +disabled = false [time] disabled = false +format = "[ $time]($style)" time_format = "%R" -style = "bg:color_bg1" -format = '[[  $time ](fg:color_fg0 bg:color_bg1)]($style)' +utc_time_offset = "local" +style = "italic dimmed white" -[line_break] +[battery] +format = "[ $percentage $symbol]($style)" +full_symbol = "█" +charging_symbol = "[↑](italic bold green)" +discharging_symbol = "↓" +unknown_symbol = "░" +empty_symbol = "▃" + +[[battery.display]] +threshold = 20 +style = "italic bold red" + +[[battery.display]] +threshold = 60 +style = "italic dimmed bright-purple" + +[[battery.display]] +threshold = 70 +style = "italic dimmed yellow" + +[git_branch] +format = " [$branch(:$remote_branch)]($style)" +symbol = "[△](bold italic bright-blue)" +style = "italic bright-blue" +truncation_symbol = "⋯" +truncation_length = 11 +ignore_branches = ["main", "master"] +only_attached = true + +[git_metrics] +format = '([▴$added]($added_style))([▿$deleted]($deleted_style))' +added_style = 'italic dimmed green' +deleted_style = 'italic dimmed red' +ignore_submodules = true disabled = false -[character] -disabled = false -success_symbol = '[](bold fg:color_green)' -error_symbol = '[](bold fg:color_red)' -vimcmd_symbol = '[](bold fg:color_green)' -vimcmd_replace_one_symbol = '[](bold fg:color_purple)' -vimcmd_replace_symbol = '[](bold fg:color_purple)' -vimcmd_visual_symbol = '[](bold fg:color_yellow)' \ No newline at end of file +[git_status] +style = "bold italic bright-blue" +format = "([⎪$ahead_behind$staged$modified$untracked$renamed$deleted$conflicted$stashed⎥]($style))" +conflicted = "[◪◦](italic bright-magenta)" +ahead = "[▴│[${count}](bold white)│](italic green)" +behind = "[▿│[${count}](bold white)│](italic red)" +diverged = "[◇ ▴┤[${ahead_count}](regular white)│▿┤[${behind_count}](regular white)│](italic bright-magenta)" +untracked = "[◌◦](italic bright-yellow)" +stashed = "[◃◈](italic white)" +modified = "[●◦](italic yellow)" +staged = "[▪┤[$count](bold white)│](italic bright-cyan)" +renamed = "[◎◦](italic bright-blue)" +deleted = "[✕](italic red)" + +[deno] +format = " [deno](italic) [∫ $version](green bold)" +version_format = "${raw}" + +[lua] +format = " [lua](italic) [${symbol}${version}]($style)" +version_format = "${raw}" +symbol = "⨀ " +style = "bold bright-yellow" + +[nodejs] +format = " [node](italic) [◫ ($version)](bold bright-green)" +version_format = "${raw}" +detect_files = ["package-lock.json", "yarn.lock"] +detect_folders = ["node_modules"] +detect_extensions = [] + +[python] +format = " [py](italic) [${symbol}${version}]($style)" +symbol = "[⌉](bold bright-blue)⌊ " +version_format = "${raw}" +style = "bold bright-yellow" + +[ruby] +format = " [rb](italic) [${symbol}${version}]($style)" +symbol = "◆ " +version_format = "${raw}" +style = "bold red" + +[rust] +format = " [rs](italic) [$symbol$version]($style)" +symbol = "⊃ " +version_format = "${raw}" +style = "bold red" + +[package] +format = " [pkg](italic dimmed) [$symbol$version]($style)" +version_format = "${raw}" +symbol = "◨ " +style = "dimmed yellow italic bold" + +[swift] +format = " [sw](italic) [${symbol}${version}]($style)" +symbol = "◁ " +style = "bold bright-red" +version_format = "${raw}" + +[aws] +disabled = true +format = " [aws](italic) [$symbol $profile $region]($style)" +style = "bold blue" +symbol = "▲ " + +[buf] +symbol = "■ " +format = " [buf](italic) [$symbol $version $buf_version]($style)" + +[c] +symbol = "ℂ " +format = " [$symbol($version(-$name))]($style)" + +[conda] +symbol = "◯ " +format = " conda [$symbol$environment]($style)" + +[dart] +symbol = "◁◅ " +format = " dart [$symbol($version )]($style)" + +[docker_context] +symbol = "◧ " +format = " docker [$symbol$context]($style)" + +[elixir] +symbol = "△ " +format = " exs [$symbol $version OTP $otp_version ]($style)" + +[elm] +symbol = "◩ " +format = " elm [$symbol($version )]($style)" + +[golang] +symbol = "∩ " +format = " go [$symbol($version )]($style)" + +[haskell] +symbol = "❯λ " +format = " hs [$symbol($version )]($style)" + +[java] +symbol = "∪ " +format = " java [${symbol}(${version} )]($style)" + +[julia] +symbol = "◎ " +format = " jl [$symbol($version )]($style)" + +[memory_usage] +symbol = "▪▫▪ " +format = " mem [${ram}( ${swap})]($style)" + +[nim] +symbol = "▴▲▴ " +format = " nim [$symbol($version )]($style)" + +[nix_shell] +style = 'bold italic dimmed blue' +symbol = '✶' +format = '[$symbol nix⎪$state⎪]($style) [$name](italic dimmed white)' +impure_msg = '[⌽](bold dimmed red)' +pure_msg = '[⌾](bold dimmed green)' +unknown_msg = '[◌](bold dimmed ellow)' + +[spack] +symbol = "◇ " +format = " spack [$symbol$environment]($style)" \ No newline at end of file diff --git a/hosts/Bellerophon/default.nix b/hosts/Bellerophon/default.nix index f59fda5..6a19c9a 100644 --- a/hosts/Bellerophon/default.nix +++ b/hosts/Bellerophon/default.nix @@ -13,7 +13,9 @@ in { imports = [ # Import hardware configuration inputs.nixos-hardware.nixosModules.common-cpu-intel - + inputs.nixos-hardware.nixosModules.common-hidpi + inputs.nixos-hardware.nixosModules.common-pc-laptop + inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd ./hardware-configuration.nix ./duo-configuration.nix inputs.disko.nixosModules.disko diff --git a/hosts/Blackbird/default.nix b/hosts/Blackbird/default.nix index a09f421..3cc9510 100644 --- a/hosts/Blackbird/default.nix +++ b/hosts/Blackbird/default.nix @@ -23,6 +23,8 @@ in { #../../modules/waydroid.nix ]; + services.xserver.videoDrivers = lib.mkForce ["modesetting"]; + # Set networking hardware.enableRedistributableFirmware = true; networking.hostName = hostname; diff --git a/themes/dracula/default.nix b/themes/dracula/default.nix index ef79687..ea1a5e5 100644 --- a/themes/dracula/default.nix +++ b/themes/dracula/default.nix @@ -49,7 +49,7 @@ }; monospace = { - package = pkgs.nerd-fonts.fira-code; + package = pkgs.fira-code-nerdfont; name = "FiraCode Nerd Font Mono"; }; diff --git a/themes/tokyonight/default.nix b/themes/tokyonight/default.nix index efb2cd3..43d3c33 100644 --- a/themes/tokyonight/default.nix +++ b/themes/tokyonight/default.nix @@ -47,7 +47,7 @@ }; monospace = { - package = pkgs.nerd-fonts.jetbrains-mono; + package = pkgs.fira-code-nerdfont; name = "JetBrainsMono Nerd Font"; };