diff --git a/.gitignore b/.gitignore index 769fa44..a931378 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ result/* result -tatara.caracal-vector* diff --git a/flake.lock b/flake.lock index 38eb78a..f312bde 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1753056897, - "narHash": "sha256-AVVMBFcuOXqIgmShvRv9TED3fkiZhQ0ZvlhsPoFfkNE=", + "lastModified": 1752781640, + "narHash": "sha256-bDgECs6Gls+KeIba8ft7jmxM3Hsbc2+DseiI4zrra2o=", "owner": "nix-community", "repo": "home-manager", - "rev": "13a83d1b6545b7f0e8f7689bad62e7a3b1d63771", + "rev": "bc9f3c8413a3aaa01ed959c371c1f9e57515965b", "type": "github" }, "original": { @@ -151,11 +151,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752997324, - "narHash": "sha256-vtTM4oDke3SeDj+1ey6DjmzXdq8ZZSCLWSaApADDvIE=", + "lastModified": 1752747119, + "narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c688a0875df5a8c28a53fb55ae45e94eae0dddb", + "rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1752976861, - "narHash": "sha256-59HcrqHfbSJUdmpzrAa9x8fW1PoS+ZGhCjL5k5HbyV8=", + "lastModified": 1752762787, + "narHash": "sha256-WZLSOR2Pei7C4nH/ntKUqOZOAa5rgvc2fVZl4RoEXmw=", "owner": "nix-community", "repo": "nixvim", - "rev": "0c50ed9349199219583cb1ed1a972d71e06039ec", + "rev": "bc0555c8694d43fb63ae2c7afec08b6987431a04", "type": "github" }, "original": { @@ -343,11 +343,11 @@ ] }, "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", + "lastModified": 1752758254, + "narHash": "sha256-VP+f1kJmTsJW+62HtJRZw/luhKHaT06lByAI3/6dXSQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", + "rev": "9aa65a267cba3e8334e3af8ec005e75d9c391bbe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b9ac030..e7700b0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Fabric's flake"; inputs = { - # nvidiaPkgs.url = "github:NixOS/nixpkgs/915a9de5b3ab337133e890f21f44deb44598c814"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -28,7 +28,6 @@ outputs = { self, nixpkgs, - # nvidiaPkgs, home-manager, zen-browser, nixvim, @@ -37,13 +36,6 @@ }: let lib = nixpkgs.lib; pkgs = nixpkgs.legacyPackages."x86_64-linux"; - # nvidiaPkgsWithUnfree = import nvidiaPkgs { - # config = { - # allowUnfree = true; - # }; - # overlays = []; - # system = "x86_64-linux"; - # }; in { nixosConfigurations = { tatara = lib.nixosSystem { @@ -57,9 +49,6 @@ modules = [ ./hosts/zion/default.nix ]; - # specialArgs = { - # nvidiaPkgs = nvidiaPkgsWithUnfree; - # }; }; }; diff --git a/hosts/common/optional/caddy.nix b/hosts/common/optional/caddy.nix deleted file mode 100644 index a1da1e6..0000000 --- a/hosts/common/optional/caddy.nix +++ /dev/null @@ -1,29 +0,0 @@ -{...}: { - services.caddy = { - enable = true; - - virtualHosts."tatara.caracal-vector.ts.net".extraConfig = '' - # Redirect for qbittorrent - redir /qbit /qbit/ 308 - - handle_path /qbit/* { - reverse_proxy http://localhost:8080 - } - - redir /vaultwarden /vaultwarden/ 308 - - handle_path /vaultwarden/* { - reverse_proxy http://localhost:2788 - } - - - redir /plex /plex/ 308 - - handle_path /plex/* { - reverse_proxy http://localhost:32400 - } - - tls internal - ''; - }; -} diff --git a/hosts/common/optional/nvidia.nix b/hosts/common/optional/nvidia.nix index 3ab67a0..317f451 100644 --- a/hosts/common/optional/nvidia.nix +++ b/hosts/common/optional/nvidia.nix @@ -3,7 +3,6 @@ config, lib, pkgs, - nvidiaPkgs, ... }: { services.xserver.videoDrivers = ["nvidia"]; @@ -17,36 +16,6 @@ open = false; nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.stable; - # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "565.77"; - # - # sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw="; - # sha256_aarch64 = "sha256-LSAYUnhfnK3rcuPe1dixOwAujSof19kNOfdRHE7bToE="; - # openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; - # settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; - # persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww="; - # - # # Optional: include patches from that version if needed - # # patches = [ - # # ./fix-for-linux-6.13.patch - # # ]; - # # patchesOpen = [ - # # ./nvidia-nv-Convert-symbol-namespace-to-string-literal.patch - # # ./crypto-Add-fix-for-6.13-Module-compilation.patch - # # ./Use-linux-aperture.c-for-removing-conflict.patch - # # ./TTM-fbdev-emulation-for-Linux-6.13.patch - # # ]; - # }; - - # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "555.58"; - # - # sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew="; - # sha256_aarch64 = lib.fakeSha256; - # openSha256 = lib.fakeSha256; - # settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M="; - # persistencedSha256 = lib.fakeSha256; - # }; }; }; } diff --git a/hosts/common/optional/plasma.nix b/hosts/common/optional/plasma.nix deleted file mode 100644 index 8d892bb..0000000 --- a/hosts/common/optional/plasma.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, ...}: { - services = { - desktopManager.plasma6.enable = true; - - displayManager.sddm.enable = true; - - displayManager.sddm.wayland.enable = true; - }; - - environment.systemPackages = with pkgs; [ - kdePackages.discover # Optional: Install if you use Flatpak or fwupd firmware update sevice - kdePackages.kcalc # Calculator - kdePackages.kcharselect # Tool to select and copy special characters from all installed fonts - kdePackages.kcolorchooser # A small utility to select a color - kdePackages.kolourpaint # Easy-to-use paint program - kdePackages.ksystemlog # KDE SystemLog Application - kdePackages.sddm-kcm # Configuration module for SDDM - kdiff3 # Compares and merges 2 or 3 files or directories - kdePackages.isoimagewriter # Optional: Program to write hybrid ISO files onto USB disks - kdePackages.partitionmanager # Optional Manage the disk devices, partitions and file systems on your computer - hardinfo2 # System information and benchmarks for Linux systems - haruna # Open source video player built with Qt/QML and libmpv - wayland-utils # Wayland utilities - wl-clipboard # Command-line copy/paste utilities for Wayland - ]; -} diff --git a/hosts/tatara/default.nix b/hosts/tatara/default.nix index 5a8b2ea..450ac28 100644 --- a/hosts/tatara/default.nix +++ b/hosts/tatara/default.nix @@ -17,7 +17,6 @@ ../common/optional/samba.nix ../common/optional/plex.nix ../common/optional/qbit.nix - ../common/optional/caddy.nix ]; # Bootloader diff --git a/hosts/zion/default.nix b/hosts/zion/default.nix index 15c9d6c..427bce0 100644 --- a/hosts/zion/default.nix +++ b/hosts/zion/default.nix @@ -10,7 +10,6 @@ ./hardware-configuration.nix # Common configurations - ../common/optional/plasma.nix ../common/global ../common/optional/nvidia.nix ../common/optional/docker.nix