Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ctp/vsc): start declaring ctp vsc #50

Merged
merged 4 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 57 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 15 additions & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -242,29 +242,35 @@
};
};

# cool wallpaper maker
# catppuccin related items
catppuccinifier = {
url = "github:lighttigerXIV/catppuccinifier";
inputs = {
nixpkgs.follows = "nixpkgs";
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 = {
nixpkgs.follows = "nixpkgs";
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";
Expand Down
111 changes: 61 additions & 50 deletions home/isabel/programs/configs/editors/vscode/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,79 @@
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
(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";
};
};
}
11 changes: 6 additions & 5 deletions home/isabel/programs/configs/editors/vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"workbench.preferredLightColorTheme": "Catppuccin Mocha",
"security.workspace.trust.untrustedFiles": "open",
"editor.suggestSelection": "first",
"editor.formatOnPaste": true,
Expand All @@ -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",
Expand All @@ -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"
}
}
17 changes: 11 additions & 6 deletions home/isabel/programs/scripts/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
config,
pkgs,
inputs',
lib,
...
}: {
Expand All @@ -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;};
});
};
};
};
Expand Down
Loading