Install more packages

home/default.nix

@@ -21,20 +21,23 @@ user:
     ./neovim.nix
     ./nextcloud.nix
     ./pasystray.nix
+    ./photography.nix
     ./picom.nix
     ./polybar.nix
     ./programs.nix
     ./qt.nix
     ./redshift.nix
+    ./reversing.nix
     ./rofi.nix
     ./rust.nix
     ./signal.nix
     ./telegram.nix
     ./thunderbird.nix
-    ./tor.nix
     ./tmux.nix
+    ./tor.nix
     ./xdg.nix
     ./zathura.nix
+    ./zoom.nix
     ./zsh.nix
   ];
 }

home/photography.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    darktable
+    rawtherapee
+  ];
+}

home/reversing.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    gdb
+    ghidra-bin
+    radare2
+  ];
+}

home/signal.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [
-    element-desktop
+    signal-desktop
   ];
 }

home/zoom.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [
+    zoom-us
+  ];
+}

machines/common.nix

@@ -1,18 +1,26 @@
 inputs:
 { config, lib, pkgs, ... }: {
   nix = {
+    package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
-    settings = {
+    binaryCaches = lib.mkForce [
-      substituters = lib.mkForce [
+      "https://cache.nixos.org/"
-        "https://cache.nixos.org/"
+      "https://nix-community.cachix.org"
-        "https://nix-community.cachix.org"
+    ];
-      ];
+    binaryCachePublicKeys = [
-      trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
-      ];
+    #settings = {
-    };
+      #substituters = lib.mkForce [
+        #"https://cache.nixos.org/"
+        #"https://nix-community.cachix.org"
+      #];
+      #trusted-public-keys = [
+        #"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      #];
+    #};
     # nix shell and nix build should use the same channel as the flake
     registry.nixpkgs.flake = inputs.nixpkgs;
   };
@@ -28,27 +36,32 @@ inputs:
   sound.enable = true;
 
   hardware = {
+    # TODO: remove
+    enableAllFirmware = true;
     pulseaudio = {
       # TODO: pipewire
-      enable = false;
+      enable = true;
       # stop mumble from muting other processes
       extraConfig = "unload-module module-role-cork";
     };
     opengl = {
       enable = true;
-      driSupport = true;
+      # driSupport = true;
       driSupport32Bit = true;
     };
   };
 
   services = {
     dbus.packages = with pkgs; [ gcr ];
+    # for u2f stick
+    udev.packages = with pkgs; [ libu2f-host ];
+    davfs2.enable = true;
     unbound.enable = true;
     udisks2.enable = true;
     # Enable CUPS to print documents.
     printing.enable = true;
     pipewire = {
-      enable = true;
+      enable = false;
       pulse.enable = true;
     };
     # required for nextcloud
@@ -57,6 +70,7 @@ inputs:
     # faster entropy generation
     haveged.enable = true;
 
+    mullvad-vpn.enable = true;
 
     xserver = {
       enable = true;
@@ -81,6 +95,7 @@ inputs:
       };
     };
   };
+
   systemd.tmpfiles.rules = [
     "L+ /lib64/ld-linux-x86-64.so.2 - - - - ${pkgs.stdenv.glibc}/lib64/ld-linux-x86-64.so.2"
   ];
@@ -90,11 +105,13 @@ inputs:
     git
     keepassxc
     lxappearance
+    mullvad-vpn
     networkmanagerapplet
     nextcloud-client
     pavucontrol
     termite
     vim
+    wget
     which
 
     xfce.thunar

machines/dev.nix

@@ -1,5 +1,5 @@
 inputs:
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     neovim
     vim

machines/office.nix

@@ -0,0 +1,11 @@
+inputs:
+{ pkgs, ... }: {
+  programs.dconf.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    barrier
+    gnome3.dconf
+    libreoffice
+    paprefs
+  ];
+}

machines/w1n5t0n.nix

@@ -8,8 +8,14 @@ inputs.nixpkgs.lib.nixosSystem {
   modules = [
     { system.stateVersion = "21.11"; }
     (import ./common.nix inputs)
+    (import ./dev.nix inputs)
+    (import ./entertainment.nix inputs)
+    (import ./office.nix inputs)
     ({ pkgs, lib, ... }: {
-      networking.hostName = hostname;
+      networking = {
+        hostName = hostname;
+        interfaces.eno1.useDHCP = true;
+      };
       users.users.me = {
         isNormalUser = true;
         createHome = true;