Merge branch 'main' of github.com:fwastring/nix

This commit is contained in:
fwastring 2025-04-07 14:21:35 +02:00
commit 82a0300eec
19 changed files with 1047 additions and 565 deletions

View file

@ -7,15 +7,16 @@
pkgs,
myhostname,
...
}: {
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
../../config/base.nix
../../config/users.nix
];
}:
{
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
../../config/base.nix
../../config/users.nix
];
networking.hostName = myhostname;
networking.hostName = myhostname;
environment.systemPackages = with pkgs; [
qgis
@ -24,34 +25,22 @@
k3sup
];
# boot.loader = {
# efi = {
# canTouchEfiVariables = true;
# };
# grub = {
# enable = true;
# efiSupport = true;
# useOSProber = true;
# };
# };
services.xserver.dpi = 140;
services = {
openssh = {
enable = true;
ports = [ 55504 ];
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
X11Forwarding = true;
};
extraConfig = ''
AllowUsers fw
'';
};
};
services.xserver.dpi = 140;
services = {
openssh = {
enable = true;
ports = [55504];
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
X11Forwarding = true;
};
extraConfig = ''
AllowUsers fw
'';
};
};
system.stateVersion = "23.11";
system.stateVersion = "23.11";
}

View file

@ -7,22 +7,31 @@
pkgs,
myhostname,
...
}: {
}:
{
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
../../config/base.nix
../../shared/openssh.nix
../../jobb/users.nix
../../config/base.nix
../../shared/openssh.nix
../../jobb/users.nix
];
environment.systemPackages = with pkgs; [
kubectl
azure-cli
];
environment.systemPackages = with pkgs; [
kubectl
azure-cli
dotnetCorePackages.sdk_8_0_3xx
k3s
cifs-utils
nfs-utils
];
services.k3s.enable = false;
services.openiscsi = {
enable = true;
name = "iqn.2016-04.com.open-iscsi:work-desktop";
};
networking.hostName = myhostname;