From 01e84f2b0fc8b632786da27ef986d3ab8fe7b302 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 12:00:57 -0600 Subject: [PATCH 1/5] [NixOS] Add jellyfin to ryzen-shine --- nixos/jellyfin.nix | 1 + nixos/machines/ryzen-shine.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/jellyfin.nix b/nixos/jellyfin.nix index 09bc47db..9b4b4f6c 100644 --- a/nixos/jellyfin.nix +++ b/nixos/jellyfin.nix @@ -2,5 +2,6 @@ { services.jellyfin = { enable = true; + openFirewall = true; }; } diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix index 08522707..762166e2 100644 --- a/nixos/machines/ryzen-shine.nix +++ b/nixos/machines/ryzen-shine.nix @@ -7,6 +7,7 @@ imports = [ ../full.nix ../dfinity.nix + ../jellyfin.nix ]; networking.interfaces.enp5s0.useDHCP = true; From 7b8ecee5b360dacb09e8e019eb339d7d9fff73bc Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 13:34:38 -0600 Subject: [PATCH 2/5] [NixOS] Add htop and ncdu to essential --- nixos/essential.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/essential.nix b/nixos/essential.nix index 337234d1..9c6aaf54 100644 --- a/nixos/essential.nix +++ b/nixos/essential.nix @@ -54,6 +54,8 @@ # Tools binutils gitFull + htop + ncdu rcm silver-searcher ripgrep From cb2578e3ad5b69db11df27390bef483a280d9689 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 15:13:22 -0600 Subject: [PATCH 3/5] [zsh] Use spaceship instead of zgen --- dotfiles/lib/zsh/zgen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/lib/zsh/zgen.sh b/dotfiles/lib/zsh/zgen.sh index 57e58764..9b2cd449 100644 --- a/dotfiles/lib/zsh/zgen.sh +++ b/dotfiles/lib/zsh/zgen.sh @@ -14,7 +14,7 @@ if ! zgen saved; then zgen load zsh-users/zsh-syntax-highlighting zgen load kennethreitz/autoenv zgen load mafredri/zsh-async - zgen load sindresorhus/pure + zgen load spaceship-prompt/spaceship-prompt spaceship # generate the init script from plugins above zgen save From cfdde16f120157f2b4681cdd57d5e4f2a1005ead Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 16:48:01 -0600 Subject: [PATCH 4/5] [NixOS] Don't manually add uid and home to users --- nixos/users.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/users.nix b/nixos/users.nix index 1412dcf9..e62f25da 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -23,14 +23,10 @@ in { imalison = userDefaults // { name = "imalison"; - uid = 1000; - home = "/home/imalison"; shell = pkgs.zsh; }; kat = userDefaults // { name = "kat"; - uid = 1001; - home = "/home/kat"; shell = pkgs.zsh; }; }; From 7d1520faa36dd76620ab7238ad9669f0a150d06b Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 11 Jul 2021 16:49:03 -0600 Subject: [PATCH 5/5] [NixOS] Add razer to flakes --- nixos/flake.nix | 4 ++++ nixos/machines/ivanm-dfinity-razer.nix | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/flake.nix b/nixos/flake.nix index 14d47f91..e6948a88 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -27,6 +27,10 @@ in { nixosConfigurations = { + ivanm-dfinity-razer = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ tweaks ./machines/ivanm-dfinity-razer.nix ]; + }; ryzen-shine = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ tweaks ./machines/ryzen-shine.nix ]; diff --git a/nixos/machines/ivanm-dfinity-razer.nix b/nixos/machines/ivanm-dfinity-razer.nix index 301a43b2..86eb5ce2 100644 --- a/nixos/machines/ivanm-dfinity-razer.nix +++ b/nixos/machines/ivanm-dfinity-razer.nix @@ -5,7 +5,6 @@ { imports = [ - ../full.nix ../extra.nix ../dfinity.nix