From 96f5e9f15c071d501531fabbc06e92b4f2cede16 Mon Sep 17 00:00:00 2001 From: Valentin Brandl Date: Fri, 18 Feb 2022 17:12:39 +0100 Subject: [PATCH] Install more packages --- home/default.nix | 5 ++++- home/photography.nix | 6 ++++++ home/reversing.nix | 7 +++++++ home/signal.nix | 2 +- home/zoom.nix | 5 +++++ machines/common.nix | 41 +++++++++++++++++++++++++++++------------ machines/dev.nix | 2 +- machines/office.nix | 11 +++++++++++ machines/w1n5t0n.nix | 8 +++++++- 9 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 home/photography.nix create mode 100644 home/reversing.nix create mode 100644 home/zoom.nix create mode 100644 machines/office.nix diff --git a/home/default.nix b/home/default.nix index 120345b..7f3769e 100644 --- a/home/default.nix +++ b/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 ]; } diff --git a/home/photography.nix b/home/photography.nix new file mode 100644 index 0000000..7aa6bce --- /dev/null +++ b/home/photography.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + darktable + rawtherapee + ]; +} diff --git a/home/reversing.nix b/home/reversing.nix new file mode 100644 index 0000000..7292e48 --- /dev/null +++ b/home/reversing.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + gdb + ghidra-bin + radare2 + ]; +} diff --git a/home/signal.nix b/home/signal.nix index 0f85d1b..986d19a 100644 --- a/home/signal.nix +++ b/home/signal.nix @@ -1,5 +1,5 @@ { pkgs, ... }: { home.packages = with pkgs; [ - element-desktop + signal-desktop ]; } diff --git a/home/zoom.nix b/home/zoom.nix new file mode 100644 index 0000000..080ea7a --- /dev/null +++ b/home/zoom.nix @@ -0,0 +1,5 @@ +{ pkgs, ... }: { + home.packages = with pkgs; [ + zoom-us + ]; +} diff --git a/machines/common.nix b/machines/common.nix index 87a09f2..f4a60b5 100644 --- a/machines/common.nix +++ b/machines/common.nix @@ -1,18 +1,26 @@ inputs: { config, lib, pkgs, ... }: { nix = { + package = pkgs.nixUnstable; extraOptions = '' experimental-features = nix-command flakes ''; - settings = { - substituters = lib.mkForce [ - "https://cache.nixos.org/" - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; + binaryCaches = lib.mkForce [ + "https://cache.nixos.org/" + "https://nix-community.cachix.org" + ]; + binaryCachePublicKeys = [ + "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 diff --git a/machines/dev.nix b/machines/dev.nix index 2dbd7b9..2cb819b 100644 --- a/machines/dev.nix +++ b/machines/dev.nix @@ -1,5 +1,5 @@ inputs: -{ config, lib, pkgs, ... }: { +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ neovim vim diff --git a/machines/office.nix b/machines/office.nix new file mode 100644 index 0000000..ad2ef55 --- /dev/null +++ b/machines/office.nix @@ -0,0 +1,11 @@ +inputs: +{ pkgs, ... }: { + programs.dconf.enable = true; + + environment.systemPackages = with pkgs; [ + barrier + gnome3.dconf + libreoffice + paprefs + ]; +} diff --git a/machines/w1n5t0n.nix b/machines/w1n5t0n.nix index ee49467..26eb522 100644 --- a/machines/w1n5t0n.nix +++ b/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;