From ee4f9f13802c0d6b262377f0ffe1a4de503f17d4 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 27 Nov 2023 14:31:26 +0000 Subject: [PATCH 1/3] feat(ctp/vsc): start declaring ctp vsc --- flake.lock | 42 +++++++ flake.nix | 24 ++-- .../configs/editors/vscode/default.nix | 112 ++++++++++-------- .../configs/editors/vscode/settings.json | 11 +- home/isabel/programs/scripts/default.nix | 17 ++- home/isabel/programs/scripts/preview.nix | 9 +- modules/base/common/host/nix/default.nix | 1 + 7 files changed, 143 insertions(+), 73 deletions(-) diff --git a/flake.lock b/flake.lock index 96246cb0a..dac0d9c09 100644 --- a/flake.lock +++ b/flake.lock @@ -151,6 +151,26 @@ "type": "github" } }, + "catppuccin-vsc": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701094251, + "narHash": "sha256-WjGzRRJqOTgm5B65w4t1cSLS3nuzkahfKEc1crykZa0=", + "owner": "catppuccin", + "repo": "vscode", + "rev": "235693bc9ba9d1e05801e5a6954af1bb5accd659", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "vscode", + "type": "github" + } + }, "catppuccin_2": { "flake": false, "locked": { @@ -1307,6 +1327,26 @@ "type": "github" } }, + "icat-wrapper": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1689446829, + "narHash": "sha256-ouOU4MuqpngtSwcmlVRnuoECiRPpVIMY4QpC0EWjNEg=", + "owner": "nekowinston", + "repo": "icat", + "rev": "4c3497a35d4f5a665c25b6ad468025f4126eaa40", + "type": "github" + }, + "original": { + "owner": "nekowinston", + "repo": "icat", + "type": "github" + } + }, "icon-picker-nvim": { "flake": false, "locked": { @@ -2922,6 +2962,7 @@ "bellado": "bellado", "catppuccin": "catppuccin", "catppuccin-toolbox": "catppuccin-toolbox", + "catppuccin-vsc": "catppuccin-vsc", "catppuccinifier": "catppuccinifier", "devshell": "devshell", "flake-parts": "flake-parts", @@ -2929,6 +2970,7 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprpicker": "hyprpicker", + "icat-wrapper": "icat-wrapper", "lanzaboote": "lanzaboote", "neovim-flake": "neovim-flake", "nh": "nh", diff --git a/flake.nix b/flake.nix index 9066a4a19..7e4798b7c 100755 --- a/flake.nix +++ b/flake.nix @@ -242,7 +242,7 @@ }; }; - # cool wallpaper maker + # catppuccin related items catppuccinifier = { url = "github:lighttigerXIV/catppuccinifier"; inputs = { @@ -250,14 +250,6 @@ flake-utils.follows = "pre-commit-hooks/flake-utils"; }; }; - - # cool tools - catppuccin-toolbox = { - url = "github:catppuccin/toolbox"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # Amazing themeing catppuccin = { url = "github:Stonks3141/ctp-nix"; inputs = { @@ -265,6 +257,20 @@ home-manager.follows = "home-manager"; }; }; + catppuccin-vsc = { + url = "github:catppuccin/vscode"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + catppuccin-toolbox = { + url = "github:catppuccin/toolbox"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # icat wrapper + icat-wrapper = { + url = "github:nekowinston/icat"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Schemas flake-schemas.url = "github:DeterminateSystems/flake-schemas"; diff --git a/home/isabel/programs/configs/editors/vscode/default.nix b/home/isabel/programs/configs/editors/vscode/default.nix index d23d0fe49..b0f16eae5 100644 --- a/home/isabel/programs/configs/editors/vscode/default.nix +++ b/home/isabel/programs/configs/editors/vscode/default.nix @@ -5,68 +5,80 @@ config, ... }: let - acceptedTypes = ["laptop" "desktop" "hybrid"]; inherit (osConfig.modules.system) flakePath mainUser; in { - programs.vscode = lib.mkIf ((lib.isAcceptedDevice osConfig acceptedTypes) && osConfig.modules.programs.editors.vscode.enable) { - enable = true; - package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ - # THEMEING - catppuccin.catppuccin-vsc-icons - catppuccin.catppuccin-vsc + config = lib.mkIf osConfig.modules.programs.editors.vscode.enable { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + # THEMEING + catppuccin.catppuccin-vsc-icons + catppuccin.catppuccin + # (pkgs.catppuccin-vsc.override { + # accentColor = "sapphire"; + # boldKeywords = true; + # italicComments = true; + # italicKeywords = true; + # extraBordersEnabled = false; + # workbenchMode = "flat"; + # bracketMode = "rainbow"; + # colorOverrides = {}; + # customUIColors = {}; + # }) - # GIT - github.copilot - github.copilot-chat - github.vscode-pull-request-github - github.vscode-github-actions - eamodio.gitlens + # GIT + github.copilot + github.copilot-chat + github.vscode-pull-request-github + github.vscode-github-actions + eamodio.gitlens - # UTILITIES - ms-vscode-remote.remote-ssh - ms-vscode.live-server - vscodevim.vim #yes i hate myself - wakatime.vscode-wakatime + # UTILITIES + ms-vscode-remote.remote-ssh + ms-vscode.live-server + vscodevim.vim #yes i hate myself + wakatime.vscode-wakatime - # LANGUAGES BASED EXTENSIONS - ## NIX - jnoortheen.nix-ide - kamadorueda.alejandra - mkhl.direnv + # LANGUAGES BASED EXTENSIONS + ## NIX + jnoortheen.nix-ide + kamadorueda.alejandra + mkhl.direnv - ## RUST - serayuzgur.crates - rust-lang.rust-analyzer + ## RUST + serayuzgur.crates + rust-lang.rust-analyzer - ## GO - golang.go + ## GO + golang.go - ## LUA - sumneko.lua + ## LUA + sumneko.lua - ## TOML - tamasfe.even-better-toml + ## TOML + tamasfe.even-better-toml - ## WEB DEV - ### GENERAL - bradlc.vscode-tailwindcss - dbaeumer.vscode-eslint - denoland.vscode-deno + ## WEB DEV + ### GENERAL + bradlc.vscode-tailwindcss + dbaeumer.vscode-eslint + denoland.vscode-deno - ### PHP - devsense.phptools-vscode + ### PHP + devsense.phptools-vscode - ### MARKDOWN - shd101wyy.markdown-preview-enhanced - unifiedjs.vscode-mdx - valentjn.vscode-ltex - ]; - mutableExtensionsDir = true; - }; + ### MARKDOWN + shd101wyy.markdown-preview-enhanced + unifiedjs.vscode-mdx + valentjn.vscode-ltex + ]; + mutableExtensionsDir = true; + }; - xdg.configFile = lib.mkIf ((lib.isAcceptedDevice osConfig acceptedTypes) && osConfig.modules.programs.gui.enable) { - "VSCodium/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/${mainUser}/programs/configs/editors/vscode/keybindings.json"; - "VSCodium/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/${mainUser}/programs/configs/editors/vscode/settings.json"; + xdg.configFile = { + "VSCodium/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/${mainUser}/programs/configs/editors/vscode/keybindings.json"; + "VSCodium/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/${mainUser}/programs/configs/editors/vscode/settings.json"; + }; }; } diff --git a/home/isabel/programs/configs/editors/vscode/settings.json b/home/isabel/programs/configs/editors/vscode/settings.json index e8797e4d0..d682571be 100644 --- a/home/isabel/programs/configs/editors/vscode/settings.json +++ b/home/isabel/programs/configs/editors/vscode/settings.json @@ -1,5 +1,4 @@ { - "workbench.preferredLightColorTheme": "Catppuccin Mocha", "security.workspace.trust.untrustedFiles": "open", "editor.suggestSelection": "first", "editor.formatOnPaste": true, @@ -25,11 +24,8 @@ "markdown-preview-enhanced.liveUpdate": true, "editor.formatOnSave": true, "explorer.confirmDelete": false, - "catppuccin.accentColor": "sapphire", - "catppuccin.workbenchMode": "flat", "workbench.settings.applyToAllProfiles": [], "workbench.iconTheme": "catppuccin-mocha", - "workbench.colorTheme": "Catppuccin Mocha", "window.titleBarStyle": "custom", "nix.enableLanguageServer": true, "nix.serverPath": "nil", @@ -43,5 +39,10 @@ } } }, - "workbench.editor.empty.hint": "hidden" + "workbench.editor.empty.hint": "hidden", + "arduino.useArduinoCli": true, + "arduino.enableUSBDetection": true, + "[css]": { + "editor.defaultFormatter": "stylelint.vscode-stylelint" + } } diff --git a/home/isabel/programs/scripts/default.nix b/home/isabel/programs/scripts/default.nix index 510be2206..f9d5e26d6 100644 --- a/home/isabel/programs/scripts/default.nix +++ b/home/isabel/programs/scripts/default.nix @@ -1,6 +1,7 @@ { config, pkgs, + inputs', lib, ... }: { @@ -10,16 +11,20 @@ ]; file = { + # Preview files script for fzf tab ".local/bin/preview" = { - # Preview files script for fzf tab - executable = true; - text = import ./preview.nix {inherit lib pkgs;}; + source = lib.getExe (pkgs.writeShellApplication { + name = "preview"; + text = import ./preview.nix {inherit inputs' lib pkgs;}; + }); }; + # Extract the compressed file with the correct tool based on the extension ".local/bin/extract" = { - # Extract the compressed file with the correct tool based on the extension - executable = true; - text = import ./extract.nix {inherit lib pkgs;}; + source = lib.getExe (pkgs.writeShellApplication { + name = "extract"; + text = import ./extract.nix {inherit lib pkgs;}; + }); }; }; }; diff --git a/home/isabel/programs/scripts/preview.nix b/home/isabel/programs/scripts/preview.nix index 68691393e..72339ca6b 100644 --- a/home/isabel/programs/scripts/preview.nix +++ b/home/isabel/programs/scripts/preview.nix @@ -1,10 +1,10 @@ { lib, pkgs, + inputs', ... }: '' - #> Syntax: bash - # Copied from Elkowar + # modified from Elkowar case "$1" in -*) exit 0;; @@ -14,7 +14,10 @@ *text*) ${lib.getExe pkgs.bat} --color always --plain "$1" ;; - *image* | *pdf) + *image*) + ${lib.getExe inputs'.icat-wrapper.packages.default} "$1" + ;; + *pdf) ${lib.getExe pkgs.catimg} -w 100 -r 2 "$1" ;; *directory*) diff --git a/modules/base/common/host/nix/default.nix b/modules/base/common/host/nix/default.nix index c87ae617d..063ff1707 100644 --- a/modules/base/common/host/nix/default.nix +++ b/modules/base/common/host/nix/default.nix @@ -40,6 +40,7 @@ overlays = [ self.overlays.defaults inputs.rust-overlay.overlays.default + inputs.catppuccin-vsc.overlays.default (_: _: { nixSchemas = inputs'.nixSchemas.packages.default; From e22fe57290e277ec1d194e3989577b84810cd25d Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 27 Nov 2023 17:18:50 +0000 Subject: [PATCH 2/3] chore: uncomment code --- .../configs/editors/vscode/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/home/isabel/programs/configs/editors/vscode/default.nix b/home/isabel/programs/configs/editors/vscode/default.nix index b0f16eae5..107173baa 100644 --- a/home/isabel/programs/configs/editors/vscode/default.nix +++ b/home/isabel/programs/configs/editors/vscode/default.nix @@ -14,18 +14,17 @@ in { extensions = with pkgs.vscode-extensions; [ # THEMEING catppuccin.catppuccin-vsc-icons - catppuccin.catppuccin - # (pkgs.catppuccin-vsc.override { - # accentColor = "sapphire"; - # boldKeywords = true; - # italicComments = true; - # italicKeywords = true; - # extraBordersEnabled = false; - # workbenchMode = "flat"; - # bracketMode = "rainbow"; - # colorOverrides = {}; - # customUIColors = {}; - # }) + (pkgs.catppuccin-vsc.override { + accentColor = "sapphire"; + boldKeywords = true; + italicComments = true; + italicKeywords = true; + extraBordersEnabled = false; + workbenchMode = "flat"; + bracketMode = "rainbow"; + colorOverrides = {}; + customUIColors = {}; + }) # GIT github.copilot From 8ce6314aaef090912f4563e77350659a528eb118 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 27 Nov 2023 17:19:10 +0000 Subject: [PATCH 3/3] bump: nix flake update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index dac0d9c09..5cf178917 100644 --- a/flake.lock +++ b/flake.lock @@ -1187,11 +1187,11 @@ ] }, "locked": { - "lastModified": 1701040754, - "narHash": "sha256-rHld3E3CeVI/GUxH3xE+mqAo+IX2hTbXVfXKahCrG5I=", + "lastModified": 1701071203, + "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c97c46dc4f45f2a78df536a6ebe15252831b800", + "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "type": "github" }, "original": { @@ -1825,11 +1825,11 @@ ] }, "locked": { - "lastModified": 1699423608, - "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=", + "lastModified": 1701058231, + "narHash": "sha256-OdvHzqZK2JUn7Ao7hZImZmgOBRYZwWy/MYQCFFjITDg=", "owner": "oxalica", "repo": "nil", - "rev": "5607d429016d6f9a72843b07127fad23ea9d661f", + "rev": "1348b53085d3befd86b39cf15dc00702af3e5a79", "type": "github" }, "original": { @@ -2144,11 +2144,11 @@ ] }, "locked": { - "lastModified": 1701047232, - "narHash": "sha256-03KIerofBJ0SJ0R2npOQpfLc7/KDLt2/UPwqBCM/0sk=", + "lastModified": 1701094540, + "narHash": "sha256-U+9qW2XnchIQwpgn6UQPe6cE7uu/9x9+IPFqQx04/QU=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e28e4d7fe39e572b7341165e25663e2a1589effd", + "rev": "561cee95846683a7930f2275e4e1b07458e3f7a9", "type": "github" }, "original": { @@ -2890,11 +2890,11 @@ ] }, "locked": { - "lastModified": 1700748844, - "narHash": "sha256-qfK4ORiTfTUpvWrJoZkI5A26TIjGIaulUC0j58aQFAI=", + "lastModified": 1701056683, + "narHash": "sha256-uSZ9EFu5sp/g3aLUOlgOK7SRf2AvKYddI63jSUesOx8=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "7f6027498e9d780abcb315d0d2c2232a2d1bd50a", + "rev": "6fa8e07d62c5e71af826b8d8857dfe1db20e7079", "type": "github" }, "original": { @@ -3077,11 +3077,11 @@ ] }, "locked": { - "lastModified": 1700965014, - "narHash": "sha256-vprUv4maYeo0zW5uyEznXsv6DXwE+lLk4dcyOz6rVBI=", + "lastModified": 1701051362, + "narHash": "sha256-3dXjewnLylWGZKNshIV0eiabhIDjcUNXC5zRKcm0TxY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ee42d1bf90ceed1b1d2e4b79f947f7513f3a3506", + "rev": "055d3d2ea161dfc6ca569f2f135a107f48cf483e", "type": "github" }, "original": {