Compare commits

..

4 Commits

6 changed files with 57 additions and 9 deletions

6
flake.lock generated
View File

@@ -287,11 +287,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760500983, "lastModified": 1761584077,
"narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -12,6 +12,7 @@
./ssh.nix ./ssh.nix
./stylix.nix ./stylix.nix
./vscode.nix ./vscode.nix
./xdg.nix
./zsh.nix ./zsh.nix
]; ];
} }

View File

@@ -1,23 +1,40 @@
{ {
pkgs, pkgs,
config,
... ...
}: }:
let
name = "Eclypsed";
email = "Ec1ypsed@proton.me";
signingKey = "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIB2h6y1Al2OVotYIpwPZMjiBLAncAI2pAPgES2+gVbJqAAAABHNzaDo= ssh:";
in
{ {
home.packages = with pkgs; [ git-ignore ]; home.packages = with pkgs; [ git-ignore ];
xdg.configFile."git/allowed_signers".text = ''
${email} namespaces="git" ${signingKey}
'';
programs = { programs = {
git = { git = {
enable = true; enable = true;
userName = "Eclypsed"; settings = {
userEmail = "Ec1ypsed@proton.me"; user = { inherit name email; };
extraConfig = {
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
};
signing = {
format = "ssh";
key = "~/.ssh/id_ed25519_sk_rk.pub";
signByDefault = true;
}; };
}; };
lazygit = { lazygit = {
enable = true; enable = true;
enableZshIntegration = true;
shellWrapperName = "lg";
}; };
}; };
} }

View File

@@ -61,9 +61,6 @@
# Formatting files # Formatting files
formatter.conform-nvim = { formatter.conform-nvim = {
enable = true; enable = true;
setupOpts = {
};
}; };
binds = { binds = {
@@ -221,6 +218,17 @@
treesitter.enable = true; treesitter.enable = true;
}; };
rust = {
enable = true;
# crates = {
# enable = true;
# };
dap.enable = true;
format.enable = true;
lsp.enable = true;
treesitter.enable = true;
};
tailwind = { tailwind = {
enable = true; enable = true;
lsp.enable = true; lsp.enable = true;

View File

@@ -50,6 +50,12 @@
"workbench.colorTheme" = "Catppuccin Mocha"; "workbench.colorTheme" = "Catppuccin Mocha";
"catppuccin.accentColor" = "flamingo"; "catppuccin.accentColor" = "flamingo";
# Remote SSH
# VSCode attempts to write to ~/.ssh/config for remote ssh connections.
# Because ~/.ssh/config is managed with home-manager, it is not writeable.
# So we specify a custom ssh config path
"remote.SSH.configFile" = "/home/eclypse/.ssh/vscode-config";
# Prettier # Prettier
"editor.defaultFormatter" = "esbenp.prettier-vscode"; "editor.defaultFormatter" = "esbenp.prettier-vscode";
"prettier.bracketSpacing" = true; "prettier.bracketSpacing" = true;

16
modules/home/xdg.nix Normal file
View File

@@ -0,0 +1,16 @@
{
config,
...
}:
{
xdg = {
enable = true;
userDirs = {
enable = true;
createDirectories = true;
extraConfig = {
XDG_DEV_DIR = "${config.home.homeDirectory}/Dev";
};
};
};
}