Delete some things we should be putting in devshells, and move to ghostty (#108)

This commit is contained in:
Patrick Stevens
2025-01-06 23:46:35 +00:00
committed by GitHub
parent c45222500f
commit ca85c8de24
8 changed files with 20 additions and 34 deletions

1
.envrc Normal file
View File

@@ -0,0 +1 @@
use flake .

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ result
bin/ bin/
obj/ obj/
.DS_Store .DS_Store
.direnv/

View File

@@ -7,10 +7,6 @@ in {
# $ nix-env -qaP | grep wget # $ nix-env -qaP | grep wget
environment.systemPackages = [ environment.systemPackages = [
pkgs.alacritty
pkgs.rustup
pkgs.libiconv
pkgs.clang
pkgs.python3 pkgs.python3
]; ];

View File

@@ -33,8 +33,8 @@
./modules/tmux.nix ./modules/tmux.nix
./modules/zsh.nix ./modules/zsh.nix
./modules/ripgrep.nix ./modules/ripgrep.nix
./modules/alacritty.nix
./modules/rust.nix ./modules/rust.nix
./modules/posix-sh.nix
(import ./modules/mail.nix (import ./modules/mail.nix
{ {
inherit mbsync secretsPath; inherit mbsync secretsPath;
@@ -269,7 +269,6 @@
nixpkgs.difftastic nixpkgs.difftastic
nixpkgs.syncthing nixpkgs.syncthing
nixpkgs.nodePackages_latest.dockerfile-language-server-nodejs nixpkgs.nodePackages_latest.dockerfile-language-server-nodejs
nixpkgs.nodePackages_latest.bash-language-server
nixpkgs.nodePackages_latest.vscode-json-languageserver nixpkgs.nodePackages_latest.vscode-json-languageserver
nixpkgs.nodePackages_latest.vscode-langservers-extracted nixpkgs.nodePackages_latest.vscode-langservers-extracted
nixpkgs.hadolint nixpkgs.hadolint
@@ -279,27 +278,20 @@
nixpkgs.fsautocomplete nixpkgs.fsautocomplete
nixpkgs.wget nixpkgs.wget
nixpkgs.yt-dlp nixpkgs.yt-dlp
nixpkgs.cmake
nixpkgs.gnumake
nixpkgs.gcc
nixpkgs.lldb nixpkgs.lldb
nixpkgs.hledger nixpkgs.hledger
nixpkgs.hledger-web nixpkgs.hledger-web
dotnet dotnet
nixpkgs.elan nixpkgs.elan
nixpkgs.coreutils-prefixed nixpkgs.coreutils-prefixed
nixpkgs.shellcheck
nixpkgs.universal-ctags
nixpkgs.asciinema nixpkgs.asciinema
nixpkgs.git-lfs nixpkgs.git-lfs
nixpkgs.imagemagick nixpkgs.imagemagick
nixpkgs.nixpkgs-fmt nixpkgs.nixpkgs-fmt
nixpkgs.age nixpkgs.age
nixpkgs.nodejs
nixpkgs.pyright nixpkgs.pyright
nixpkgs.woodpecker-agent nixpkgs.woodpecker-agent
nixpkgs.lynx nixpkgs.lynx
nixpkgs.alejandra
nixpkgs.ffmpeg nixpkgs.ffmpeg
nixpkgs.bat nixpkgs.bat
nixpkgs.pandoc nixpkgs.pandoc
@@ -313,6 +305,8 @@
nixpkgs.font-awesome nixpkgs.font-awesome
nixpkgs.gopls nixpkgs.gopls
nixpkgs.go nixpkgs.go
nixpkgs.libiconv
nixpkgs.ghostty
] ]
++ ( ++ (
if nixpkgs.stdenv.isLinux if nixpkgs.stdenv.isLinux

View File

@@ -1,19 +0,0 @@
{pkgs, ...}: {
programs.alacritty = {
enable = true;
settings = {
font = {
normal = {
family = "FiraCode Nerd Font Mono";
};
};
terminal = {shell = "${pkgs.zsh}/bin/zsh";};
};
};
home.packages = [
pkgs.alacritty
pkgs.nerd-fonts.fira-code
pkgs.nerd-fonts.droid-sans-mono
];
}

View File

@@ -0,0 +1,9 @@
{pkgs, ...}: {
programs.ghostty = {
enable = true;
};
home.packages = [
pkgs.ghostty
];
}

View File

@@ -0,0 +1,6 @@
{pkgs, ...}: {
home.packages = [
pkgs.shellcheck
pkgs.nodePackages_latest.bash-language-server
];
}

View File

@@ -29,8 +29,6 @@ zle -N edit-command-line
bindkey '^X^E' edit-command-line bindkey '^X^E' edit-command-line
bindkey -e bindkey -e
PATH="$PATH:$HOME/.cargo/bin"
if [[ -z "$TMUX" ]]; then if [[ -z "$TMUX" ]]; then
tmux new-session -A -s default tmux new-session -A -s default
fi fi