Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ivan Malison 2021-07-12 01:10:34 +00:00
commit efe386ac91
7 changed files with 9 additions and 6 deletions

View File

@ -14,7 +14,7 @@ if ! zgen saved; then
zgen load zsh-users/zsh-syntax-highlighting zgen load zsh-users/zsh-syntax-highlighting
zgen load kennethreitz/autoenv zgen load kennethreitz/autoenv
zgen load mafredri/zsh-async zgen load mafredri/zsh-async
zgen load sindresorhus/pure zgen load spaceship-prompt/spaceship-prompt spaceship
# generate the init script from plugins above # generate the init script from plugins above
zgen save zgen save

View File

@ -72,6 +72,8 @@ in
binutils binutils
# direnv # direnv
gitFull gitFull
htop
ncdu
rcm rcm
ripgrep ripgrep
silver-searcher silver-searcher

View File

@ -27,6 +27,10 @@
in in
{ {
nixosConfigurations = { nixosConfigurations = {
ivanm-dfinity-razer = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ tweaks ./machines/ivanm-dfinity-razer.nix ];
};
ryzen-shine = nixpkgs.lib.nixosSystem { ryzen-shine = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ tweaks ./machines/ryzen-shine.nix ]; modules = [ tweaks ./machines/ryzen-shine.nix ];

View File

@ -2,5 +2,6 @@
{ {
services.jellyfin = { services.jellyfin = {
enable = true; enable = true;
openFirewall = true;
}; };
} }

View File

@ -5,7 +5,6 @@
{ {
imports = [ imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../full.nix ../full.nix
../extra.nix ../extra.nix
../dfinity.nix ../dfinity.nix

View File

@ -7,6 +7,7 @@
imports = [ imports = [
../full.nix ../full.nix
../dfinity.nix ../dfinity.nix
../jellyfin.nix
]; ];
networking.interfaces.enp5s0.useDHCP = true; networking.interfaces.enp5s0.useDHCP = true;

View File

@ -23,14 +23,10 @@
in { in {
imalison = userDefaults // { imalison = userDefaults // {
name = "imalison"; name = "imalison";
uid = 1000;
home = "/home/imalison";
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
kat = userDefaults // { kat = userDefaults // {
name = "kat"; name = "kat";
uid = 1001;
home = "/home/kat";
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
}; };