From 5411b3709efc67ee1973a91495b84979803fbdd9 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 13 Apr 2026 21:18:14 -0600 Subject: testing out nix-search-tv : seems to work but unf to disko broken --- flake.lock | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 46 +++++++++++++++++---- home-manager/home.nix | 17 +++++++- 3 files changed, 161 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 466a989..3a6ae89 100644 --- a/flake.lock +++ b/flake.lock @@ -229,6 +229,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -663,6 +681,24 @@ "type": "github" } }, + "ndg": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1775504466, + "narHash": "sha256-FfRAANlGiF3oxq4aOO4BeyfAHRITsVg9tFdpSGgX/8c=", + "owner": "feel-co", + "repo": "ndg", + "rev": "3f35db16e655503eb1b0c3fba8e3f003199720a4", + "type": "github" + }, + "original": { + "owner": "feel-co", + "repo": "ndg", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -742,6 +778,27 @@ "type": "github" } }, + "nix-search-tv": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771465079, + "narHash": "sha256-vWKMGj2fBUbsAvwoYjgT+L4hH0A96u4rDOaT0wnj7iw=", + "owner": "3timeslazy", + "repo": "nix-search-tv", + "rev": "73a34372b15b3824586b3f65c22c4ff8f0eb4c2c", + "type": "github" + }, + "original": { + "owner": "3timeslazy", + "repo": "nix-search-tv", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -905,6 +962,19 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1775036866, + "narHash": "sha256-ByAX1LkhCwZ94+KnFAmnJSMAvui7kgCxjHgUHsWAbfI=", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre972949.6201e203d095/nixexprs.tar.xz?lastModified=1775036866&rev=6201e203d09599479a3b3450ed24fa81537ebc4e" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, "nushell-scripts": { "flake": false, "locked": { @@ -961,12 +1031,14 @@ "nix-colors": "nix-colors", "nix-index-database": "nix-index-database", "nix-minecraft": "nix-minecraft", + "nix-search-tv": "nix-search-tv", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_4", "nixpkgs-old": "nixpkgs-old", "nixpkgs-unstable": "nixpkgs-unstable", "nushell-scripts": "nushell-scripts", "sops-nix": "sops-nix", + "unf": "unf", "wallpapers": "wallpapers" } }, @@ -1036,6 +1108,42 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "unf": { + "inputs": { + "ndg": "ndg", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1760178630, + "narHash": "sha256-oxRMTQtzIO1yFRhY++Ss8+ea1cTH40bD/+FAE+m5NFk=", + "ref": "refs/heads/main", + "rev": "8a6aa536039f1b207888b1369c5cabf0b131e07b", + "revCount": 5, + "type": "git", + "url": "https://git.atagen.co/atagen/unf" + }, + "original": { + "type": "git", + "url": "https://git.atagen.co/atagen/unf" + } + }, "wallpapers": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 129d6ad..dcf3558 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,11 @@ # inputs.nixpkgs.follows = "nixpkgs"; # inputs.lix.follows = "lix"; # }; + + unf = { + url = "git+https://git.atagen.co/atagen/unf"; + inputs.nixpkgs.follows = "nixpkgs"; + }; #for device formatting disko = { @@ -67,6 +72,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-search-tv = { + url = "github:3timeslazy/nix-search-tv"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + modded-minecraft-servers.url = "github:mkaito/nixos-modded-minecraft-servers"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; @@ -80,6 +90,7 @@ # url = "github:AstroNvim/AstroVnim/v3.36.0"; # flake = false; # }; + # useful nushell scripts, such as auto_completion nushell-scripts = { @@ -192,18 +203,32 @@ let inherit (self) outputs; lib = nixpkgs.lib // home-manager.lib; - systems = [ "x86_64-linux" "aarch64-linux" ]; - # forAllSystems = f: lib.genAttrs systems (system: f pkgsFor.${system}); - pkgsFor = lib.genAttrs systems (system: import nixpkgs { - inherit system; - config.allowUnfree = true; - }); + # systems = [ "x86_64-linux" "aarch64-linux" ]; + # # forAllSystems = f: lib.genAttrs systems (system: f pkgsFor.${system}); + # pkgsFor = lib.genAttrs systems (system: import nixpkgs { + # inherit system; + # config.allowUnfree = true; + # }); + + # function to use unf to list options from arbitrary module for home-manager + mkOpts = system: module: + inputs.unf.lib.json { + inherit self; + pkgs = nixpkgs.legacyPackages.${system}; + + # not all modules can be evaluated easily. If your module + # does not evaluate, try checking this NüschtOS file: + # https://github.com/NuschtOS/search.nuschtos.de/blob/main/flake.nix + modules = [module]; + }; minimalHomeManagerSettings = [ # From github:MasterofNull/nixos config home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.extraSpecialArgs = { + inherit inputs; + }; } ]; nixIndex = [ @@ -261,7 +286,12 @@ modules = minimalModuleConfig ++ [ ./machines/zenbook # lix-module.nixosModules.default # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} - home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; } + home-manager.nixosModules.home-manager { + home-manager.users.defin = import ./home-manager/tiling-wm.nix; + home-manager.extraSpecialArgs = { + diskoOptions = inputs.disko.nixosModules.default; + }; + } ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 313148e..814678a 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,9 +1,11 @@ -{ pkgs, hyprland-plugins, ... }: +{ pkgs, inputs, hyprland-plugins, ... } @ args : # let # home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; # unstable = import {}; # in -{ +let + ns = pkgs.writeShellScriptBin "ns" (builtins.readFile "${inputs.nix-search-tv}/nixpkgs.sh"); +in { imports = [ ./default.nix ]; @@ -89,6 +91,8 @@ openjdk adoptopenjdk-icedtea-web + ns + fzf ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage @@ -126,6 +130,15 @@ # }; programs = { + nix-search-tv = { + enable = true; + settings = { + experimental.options_file = { + disko = "${args.diskoOptions}"; + }; + }; + }; + qutebrowser = { enable = true; loadAutoconfig = true; -- cgit v1.2.3