From 02f58e26b61ec7fc9eca0080e68d2cdbc9d70f33 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Wed, 29 Dec 2021 13:06:12 +0100 Subject: [PATCH] Sync config --- configuration.nix | 2 +- hardware/hardware-configuration-desktop.nix | 2 +- roles/subroles/reversing.nix | 8 +++++ roles/workstation.nix | 39 ++++++++++++++++++--- 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 roles/subroles/reversing.nix diff --git a/configuration.nix b/configuration.nix index 0dc85b2..97d2e38 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,5 +13,5 @@ # 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). - system.stateVersion = "20.09"; # Did you read the comment? + system.stateVersion = "21.11"; # Did you read the comment? } diff --git a/hardware/hardware-configuration-desktop.nix b/hardware/hardware-configuration-desktop.nix index 098c0ed..698369a 100644 --- a/hardware/hardware-configuration-desktop.nix +++ b/hardware/hardware-configuration-desktop.nix @@ -19,7 +19,7 @@ }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6456-8B97"; + { device = "/dev/disk/by-uuid/0DD8-8BF6"; fsType = "vfat"; }; diff --git a/roles/subroles/reversing.nix b/roles/subroles/reversing.nix new file mode 100644 index 0000000..f6403fa --- /dev/null +++ b/roles/subroles/reversing.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + radare2 + ghidra-bin + gdb + ]; +} diff --git a/roles/workstation.nix b/roles/workstation.nix index 861dc3b..5994bb4 100644 --- a/roles/workstation.nix +++ b/roles/workstation.nix @@ -3,10 +3,21 @@ { nixpkgs.config.allowUnfree = true; - # for ihp - nix.trustedUsers = [ "root" "me" ]; + nix = { + # for ihp + trustedUsers = [ "root" "me" ]; + # package = pkgs.nixUnstable; + # extraOptions = '' + # experimental-features = nix-command flakes + # ''; + }; boot = { + # function keys on keychron keyboard won't work otherwise + # extraModprobeConfig = "options hid_apple fnmode=2"; + kernel.sysctl = { + "module.hid_apple.parameters.fnmode" = 2; + }; # use latest kernel kernelPackages = pkgs.linuxPackages_latest; # Use the systemd-boot EFI boot loader. @@ -21,6 +32,9 @@ preLVM = true; }; }; + + # loopback webcam + extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; }; networking.hostName = "w1n5t0n"; # Define your hostname. @@ -68,13 +82,16 @@ xfce.thunar-volman # mounting external devices in thunar gvfs + + # loopback webcam + linuxPackages.v4l2loopback ]; # mounting external devices as user services.udisks2.enable = true; # required for nextcloud - services.gnome3.gnome-keyring.enable = true; + services.gnome.gnome-keyring.enable = true; virtualisation.docker = { enable = true; @@ -84,6 +101,7 @@ # virtualisation.podman = { # enable = true; # dockerCompat = true; + # dockerSocket.enable = true; # }; # virtualisation.lxd.enable = true; # virtualisation.virtualbox.host.enable = true; @@ -132,7 +150,13 @@ # anonymousClients.allowAll = true; # }; }; - opengl.driSupport32Bit = true; + opengl = { + driSupport32Bit = true; + extraPackages = with pkgs; [ + rocm-opencl-icd + rocm-opencl-runtime + ]; + }; }; # set keyboard layout @@ -191,6 +215,8 @@ "docker" "networkmanager" "plugdev" + "users" + "uucp" "vboxusers" "video" "wheel" @@ -211,6 +237,10 @@ # Enable NTFS support boot.supportedFilesystems = [ "ntfs" ]; + security.sudo = { + extraConfig = "Defaults insults"; + }; + imports = [ ./subroles/dev.nix @@ -218,6 +248,7 @@ ./subroles/internet.nix ./subroles/office.nix ./subroles/photography.nix + ./subroles/reversing.nix ./subroles/university.nix ]; }