diff --git a/flake.lock b/flake.lock index 9c59fb7..e060d22 100644 --- a/flake.lock +++ b/flake.lock @@ -441,11 +441,11 @@ ] }, "locked": { - "lastModified": 1739735835, - "narHash": "sha256-S4VskZCNjRX6saW7GtVb4MD3kWdfvRvLurLj9QcM4Wg=", + "lastModified": 1739790043, + "narHash": "sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E+bVJiZ0XAmncvgQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b15e9ec6769d770879759f086dd4e51fae7f2394", + "rev": "c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9", "type": "github" }, "original": { @@ -528,11 +528,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1739739229, - "narHash": "sha256-4slTvuGM2NBjsvBrgXU5L/l8Swa50ZrcdfxU6x1CzFI=", + "lastModified": 1739757807, + "narHash": "sha256-HYaYpFFCopski3zyKDp/XTARlkwCkSHvfWBoCAcbqkk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e2a9271150f9f1a2cba825f6f21bb130effc6b11", + "rev": "59c615c321c45302491de3b1c003844c86aefca7", "type": "github" }, "original": { @@ -793,7 +793,7 @@ "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" }, "original": { "type": "tarball", @@ -863,11 +863,11 @@ }, "nixpkgs-smol": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1739776882, + "narHash": "sha256-PAiogZP1rLOwSkoL8eNgnbcobe5AqIq+Zc8A9NNFv+A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "1ead14e49dfa47e91e68df64ef3dbf036809c742", "type": "github" }, "original": { diff --git a/hosts/epimetheus/configuration.nix b/hosts/epimetheus/configuration.nix index 59395b1..6571bef 100644 --- a/hosts/epimetheus/configuration.nix +++ b/hosts/epimetheus/configuration.nix @@ -1,6 +1,5 @@ { pkgs, - pkgs-smol, lib, modulesPath, config, @@ -9,12 +8,7 @@ imports = ["${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"]; boot = { - supportedFilesystems = ["zfs"]; - zfs = { - forceImportRoot = false; - package = pkgs-smol.zfs; - }; - kernelPackages = pkgs-smol.linuxPackages_6_12; + kernelPackages = pkgs.linuxPackages_6_12; kernelParams = lib.mkAfter ["noquiet" "toram"]; enableContainers = false; }; @@ -26,21 +20,13 @@ neovim parted git - nixd pciutils - - # The installers - arch-install-scripts # For arch and it's - xbps # Void linux - dnf5 # Fedora - debootstrap # Debin and ubuntu - apt # Ubuntu ]; documentation = { - enable = lib.mkDefault false; - doc.enable = lib.mkDefault false; - info.enable = lib.mkDefault false; + enable = lib.mkForce false; + doc.enable = lib.mkForce false; + info.enable = lib.mkForce false; }; networking = { @@ -51,6 +37,20 @@ services = { logrotate.enable = false; udisks2.enable = false; + openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + }; + }; + }; + + users.users = { + root = { + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILPbmiNqoyeKXk/VopFm2cFfEnV4cKCFBhbhyYB69Fuu" + ]; + }; }; programs = { @@ -78,7 +78,6 @@ "nix-command" "flakes" "auto-allocate-uids" - "pipe-operator" "recursive-nix" "ca-derivations" "dynamic-derivations" @@ -94,15 +93,11 @@ "https://nix-community.cachix.org" "https://nixpkgs-unfree.cachix.org" "https://hyprland.cachix.org/" - "https://anyrun.cachix.org" - "https://wezterm.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" - "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" ]; }; }; diff --git a/hosts/nyx/configuration.nix b/hosts/nyx/configuration.nix index 002f7c1..1029a0b 100644 --- a/hosts/nyx/configuration.nix +++ b/hosts/nyx/configuration.nix @@ -99,7 +99,13 @@ pingu = { isNormalUser = true; description = "Elissa"; - extraGroups = ["networkmanager" "wheel" "input" "render"]; + extraGroups = [ + "networkmanager" + "wheel" + "input" + "render" + "jellyfin" + ]; shell = pkgs.bash; packages = with pkgs; [ floorp @@ -183,7 +189,6 @@ "nix-command" "flakes" "auto-allocate-uids" - "pipe-operator" "recursive-nix" "ca-derivations" "dynamic-derivations" @@ -193,7 +198,9 @@ sandbox = true; auto-optimise-store = true; keep-going = true; + fallback = true; warn-dirty = false; + allow-import-from-derivation = true; use-xdg-base-directories = true; allowed-users = ["@wheel" "pingu" "root"]; trusted-users = ["@wheel" "pingu" "root"]; @@ -202,16 +209,12 @@ "https://nixpkgs-unfree.cachix.org" "https://haipkgs.cachix.org" "https://hyprland.cachix.org" - "https://anyrun.cachix.org" - "https://wezterm.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "haipkgs.cachix.org-1:AcjMqIafTEQ7dw99RpeTJU2ywNUn1h8yIxz2+zjpK/A=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" - "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" ]; }; }; @@ -233,7 +236,6 @@ ]; systemPackages = with pkgs; [ - toybox nautilus nautilus-python diff-so-fancy @@ -273,17 +275,13 @@ go lua lua-language-server - nil - nixd nix-output-monitor alejandra comma zip nodejs - typescript busybox rustup - vscode-fhs bibata-cursors spotify jq diff --git a/hosts/nyx/home.nix b/hosts/nyx/home.nix index e0bd44e..029ece6 100644 --- a/hosts/nyx/home.nix +++ b/hosts/nyx/home.nix @@ -22,6 +22,7 @@ signing = { signByDefault = true; key = "/home/pingu/.ssh/id_ed25519"; + format = "ssh"; }; extraConfig = { core = { @@ -31,7 +32,6 @@ url = { "ssh://git@github.com/" = {insteadOf = "https://github.com/";}; }; - gpg = {format = "ssh";}; init = {defaultBranch = "main";}; format = { signOff = true; diff --git a/modules/home-manager/hypr/hyprland/rules.nix b/modules/home-manager/hypr/hyprland/rules.nix index 3927d02..645b971 100644 --- a/modules/home-manager/hypr/hyprland/rules.nix +++ b/modules/home-manager/hypr/hyprland/rules.nix @@ -1,4 +1,4 @@ -{...}: { +_: { wayland.windowManager.hyprland.settings = { workspace = [ "special:special, on-created-empty:exec spotify --enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime=true" diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index ece86ab..8cf2b40 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -40,6 +40,14 @@ group = "jellyfin"; }; + bazarr = { + enable = true; + openFirewall = true; + package = pkgs.bazarr; + user = "jellyfin"; + group = "jellyfin"; + }; + prowlarr = { enable = true; openFirewall = true;