Remove unused packages, switch to bash as login shell to fix environment

This commit is contained in:
Artemis Tosini 2020-08-09 16:18:52 +00:00
parent 43a59ea1c8
commit b6977b68eb
Signed by: artemist
GPG key ID: ADFFE553DCBB831E
9 changed files with 18 additions and 15 deletions

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "private"] [submodule "private"]
path = private path = private
url = git@github.com:artemist/nixos-config-private.git url = git@github.com:artemist/nixos-config-private.git
[submodule "externals/nixos-rocm"]
path = externals/nixos-rocm
url = https://github.com/nixos-rocm/nixos-rocm.git

View file

@ -36,6 +36,7 @@
pkgs.android-udev-rules pkgs.android-udev-rules
pkgs.openocd pkgs.openocd
(pkgs.callPackage ./externals/rules/adafruit.nix { }) (pkgs.callPackage ./externals/rules/adafruit.nix { })
(pkgs.callPackage ./externals/rules/ds4drv.nix { })
(pkgs.callPackage ./externals/rules/fpga.nix { }) (pkgs.callPackage ./externals/rules/fpga.nix { })
(pkgs.callPackage ./externals/rules/limesuite.nix { }) (pkgs.callPackage ./externals/rules/limesuite.nix { })
(pkgs.callPackage ./externals/rules/cm-rgb.nix { }) (pkgs.callPackage ./externals/rules/cm-rgb.nix { })

View file

@ -13,7 +13,6 @@
./packages.nix ./packages.nix
./fonts.nix ./fonts.nix
./ssh.nix ./ssh.nix
./rocm.nix
]; ];
nix = { nix = {
@ -182,7 +181,6 @@
isNormalUser = true; isNormalUser = true;
description = "Artemis Tosini"; description = "Artemis Tosini";
uid = 1000; uid = 1000;
shell = "/run/current-system/sw/bin/fish";
extraGroups = [ "networkmanager" "wheel" "adbusers" "wireshark" "video" "docker" "lxd" "plugdev" "dialout" ]; extraGroups = [ "networkmanager" "wheel" "adbusers" "wireshark" "video" "docker" "lxd" "plugdev" "dialout" ];
# hashedPassword set in private # hashedPassword set in private
}; };

@ -1 +0,0 @@
Subproject commit a1f8c1518b4fd9ae718abd059986d004069be7da

7
externals/rules/ds4drv.nix vendored Normal file
View file

@ -0,0 +1,7 @@
{ writeTextFile }:
writeTextFile {
name = "ds4drv-udev-rules";
text = builtins.readFile ./ds4drv.rules;
destination = "/etc/udev/rules.d/50-ds4drv.rules";
}

5
externals/rules/ds4drv.rules vendored Normal file
View file

@ -0,0 +1,5 @@
KERNEL=="uinput", MODE="0666"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="05c4", MODE="0666"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", KERNELS=="0005:054C:05C4.*", MODE="0666"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="09cc", MODE="0666"
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", KERNELS=="0005:054C:09CC.*", MODE="0666"

View file

@ -2,6 +2,7 @@
{ {
fonts = { fonts = {
fontconfig.enable = true;
enableDefaultFonts = true; enableDefaultFonts = true;
fonts = with pkgs; [ fonts = with pkgs; [
cantarell-fonts cantarell-fonts

View file

@ -14,7 +14,7 @@ in
{ {
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
# Audiovisual # Audiovisual
audacity # audacity
darktable darktable
exiftool exiftool
ffmpeg-full ffmpeg-full
@ -234,9 +234,10 @@ in
zathura zathura
# Web # Web
(chromium.override { useOzone = true; }) # (chromium.override { useOzone = true; })
chromium
fullFirefox fullFirefox
tor-browser-bundle-bin # tor-browser-bundle-bin
# Communication # Communication
discord discord

View file

@ -1,6 +0,0 @@
{ config, pkgs, lib, ... }:
{
nixpkgs.overlays = [ (import ./externals/nixos-rocm) ];
hardware.opengl.extraPackages = [ pkgs.rocm-opencl-icd ];
}