mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-12-21 19:24:15 +00:00
Compare commits
2 commits
63aefa9edf
...
9379108490
Author | SHA1 | Date | |
---|---|---|---|
|
9379108490 | ||
|
03f5c8878c |
5 changed files with 42 additions and 47 deletions
|
@ -17,11 +17,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -27,7 +27,7 @@ let
|
|||
"-git-assume-unchanged-size 0"
|
||||
"-theme /etc/powerline-theme.json"
|
||||
"-path-aliases '~/git=~/git'"
|
||||
"-jobs $(jobs -p | wc -l)"
|
||||
"-jobs $(jobs -pr | wc -l)"
|
||||
];
|
||||
|
||||
termtitle = ''\[\e]0;\u@\h: \w\a\]'';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
aconfig = (pkgs.formats.toml { }).generate "alacritty.toml"
|
||||
config = (pkgs.formats.toml { }).generate "alacritty.toml"
|
||||
{
|
||||
env.TERM = "xterm-256color";
|
||||
font.size = 12;
|
||||
|
@ -32,11 +32,9 @@ let
|
|||
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (config.sconfig.desktop.enable) {
|
||||
environment.etc."xdg/alacritty.toml".source = aconfig;
|
||||
environment.systemPackages = [
|
||||
(lib.hiPrio notify-fix)
|
||||
pkgs.alacritty
|
||||
];
|
||||
};
|
||||
environment.etc."xdg/alacritty.toml".source = config;
|
||||
environment.systemPackages = [
|
||||
(lib.hiPrio notify-fix)
|
||||
pkgs.alacritty
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,37 +1,35 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
config = lib.mkIf (config.sconfig.desktop.enable) {
|
||||
environment.systemPackages = with pkgs; [
|
||||
(vscode-with-extensions.override {
|
||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||
esbenp.prettier-vscode
|
||||
jnoortheen.nix-ide
|
||||
ms-azuretools.vscode-docker
|
||||
ms-python.python
|
||||
redhat.vscode-yaml
|
||||
shardulm94.trailing-spaces
|
||||
];
|
||||
})
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
(vscode-with-extensions.override {
|
||||
vscodeExtensions = with pkgs.vscode-extensions; [
|
||||
esbenp.prettier-vscode
|
||||
jnoortheen.nix-ide
|
||||
ms-azuretools.vscode-docker
|
||||
ms-python.python
|
||||
redhat.vscode-yaml
|
||||
shardulm94.trailing-spaces
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
environment.etc."bck-settings.sh".text = ''
|
||||
mkdir -p ~/.config/Code/User
|
||||
ln -sf /etc/vscode-settings.json ~/.config/Code/User/settings.json
|
||||
ln -sf /etc/vscode-keybindings.json ~/.config/Code/User/keybindings.json
|
||||
'';
|
||||
environment.etc."bck-settings.sh".text = ''
|
||||
mkdir -p ~/.config/Code/User
|
||||
ln -sf /etc/vscode-settings.json ~/.config/Code/User/settings.json
|
||||
ln -sf /etc/vscode-keybindings.json ~/.config/Code/User/keybindings.json
|
||||
'';
|
||||
|
||||
environment.etc."vscode-keybindings.json".source = ./vscode-keybindings.json;
|
||||
environment.etc."vscode-settings.json".text = builtins.toJSON (
|
||||
(
|
||||
builtins.fromJSON (builtins.readFile ./vscode-settings.json)
|
||||
) // {
|
||||
# NixOS-specific vscode settings:
|
||||
"extensions.autoCheckUpdates" = false;
|
||||
"extensions.autoUpdate" = false;
|
||||
"terminal.external.linuxExec" = "x-terminal-emulator";
|
||||
"terminal.integrated.fontFamily" = "DejaVuSansM Nerd Font";
|
||||
"update.mode" = "none";
|
||||
}
|
||||
);
|
||||
};
|
||||
environment.etc."vscode-keybindings.json".source = ./vscode-keybindings.json;
|
||||
environment.etc."vscode-settings.json".text = builtins.toJSON (
|
||||
(
|
||||
builtins.fromJSON (builtins.readFile ./vscode-settings.json)
|
||||
) // {
|
||||
# NixOS-specific vscode settings:
|
||||
"extensions.autoCheckUpdates" = false;
|
||||
"extensions.autoUpdate" = false;
|
||||
"terminal.external.linuxExec" = "x-terminal-emulator";
|
||||
"terminal.integrated.fontFamily" = "DejaVuSansM Nerd Font";
|
||||
"update.mode" = "none";
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
@ -36,7 +36,6 @@ in
|
|||
normal.A-j = ":buffer-previous";
|
||||
normal.A-k = ":buffer-next";
|
||||
normal.space.e = ":w";
|
||||
normal.space.x = ":q";
|
||||
normal.space.backspace = ":reset-diff-change";
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue