fix: oops copied the wrong files

This commit is contained in:
Xory 2025-11-30 21:22:13 +02:00
parent 171583da69
commit 8226f5b933
2 changed files with 189 additions and 71 deletions

View file

@ -1,8 +1,8 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # and in the NixOS manual (accessible by running nixos-help).
{ config, lib, pkgs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
imports = imports =
@ -10,71 +10,196 @@
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
# Use the systemd-boot EFI boot loader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# networking.hostName = "nixos"; # Define your hostname. # Use latest kernel.
# Pick only one of the below networking options. boot.kernelPackages = pkgs.linuxPackages_latest;
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. environment.persistence."/persist" = {
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. enable = true;
hideMounts = true;
directories = [
"/var/log"
"/var/lib/bluetooth"
"/var/lib/nixos"
"/var/lib/libvirt"
"/etc/NetworkManager/system-connections"
];
files = [
"/etc/machine-id"
];
};
services.fwupd.enable = true;
networking.hostName = "yeva"; # Define your hostname.
# Enable networking
networking.networkmanager.enable = true;
# Set your time zone. # Set your time zone.
# time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Athens";
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Select internationalisation properties. # Select internationalisation properties.
# i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_GB.UTF-8";
# console = {
# font = "Lat2-Terminus16"; i18n.extraLocaleSettings = {
# keyMap = "us"; LC_ADDRESS = "en_GB.UTF-8";
# useXkbConfig = true; # use xkb.options in tty. LC_IDENTIFICATION = "en_GB.UTF-8";
# }; LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
# Define a user account. Don't forget to set a password with passwd.
programs.zsh.enable = true; # home-manager already installs this but nixos complains w/o it
users.users.xory = {
isNormalUser = true;
description = "xory";
extraGroups = [ "networkmanager" "wheel" "docker" "libvirt" "dialout" ];
shell = pkgs.zsh;
initialHashedPassword = "$6$JXLpG5JYMJgZndm9$0sC8uPJ99cYL.hNv3DFQ20ky8tiZoxioe9GlMEanTwAD99LJ175/bHtN6Bm6bYsQG1BVGRdmphnXEcWS9ApoK0";
};
# ZeroTier
services.zerotierone.enable = true;
services.zerotierone.joinNetworks = [ "b3ce837c63" "363c67c55a726a89" ];
# nix-ld
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
libGL
SDL2
];
# Firejail
programs.firejail = {
enable = true;
wrappedBinaries =
let
apps = {
firefox = {};
"signal-desktop-bin" = { name = "signal-desktop"; };
vesktop = {};
spotify = {};
obsidian = {};
};
in
lib.mapAttrs (pkg: conf:
let
binName = conf.name or pkg;
in
{
executable = "${pkgs.${pkg}}/bin/${binName}";
profile = "${pkgs.firejail}/etc/firejail/${binName}.profile";
extraArgs = [
"--env=GTK_THEME=Adwaita:dark"
];
}) apps;
};
# Enable the X11 windowing system. # Enable the X11 windowing system.
# services.xserver.enable = true; # You can disable this if you're only using the Wayland session.
services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment.
services.displayManager.sddm.enable = true;
# services.desktopManager.plasma6.enable = true;
# Enable Hyprland.
programs.hyprland.enable = true;
# Configure keymap in X11 # Configure keymap in X11
# services.xserver.xkb.layout = "us"; services.xserver.xkb = {
# services.xserver.xkb.options = "eurosign:e,caps:escape"; layout = "us";
variant = "";
};
# Enable CUPS to print documents. # Enable CUPS to print documents.
# services.printing.enable = true; # services.printing.enable = true;
# Enable sound. programs.gnupg.agent.enable = true;
# services.pulseaudio.enable = true;
# OR # Enable sound with pipewire.
# services.pipewire = { services.pulseaudio.enable = false;
# enable = true; security.rtkit.enable = true;
# pulse.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;
};
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General.Experimental = true;
General.FastConnectable = true;
Policy.AutoEnable = true;
};
};
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.libinput.enable = true; # services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with passwd. # Enable automatic login for the user.
# users.users.alice = { services.displayManager.autoLogin.enable = true;
# isNormalUser = true; services.displayManager.autoLogin.user = "xory";
# extraGroups = [ "wheel" ]; # Enable sudo for the user.
# packages = with pkgs; [
# tree
# ];
# };
# programs.firefox.enable = true; # Install firefox.
programs.firefox.enable = true;
# List packages installed in system profile. # Allow unfree packages
# You can use https://search.nixos.org/ to find more packages (and options). nixpkgs.config.allowUnfree = true;
# environment.systemPackages = with pkgs; [
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget # wget
# ]; neovim
git
framework-tool
inputmodule-control
];
programs.steam.enable = true;
nix.gc = {
automatic = true;
dates = "weekly";
options = "--delete-older-than 2d";
};
programs.virt-manager.enable = true;
virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.swtpm.enable = true;
virtualisation.libvirtd.qemu.vhostUserPackages = [ pkgs.virtiofsd ];
virtualisation.spiceUSBRedirection.enable = true;
virtualisation.docker.enable = true;
services = {
syncthing = {
enable = true;
group = "users";
user = "xory";
dataDir = "/home/xory/Sync"; # Default folder for new synced folders
configDir = "/home/xory/Sync/.config/syncthing"; # Folder for Syncthing's settings and keys
};
};
services.openssh.enable = true; # TODO: add key-based auth
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
@ -90,34 +215,19 @@
# services.openssh.enable = true; # services.openssh.enable = true;
# Open ports in the firewall. # Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ]; networking.firewall.allowedTCPPorts = [ 8000 22000 ];
# networking.firewall.allowedUDPPorts = [ ... ]; networking.firewall.allowedUDPPorts = [ 8000 22000 21027 ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
# networking.firewall.enable = false; # networking.firewall.enable = false;
nix.settings.experimental-features = [ "nix-command" "flakes" ];
# Copy the NixOS configuration file and link it from the resulting system
# (/run/current-system/configuration.nix). This is useful in case you
# accidentally delete configuration.nix.
# system.copySystemConfiguration = true;
# This option defines the first version of NixOS you have installed on this particular machine, # This value determines the NixOS release from which the default
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # settings for stateful data, like file locations and database versions
# # on your system were taken. Its perfectly fine and recommended to leave
# Most users should NEVER change this value after the initial install, for any reason, # this value at the release version of the first install of this system.
# even if you've upgraded your system to a new NixOS release. # Before changing this value read the documentation for this option
# # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
# 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? system.stateVersion = "25.05"; # Did you read the comment?
} }

View file

@ -9,7 +9,8 @@
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/200718ce-94cf-459d-8dc6-a740d21db404";
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -19,6 +20,13 @@
options = [ "size=4G" ]; options = [ "size=4G" ];
}; };
fileSystems."/persist" =
{
device = "/dev/disk/by-uuid/582e1f64-6395-4815-a3f2-f37835523d9c";
fsType = "ext4";
neededForBoot = true;
};
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/10203712-12cb-40ba-a97d-ab3b2c8497e7"; { device = "/dev/disk/by-uuid/10203712-12cb-40ba-a97d-ab3b2c8497e7";
fsType = "ext4"; fsType = "ext4";