From ce86ca48aa1c4457af611e1104c3303c7db50473 Mon Sep 17 00:00:00 2001 From: pupbrained Date: Mon, 30 Sep 2024 23:05:28 -0400 Subject: [PATCH] some stuffs --- flake.lock | 120 +++++++++--------- homes/x86_64-linux/marshall@navis/default.nix | 2 +- modules/home/vscode/default.nix | 52 ++++++++ 3 files changed, 113 insertions(+), 61 deletions(-) create mode 100644 modules/home/vscode/default.nix diff --git a/flake.lock b/flake.lock index 39c436b..93d970d 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727620986, - "narHash": "sha256-4RlJt1MJmZcuP3ROlrb2YvG8WfH0BM/nGqDgNT/DAwE=", + "lastModified": 1727734424, + "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0eee1b2134e9aa3427081715ada883f3523a9608", + "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727616413, - "narHash": "sha256-EuipmcqmOK+xRtwElUlrp+S8h24uqgZ+LQmNhEZTrTU=", + "lastModified": 1727746579, + "narHash": "sha256-DUfc08Zry3EJi9SutWopIEdADWm0lzcmnDIXEIFoYGU=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "5b0f33c0fbf07e9d1cec4e15e32bf2e7c1979df1", + "rev": "074bbcc4e3fa9ce4bee100de64506c3662c62299", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1727604521, - "narHash": "sha256-dJM7gi63/Z80Ti3SWdOYbe8E3xKugG+iBBWmbtlyI4w=", + "lastModified": 1727707210, + "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "4b43b68281fd1a332c2aec8fbc077d92ca352c3e", + "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727636110, - "narHash": "sha256-sHhL5Xqq9rjOO128N7S+iNHx73GJWi0RmQIBGJLVHhU=", + "lastModified": 1727638677, + "narHash": "sha256-VIsBA23C9rtOa7SUj4qdkMeOz64i/7yIeJ6+X6o5H64=", "ref": "refs/heads/main", - "rev": "3964f717d0aee41676a3138c05a3fd3c7d14c843", - "revCount": 22, + "rev": "44737fec37903d8d2dbabf0df0ba3e1580757c03", + "revCount": 23, "type": "git", "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git" }, @@ -880,11 +880,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727621787, - "narHash": "sha256-gSoqO3r98YvPEvN/6Fnw+UNg4hEwq/YWFijPtlLtFWM=", + "lastModified": 1727714556, + "narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", "ref": "refs/heads/main", - "rev": "6649255d54f45a7e2fedd9b4be85fe5d11229c04", - "revCount": 5278, + "rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", + "revCount": 5285, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -912,11 +912,11 @@ ] }, "locked": { - "lastModified": 1727625596, - "narHash": "sha256-+BQyiJPhb9txsO6xZ4c4HrQwBzTe9gohX1e+wUvOM+Q=", + "lastModified": 1727705521, + "narHash": "sha256-tR4bc6zONkxore1F7CRrwHs9NITht8NY0JTidPSmMXY=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "13301eeede3deb4b3a5478518eb0931ae274a798", + "rev": "9215288eb2ded9d0c08d468ea90ba68f43162c67", "type": "github" }, "original": { @@ -1058,11 +1058,11 @@ }, "impermanence": { "locked": { - "lastModified": 1727556076, - "narHash": "sha256-5Iplxbdn/7kQp4UYXMnUMFL2i2lyysOhRyzvvtPe1Qc=", + "lastModified": 1727649413, + "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=", "owner": "nix-community", "repo": "impermanence", - "rev": "fff0d95cf40609941769a443a001b25fb95b68ab", + "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e", "type": "github" }, "original": { @@ -1180,11 +1180,11 @@ ] }, "locked": { - "lastModified": 1727580512, - "narHash": "sha256-gEWoJ+027OwsNs6f1GkDPrCxBFr5Vky7vWKjHRJi60s=", + "lastModified": 1727658919, + "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a2ab1588541ae442bd3a682f8f6bbcbca2672f10", + "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", "type": "github" }, "original": { @@ -1297,11 +1297,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1727571603, - "narHash": "sha256-E/oHqQDtdeGNJk5k7QhyBNhe/ujxG8oF8aMP+iWyVuY=", + "lastModified": 1727742380, + "narHash": "sha256-5lFzlmiwrl3OHrw7QhZn/ZpZtygzx1UspKOaZqpxXSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1558c5feaa3a3f558e8512590e68f1a9c87e17", + "rev": "9dc3c339a2aecbd61ab2549248d8b64ba1c28af5", "type": "github" }, "original": { @@ -1375,8 +1375,8 @@ "nixpkgs_15": { "locked": { "lastModified": 0, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", - "path": "/nix/store/fpivx4sjcp2vk4rp9nhliln5cwcp3kc6-source", + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", "type": "path" }, "original": { @@ -1401,8 +1401,8 @@ "nixpkgs_17": { "locked": { "lastModified": 0, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", - "path": "/nix/store/fpivx4sjcp2vk4rp9nhliln5cwcp3kc6-source", + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", "type": "path" }, "original": { @@ -1428,11 +1428,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -1524,11 +1524,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -1563,11 +1563,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1727576675, - "narHash": "sha256-XJgdI3xnYjgBKZK8qefS7X6x+9rUMdTEa2jrapbaBig=", + "lastModified": 1727746745, + "narHash": "sha256-EP95VHCvjYxfJUz8QGibSEbLIfWS3Qz37s1xfgDBjeI=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "ebaf7cc8b70c4bc241d47cc1a4ecf0a72c81b2d0", + "rev": "853926edd453a7faa6febdd669d70a51d1153311", "type": "github" }, "original": { @@ -1589,11 +1589,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1727557953, - "narHash": "sha256-xe8JQaNOPTyzWsSlLu2yC6qw4SjOMHrXk4Iq+pIgLhM=", + "lastModified": 1727645871, + "narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=", "owner": "nix-community", "repo": "nixvim", - "rev": "2c4e4681db658deeceb2f781136d7ba1d0009521", + "rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200", "type": "github" }, "original": { @@ -1707,11 +1707,11 @@ ] }, "locked": { - "lastModified": 1727490462, - "narHash": "sha256-OrrPiNBiikv9BR464XTT75FzOq7tKAvMbMi7YOKVIeg=", + "lastModified": 1727663505, + "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11a13e50debafae4ae802f1d6b8585101516dd93", + "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", "type": "github" }, "original": { @@ -2032,11 +2032,11 @@ }, "unstable": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -2092,11 +2092,11 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1726451364, - "narHash": "sha256-6WKgYq0+IzPSXxVl1MfODIVwEbd3Sw0zc5sMSOyzA8I=", + "lastModified": 1727679381, + "narHash": "sha256-EyaSYRNdZGvWDjDb9Gk3hPcXNQqwg7pyVp3SOBJ7TBo=", "owner": "xmonad", "repo": "xmonad", - "rev": "a4140b93497333ec7f3127ee4dabcb8ae8a721b6", + "rev": "aadb8df59bca896b198420757aff570e53bd9c9c", "type": "github" }, "original": { @@ -2113,11 +2113,11 @@ "xmonad": "xmonad" }, "locked": { - "lastModified": 1726510493, - "narHash": "sha256-0kGVX0iKFHlC2Kgx+bdX68P0qqPQdudSgi11bsvaNJY=", + "lastModified": 1727715770, + "narHash": "sha256-lsSmUbt1REKL2E5qon43AbPePsAyT2M16J0wWQVODW0=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "42340e0f76a7a934f2a4a8d0da3165f74f68e6be", + "rev": "2c161ff670593d147823a08d73730080ef952753", "type": "github" }, "original": { @@ -2131,11 +2131,11 @@ "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1727248177, - "narHash": "sha256-QHE2H3VYUK3T7zVbIfqEF7P8hBeim8vU5hXz8X6y8j0=", + "lastModified": 1727727983, + "narHash": "sha256-zWOQBzmVeC2YF6R/V+GjhEjdOKW+qaHO0em5CfhjBbw=", "owner": "fufexan", "repo": "zen-browser-flake", - "rev": "67f1db200b6d533cf1f2b562c183ac536919ec4b", + "rev": "5ea9183acb736b9a606a1f33505d20a6f14dc5cf", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index 865b2c5..38c91e7 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -140,7 +140,6 @@ in { ''; }) youki - zed-editor ] ++ (with jetbrains; [ clion @@ -152,6 +151,7 @@ in { nixvim.packages.${pkgs.system}.default zen-browser.packages.${pkgs.system}.specific chaotic.packages.${pkgs.system}.distrobox_git + chaotic.packages.${pkgs.system}.zed-editor_git ]); stateVersion = "24.05"; diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix new file mode 100644 index 0000000..130de61 --- /dev/null +++ b/modules/home/vscode/default.nix @@ -0,0 +1,52 @@ +{pkgs, ...}: { + programs.vscode = { + enable = true; + package = pkgs.vscode.fhsWithPackages (ps: with ps; [rustup zlib openssl.dev pkg-config]); + + extensions = with pkgs.vscode-extensions; [ + bbenoist.nix + catppuccin.catppuccin-vsc + catppuccin.catppuccin-vsc-icons + llvm-vs-code-extensions.vscode-clangd + kamadorueda.alejandra + mkhl.direnv + usernamehw.errorlens + vadimcn.vscode-lldb + vscodevim.vim + ]; + + keybindings = [ + { + key = "shift+k"; + command = "editor.action.showHover"; + when = "editorTextFocus"; + } + { + key = "ctrl+k ctrl+i"; + command = "-editor.action.showHover"; + when = "editorTextFocus"; + } + ]; + + userSettings = { + "files.autoSave" = "afterDelay"; + + "editor.fontFamily" = "Maple Mono NF"; + "editor.fontLigatures" = true; + "editor.fontSize" = 16; + "editor.formatOnSave" = true; + "editor.minimap.enabled" = false; + + "vim.camelCaseMotion.enable" = true; + "vim.smartRelativeLine" = false; + "vim.sneak" = true; + "vim.useSystemClipboard" = true; + + "workbench.colorTheme" = "Catppuccin Mocha"; + "workbench.iconTheme" = "catppuccin-mocha"; + + "window.menuBarVisibility" = "toggle"; + "window.titleBarStyle" = "custom"; + }; + }; +}