From ec8fbeacc15a6abf0e3562842df75ce050416874 Mon Sep 17 00:00:00 2001 From: Lilith Date: Thu, 13 Mar 2025 01:29:44 +0100 Subject: [PATCH] unfree --- flake.nix | 2 +- home/default.nix | 5 +++-- home/lilith/default.nix | 8 ++++---- home/lilith/hyprland/hyprpaper.nix | 2 +- home/lilith/persist.nix | 2 -- home/lilith/sops.nix | 8 +++++--- system/core/persistence.nix | 1 - system/optional/nfs.nix | 11 +++++++++++ unfree.nix | 6 ++++++ 9 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 unfree.nix diff --git a/flake.nix b/flake.nix index 95676e3c..8f3072b7 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ hostname: let hardware = import ./hosts/${hostname}/hardware-configuration.nix; - args = builtins.functionArgs hardware // { lib.mkdefault = lib.id; }; + args = builtins.functionArgs hardware // { lib.mkDefault = lib.id; }; in (hardware args).nixpkgs.hostPlatform; diff --git a/home/default.nix b/home/default.nix index 1a252efb..fa98603b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,9 +1,10 @@ -{home-manager, lib, ...}: { - imports [ home-manager.nixosModules.home-manager ]; +{ home-manager, sops-nix, ... } @ inputs: { + imports = [ home-manager.nixosModules.home-manager ]; home-manager.backupFileExtension = "bak"; home-manager.users."lilith" = { imports = [ + sops-nix.homeManagerModules.sops ./lilith ]; diff --git a/home/lilith/default.nix b/home/lilith/default.nix index 6e75fee4..199d86fe 100644 --- a/home/lilith/default.nix +++ b/home/lilith/default.nix @@ -1,14 +1,14 @@ -{ matshell, sops-nix, ...}: { +{ sops-nix, ...}: { imports = [ # ags.homeManagerModules.default - matshell.homeManagerModules.default - sops-nix.homeManagerModules.sops + # matshell.homeManagerModules.default + # sops-nix.homeManagerModules.sops # ./ags # ToDo: get codin :3 ./hyprland ./rofi.nix ./dunst.nix - ./matshell.nix + # ./matshell.nix ./env.nix diff --git a/home/lilith/hyprland/hyprpaper.nix b/home/lilith/hyprland/hyprpaper.nix index 4295de8b..bdcfcfba 100644 --- a/home/lilith/hyprland/hyprpaper.nix +++ b/home/lilith/hyprland/hyprpaper.nix @@ -1,7 +1,7 @@ { ... }: { home.file.".config/hypr/wallpaper.png" = { - source = ../../wallpapers/default.png; + source = ../../../wallpapers/default.png; }; services.hyprpaper = let diff --git a/home/lilith/persist.nix b/home/lilith/persist.nix index 1f3b8d26..01247019 100644 --- a/home/lilith/persist.nix +++ b/home/lilith/persist.nix @@ -17,7 +17,6 @@ "obsidian" "code" ".keepass" - ] ++ lib.optionals config.gaming.enable [ ".local/share/PrismLauncher" ".local/share/Steam" ".local/share/lutris" @@ -34,7 +33,6 @@ ".cargo" ".local/state/wireplumber" "tmp" - ] ++ lib.optionals config.gaming.enable [ ]; files = []; }; diff --git a/home/lilith/sops.nix b/home/lilith/sops.nix index 739401cb..6aef2b08 100644 --- a/home/lilith/sops.nix +++ b/home/lilith/sops.nix @@ -1,6 +1,8 @@ -{ - ... -}: { +{ ... }: { + # imports = [ + # sops-nix.homeManagerModules.default + # ]; + sops = { age.keyFile = /persist/data/home/lilith/.config/sops/age/keys.txt; }; diff --git a/system/core/persistence.nix b/system/core/persistence.nix index 7caeb727..a5166246 100644 --- a/system/core/persistence.nix +++ b/system/core/persistence.nix @@ -24,7 +24,6 @@ "nixos" "sync" - "obsidian" "code" ".keepass" ]; diff --git a/system/optional/nfs.nix b/system/optional/nfs.nix index 1ff8e746..d8e3b59b 100644 --- a/system/optional/nfs.nix +++ b/system/optional/nfs.nix @@ -15,5 +15,16 @@ "_netdev" ]; }; + fileSystems."/mnt/nas/torrent" = { + device = "nixserver:/torrent"; + fsType = "nfs"; + options = [ + "nfsvers=4.2" + "noauto" + "x-systemd.automount" + "x-systemd.idle-timeout=600" + "_netdev" + ]; + }; }; } diff --git a/unfree.nix b/unfree.nix new file mode 100644 index 00000000..6675cc39 --- /dev/null +++ b/unfree.nix @@ -0,0 +1,6 @@ +{ + allowed = [ + "steam" + "steam-unwrapped" + ]; +}