diff --git a/common/nixpkgs.nix b/common/nixpkgs.nix
index 42d7c03..03c9c0c 100644
--- a/common/nixpkgs.nix
+++ b/common/nixpkgs.nix
@@ -42,7 +42,7 @@
autoUpgrade = {
enable = true;
dates = "daily";
- flake = "github:kaesaecracker/nixos-configuration";
+ flake = "git+https://git.berlin.ccc.de/vinzenz/nixos-configuration.git";
};
};
diff --git a/home/ronja/default.nix b/home/ronja/default.nix
index 35fa2d9..b4bebd0 100644
--- a/home/ronja/default.nix
+++ b/home/ronja/default.nix
@@ -1,55 +1,57 @@
inputs@{ config, pkgs, ... }:
{
- home.packages = with pkgs; [
- ## Apps
- telegram-desktop
- kdiff3
- ];
+ imports = [ ./vscode.nix ];
+ config.home-manager.users.ronja = {
+ home.packages = with pkgs; [
+ ## Apps
+ telegram-desktop
+ kdiff3
+ ];
- programs = {
- home-manager.enable = true;
- vscode = import ./vscode.nix inputs;
+ programs = {
+ home-manager.enable = true;
- zsh = {
- history = {
- size = 10000;
- path = "${config.xdg.dataHome}/zsh/history";
- expireDuplicatesFirst = true;
+ zsh = {
+ history = {
+ size = 10000;
+ path = "${config.xdg.dataHome}/zsh/history";
+ 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;
- theme = "agnoster";
- plugins = [
- "git"
- "sudo"
- "systemadmin"
+ extensions = [
+ {
+ # ublock origin
+ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
+ }
+ {
+ 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";
- }
- ];
- };
};
}
diff --git a/home/ronja/vscode.nix b/home/ronja/vscode.nix
index 29f5046..79ab666 100644
--- a/home/ronja/vscode.nix
+++ b/home/ronja/vscode.nix
@@ -1,56 +1,58 @@
{ pkgs, ... }:
{
- enable = true;
- package = pkgs.vscodium;
- enableUpdateCheck = false;
- extensions = with pkgs.vscode-extensions; [
- bbenoist.nix
- ms-python.python
- kamadorueda.alejandra
- editorconfig.editorconfig
- yzhang.markdown-all-in-one
- redhat.vscode-yaml
- pkief.material-icon-theme
- rust-lang.rust-analyzer
- tamasfe.even-better-toml
- llvm-vs-code-extensions.vscode-clangd
- mkhl.direnv
- vadimcn.vscode-lldb
- ms-dotnettools.csharp
- ms-vscode-remote.remote-ssh
- ];
- userSettings = {
- "files.autoSave" = "afterDelay";
- "files.autoSaveWhenNoErrors" = true;
- "files.autoSaveWorkspaceFilesOnly" = true;
+ config.programs.vscode = {
+ enable = true;
+ package = pkgs.vscodium;
+ enableUpdateCheck = false;
+ extensions = with pkgs.vscode-extensions; [
+ bbenoist.nix
+ ms-python.python
+ kamadorueda.alejandra
+ editorconfig.editorconfig
+ yzhang.markdown-all-in-one
+ redhat.vscode-yaml
+ pkief.material-icon-theme
+ rust-lang.rust-analyzer
+ tamasfe.even-better-toml
+ llvm-vs-code-extensions.vscode-clangd
+ mkhl.direnv
+ vadimcn.vscode-lldb
+ ms-dotnettools.csharp
+ ms-vscode-remote.remote-ssh
+ ];
+ userSettings = {
+ "files.autoSave" = "afterDelay";
+ "files.autoSaveWhenNoErrors" = true;
+ "files.autoSaveWorkspaceFilesOnly" = true;
- "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
- "editor.fontLigatures" = true;
- "editor.formatOnSave" = true;
- "editor.formatOnSaveMode" = "modificationsIfAvailable";
- "editor.minimap.autohide" = true;
+ "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
+ "editor.fontLigatures" = true;
+ "editor.formatOnSave" = true;
+ "editor.formatOnSaveMode" = "modificationsIfAvailable";
+ "editor.minimap.autohide" = true;
- "workbench.startupEditor" = "readme";
- "workbench.enableExperiments" = false;
- "workbench.iconTheme" = "material-icon-theme";
+ "workbench.startupEditor" = "readme";
+ "workbench.enableExperiments" = false;
+ "workbench.iconTheme" = "material-icon-theme";
- "update.mode" = "none";
- "extensions.autoUpdate" = false;
- "extensions.autoCheckUpdates" = false;
+ "update.mode" = "none";
+ "extensions.autoUpdate" = false;
+ "extensions.autoCheckUpdates" = false;
- "telemetry.telemetryLevel" = "off";
- "redhat.telemetry.enabled" = false;
+ "telemetry.telemetryLevel" = "off";
+ "redhat.telemetry.enabled" = false;
- "git.autofetch" = true;
- "diffEditor.diffAlgorithm" = "advanced";
- "explorer.excludeGitIgnore" = true;
- "markdown.extension.tableFormatter.normalizeIndentation" = true;
- "markdown.extension.toc.orderedList" = false;
- "rust-analyzer.checkOnSave.command" = "clippy";
+ "git.autofetch" = true;
+ "diffEditor.diffAlgorithm" = "advanced";
+ "explorer.excludeGitIgnore" = true;
+ "markdown.extension.tableFormatter.normalizeIndentation" = true;
+ "markdown.extension.toc.orderedList" = false;
+ "rust-analyzer.checkOnSave.command" = "clippy";
- "\[makefile\]" = {
- "editor.insertSpaces" = false;
- "editor.detectIndentation" = false;
+ "\[makefile\]" = {
+ "editor.insertSpaces" = false;
+ "editor.detectIndentation" = false;
+ };
};
};
}
diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix
index 1ff08c4..1f2ff01 100644
--- a/home/vinzenz/default.nix
+++ b/home/vinzenz/default.nix
@@ -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 = {
- 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;
+ config = {
- direnv = {
- enable = true;
- nix-direnv.enable = true;
- };
+ programs = {
+ home-manager.enable = true;
+ fzf.enable = true;
+ git-credential-oauth.enable = true;
- eza = {
- enable = true;
- git = true;
- icons = "auto";
- extraOptions = [
- "--group-directories-first"
- "--header"
+ direnv = {
+ enable = true;
+ nix-direnv.enable = true;
+ };
+
+ eza = {
+ 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 = {
- enable = true;
- enableZshIntegration = true;
+ home.file."policy.json" = {
+ target = ".config/containers/policy.json";
+ 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;
- };
- };
}
diff --git a/home/vinzenz/editorconfig.nix b/home/vinzenz/editorconfig.nix
index 8eb3987..496c714 100644
--- a/home/vinzenz/editorconfig.nix
+++ b/home/vinzenz/editorconfig.nix
@@ -1,17 +1,20 @@
+{ ... }:
{
- enable = true;
- settings = {
- "*" = {
- charset = "utf-8";
- end_of_line = "lf";
- trim_trailing_whitespace = true;
- insert_final_newline = true;
- max_line_width = 120;
- indent_style = "space";
- indent_size = 4;
- };
- "*.nix" = {
- indent_size = 2;
+ config.editorconfig = {
+ enable = true;
+ settings = {
+ "*" = {
+ charset = "utf-8";
+ end_of_line = "lf";
+ trim_trailing_whitespace = true;
+ insert_final_newline = true;
+ max_line_width = 120;
+ indent_style = "space";
+ indent_size = 4;
+ };
+ "*.nix" = {
+ indent_size = 2;
+ };
};
};
}
diff --git a/home/vinzenz/git.nix b/home/vinzenz/git.nix
index 3aee6da..ddaa890 100644
--- a/home/vinzenz/git.nix
+++ b/home/vinzenz/git.nix
@@ -1,23 +1,26 @@
+{ ... }:
{
- enable = true;
- userName = "Vinzenz Schroeter";
- userEmail = "vinzenz.f.s@gmail.com";
+ config.programs.git = {
+ enable = true;
+ userName = "Vinzenz Schroeter";
+ userEmail = "vinzenz.f.s@gmail.com";
- aliases = {
- prettylog = "log --pretty=oneline --graph";
- spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d";
+ aliases = {
+ prettylog = "log --pretty=oneline --graph";
+ 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"
- ];
}
diff --git a/home/vinzenz/gnome.nix b/home/vinzenz/gnome.nix
index 4e70618..b0f6e3d 100644
--- a/home/vinzenz/gnome.nix
+++ b/home/vinzenz/gnome.nix
@@ -1,4 +1,4 @@
-inputs@{ pkgs, ... }:
+{ pkgs, ... }:
{
config = {
home.packages = with pkgs.gnomeExtensions; [
diff --git a/home/vinzenz/ssh.nix b/home/vinzenz/ssh.nix
index ae25099..260185f 100644
--- a/home/vinzenz/ssh.nix
+++ b/home/vinzenz/ssh.nix
@@ -1,52 +1,55 @@
+{ ... }:
{
- enable = true;
- matchBlocks = {
- "vpn1" = {
- host = "vpn1 hetzner-vpn1";
- hostname = "157.90.146.125"; # 2a01:4f8:c012:7137::/64
- user = "root";
- };
- "vpn2" = {
- host = "vpn2 hetzner-vpn2";
- hostname = "2a01:4f8:c013:65dd::1";
- user = "root";
- };
- "vpn1-ts" = {
- host = "vpn1-ts hetzner-vpn1.donkey-pentatonic.ts.net";
- hostname = "hetzner-vpn1.donkey-pentatonic.ts.net";
- user = "root";
- };
- "openwrt" = {
- host = "openwrt openwrt.lan";
- hostname = "openwrt.lan";
- user = "root";
- };
- "openwrt-ts" = {
- hostname = "openwrt.donkey-pentatonic.ts.net";
- port = 2222;
- user = "root";
- };
- "openwrt-j" = {
- hostname = "openwrt.donkey-pentatonic.ts.net";
- proxyJump = "vpn1";
- port = 2222;
- user = "root";
- };
- "pc2-power" = {
- hostname = "openwrt.donkey-pentatonic.ts.net";
- proxyJump = "vpn1";
- port = 2222;
- user = "pc2-power";
- };
- "avd-power" = {
- # hostname = "2001:678:560:23:9833:63ff:fe2d:f477"
- # hostname = "195.160.172.25";
- hostname = "avd-jumphost.club.berlin.ccc.de";
- user = "power";
- };
- "avd" = {
- hostname = "avd.club.berlin.ccc.de";
- user = "vinzenz";
+ config.programs.ssh = {
+ enable = true;
+ matchBlocks = {
+ "vpn1" = {
+ host = "vpn1 hetzner-vpn1";
+ hostname = "157.90.146.125"; # 2a01:4f8:c012:7137::/64
+ user = "root";
+ };
+ "vpn2" = {
+ host = "vpn2 hetzner-vpn2";
+ hostname = "2a01:4f8:c013:65dd::1";
+ user = "root";
+ };
+ "vpn1-ts" = {
+ host = "vpn1-ts hetzner-vpn1.donkey-pentatonic.ts.net";
+ hostname = "hetzner-vpn1.donkey-pentatonic.ts.net";
+ user = "root";
+ };
+ "openwrt" = {
+ host = "openwrt openwrt.lan";
+ hostname = "openwrt.lan";
+ user = "root";
+ };
+ "openwrt-ts" = {
+ hostname = "openwrt.donkey-pentatonic.ts.net";
+ port = 2222;
+ user = "root";
+ };
+ "openwrt-j" = {
+ hostname = "openwrt.donkey-pentatonic.ts.net";
+ proxyJump = "vpn1";
+ port = 2222;
+ user = "root";
+ };
+ "pc2-power" = {
+ hostname = "openwrt.donkey-pentatonic.ts.net";
+ proxyJump = "vpn1";
+ port = 2222;
+ user = "pc2-power";
+ };
+ "avd-power" = {
+ # hostname = "2001:678:560:23:9833:63ff:fe2d:f477"
+ # hostname = "195.160.172.25";
+ hostname = "avd-jumphost.club.berlin.ccc.de";
+ user = "power";
+ };
+ "avd" = {
+ hostname = "avd.club.berlin.ccc.de";
+ user = "vinzenz";
+ };
};
};
}
diff --git a/home/vinzenz/vscode.nix b/home/vinzenz/vscode.nix
index 0faf92e..098fc4a 100644
--- a/home/vinzenz/vscode.nix
+++ b/home/vinzenz/vscode.nix
@@ -1,58 +1,60 @@
{ pkgs, lib, ... }:
{
- enable = true;
- package = pkgs.vscodium;
- enableUpdateCheck = false;
- extensions = with pkgs.vscode-extensions; [
- bbenoist.nix
- ms-python.python
- kamadorueda.alejandra
- editorconfig.editorconfig
- yzhang.markdown-all-in-one
- redhat.vscode-yaml
- pkief.material-icon-theme
- rust-lang.rust-analyzer
- tamasfe.even-better-toml
- llvm-vs-code-extensions.vscode-clangd
- mkhl.direnv
- vadimcn.vscode-lldb
- ms-dotnettools.csharp
- ms-vscode-remote.remote-ssh
- RoweWilsonFrederiskHolme.wikitext
- ];
- userSettings = {
- "files.autoSave" = "afterDelay";
- "files.autoSaveWhenNoErrors" = true;
- "files.autoSaveWorkspaceFilesOnly" = true;
+ config.programs.vscode = {
+ enable = true;
+ package = pkgs.vscodium;
+ enableUpdateCheck = false;
+ extensions = with pkgs.vscode-extensions; [
+ bbenoist.nix
+ ms-python.python
+ kamadorueda.alejandra
+ editorconfig.editorconfig
+ yzhang.markdown-all-in-one
+ redhat.vscode-yaml
+ pkief.material-icon-theme
+ rust-lang.rust-analyzer
+ tamasfe.even-better-toml
+ llvm-vs-code-extensions.vscode-clangd
+ mkhl.direnv
+ vadimcn.vscode-lldb
+ ms-dotnettools.csharp
+ ms-vscode-remote.remote-ssh
+ RoweWilsonFrederiskHolme.wikitext
+ ];
+ userSettings = {
+ "files.autoSave" = "afterDelay";
+ "files.autoSaveWhenNoErrors" = true;
+ "files.autoSaveWorkspaceFilesOnly" = true;
- "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
- "editor.fontLigatures" = true;
- "editor.formatOnSave" = true;
- "editor.formatOnSaveMode" = "modificationsIfAvailable";
- "editor.minimap.autohide" = true;
+ "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
+ "editor.fontLigatures" = true;
+ "editor.formatOnSave" = true;
+ "editor.formatOnSaveMode" = "modificationsIfAvailable";
+ "editor.minimap.autohide" = true;
- "workbench.startupEditor" = "readme";
- "workbench.enableExperiments" = false;
- "workbench.iconTheme" = "material-icon-theme";
+ "workbench.startupEditor" = "readme";
+ "workbench.enableExperiments" = false;
+ "workbench.iconTheme" = "material-icon-theme";
- "update.mode" = "none";
- "extensions.autoUpdate" = false;
- "extensions.autoCheckUpdates" = false;
+ "update.mode" = "none";
+ "extensions.autoUpdate" = false;
+ "extensions.autoCheckUpdates" = false;
- "telemetry.telemetryLevel" = "off";
- "redhat.telemetry.enabled" = false;
+ "telemetry.telemetryLevel" = "off";
+ "redhat.telemetry.enabled" = false;
- "git.autofetch" = true;
- "git.path" = "${lib.getBin pkgs.git}/bin/git";
- "diffEditor.diffAlgorithm" = "advanced";
- "explorer.excludeGitIgnore" = true;
- "markdown.extension.tableFormatter.normalizeIndentation" = true;
- "markdown.extension.toc.orderedList" = false;
- "rust-analyzer.checkOnSave.command" = "clippy";
+ "git.autofetch" = true;
+ "git.path" = "${lib.getBin pkgs.git}/bin/git";
+ "diffEditor.diffAlgorithm" = "advanced";
+ "explorer.excludeGitIgnore" = true;
+ "markdown.extension.tableFormatter.normalizeIndentation" = true;
+ "markdown.extension.toc.orderedList" = false;
+ "rust-analyzer.checkOnSave.command" = "clippy";
- "\[makefile\]" = {
- "editor.insertSpaces" = false;
- "editor.detectIndentation" = false;
+ "\[makefile\]" = {
+ "editor.insertSpaces" = false;
+ "editor.detectIndentation" = false;
+ };
};
};
}
diff --git a/home/vinzenz/zsh.nix b/home/vinzenz/zsh.nix
index 5ec9e83..0b5ed96 100644
--- a/home/vinzenz/zsh.nix
+++ b/home/vinzenz/zsh.nix
@@ -1,41 +1,43 @@
{ config, ... }:
{
- initExtra = ''
- eval "$(direnv hook zsh)";
- export PATH=$PATH:/home/vinzenz/.cargo/bin
- '';
+ config.programs.zsh = {
+ initExtra = ''
+ eval "$(direnv hook zsh)";
+ export PATH=$PATH:/home/vinzenz/.cargo/bin
+ '';
- enableCompletion = true;
+ enableCompletion = true;
- shellAliases = {
- my-apply = "sudo nixos-rebuild boot --flake";
- my-switch = "sudo nixos-rebuild switch --flake";
- my-update = "sudo nixos-rebuild boot --upgrade --flake";
- my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
- my-test = "sudo nixos-rebuild test";
- my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
- my-ip4 = "ip addr show | grep 192";
- deadnix = "nix run github:astro/deadnix -- ";
- statix = "nix run git+https://git.peppe.rs/languages/statix -- ";
- };
+ shellAliases = {
+ my-apply = "sudo nixos-rebuild boot --flake";
+ my-switch = "sudo nixos-rebuild switch --flake";
+ my-update = "sudo nixos-rebuild boot --upgrade --flake";
+ my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
+ my-test = "sudo nixos-rebuild test";
+ my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
+ my-ip4 = "ip addr show | grep 192";
+ deadnix = "nix run github:astro/deadnix -- ";
+ statix = "nix run git+https://git.peppe.rs/languages/statix -- ";
+ };
- history = {
- size = 10000;
- path = "${config.xdg.dataHome}/zsh/history";
- expireDuplicatesFirst = true;
- };
+ history = {
+ size = 10000;
+ path = "${config.xdg.dataHome}/zsh/history";
+ expireDuplicatesFirst = true;
+ };
- oh-my-zsh = {
- enable = true;
- theme = "agnoster";
- plugins = [
- "git"
- "sudo"
- "systemadmin"
- "battery"
- "dotnet"
- "rust"
- "tailscale"
- ];
+ oh-my-zsh = {
+ enable = true;
+ theme = "agnoster";
+ plugins = [
+ "git"
+ "sudo"
+ "systemadmin"
+ "battery"
+ "dotnet"
+ "rust"
+ "tailscale"
+ ];
+ };
};
}
diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix
index 0e4a769..7ad1351 100644
--- a/hosts/vinzenz-lpt2/configuration.nix
+++ b/hosts/vinzenz-lpt2/configuration.nix
@@ -1,34 +1,32 @@
-{
- pkgs,
- ...
-}:
+{ pkgs, ... }:
{
imports = [ ./nginx.nix ];
- networking.networkmanager.enable = true;
- nix.settings.extra-platforms = [
- "aarch64-linux"
- "i686-linux"
- ];
- services.xserver.xkb = {
- # Configure keymap in X11
- layout = "de";
- variant = "";
+ config = {
+ networking.networkmanager.enable = true;
+ nix.settings.extra-platforms = [
+ "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;
}
diff --git a/hosts/vinzenz-lpt2/imports.nix b/hosts/vinzenz-lpt2/imports.nix
index 7f18417..a37f1ff 100644
--- a/hosts/vinzenz-lpt2/imports.nix
+++ b/hosts/vinzenz-lpt2/imports.nix
@@ -11,5 +11,6 @@
../../modules/desktop-environment.nix
../../modules/desktop-hardware.nix
+ ../../home/vinzenz
];
}
diff --git a/hosts/vinzenz-pc2/configuration.nix b/hosts/vinzenz-pc2/configuration.nix
index a163141..ea29735 100644
--- a/hosts/vinzenz-pc2/configuration.nix
+++ b/hosts/vinzenz-pc2/configuration.nix
@@ -1,40 +1,34 @@
-{
- pkgs,
- ...
-}:
+{ pkgs, ... }:
{
imports = [
./hardware.nix
./vscode-server.nix
];
- networking.networkmanager.enable = true;
- nix.settings.extra-platforms = [
- "aarch64-linux"
- "i686-linux"
- ];
+ config = {
+ networking.networkmanager.enable = true;
+ nix.settings.extra-platforms = [
+ "aarch64-linux"
+ "i686-linux"
+ ];
- services.xserver.xkb = {
- # Configure keymap in X11
- layout = "de";
- variant = "";
+ services.xserver.xkb = {
+ # Configure keymap in X11
+ layout = "de";
+ 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''
- ];
}
diff --git a/hosts/vinzenz-pc2/imports.nix b/hosts/vinzenz-pc2/imports.nix
index ff296b9..1834b06 100644
--- a/hosts/vinzenz-pc2/imports.nix
+++ b/hosts/vinzenz-pc2/imports.nix
@@ -11,5 +11,7 @@
../../home
../../modules/desktop-environment.nix
../../modules/desktop-hardware.nix
+
+ ../../home/vinzenz
];
}