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.

Sign up for GitHub

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

Resolving VSCode Terminal #10

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Resolving VSCode Terminal #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a282b1a
Deprecated
ZeroDeth Aug 2, 2023
665a306
Matching `/etc/nixos/configuration.nix`
ZeroDeth Aug 2, 2023
50c49fc
Revert old pkgs installation
ZeroDeth Aug 2, 2023
3b6b8c4
Revert Kitty
ZeroDeth Aug 2, 2023
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
19 changes: 14 additions & 5 deletions hosts/linode/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,24 @@
# public binary cache that I use for all my derivations. You can keep
# this, use your own, or toss it. Its typically safe to use a binary cache
# since the data inside is checksummed.
binaryCaches = ["https://mitchellh-nixos-config.cachix.org"];
binaryCachePublicKeys = ["mitchellh-nixos-config.cachix.org-1:bjEbXJyLrL1HZZHBbO4QALnI5faYZppzkU4D2s0G8RQ="];
settings = {
substituters = ["https://mitchellh-nixos-config.cachix.org"];
trusted-public-keys = ["mitchellh-nixos-config.cachix.org-1:bjEbXJyLrL1HZZHBbO4QALnI5faYZppzkU4D2s0G8RQ="];
};
};

nixpkgs.config.permittedInsecurePackages = [
# Needed for k2pdfopt 2.53.
"mupdf-1.17.0"
"nodejs-16.20.0"
"nodejs-16.20.1"
"nodejs-18.16.1"
];

nixpkgs.config.allowUnfree = true;

# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
# boot.loader.grub.efiSupport = true;
# boot.loader.grub.efiInstallAsRemovable = true;
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
Expand Down Expand Up @@ -107,7 +116,7 @@
vim
# firefox
nixUnstable
nodejs-16_x
nodejs
yarn
git

Expand Down Expand Up @@ -169,7 +178,7 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
system.stateVersion = "23.05"; # Did you read the comment?

# Enable Longview Agent
services.longview = {
Expand Down
16 changes: 9 additions & 7 deletions machines/linode-intel.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,24 @@
# public binary cache that I use for all my derivations. You can keep
# this, use your own, or toss it. Its typically safe to use a binary cache
# since the data inside is checksummed.
binaryCaches = ["https://mitchellh-nixos-config.cachix.org"];
binaryCachePublicKeys = ["mitchellh-nixos-config.cachix.org-1:bjEbXJyLrL1HZZHBbO4QALnI5faYZppzkU4D2s0G8RQ="];
settings = {
substituters = ["https://mitchellh-nixos-config.cachix.org"];
trusted-public-keys = ["mitchellh-nixos-config.cachix.org-1:bjEbXJyLrL1HZZHBbO4QALnI5faYZppzkU4D2s0G8RQ="];
};
};

nixpkgs.config.permittedInsecurePackages = [
# Needed for k2pdfopt 2.53.
"mupdf-1.17.0"
"nodejs-16.20.0"
"nodejs-16.20.1"
"nodejs-18.16.1"
];

nixpkgs.config.allowUnfree = true;

# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
# boot.loader.grub.efiSupport = true;
# boot.loader.grub.efiInstallAsRemovable = true;
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
Expand Down Expand Up @@ -170,13 +172,13 @@
inetutils
mtr
sysstat
# vim
vim
# firefox
nixUnstable
nodejs
nodejs_16
yarn
# git
code-server
git
# code-server

# For hypervisors that support auto-resizing, this script forces it.
# I've noticed not everyone listens to the udev events so this is a hack.
Expand Down
6 changes: 4 additions & 2 deletions users/zerodeth/config.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,10 @@ end
# Ghostty supports auto-injection but Nix-darwin hard overwrites XDG_DATA_DIRS
# which make it so that we can't use the auto-injection. We have to source
# manually.
if set -q GHOSTTY_RESOURCES_DIR
source "$GHOSTTY_RESOURCES_DIR/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
if set -q KITTY_INSTALLATION_DIR
set --global KITTY_SHELL_INTEGRATION enabled
source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
end

#-------------------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions users/zerodeth/home-manager.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ in {
"source ${sources.theme-bobthefish}/functions/fish_prompt.fish"
"source ${sources.theme-bobthefish}/functions/fish_right_prompt.fish"
"source ${sources.theme-bobthefish}/functions/fish_title.fish"
] ++ (if isDarwin then [
# On Mac, we want to always set this to load the shell integration for the
# terminals we use. Kitty always sets this but other terminals also work
# with this just fine.
"set -g KITTY_INSTALLATION_DIR ${pkgs.kitty}/Applications/kitty.app/Contents/Resources/kitty"
] else []) ++ [
(builtins.readFile ./config.fish)
"set -g SHELL ${pkgs.fish}/bin/fish"
]));
Expand Down