Skip to content

Commit 2d96da1

Browse files
committed
Remove vscode
1 parent b1ab2e8 commit 2d96da1

File tree

11 files changed

+25
-50
lines changed

11 files changed

+25
-50
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ nix flake update --override-input nixpkgs github:NixOS/nixpkgs/7252b96d60dc2ccf3
121121

122122
## Quirks
123123

124-
- VSCode needs `"password-store": "gnome-libsecret"` to `~/.vscode/argv.json` to see gnome-keyring
125124
- GParted needs `sudo -E gparted` to run
126125
- Although it shouldn't be needed, to change the M720 Triathlon buttons:
127126

configuration.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ lib, pkgs, ... }: {
1+
{ config, lib, pkgs, ... }: {
22
imports = [ ./system ];
33

44
system.copySystemConfiguration = false;
@@ -42,6 +42,7 @@
4242
# Better getty
4343
kmscon = {
4444
#enable = lib.mkDefault true;
45+
fonts = [ config.stylix.fonts.monospace ];
4546
useXkbConfig = true;
4647
hwRender = true;
4748
extraConfig = ''

desktop/hyprland.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
gvfs.enable = true;
2323
# Thumbnail support
2424
tumbler.enable = true;
25-
26-
# GNOME Keyring - used by VSCode mainly
27-
gnome.gnome-keyring.enable = true;
2825
};
2926

3027
programs = {

desktop/sway.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232

3333
displayManager.autoLogin.enable = lib.mkForce false;
3434

35-
# GNOME Keyring - used by VSCode mainly
36-
gnome.gnome-keyring.enable = true;
37-
3835
# XFCE File management
3936
# Mount, trash and more
4037
gvfs.enable = true;

home/dev.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
kubernetes-helm
5555
oci-cli
5656
terraform
57-
vscode
5857
cilium-cli
5958

6059
opennoodl

home/git.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,11 @@
5555
};
5656

5757
diff = {
58-
guitool = "vscode";
5958
srcprefix = "-h";
6059
zip.textconv = "unzip -c -a";
6160
};
6261

63-
difftool = {
64-
prompt = false;
65-
vscode.cmd = "code --wait --diff \"$LOCAL\" \"$REMOTE\"";
66-
};
62+
difftool.prompt = false;
6763
};
6864

6965
ignores = [

home/neovim.nix

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
{ config, pkgs, ... }: {
22
# Issues:
3-
# - Transparent background
4-
# - Open to vscode keybind (with confirmation/menu to open the whole dir)
53
# - Run python script with args/env (nvim-iron?)
64
# - Set up nvim-dap
75
# - Use nixvim?
86
# - Move to lua?
7+
# - Change theme
8+
# - Symbol hovering info (like vscode)
9+
# - Fix the fucking == comments
10+
# - Ctrl-backspace deletes the whole word
11+
# - TreeSitter? just better directory listing show? (icons, etc.)
12+
# - Integrated terminal
13+
# - Ctrl-<arrow> to accept only word of copilot suggestion
14+
# - Copilot by default? maybe with an alias?
15+
# - Markdown preview
16+
# - Better git diff view when `:G d`
17+
# - Some kind of multi-project support (windows? tabs?) and/or "open as project" default
18+
# - Command to edit nix/neovim config
19+
# - Better rebuild command
20+
# - Restart with the same buffers/state
21+
# - vscode-like runner (run this test/function/etc.)
922

1023
programs = {
1124
neovim = {

overlays/default.nix

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@ _: {
1212
];
1313
buildInputs = previousAttrs.buildInputs ++ [ final.libsForQt5.kguiaddons ];
1414
});
15-
16-
vscode = prev.vscode.overrideAttrs (oldAttrs: rec {
17-
plat = "linux-x64";
18-
19-
#gha-updater: VERSION="$(curl https://update.code.visualstudio.com/api/releases/stable | jq -r '. | first')" && echo -n "$VERSION $(nix-prefetch-url https://update.code.visualstudio.com/$VERSION/linux-x64/stable)"
20-
version = "1.100.2";
21-
sha256 = "1h55vjyv6vy4vyzi6lypnh4jrng8dgb7i6l9rq6k94lbl3mbnb2w";
22-
23-
src = prev.fetchurl {
24-
inherit sha256;
25-
name = "VSCode_${version}_${plat}.tar.gz";
26-
url = "https://update.code.visualstudio.com/${version}/${plat}/stable";
27-
};
28-
29-
postInstall = oldAttrs.postInstall or "" + ''
30-
# Create a wrapper script for VSCode
31-
wrapProgram "$out/bin/code" \
32-
--set LD_LIBRARY_PATH "${final.stdenv.cc.cc.lib}/lib/"
33-
'';
34-
});
3515
})
3616
];
3717
}

system/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ _: {
1212
./cli.nix
1313
./ddc-ci.nix
1414
./display.nix
15-
./fonts.nix
1615
./network.nix
1716
./steam.nix
1817
./theme.nix

system/fonts.nix

Lines changed: 0 additions & 11 deletions
This file was deleted.

system/theme.nix

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ let
33
base16Scheme = { name }: "${pkgs.base16-schemes}/share/themes/${name}.yaml";
44
in
55
{
6+
fonts.packages = with pkgs; [
7+
iosevka-bin
8+
nerd-fonts.iosevka
9+
];
10+
611
stylix = {
712
enable = true;
813
autoEnable = true;
@@ -19,8 +24,8 @@ in
1924

2025
fonts = {
2126
monospace = {
22-
package = pkgs.iosevka-bin;
23-
name = "Iosevka";
27+
package = pkgs.nerd-fonts.iosevka;
28+
name = "Iosevka Nerd Font";
2429
};
2530
sizes = {
2631
desktop = 12;

0 commit comments

Comments
 (0)