Browse Source

deployment changes, fix qtwebkit, switch to unstable, make microsoft teams happy with v4l2sink

master
parent
commit
9f50801734
Signed by: govanify <gauvain@govanify.com> GPG Key ID: DE62E1E2A6145556
8 changed files with 14 additions and 17 deletions
  1. +1
    -0
      common/bluetooth.nix
  2. +1
    -0
      common/default.nix
  3. +5
    -3
      common/graphical.nix
  4. +0
    -6
      common/locale.nix
  5. +2
    -1
      common/users.nix
  6. +4
    -6
      machines/alastor/hardware.nix
  7. +1
    -1
      pkgs/vim.nix
  8. BIN
      secrets/deployment.nix

+ 1
- 0
common/bluetooth.nix View File

@@ -1,5 +1,6 @@
{ config, pkgs, ... }: {
hardware.bluetooth.enable = true;
hardware.bluetooth.package = pkgs.bluezFull;
services.blueman.enable = true;




+ 1
- 0
common/default.nix View File

@@ -62,6 +62,7 @@
"www.duckduckgo.com" "www.kernel.org" "www.mozilla.org" "www.xkcd.com"];


virtualisation.docker.enable = true;

}


+ 5
- 3
common/graphical.nix View File

@@ -31,11 +31,13 @@
#tor-browser-bundle-bin
#firefox-bin
# art
blender krita kdenlive ardour
blender krita #kdenlive
ardour
# stem
freecad kicad wireshark sourcetrail
#freecad
kicad wireshark sourcetrail pandoc
# recording/streaming
obs-studio obs-wlrobs
obs-studio obs-wlrobs obs-v4l2sink

jdk11
android-studio


+ 0
- 6
common/locale.nix View File

@@ -51,11 +51,5 @@
XMODIFIERS = "@im=ibus";
QT_IM_MODULE = "ibus";
};

# https://github.com/NixOS/nixpkgs/issues/72896
# ok....
environment.systemPackages = with pkgs; [
qt5.full
];
}


+ 2
- 1
common/users.nix View File

@@ -6,7 +6,8 @@

users.users.govanify = {
isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "audio" "wireshark" "adbusers"];
extraGroups = [ "wheel" "networkmanager" "audio" "wireshark" "adbusers"
"docker"];
};

home-manager.users.govanify = {


+ 4
- 6
machines/alastor/hardware.nix View File

@@ -15,14 +15,12 @@
version = 2;
efiSupport = true;
enableCryptodisk = true;
extraInitrd = /boot/initrd.keys.gz;
};

# broken
#boot.initrd.secrets = {
# "keyfile_lain.bin" = "/etc/secrets/initrd/keyfile_lain.bin";
# "keyfile_matrix.bin" = "/etc/secrets/initrd/keyfile_matrix.bin";
#};
boot.initrd.secrets = {
"/keyfile_lain.bin" = "/etc/secrets/initrd/keyfile_lain.bin";
"/keyfile_matrix.bin" = "/etc/secrets/initrd/keyfile_matrix.bin";
};

boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];


+ 1
- 1
pkgs/vim.nix View File

@@ -11,7 +11,7 @@ let
nerdcommenter easymotion vim-obsession #vim-prosession
syntastic ultisnips vim-snippets deoplete-nvim
deoplete-rust deoplete-clang deoplete-jedi vim-nix
rust-vim meson ];
rust-vim meson Jenkinsfile-vim-syntax ];
extraConfig = ''
" This should be enabled by default
set number


BIN
secrets/deployment.nix View File


Loading…
Cancel
Save