less import usage
This commit is contained in:
Vinzenz Schroeter
parent
f343ae1170
commit
e75cd528d0
|
|
@ -42,7 +42,7 @@
|
||||||
autoUpgrade = {
|
autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dates = "daily";
|
dates = "daily";
|
||||||
flake = "github:kaesaecracker/nixos-configuration";
|
flake = "git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,55 +1,57 @@
|
||||||
inputs@{ config, pkgs, ... }:
|
inputs@{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
imports = [ ./vscode.nix ];
|
||||||
## Apps
|
config.home-manager.users.ronja = {
|
||||||
telegram-desktop
|
home.packages = with pkgs; [
|
||||||
kdiff3
|
## Apps
|
||||||
];
|
telegram-desktop
|
||||||
|
kdiff3
|
||||||
|
];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
home-manager.enable = true;
|
home-manager.enable = true;
|
||||||
vscode = import ./vscode.nix inputs;
|
|
||||||
|
|
||||||
zsh = {
|
zsh = {
|
||||||
history = {
|
history = {
|
||||||
size = 10000;
|
size = 10000;
|
||||||
path = "${config.xdg.dataHome}/zsh/history";
|
path = "${config.xdg.dataHome}/zsh/history";
|
||||||
expireDuplicatesFirst = true;
|
expireDuplicatesFirst = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
oh-my-zsh = {
|
||||||
|
enable = true;
|
||||||
|
theme = "agnoster";
|
||||||
|
plugins = [
|
||||||
|
"git"
|
||||||
|
"sudo"
|
||||||
|
"systemadmin"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
oh-my-zsh = {
|
git = {
|
||||||
|
userName = "Ronja Spiegelberg";
|
||||||
|
userEmail = "ronja.spiegelberg@gmail.com";
|
||||||
|
|
||||||
|
extraConfig = {
|
||||||
|
pull.ff = "only";
|
||||||
|
merge.tool = "kdiff3";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
chromium = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "agnoster";
|
extensions = [
|
||||||
plugins = [
|
{
|
||||||
"git"
|
# ublock origin
|
||||||
"sudo"
|
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
||||||
"systemadmin"
|
}
|
||||||
|
{
|
||||||
|
id = "dcpihecpambacapedldabdbpakmachpb";
|
||||||
|
updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
git = {
|
|
||||||
userName = "Ronja Spiegelberg";
|
|
||||||
userEmail = "ronja.spiegelberg@gmail.com";
|
|
||||||
|
|
||||||
extraConfig = {
|
|
||||||
pull.ff = "only";
|
|
||||||
merge.tool = "kdiff3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
chromium = {
|
|
||||||
enable = true;
|
|
||||||
extensions = [
|
|
||||||
{
|
|
||||||
# ublock origin
|
|
||||||
id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "dcpihecpambacapedldabdbpakmachpb";
|
|
||||||
updateUrl = "https://raw.githubusercontent.com/iamadamdev/bypass-paywalls-chrome/master/updates.xml";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,56 +1,58 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
enable = true;
|
config.programs.vscode = {
|
||||||
package = pkgs.vscodium;
|
enable = true;
|
||||||
enableUpdateCheck = false;
|
package = pkgs.vscodium;
|
||||||
extensions = with pkgs.vscode-extensions; [
|
enableUpdateCheck = false;
|
||||||
bbenoist.nix
|
extensions = with pkgs.vscode-extensions; [
|
||||||
ms-python.python
|
bbenoist.nix
|
||||||
kamadorueda.alejandra
|
ms-python.python
|
||||||
editorconfig.editorconfig
|
kamadorueda.alejandra
|
||||||
yzhang.markdown-all-in-one
|
editorconfig.editorconfig
|
||||||
redhat.vscode-yaml
|
yzhang.markdown-all-in-one
|
||||||
pkief.material-icon-theme
|
redhat.vscode-yaml
|
||||||
rust-lang.rust-analyzer
|
pkief.material-icon-theme
|
||||||
tamasfe.even-better-toml
|
rust-lang.rust-analyzer
|
||||||
llvm-vs-code-extensions.vscode-clangd
|
tamasfe.even-better-toml
|
||||||
mkhl.direnv
|
llvm-vs-code-extensions.vscode-clangd
|
||||||
vadimcn.vscode-lldb
|
mkhl.direnv
|
||||||
ms-dotnettools.csharp
|
vadimcn.vscode-lldb
|
||||||
ms-vscode-remote.remote-ssh
|
ms-dotnettools.csharp
|
||||||
];
|
ms-vscode-remote.remote-ssh
|
||||||
userSettings = {
|
];
|
||||||
"files.autoSave" = "afterDelay";
|
userSettings = {
|
||||||
"files.autoSaveWhenNoErrors" = true;
|
"files.autoSave" = "afterDelay";
|
||||||
"files.autoSaveWorkspaceFilesOnly" = true;
|
"files.autoSaveWhenNoErrors" = true;
|
||||||
|
"files.autoSaveWorkspaceFilesOnly" = true;
|
||||||
|
|
||||||
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
|
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
|
||||||
"editor.fontLigatures" = true;
|
"editor.fontLigatures" = true;
|
||||||
"editor.formatOnSave" = true;
|
"editor.formatOnSave" = true;
|
||||||
"editor.formatOnSaveMode" = "modificationsIfAvailable";
|
"editor.formatOnSaveMode" = "modificationsIfAvailable";
|
||||||
"editor.minimap.autohide" = true;
|
"editor.minimap.autohide" = true;
|
||||||
|
|
||||||
"workbench.startupEditor" = "readme";
|
"workbench.startupEditor" = "readme";
|
||||||
"workbench.enableExperiments" = false;
|
"workbench.enableExperiments" = false;
|
||||||
"workbench.iconTheme" = "material-icon-theme";
|
"workbench.iconTheme" = "material-icon-theme";
|
||||||
|
|
||||||
"update.mode" = "none";
|
"update.mode" = "none";
|
||||||
"extensions.autoUpdate" = false;
|
"extensions.autoUpdate" = false;
|
||||||
"extensions.autoCheckUpdates" = false;
|
"extensions.autoCheckUpdates" = false;
|
||||||
|
|
||||||
"telemetry.telemetryLevel" = "off";
|
"telemetry.telemetryLevel" = "off";
|
||||||
"redhat.telemetry.enabled" = false;
|
"redhat.telemetry.enabled" = false;
|
||||||
|
|
||||||
"git.autofetch" = true;
|
"git.autofetch" = true;
|
||||||
"diffEditor.diffAlgorithm" = "advanced";
|
"diffEditor.diffAlgorithm" = "advanced";
|
||||||
"explorer.excludeGitIgnore" = true;
|
"explorer.excludeGitIgnore" = true;
|
||||||
"markdown.extension.tableFormatter.normalizeIndentation" = true;
|
"markdown.extension.tableFormatter.normalizeIndentation" = true;
|
||||||
"markdown.extension.toc.orderedList" = false;
|
"markdown.extension.toc.orderedList" = false;
|
||||||
"rust-analyzer.checkOnSave.command" = "clippy";
|
"rust-analyzer.checkOnSave.command" = "clippy";
|
||||||
|
|
||||||
"\[makefile\]" = {
|
"\[makefile\]" = {
|
||||||
"editor.insertSpaces" = false;
|
"editor.insertSpaces" = false;
|
||||||
"editor.detectIndentation" = false;
|
"editor.detectIndentation" = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,60 +1,66 @@
|
||||||
inputs@{ pkgs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [ ./gnome.nix ];
|
config.home-manager.users.vinzenz =
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./editorconfig.nix
|
||||||
|
./git.nix
|
||||||
|
./gnome.nix
|
||||||
|
./ssh.nix
|
||||||
|
./vscode.nix
|
||||||
|
./zsh.nix
|
||||||
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
programs = {
|
|
||||||
home-manager.enable = true;
|
|
||||||
fzf.enable = true;
|
|
||||||
zsh = import ./zsh.nix inputs;
|
|
||||||
git = import ./git.nix;
|
|
||||||
vscode = import ./vscode.nix inputs;
|
|
||||||
ssh = import ./ssh.nix;
|
|
||||||
git-credential-oauth.enable = true;
|
|
||||||
|
|
||||||
direnv = {
|
programs = {
|
||||||
enable = true;
|
home-manager.enable = true;
|
||||||
nix-direnv.enable = true;
|
fzf.enable = true;
|
||||||
};
|
git-credential-oauth.enable = true;
|
||||||
|
|
||||||
eza = {
|
direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
git = true;
|
nix-direnv.enable = true;
|
||||||
icons = "auto";
|
};
|
||||||
extraOptions = [
|
|
||||||
"--group-directories-first"
|
eza = {
|
||||||
"--header"
|
enable = true;
|
||||||
|
git = true;
|
||||||
|
icons = "auto";
|
||||||
|
extraOptions = [
|
||||||
|
"--group-directories-first"
|
||||||
|
"--header"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
thefuck = {
|
||||||
|
enable = true;
|
||||||
|
enableZshIntegration = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
keepassxc
|
||||||
|
insync
|
||||||
|
|
||||||
|
telegram-desktop
|
||||||
|
element-desktop
|
||||||
|
|
||||||
|
wireguard-tools
|
||||||
|
wirelesstools
|
||||||
|
|
||||||
|
kdiff3
|
||||||
|
jetbrains-toolbox
|
||||||
|
|
||||||
|
blanket
|
||||||
|
vlc
|
||||||
];
|
];
|
||||||
};
|
|
||||||
|
|
||||||
thefuck = {
|
home.file."policy.json" = {
|
||||||
enable = true;
|
target = ".config/containers/policy.json";
|
||||||
enableZshIntegration = true;
|
text = builtins.readFile ./.config/containers/policy.json;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
editorconfig = import ./editorconfig.nix;
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
keepassxc
|
|
||||||
insync
|
|
||||||
|
|
||||||
telegram-desktop
|
|
||||||
element-desktop
|
|
||||||
|
|
||||||
wireguard-tools
|
|
||||||
wirelesstools
|
|
||||||
|
|
||||||
kdiff3
|
|
||||||
jetbrains-toolbox
|
|
||||||
|
|
||||||
blanket
|
|
||||||
vlc
|
|
||||||
];
|
|
||||||
|
|
||||||
home.file."policy.json" = {
|
|
||||||
target = ".config/containers/policy.json";
|
|
||||||
text = builtins.readFile ./.config/containers/policy.json;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,20 @@
|
||||||
|
{ ... }:
|
||||||
{
|
{
|
||||||
enable = true;
|
config.editorconfig = {
|
||||||
settings = {
|
enable = true;
|
||||||
"*" = {
|
settings = {
|
||||||
charset = "utf-8";
|
"*" = {
|
||||||
end_of_line = "lf";
|
charset = "utf-8";
|
||||||
trim_trailing_whitespace = true;
|
end_of_line = "lf";
|
||||||
insert_final_newline = true;
|
trim_trailing_whitespace = true;
|
||||||
max_line_width = 120;
|
insert_final_newline = true;
|
||||||
indent_style = "space";
|
max_line_width = 120;
|
||||||
indent_size = 4;
|
indent_style = "space";
|
||||||
};
|
indent_size = 4;
|
||||||
"*.nix" = {
|
};
|
||||||
indent_size = 2;
|
"*.nix" = {
|
||||||
|
indent_size = 2;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,26 @@
|
||||||
|
{ ... }:
|
||||||
{
|
{
|
||||||
enable = true;
|
config.programs.git = {
|
||||||
userName = "Vinzenz Schroeter";
|
enable = true;
|
||||||
userEmail = "vinzenz.f.s@gmail.com";
|
userName = "Vinzenz Schroeter";
|
||||||
|
userEmail = "vinzenz.f.s@gmail.com";
|
||||||
|
|
||||||
aliases = {
|
aliases = {
|
||||||
prettylog = "log --pretty=oneline --graph";
|
prettylog = "log --pretty=oneline --graph";
|
||||||
spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
|
spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
|
||||||
|
};
|
||||||
|
|
||||||
|
extraConfig = {
|
||||||
|
pull.ff = "only";
|
||||||
|
merge.tool = "kdiff3";
|
||||||
|
push.autoSetupRemote = "true";
|
||||||
|
credential.credentialStore = "cache";
|
||||||
|
};
|
||||||
|
|
||||||
|
ignores = [
|
||||||
|
".direnv"
|
||||||
|
".idea"
|
||||||
|
".envrc"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = {
|
|
||||||
pull.ff = "only";
|
|
||||||
merge.tool = "kdiff3";
|
|
||||||
push.autoSetupRemote = "true";
|
|
||||||
credential.credentialStore = "cache";
|
|
||||||
};
|
|
||||||
|
|
||||||
ignores = [
|
|
||||||
".direnv"
|
|
||||||
".idea"
|
|
||||||
".envrc"
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
inputs@{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
home.packages = with pkgs.gnomeExtensions; [
|
home.packages = with pkgs.gnomeExtensions; [
|
||||||
|
|
|
||||||
|
|
@ -1,52 +1,55 @@
|
||||||
|
{ ... }:
|
||||||
{
|
{
|
||||||
enable = true;
|
config.programs.ssh = {
|
||||||
matchBlocks = {
|
enable = true;
|
||||||
"vpn1" = {
|
matchBlocks = {
|
||||||
host = "vpn1 hetzner-vpn1";
|
"vpn1" = {
|
||||||
hostname = "157.90.146.125"; # 2a01:4f8:c012:7137::/64
|
host = "vpn1 hetzner-vpn1";
|
||||||
user = "root";
|
hostname = "157.90.146.125"; # 2a01:4f8:c012:7137::/64
|
||||||
};
|
user = "root";
|
||||||
"vpn2" = {
|
};
|
||||||
host = "vpn2 hetzner-vpn2";
|
"vpn2" = {
|
||||||
hostname = "2a01:4f8:c013:65dd::1";
|
host = "vpn2 hetzner-vpn2";
|
||||||
user = "root";
|
hostname = "2a01:4f8:c013:65dd::1";
|
||||||
};
|
user = "root";
|
||||||
"vpn1-ts" = {
|
};
|
||||||
host = "vpn1-ts hetzner-vpn1.donkey-pentatonic.ts.net";
|
"vpn1-ts" = {
|
||||||
hostname = "hetzner-vpn1.donkey-pentatonic.ts.net";
|
host = "vpn1-ts hetzner-vpn1.donkey-pentatonic.ts.net";
|
||||||
user = "root";
|
hostname = "hetzner-vpn1.donkey-pentatonic.ts.net";
|
||||||
};
|
user = "root";
|
||||||
"openwrt" = {
|
};
|
||||||
host = "openwrt openwrt.lan";
|
"openwrt" = {
|
||||||
hostname = "openwrt.lan";
|
host = "openwrt openwrt.lan";
|
||||||
user = "root";
|
hostname = "openwrt.lan";
|
||||||
};
|
user = "root";
|
||||||
"openwrt-ts" = {
|
};
|
||||||
hostname = "openwrt.donkey-pentatonic.ts.net";
|
"openwrt-ts" = {
|
||||||
port = 2222;
|
hostname = "openwrt.donkey-pentatonic.ts.net";
|
||||||
user = "root";
|
port = 2222;
|
||||||
};
|
user = "root";
|
||||||
"openwrt-j" = {
|
};
|
||||||
hostname = "openwrt.donkey-pentatonic.ts.net";
|
"openwrt-j" = {
|
||||||
proxyJump = "vpn1";
|
hostname = "openwrt.donkey-pentatonic.ts.net";
|
||||||
port = 2222;
|
proxyJump = "vpn1";
|
||||||
user = "root";
|
port = 2222;
|
||||||
};
|
user = "root";
|
||||||
"pc2-power" = {
|
};
|
||||||
hostname = "openwrt.donkey-pentatonic.ts.net";
|
"pc2-power" = {
|
||||||
proxyJump = "vpn1";
|
hostname = "openwrt.donkey-pentatonic.ts.net";
|
||||||
port = 2222;
|
proxyJump = "vpn1";
|
||||||
user = "pc2-power";
|
port = 2222;
|
||||||
};
|
user = "pc2-power";
|
||||||
"avd-power" = {
|
};
|
||||||
# hostname = "2001:678:560:23:9833:63ff:fe2d:f477"
|
"avd-power" = {
|
||||||
# hostname = "195.160.172.25";
|
# hostname = "2001:678:560:23:9833:63ff:fe2d:f477"
|
||||||
hostname = "avd-jumphost.club.berlin.ccc.de";
|
# hostname = "195.160.172.25";
|
||||||
user = "power";
|
hostname = "avd-jumphost.club.berlin.ccc.de";
|
||||||
};
|
user = "power";
|
||||||
"avd" = {
|
};
|
||||||
hostname = "avd.club.berlin.ccc.de";
|
"avd" = {
|
||||||
user = "vinzenz";
|
hostname = "avd.club.berlin.ccc.de";
|
||||||
|
user = "vinzenz";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,58 +1,60 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
enable = true;
|
config.programs.vscode = {
|
||||||
package = pkgs.vscodium;
|
enable = true;
|
||||||
enableUpdateCheck = false;
|
package = pkgs.vscodium;
|
||||||
extensions = with pkgs.vscode-extensions; [
|
enableUpdateCheck = false;
|
||||||
bbenoist.nix
|
extensions = with pkgs.vscode-extensions; [
|
||||||
ms-python.python
|
bbenoist.nix
|
||||||
kamadorueda.alejandra
|
ms-python.python
|
||||||
editorconfig.editorconfig
|
kamadorueda.alejandra
|
||||||
yzhang.markdown-all-in-one
|
editorconfig.editorconfig
|
||||||
redhat.vscode-yaml
|
yzhang.markdown-all-in-one
|
||||||
pkief.material-icon-theme
|
redhat.vscode-yaml
|
||||||
rust-lang.rust-analyzer
|
pkief.material-icon-theme
|
||||||
tamasfe.even-better-toml
|
rust-lang.rust-analyzer
|
||||||
llvm-vs-code-extensions.vscode-clangd
|
tamasfe.even-better-toml
|
||||||
mkhl.direnv
|
llvm-vs-code-extensions.vscode-clangd
|
||||||
vadimcn.vscode-lldb
|
mkhl.direnv
|
||||||
ms-dotnettools.csharp
|
vadimcn.vscode-lldb
|
||||||
ms-vscode-remote.remote-ssh
|
ms-dotnettools.csharp
|
||||||
RoweWilsonFrederiskHolme.wikitext
|
ms-vscode-remote.remote-ssh
|
||||||
];
|
RoweWilsonFrederiskHolme.wikitext
|
||||||
userSettings = {
|
];
|
||||||
"files.autoSave" = "afterDelay";
|
userSettings = {
|
||||||
"files.autoSaveWhenNoErrors" = true;
|
"files.autoSave" = "afterDelay";
|
||||||
"files.autoSaveWorkspaceFilesOnly" = true;
|
"files.autoSaveWhenNoErrors" = true;
|
||||||
|
"files.autoSaveWorkspaceFilesOnly" = true;
|
||||||
|
|
||||||
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
|
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
|
||||||
"editor.fontLigatures" = true;
|
"editor.fontLigatures" = true;
|
||||||
"editor.formatOnSave" = true;
|
"editor.formatOnSave" = true;
|
||||||
"editor.formatOnSaveMode" = "modificationsIfAvailable";
|
"editor.formatOnSaveMode" = "modificationsIfAvailable";
|
||||||
"editor.minimap.autohide" = true;
|
"editor.minimap.autohide" = true;
|
||||||
|
|
||||||
"workbench.startupEditor" = "readme";
|
"workbench.startupEditor" = "readme";
|
||||||
"workbench.enableExperiments" = false;
|
"workbench.enableExperiments" = false;
|
||||||
"workbench.iconTheme" = "material-icon-theme";
|
"workbench.iconTheme" = "material-icon-theme";
|
||||||
|
|
||||||
"update.mode" = "none";
|
"update.mode" = "none";
|
||||||
"extensions.autoUpdate" = false;
|
"extensions.autoUpdate" = false;
|
||||||
"extensions.autoCheckUpdates" = false;
|
"extensions.autoCheckUpdates" = false;
|
||||||
|
|
||||||
"telemetry.telemetryLevel" = "off";
|
"telemetry.telemetryLevel" = "off";
|
||||||
"redhat.telemetry.enabled" = false;
|
"redhat.telemetry.enabled" = false;
|
||||||
|
|
||||||
"git.autofetch" = true;
|
"git.autofetch" = true;
|
||||||
"git.path" = "${lib.getBin pkgs.git}/bin/git";
|
"git.path" = "${lib.getBin pkgs.git}/bin/git";
|
||||||
"diffEditor.diffAlgorithm" = "advanced";
|
"diffEditor.diffAlgorithm" = "advanced";
|
||||||
"explorer.excludeGitIgnore" = true;
|
"explorer.excludeGitIgnore" = true;
|
||||||
"markdown.extension.tableFormatter.normalizeIndentation" = true;
|
"markdown.extension.tableFormatter.normalizeIndentation" = true;
|
||||||
"markdown.extension.toc.orderedList" = false;
|
"markdown.extension.toc.orderedList" = false;
|
||||||
"rust-analyzer.checkOnSave.command" = "clippy";
|
"rust-analyzer.checkOnSave.command" = "clippy";
|
||||||
|
|
||||||
"\[makefile\]" = {
|
"\[makefile\]" = {
|
||||||
"editor.insertSpaces" = false;
|
"editor.insertSpaces" = false;
|
||||||
"editor.detectIndentation" = false;
|
"editor.detectIndentation" = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,41 +1,43 @@
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
initExtra = ''
|
config.programs.zsh = {
|
||||||
eval "$(direnv hook zsh)";
|
initExtra = ''
|
||||||
export PATH=$PATH:/home/vinzenz/.cargo/bin
|
eval "$(direnv hook zsh)";
|
||||||
'';
|
export PATH=$PATH:/home/vinzenz/.cargo/bin
|
||||||
|
'';
|
||||||
|
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
my-apply = "sudo nixos-rebuild boot --flake";
|
my-apply = "sudo nixos-rebuild boot --flake";
|
||||||
my-switch = "sudo nixos-rebuild switch --flake";
|
my-switch = "sudo nixos-rebuild switch --flake";
|
||||||
my-update = "sudo nixos-rebuild boot --upgrade --flake";
|
my-update = "sudo nixos-rebuild boot --upgrade --flake";
|
||||||
my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
|
my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
|
||||||
my-test = "sudo nixos-rebuild test";
|
my-test = "sudo nixos-rebuild test";
|
||||||
my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
|
my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
|
||||||
my-ip4 = "ip addr show | grep 192";
|
my-ip4 = "ip addr show | grep 192";
|
||||||
deadnix = "nix run github:astro/deadnix -- ";
|
deadnix = "nix run github:astro/deadnix -- ";
|
||||||
statix = "nix run git+https://git.peppe.rs/languages/statix -- ";
|
statix = "nix run git+https://git.peppe.rs/languages/statix -- ";
|
||||||
};
|
};
|
||||||
|
|
||||||
history = {
|
history = {
|
||||||
size = 10000;
|
size = 10000;
|
||||||
path = "${config.xdg.dataHome}/zsh/history";
|
path = "${config.xdg.dataHome}/zsh/history";
|
||||||
expireDuplicatesFirst = true;
|
expireDuplicatesFirst = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "agnoster";
|
theme = "agnoster";
|
||||||
plugins = [
|
plugins = [
|
||||||
"git"
|
"git"
|
||||||
"sudo"
|
"sudo"
|
||||||
"systemadmin"
|
"systemadmin"
|
||||||
"battery"
|
"battery"
|
||||||
"dotnet"
|
"dotnet"
|
||||||
"rust"
|
"rust"
|
||||||
"tailscale"
|
"tailscale"
|
||||||
];
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,32 @@
|
||||||
{
|
{ pkgs, ... }:
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
imports = [ ./nginx.nix ];
|
imports = [ ./nginx.nix ];
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
nix.settings.extra-platforms = [
|
|
||||||
"aarch64-linux"
|
|
||||||
"i686-linux"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.xserver.xkb = {
|
config = {
|
||||||
# Configure keymap in X11
|
networking.networkmanager.enable = true;
|
||||||
layout = "de";
|
nix.settings.extra-platforms = [
|
||||||
variant = "";
|
"aarch64-linux"
|
||||||
|
"i686-linux"
|
||||||
|
];
|
||||||
|
|
||||||
|
services.xserver.xkb = {
|
||||||
|
# Configure keymap in X11
|
||||||
|
layout = "de";
|
||||||
|
variant = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Configure console keymap
|
||||||
|
console.keyMap = "de";
|
||||||
|
|
||||||
|
users.users.vinzenz.openssh.authorizedKeys.keys = [
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
|
||||||
|
];
|
||||||
|
|
||||||
|
#users.users.ronja.openssh.authorizedKeys.keys = [
|
||||||
|
# ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key''
|
||||||
|
#];
|
||||||
|
|
||||||
|
programs.adb.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Configure console keymap
|
|
||||||
console.keyMap = "de";
|
|
||||||
|
|
||||||
home-manager.users.vinzenz = import ../../home/vinzenz;
|
|
||||||
|
|
||||||
users.users.vinzenz.openssh.authorizedKeys.keys = [
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming''
|
|
||||||
];
|
|
||||||
|
|
||||||
#users.users.ronja.openssh.authorizedKeys.keys = [
|
|
||||||
# ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key''
|
|
||||||
#];
|
|
||||||
|
|
||||||
programs.adb.enable = true;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,5 +11,6 @@
|
||||||
../../modules/desktop-environment.nix
|
../../modules/desktop-environment.nix
|
||||||
../../modules/desktop-hardware.nix
|
../../modules/desktop-hardware.nix
|
||||||
|
|
||||||
|
../../home/vinzenz
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,40 +1,34 @@
|
||||||
{
|
{ pkgs, ... }:
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./vscode-server.nix
|
./vscode-server.nix
|
||||||
];
|
];
|
||||||
networking.networkmanager.enable = true;
|
config = {
|
||||||
nix.settings.extra-platforms = [
|
networking.networkmanager.enable = true;
|
||||||
"aarch64-linux"
|
nix.settings.extra-platforms = [
|
||||||
"i686-linux"
|
"aarch64-linux"
|
||||||
];
|
"i686-linux"
|
||||||
|
];
|
||||||
|
|
||||||
services.xserver.xkb = {
|
services.xserver.xkb = {
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
layout = "de";
|
layout = "de";
|
||||||
variant = "";
|
variant = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Configure console keymap
|
||||||
|
console.keyMap = "de";
|
||||||
|
|
||||||
|
users.users.vinzenz.openssh.authorizedKeys.keys = [
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming''
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
|
||||||
|
];
|
||||||
|
|
||||||
|
users.users.ronja.openssh.authorizedKeys.keys = [
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key''
|
||||||
|
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius''
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Configure console keymap
|
|
||||||
console.keyMap = "de";
|
|
||||||
|
|
||||||
home-manager.users = {
|
|
||||||
vinzenz = import ../../home/vinzenz;
|
|
||||||
ronja = import ../../home/ronja;
|
|
||||||
};
|
|
||||||
|
|
||||||
users.users.vinzenz.openssh.authorizedKeys.keys = [
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming''
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH''
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming''
|
|
||||||
];
|
|
||||||
|
|
||||||
users.users.ronja.openssh.authorizedKeys.keys = [
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ssh-host-key''
|
|
||||||
''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgN6J8KyVyQqBAz+y3drXDmIsxOPkdPB+ISgpIP9Eld Generated By Termius''
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,5 +11,7 @@
|
||||||
../../home
|
../../home
|
||||||
../../modules/desktop-environment.nix
|
../../modules/desktop-environment.nix
|
||||||
../../modules/desktop-hardware.nix
|
../../modules/desktop-hardware.nix
|
||||||
|
|
||||||
|
../../home/vinzenz
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue