format, add nixpkgs to xonsh

This commit is contained in:
Artemis Tosini 2020-06-01 02:42:32 +00:00
parent 7faae5e9f9
commit 836bc1e675
Signed by: artemist
GPG key ID: EE5227935FE3FF18
2 changed files with 29 additions and 18 deletions

View file

@ -7,15 +7,15 @@
{ {
imports = imports =
[ [
./private ./private
./hardware-configuration.nix ./hardware-configuration.nix
./boot-config.nix ./boot-config.nix
./packages.nix ./packages.nix
./fonts.nix ./fonts.nix
./ssh.nix ./ssh.nix
./dns.nix ./dns.nix
./rocm.nix ./rocm.nix
]; ];
nix = { nix = {
daemonNiceLevel = 5; daemonNiceLevel = 5;
@ -118,7 +118,7 @@
enable = true; enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
(callPackage ./externals/packages/xdg-desktop-portal-wlr.nix { }) (callPackage ./externals/packages/xdg-desktop-portal-wlr.nix {})
]; ];
}; };
@ -169,7 +169,14 @@
}; };
firejail.enable = true; firejail.enable = true;
fish.enable = true; fish.enable = true;
xonsh.enable = true; xonsh = {
enable = true;
package = pkgs.xonsh.overridePythonAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.python3Packages.nixpkgs ];
}
);
};
}; };
users = { users = {
@ -178,10 +185,10 @@
description = "Artemis Tosini"; description = "Artemis Tosini";
uid = 1000; uid = 1000;
shell = "/run/current-system/sw/bin/fish"; 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
}; };
extraGroups.plugdev = { }; extraGroups.plugdev = {};
users.root = { users.root = {
subUidRanges = [ { startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; } ]; subUidRanges = [ { startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; } ];
subGidRanges = [ { startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } ]; subGidRanges = [ { startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } ];

View file

@ -148,6 +148,7 @@ in
# Development # Development
arduino arduino
bear
binutils-unwrapped binutils-unwrapped
ccache ccache
clang-tools clang-tools
@ -157,13 +158,16 @@ in
gdb gdb
gnumake gnumake
go go
gopls
jetbrains.clion jetbrains.clion
llvm.clang llvm.clang
llvm.lld llvm.lld
nasm nasm
nixpkgs-fmt
nodejs nodejs
patchelf patchelf
python37Packages.python-language-server python3Packages.python-language-server
rnix-lsp
rr rr
rustup rustup
valgrind valgrind