renamed some files and directories that had identical filenames. Altered some nixvim plugin options. Set up gpg signing for git commits.

This commit is contained in:
pagedmov
2024-11-10 02:57:08 -05:00
committed by pagedmov
parent 2a1ba18c09
commit 366a0c1175
15 changed files with 41 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
imports = [ imports = [
./gtk.nix ./gtk.nix
./spicetify.nix ./spicetify.nix
./stylix.nix ./stylixhome.nix
./starship.nix ./starship.nix
./userpkgs.nix ./userpkgs.nix
./zshell.nix ./zshell.nix

View File

@@ -19,6 +19,10 @@ in {
targets = { targets = {
waybar.enable = false; waybar.enable = false;
btop.enable = false; btop.enable = false;
nixvim.transparentBackground = {
main = false;
signColumn = false;
};
}; };
cursor = { cursor = {
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;

View File

@@ -24,6 +24,8 @@ in {
config = lib.mkIf config.movOpts.envConfig.userPkgs.enable { config = lib.mkIf config.movOpts.envConfig.userPkgs.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
nemo nemo
yubikey-manager
yubikey-personalization
gtk3 gtk3
sqlite sqlite
gimp gimp

View File

@@ -1,4 +1,4 @@
{ lib, config, username, ... }: { { lib, config, username, pkgs, ... }: {
options = { options = {
movOpts.programConfigs.gitConfig.enable = movOpts.programConfigs.gitConfig.enable =
lib.mkEnableOption "enables my git configuration"; lib.mkEnableOption "enables my git configuration";
@@ -6,7 +6,12 @@
config = lib.mkIf config.movOpts.programConfigs.gitConfig.enable { config = lib.mkIf config.movOpts.programConfigs.gitConfig.enable {
programs.git = { programs.git = {
enable = true; enable = true;
userEmail = "${username}@gmail.com"; signing = {
gpgPath = "${pkgs.gnupg}/bin/gpg";
key = "76118C11E525D3D0CBCA0F6EB2A3D477E86843DB";
signByDefault = true;
};
userEmail = "kylerclay@proton.me";
userName = "${username}"; userName = "${username}";
}; };
}; };

View File

@@ -1,6 +1,21 @@
{ {
programs.nixvim = { programs.nixvim = {
keymaps = [ keymaps = [
{
action = "<cmd>ChatGPTEditWithInstructions<CR>";
key = "!egpt";
mode = "n";
}
{
action = "<cmd>ChatGPTCompleteCode<CR>";
key = "!cgpt";
mode = "n";
}
{
action = "<cmd>ChatGPT<CR>";
key = "!gpt";
mode = "n";
}
{ {
action = "<cmd>lua vim.lsp.buf.code_action()<CR>"; action = "<cmd>lua vim.lsp.buf.code_action()<CR>";
key = "!ca"; key = "!ca";

View File

@@ -0,0 +1,8 @@
{
programs.nixvim.plugins.chatgpt = {
enable = true;
settings = {
api_key_cmd = "pass keys/openai/apikey";
};
};
}

View File

@@ -8,6 +8,7 @@
# ./coq.nix # ./coq.nix
./barbar.nix ./barbar.nix
./cmp.nix ./cmp.nix
./chatgpt.nix
./lsp.nix ./lsp.nix
./fidget.nix ./fidget.nix
./lualine.nix ./lualine.nix

View File

@@ -4,6 +4,7 @@
settings = { settings = {
virtual_text = { enable = true; }; virtual_text = { enable = true; };
autocmd.enabled = true; autocmd.enabled = true;
sign.enabled = false;
}; };
}; };
} }

View File

@@ -1,3 +1,3 @@
{ inputs, nixpkgs, config, self, username, host, lib, ... }: { { inputs, nixpkgs, config, self, username, host, lib, ... }: {
imports = [ ./hardware ./software ./environment ]; imports = [ ./hardware ./software ./sysenv ];
} }

View File

@@ -19,6 +19,7 @@
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
}; };
pcscd.enable = true;
udev.enable = true; udev.enable = true;
dbus.enable = true; dbus.enable = true;
mullvad-vpn.enable = true; mullvad-vpn.enable = true;