m3tam3re
/
nix-configurations
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: m3tam3re:e220ebdae6feb22995b54a9c1060c1e844dd4b27
Branches Tags
m3tam3re:master
m3tam3re:unstable
..
compare: m3tam3re:a9aefa240b22deef30b459993e5f2e30aec02b2d
Branches Tags
m3tam3re:unstable
m3tam3re:master

No commits in common. "e220ebdae6feb22995b54a9c1060c1e844dd4b27" and "a9aefa240b22deef30b459993e5f2e30aec02b2d" have entirely different histories.
e220ebdae6 ... a9aefa240b

16 changed files with 37 additions and 283 deletions
Show Stats Expand all files Collapse all files

36
flake.lock
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1677969766, "lastModified": 1676153903,
"narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "narHash": "sha256-uetRyjgMiZCs6srmZ10M764Vn7F53M9mVuqnzHmyBqU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "rev": "ea17cc71b4e1bc5b2601f210a1c85db9453ad723",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -85,11 +85,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1678729503, "lastModified": 1675935446,
"narHash": "sha256-j+h4Bdqbe+qjzhxdhkRmVgSx2lxJ8HnKeYcAhhnd1zM=", "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "24c1a6335e3da6a3ecf82f33ac50c2ad66aee346", "rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1677676435, "lastModified": 1674641431,
"narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -116,11 +116,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1678654296, "lastModified": 1676202775,
"narHash": "sha256-aVfw3ThpY7vkUeF1rFy10NAkpKDS2imj3IakrzT0Occ=", "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a1dc8acd977ff3dccd1328b7c4a6995429a656b", "rev": "d917136f550a8c36efb1724390c7245105f79023",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1678703398, "lastModified": 1676177817,
"narHash": "sha256-Y1mW3dBsoWLHpYm+UIHb5VZ7rx024NNHaF16oZBx++o=", "narHash": "sha256-OQnBnuKkpwkfNY31xQyfU5hNpLs1ilWt+hVY6ztEEOM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "67f26c1cfc5d5783628231e776a81c1ade623e0b", "rev": "1b82144edfcd0c86486d2e07c7298f85510e7fb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,11 +188,11 @@
}, },
"utils_2": { "utils_2": {
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1667395993,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github" "type": "github"
}, },
"original": { "original": {

20
flake.nix
View File

@ -47,17 +47,6 @@
}) })
]; ];
}; };
lkk-prod-2 = lib.nixosSystem {
specialArgs = { inherit inputs; };
modules = [
allowUnfree
./hosts/lkk-prod-2
agenix.nixosModules.default
({ config, pkgs, ... }: {
nixpkgs.overlays = [ overlay-unstable ];
})
];
};
}; };
homeConfigurations = { homeConfigurations = {
# Laptop # Laptop
@ -92,15 +81,6 @@
self.nixosConfigurations.lkk-prod-1; self.nixosConfigurations.lkk-prod-1;
}; };
}; };
deploy.nodes.lkk-prod-2 = {
hostname = "lkk-prod-2";
sshUser = "root";
profiles.system = {
user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos
self.nixosConfigurations.lkk-prod-2;
};
};
deploy.remoteBuild = true; deploy.remoteBuild = true;
}; };
} }

1
home/features/desktop/design.nix
View File

@ -11,7 +11,6 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
argyllcms argyllcms
cyan
darktable darktable
gimp-with-plugins gimp-with-plugins
gimpPlugins.gmic gimpPlugins.gmic

1
home/features/desktop/media.nix
View File

@ -23,7 +23,6 @@ in {
mpv mpv
obs-studio obs-studio
plexamp plexamp
uxplay
vlc vlc
youtube-dl youtube-dl
]; ];

12
home/features/desktop/plasma.nix
View File

@ -1,8 +1,14 @@
{ pkgs, lib, outputs, ... }: {
{ pkgs, lib, outputs, ... }:
{
imports = [ imports = [
# #
]; ];
home.packages = with pkgs; [ alacritty brave libreoffice nextcloud-client ]; home.packages = with pkgs; [
services.espanso.enable = true; alacritty
brave
libreoffice
nextcloud-client
];
} }

1
home/features/services/default.nix
View File

@ -1 +0,0 @@
{ imports = [ ./netbird.nix ]; }

14
home/features/services/netbird.nix
View File

@ -1,14 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.features.services.netbird;
in {
options.features.services.netbird.enable = mkEnableOption "install netbird";
config = mkIf cfg.enable {
home.packages = with pkgs; [ netbird-ui ];
};
}

4
home/users/m3tam3re/m3-nix.nix
View File

@ -6,7 +6,6 @@
../../features/desktop ../../features/desktop
../../features/gaming ../../features/gaming
../../features/virtualization ../../features/virtualization
../../features/services
]; ];
features = { features = {
@ -28,9 +27,6 @@
podman.enable = true; podman.enable = true;
qemu.enable = true; qemu.enable = true;
}; };
services = {
netbird.enable = true;
};
}; };

4
home/users/produktion/lkk-prod-1.nix
View File

@ -3,7 +3,6 @@
./base ./base
../../features/cli ../../features/cli
../../features/desktop/plasma.nix ../../features/desktop/plasma.nix
../../features/services
]; ];
features = { features = {
@ -11,9 +10,6 @@
fish.enable = true; fish.enable = true;
starship.enable = true; starship.enable = true;
}; };
services = {
netbird.enable = true;
};
}; };
home.stateVersion = "22.11"; home.stateVersion = "22.11";

20
home/users/produktion/lkk-prod-2.nix
View File

@ -1,20 +0,0 @@
{ config, pkgs, ... }: {
imports = [
./base
../../features/cli
../../features/desktop/plasma.nix
../../features/services
];
features = {
cli = {
fish.enable = true;
starship.enable = true;
};
services = {
netbird.enable = true;
};
};
home.stateVersion = "22.11";
}

5
hosts/lkk-nix-1/services/#netbird.nix#
View File

@ -1,5 +0,0 @@
{
services.netbird = {
enable = true;
};
}

7
hosts/lkk-prod-1/default.nix
View File

@ -7,10 +7,9 @@
../common/base ../common/base
]; ];
# Bootloader. boot.loader.grub.enable = true;
boot.loader.systemd-boot.enable = true; boot.loader.grub.device = "/dev/vda";
boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.useOSProber = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi";
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking = { networking = {

19
hosts/lkk-prod-1/hardware-configuration.nix
View File

@ -5,34 +5,29 @@
{ {
imports = imports =
[ (modulesPath + "/hardware/network/broadcom-43xx.nix") [ (modulesPath + "/profiles/qemu-guest.nix")
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/88887b78-5a75-49cf-991d-7a3c8f813799"; { device = "/dev/disk/by-uuid/72016102-ac1b-462f-97c5-8575f91780d8";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot/efi" = swapDevices =
{ device = "/dev/disk/by-uuid/67E3-17ED"; [ { device = "/dev/disk/by-uuid/0d57f573-b278-48d2-ad44-5a1cf28bcd2b"; }
fsType = "vfat"; ];
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp3s0f0.useDHCP = lib.mkDefault true; # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

136
hosts/lkk-prod-2/default.nix
View File

@ -1,136 +0,0 @@
{ config, pkgs, ... }:
{
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
../common/users/produktion
../common/base
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi";
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking = {
hostName = "lkk-prod-2";
networkmanager.enable = true;
firewall.enable = true;
};
services.openssh = {
enable = true;
permitRootLogin = "yes";
};
services.avahi = {
enable = true;
nssmdns = true;
};
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Set your time zone.
time.timeZone = "Europe/Berlin";
# Select internationalisation properties.
i18n.defaultLocale = "de_DE.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11
services.xserver = {
layout = "de";
xkbVariant = "";
};
# Configure console keymap
console.keyMap = "de";
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs;
[
neovim
];
nix = {
gc = {
automatic = true;
options = "--delete-older-than 30d";
};
optimise.automatic = true;
};
system.stateVersion = "22.11"; # Did you read the comment?
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
}

39
hosts/lkk-prod-2/hardware-configuration.nix
View File

@ -1,39 +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 + "/hardware/network/broadcom-43xx.nix")
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/73092ab4-3dcb-4b39-8fa2-44c0341c44c0";
fsType = "ext4";
};
fileSystems."/boot/efi" =
{ device = "/dev/disk/by-uuid/67E3-17ED";
fsType = "vfat";
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

1
hosts/m3-nix/services/default.nix
View File

@ -14,5 +14,4 @@
}; };
services.kubo = { enable = true; }; # IPFS services.kubo = { enable = true; }; # IPFS
services.printing.enable = true; services.printing.enable = true;
services.netbird.enable = true;
} }