diff --git a/common/hellcooling/config/discord-pc-ptb.json b/common/hellcooling/config/discord-pc-ptb.json index e9146b6..b3aa8cd 100644 Binary files a/common/hellcooling/config/discord-pc-ptb.json and b/common/hellcooling/config/discord-pc-ptb.json differ diff --git a/common/hellcooling/install.sh b/common/hellcooling/install.sh deleted file mode 100644 index e69de29..0000000 diff --git a/nix/hosts/alymac/default.nix b/nix/hosts/alymac/default.nix index d674a2d..d0d85bf 100644 --- a/nix/hosts/alymac/default.nix +++ b/nix/hosts/alymac/default.nix @@ -8,7 +8,6 @@ let libtool patchelf pcre - pinentry pkg-config ]; @@ -22,7 +21,6 @@ let ffmpeg fzf gh - # git # already managed by home-manager git-crypt gitui gnupg @@ -30,7 +28,6 @@ let kubectl kubelogin-oidc mosh - neovim nixpkgs-fmt ripgrep sops @@ -70,8 +67,6 @@ let in { - imports = []; - # Absolutely proprietary. nixpkgs.config.allowUnfree = true; @@ -95,36 +90,18 @@ in home-manager = { useGlobalPkgs = true; useUserPackages = true; + extraSpecialArgs = { inherit dotfiles; }; users.alyxia = { pkgs, ... }: { + imports = [ ./zsh.nix ./git.nix ./nvim.nix ]; + home = { packages = packageSets.everything; - }; - programs.zsh = { - enable = true; - initExtra = '' - export GPG_TTY=$(tty) - source ${dotfiles}/zsh/zshrc + file.".npmrc".text = '' + prefix = ''${HOME}/.npm-packages ''; }; - programs.git = { - enable = true; - package = pkgs.gitAndTools.gitFull; # contains git send-email et al - - userName = "Alyxia Sother"; - userEmail = "alyxia@riseup.net"; - - signing = { - key = "01E16C4E775A37E4"; - signByDefault = true; - }; - - delta.enable = true; - }; - - programs.gitui.enable = true; - # DO NOT CHANGE UNLESS YOU ARE ABSOLUTELY SURE ALL STATE AFFECTED BY THIS # OPTION IS APPROPRIATELY MIGRATED!!! home.stateVersion = "23.05"; # did you read the comment? @@ -151,6 +128,7 @@ in "croc" "ddev" "mkcert" + "pinentry-mac" "pkg-config" "sdl2" ]; diff --git a/nix/hosts/alymac/git.nix b/nix/hosts/alymac/git.nix new file mode 100644 index 0000000..76f662c --- /dev/null +++ b/nix/hosts/alymac/git.nix @@ -0,0 +1,20 @@ +{ pkgs, dotfiles, ... }: + +{ + programs.git = { + enable = true; + package = pkgs.gitAndTools.gitFull; # contains git send-email et al + + userName = "Alyxia Sother"; + userEmail = "alyxia@riseup.net"; + + signing = { + key = "01E16C4E775A37E4"; + signByDefault = true; + }; + + delta.enable = true; + }; + + programs.gitui.enable = true; +} diff --git a/nix/hosts/alymac/nvim.nix b/nix/hosts/alymac/nvim.nix new file mode 100644 index 0000000..12e2b5e --- /dev/null +++ b/nix/hosts/alymac/nvim.nix @@ -0,0 +1,31 @@ +{ pkgs, dotfiles, ... }: + +{ + programs.neovim = { + enable = true; + package = pkgs.neovim-unwrapped; + + extraConfig = "source ${dotfiles}/nvim/init.vim"; + + coc = { + enable = true; + + settings = { + languageserver = { + nix = { + command = "nil"; + filetypes = [ "nix" ]; + rootPatterns = [ "flake.nix" ]; + "settings.nil" = { + "formatting.command" = ["nixpkgs-fmt"]; + }; + }; + "go.goPlsOptions" = { + completion = true; + completeUnimported = true; + }; + }; + }; + }; + }; +} diff --git a/nix/hosts/alymac/zsh.nix b/nix/hosts/alymac/zsh.nix new file mode 100644 index 0000000..46b4a1b --- /dev/null +++ b/nix/hosts/alymac/zsh.nix @@ -0,0 +1,13 @@ +{ dotfiles, ... }: + +{ + programs.zsh = { + enable = true; + initExtra = '' + export GPG_TTY=$(tty) + source ${dotfiles}/zsh/zshrc + + export PATH="$PATH:$HOME/.npm-packages/bin" + ''; + }; +}