Compare commits
No commits in common. "c96522fdfcf5cd0c0623a066b0b53bc203f6e4d7" and "35fd6d6d63cd2dd504acd0aa5af33bca4b73f57b" have entirely different histories.
c96522fdfc
...
35fd6d6d63
19 changed files with 59 additions and 176 deletions
42
flake.lock
generated
42
flake.lock
generated
|
|
@ -65,11 +65,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781152676,
|
||||
"narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
|
||||
"lastModified": 1780290312,
|
||||
"narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
|
||||
"rev": "115e5211780054d8a890b41f0b7734cafad54dfe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -197,16 +197,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781319724,
|
||||
"narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
|
||||
"lastModified": 1779506708,
|
||||
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
|
||||
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-26.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -261,11 +261,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1781168557,
|
||||
"narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=",
|
||||
"lastModified": 1780310866,
|
||||
"narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "6358ff76821101c178e3ab4919a62799bfe3652e",
|
||||
"rev": "4ed851c979641e28597a05086332d75cdc9e395f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -338,11 +338,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1781074563,
|
||||
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
|
||||
"lastModified": 1780243769,
|
||||
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
|
||||
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -354,16 +354,16 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1781216227,
|
||||
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||
"lastModified": 1780511130,
|
||||
"narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||
"rev": "535f3e6942cb1cead3929c604320d3db54b542b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-26.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -476,11 +476,11 @@
|
|||
"secrets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1781738124,
|
||||
"narHash": "sha256-fff++SWoSeZJk9wwns/XzCHGU5ZOTDie821At68gH9I=",
|
||||
"lastModified": 1781207988,
|
||||
"narHash": "sha256-ZsPqHeeUXDR1fksT4EGlizv8RHPHp42kusVNhnenzxo=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "fdf7619e52d6bea25224f19da87b6946a6f23cf7",
|
||||
"revCount": 41,
|
||||
"rev": "53c5bdca5f2ff22b4e950c38b4d8bb96ee03c80d",
|
||||
"revCount": 40,
|
||||
"type": "git",
|
||||
"url": "ssh://git@git.jfreudenberger.de/JuliusFreudenberger/nix-private.git"
|
||||
},
|
||||
|
|
|
|||
28
flake.nix
28
flake.nix
|
|
@ -12,10 +12,10 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-26.05";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
auto-cpufreq = {
|
||||
|
|
@ -88,12 +88,14 @@
|
|||
|
||||
specialArgs = {
|
||||
inherit inputs outputs username;
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
};
|
||||
};
|
||||
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.framework-11th-gen-intel
|
||||
auto-cpufreq.nixosModules.default
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
./hosts/julius-framework
|
||||
./users/julius/nixos.nix
|
||||
|
||||
|
|
@ -150,6 +152,9 @@
|
|||
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
};
|
||||
};
|
||||
|
||||
modules = [
|
||||
|
|
@ -164,6 +169,9 @@
|
|||
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
inherit system;
|
||||
};
|
||||
};
|
||||
|
||||
modules = [
|
||||
|
|
@ -173,20 +181,6 @@
|
|||
];
|
||||
};
|
||||
|
||||
busch-nixos-native = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
};
|
||||
|
||||
modules = [
|
||||
./hosts/busch-nixos-native
|
||||
disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
];
|
||||
};
|
||||
|
||||
srv01-hf = nixpkgs.lib.nixosSystem rec {
|
||||
system = "x86_64-linux";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,5 @@
|
|||
name = "Arc";
|
||||
package = pkgs.arc-icon-theme;
|
||||
};
|
||||
gtk4.theme = null;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@
|
|||
viAlias = true;
|
||||
vimdiffAlias = true;
|
||||
withNodeJs = true;
|
||||
withRuby = false;
|
||||
withPython3 = false;
|
||||
coc.enable = true;
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
vim-gitgutter
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@
|
|||
"text/calendar" = ["thunderbird.desktop"];
|
||||
};
|
||||
};
|
||||
userDirs = {
|
||||
enable = true;
|
||||
setSessionVariables = false;
|
||||
};
|
||||
userDirs.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@
|
|||
history.size = 10000;
|
||||
history.path = "$HOME/.zsh_history";
|
||||
|
||||
dotDir = config.home.homeDirectory;
|
||||
|
||||
initContent = lib.mkMerge [ beforeCompInit defaultInit ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ inputs, outputs, config, lib, pkgs, ... }:
|
||||
{ inputs, outputs, config, lib, pkgs, pkgs-unstable, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
../../users/julius/nixos-server.nix
|
||||
../../modules/nix.nix
|
||||
../../modules/qemu-guest.nix
|
||||
../../modules/auto-upgrade.nix
|
||||
../../modules/locale.nix
|
||||
../../modules/server-cli.nix
|
||||
|
|
@ -41,7 +40,7 @@
|
|||
nixpkgs.config.nvidia.acceptLicense = true;
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
networking.hostName = "busch-gpu-docker"; # Define your hostname.
|
||||
networking.hostName = "docker-gpu"; # Define your hostname.
|
||||
|
||||
services.netbird-client = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ inputs, outputs, config, lib, pkgs, ... }:
|
||||
{ inputs, outputs, config, lib, pkgs, pkgs-unstable, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
|
|
@ -9,7 +9,6 @@
|
|||
../../users/julius/nixos-server.nix
|
||||
../../modules/nix.nix
|
||||
../../modules/auto-upgrade.nix
|
||||
../../modules/qemu-guest.nix
|
||||
../../modules/locale.nix
|
||||
../../modules/server-cli.nix
|
||||
../../modules/sshd.nix
|
||||
|
|
@ -29,7 +28,7 @@
|
|||
};
|
||||
tmp.useTmpfs = true;
|
||||
};
|
||||
networking.hostName = "busch-main-docker"; # Define your hostname.
|
||||
networking.hostName = "docker-main"; # Define your hostname.
|
||||
|
||||
services.netbird-client = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
{ inputs, outputs, config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
../../modules/disko/legacy-full-ext4.nix
|
||||
./secrets.nix
|
||||
|
||||
../../users/julius/nixos-server.nix
|
||||
../../modules/nix.nix
|
||||
../../modules/auto-upgrade.nix
|
||||
../../modules/qemu-guest.nix
|
||||
../../modules/locale.nix
|
||||
../../modules/server-cli.nix
|
||||
../../modules/sshd.nix
|
||||
../../modules/netbird-client.nix
|
||||
"${inputs.secrets}/modules/opkssh.nix"
|
||||
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
boot = {
|
||||
loader.grub = {
|
||||
enable = true;
|
||||
};
|
||||
tmp.useTmpfs = true;
|
||||
};
|
||||
networking.hostName = "busch-nixos-native"; # Define your hostname.
|
||||
|
||||
services.netbird-client = {
|
||||
enable = true;
|
||||
managementUrl = "https://netbird.jfreudenberger.de";
|
||||
host.setupKey = "E182754A-F338-4DAE-8036-03404033D30E";
|
||||
};
|
||||
|
||||
services.beszel.agent = {
|
||||
enable = true;
|
||||
environment = {
|
||||
HUB_URL = "https://beszel.jfreudenberger.de";
|
||||
DISABLE_SSH = "true";
|
||||
};
|
||||
environmentFile = config.age.secrets.beszel.path;
|
||||
};
|
||||
|
||||
services.renovate = {
|
||||
enable = true;
|
||||
credentials = {
|
||||
RENOVATE_TOKEN = config.age.secrets.renovate-token.path;
|
||||
RENOVATE_GITHUB_COM_TOKEN = config.age.secrets.renovate-github-com-token.path;
|
||||
};
|
||||
settings = {
|
||||
gitAuthor = "Renovate Bot <renovate@jfreudenberger.de>";
|
||||
platform = "forgejo";
|
||||
endpoint = "https://git.jfreudenberger.de";
|
||||
};
|
||||
};
|
||||
|
||||
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||
# Most users should NEVER change this value after the initial install, for any reason,
|
||||
# even if you've upgraded your system to a new NixOS release.
|
||||
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
|
||||
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
|
||||
# to actually do that.
|
||||
# This value being lower than the current NixOS release does NOT mean your system is
|
||||
# out of date, out of support, or vulnerable.
|
||||
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
|
||||
# and migrated your data accordingly.
|
||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||
system.stateVersion = "25.05"; # Did you read the comment?
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
age.secrets = {
|
||||
beszel.file = "${inputs.secrets}/secrets/busch-nixos-native/beszel";
|
||||
renovate-token.file = "${inputs.secrets}/secrets/busch-nixos-native/renovate-token";
|
||||
renovate-github-com-token.file = "${inputs.secrets}/secrets/busch-nixos-native/renovate-github-com-token";
|
||||
};
|
||||
}
|
||||
|
|
@ -87,8 +87,6 @@
|
|||
memoryPercent = 50;
|
||||
};
|
||||
|
||||
hardware.ksm.enable = true; # Linux kernel Same-Page Merging, useful when having multiple VMs with same OS
|
||||
|
||||
networking.useDHCP = false;
|
||||
|
||||
systemd.network = {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ inputs, outputs, config, pkgs, ... }:
|
||||
{ inputs, outputs, config, pkgs, pkgs-unstable, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
|
|
@ -51,6 +51,7 @@
|
|||
|
||||
services.resolved.enable = true;
|
||||
services.netbird = {
|
||||
package = pkgs-unstable.netbird;
|
||||
useRoutingFeatures = "client";
|
||||
clients.wt0 = {
|
||||
hardened = true;
|
||||
|
|
@ -74,12 +75,9 @@
|
|||
loader = {
|
||||
efi.canTouchEfiVariables = true;
|
||||
systemd-boot = {
|
||||
enable = false; # Enabled by lanzaboote
|
||||
};
|
||||
};
|
||||
lanzaboote = {
|
||||
enable = true;
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
editor = false;
|
||||
};
|
||||
};
|
||||
initrd = {
|
||||
systemd.enable = true;
|
||||
|
|
|
|||
|
|
@ -7,9 +7,8 @@
|
|||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
curl
|
||||
dig
|
||||
git
|
||||
fastfetch
|
||||
neofetch
|
||||
bat
|
||||
tealdeer
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
pavucontrol
|
||||
|
||||
xed-editor
|
||||
mate-calc
|
||||
mate.mate-calc
|
||||
|
||||
xarchiver
|
||||
engrampa
|
||||
mate.engrampa
|
||||
nemo-with-nextcloud-extensions
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@
|
|||
dex # autostart applications
|
||||
xbindkeys # bind keys to commands
|
||||
xclip
|
||||
xbacklight # control screen brightness
|
||||
xorg.xbacklight # control screen brightness
|
||||
brightnessctl
|
||||
numlockx
|
||||
xdpyinfo # get screen information
|
||||
xorg.xdpyinfo # get screen information
|
||||
sysstat # get system information
|
||||
|
||||
scrot
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
pkgs-unstable,
|
||||
utils,
|
||||
config,
|
||||
lib,
|
||||
|
|
@ -9,14 +10,13 @@ let
|
|||
|
||||
cfg = config.services.netbird-client;
|
||||
|
||||
clientVersion = "0.72.4";
|
||||
clientVersion = "0.71.2";
|
||||
|
||||
clientConfiguration = lib.types.submodule {
|
||||
options = {
|
||||
setupKey = lib.mkOption {
|
||||
description = "Setup Key for this client";
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -45,7 +45,8 @@ in {
|
|||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.netbird = lib.mkIf (cfg.host.setupKey != null) {
|
||||
services.netbird = {
|
||||
package = pkgs-unstable.netbird;
|
||||
useRoutingFeatures = "both";
|
||||
clients.wt0 = {
|
||||
hardened = false;
|
||||
|
|
@ -59,10 +60,11 @@ in {
|
|||
};
|
||||
};
|
||||
};
|
||||
systemd.services.${config.services.netbird.clients.wt0.service.name}.path = [ pkgs.shadow ];
|
||||
|
||||
services.resolved.enable = lib.mkIf (cfg.host.setupKey != null) true;
|
||||
services.resolved.enable = true;
|
||||
|
||||
virtualisation.oci-containers.containers = lib.mkIf (cfg.docker.setupKey != null) {
|
||||
virtualisation.oci-containers.containers = {
|
||||
netbird = {
|
||||
image = "netbirdio/netbird:${clientVersion}-rootless";
|
||||
autoStart = true;
|
||||
|
|
@ -81,7 +83,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
systemd.services."docker-netbird" = lib.mkIf (cfg.docker.setupKey != null) {
|
||||
systemd.services."docker-netbird" = {
|
||||
after = [
|
||||
"docker-network-webproxy.service"
|
||||
];
|
||||
|
|
@ -91,7 +93,7 @@ in {
|
|||
};
|
||||
|
||||
|
||||
systemd.services."docker-network-webproxy" = lib.mkIf (cfg.docker.setupKey != null) {
|
||||
systemd.services."docker-network-webproxy" = {
|
||||
path = [ pkgs.docker_29 ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
cfg = config.services.netbird-docker;
|
||||
netbirdCfg = config.services.netbird;
|
||||
|
||||
serverVersion = "0.72.4";
|
||||
serverVersion = "0.72.2";
|
||||
dashboardVersion = "2.39.0";
|
||||
|
||||
in {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
glib,
|
||||
gtk3,
|
||||
nemo,
|
||||
engrampa,
|
||||
mate,
|
||||
cinnamon-translations,
|
||||
}:
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
popd
|
||||
substituteInPlace src/nemo-engrampa.c \
|
||||
--replace-fail "file-roller" "${lib.getExe engrampa}" \
|
||||
--replace-fail "file-roller" "${lib.getExe mate.engrampa}" \
|
||||
--replace-fail "fileroller" "engrampa" \
|
||||
--replace-fail "FileRoller" "Engrampa" \
|
||||
--replace-quiet "GNOMELOCALEDIR" "${cinnamon-translations}/share/locale"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue