This commit is contained in:
Morten Olsen
2024-04-09 23:27:20 +02:00
parent 25e2db9264
commit b8fbdd67c2
5 changed files with 25 additions and 18 deletions

2
os.sh
View File

@@ -27,7 +27,7 @@ function buildvm() {
function upgrade() { function upgrade() {
if git -C "$LOCATION" diff-index --quiet HEAD --; then if git -C "$LOCATION" diff-index --quiet HEAD --; then
nix flake update --commit-lock-file "$LOCATION" nix flake update --commit-lock-file --flake "$LOCATION"
apply $1 apply $1
else else
echo "Error: git working tree is dirty" echo "Error: git working tree is dirty"

View File

@@ -3,11 +3,6 @@
{ {
# environment.sessionVariables.NIXOS_OZONE_WL = "1"; # environment.sessionVariables.NIXOS_OZONE_WL = "1";
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0"
];
# ^ requested by obsidian
programs.zsh.enable = true; programs.zsh.enable = true;
users.users.alice = { users.users.alice = {
isNormalUser = true; isNormalUser = true;
@@ -16,9 +11,22 @@
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
users.users."alice".openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCj8wspkAnOpEmipwB/xd8vpEx9aqNbyjD2xzv0msDJvYMn26ZO3cbtbWbMI9Uns55aHcL0bStdbaJQIcL8ZVzvQtKq+spdZYQpN4cFlN16HXKR/UjBYtJEdHVxb2cwb2DM04aLDuAlCAJGChEAqpIQFpvlByyAaxSPwor5Cy5JHmm5fMkvcJEvPtxQOo4yovY8qW9scWlOCrzNSAYtBwTGG8REcRuTaEW9EJlmn8QZA+T+cE7nFdZOlmm752jW9wBCAIKlg6W5gX0rysSxy+MkKB/2ohpLI+0SeWAM8+CEtZjO7GP6xRPXZgrZJssytzQsJoiMTs6rJM5ovHUMVNPGDLCB6+8lWM7Jk4hh0lIQTOC5AMucH2jRJSyQb2AA3kbPuWOwHDDIlSUnNFsI/xUVs1lfx3ikIZEb9oZcKwWBB2PeL/KT6ca7dsI3PyFL+hC5Wi7ll0Aj5w+dBZOxwW1agSo4ujPKO9oIVwqEA+PqoK/GZtIHAx6t/m3DK8T4HAo2GZMqyzRgcqk1bttaCFzX2h074yW1du8+l4yIqWrooqD474V3MT05HUxkA1+9S5ldEwK4J50WfKlhNuZn5YeiHLngisu8WyIGREYDGlkM+1qxwHiJGohigS20kpmTUkKvyLRXItAcvQYBknCV3qb8B1Kj1bvbN3sCaqQAeVWxDw=="
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFaIAP/ZJ7+7jeR44e1yIJjfQAB6MN351LDKJAXVF62P"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDbZITpz5QrVIxPn9gKVWMPK+3W3YZZGszFOQvO/h7M"
];
networking.firewall = { networking.firewall = {
enable = true; enable = true;
allowedTCPPorts = [ 8081 5001 ]; allowedTCPPorts = [ 8081 5001 53317 ];
};
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
#settings.KbdInteractiveAuthentication = false;
settings.PermitRootLogin = "no";
}; };
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [

View File

@@ -10,7 +10,6 @@
./programs/kitty ./programs/kitty
./programs/firefox ./programs/firefox
./programs/vscode ./programs/vscode
./programs/obsidian
]; ];
home.file = { home.file = {
@@ -27,6 +26,8 @@
pkgs.gimp pkgs.gimp
pkgs.blender pkgs.blender
pkgs.discord pkgs.discord
pkgs.bun
pkgs.localsend
]; ];

View File

@@ -1,7 +0,0 @@
{ config, pkgs, ... }:
{
home.packages = [
pkgs.obsidian
];
}

View File

@@ -0,0 +1,5 @@
if [ -d "$HOME/.bun" ]; then
export BUN_INSTALL="$HOME/.bun"
export PATH="$BUN_INSTALL/bin:$PATH"
fi