From 5961834ac1dbd542b823657707093262405668cb Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Tue, 24 Feb 2026 00:03:23 +0000 Subject: [PATCH] Updated conifg to use `nixers` repo --- flake.lock | 134 ++++++++++++++---- flake.nix | 79 ++++++----- home-manager/core.nix | 2 +- home-manager/worklaptop.nix | 2 +- home-manager/worklaptop/packages.nix | 12 +- home-manager/worklaptop/packages/default.nix | 6 - .../packages/pkgs/python/default.nix | 7 - .../packages/pkgs/rbw-autofill/default.nix | 6 - .../packages/pkgs/rbw-autofill/script.sh | 21 --- .../packages/pkgs/vivaldi-wayland/default.nix | 11 -- .../pkgs/walker-obsidian-search/default.nix | 23 --- .../pkgs/walker-obsidian-search/script.clj | 39 ----- nixos/worklaptop/packages.nix | 3 +- 13 files changed, 153 insertions(+), 192 deletions(-) delete mode 100644 home-manager/worklaptop/packages/default.nix delete mode 100644 home-manager/worklaptop/packages/pkgs/python/default.nix delete mode 100644 home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix delete mode 100644 home-manager/worklaptop/packages/pkgs/rbw-autofill/script.sh delete mode 100644 home-manager/worklaptop/packages/pkgs/vivaldi-wayland/default.nix delete mode 100644 home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix delete mode 100644 home-manager/worklaptop/packages/pkgs/walker-obsidian-search/script.clj diff --git a/flake.lock b/flake.lock index 1c692a5..72b4142 100644 --- a/flake.lock +++ b/flake.lock @@ -19,6 +19,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -43,6 +59,7 @@ "home-manager_2": { "inputs": { "nixpkgs": [ + "nixers-repo", "zen-browser", "nixpkgs" ] @@ -79,6 +96,30 @@ "type": "github" } }, + "nixers-repo": { + "inputs": { + "elephant": "elephant", + "flake-compat": "flake-compat", + "hyprcursor-phinger": "hyprcursor-phinger", + "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable", + "walker": "walker", + "zen-browser": "zen-browser" + }, + "locked": { + "lastModified": 1771892203, + "narHash": "sha256-BpSgISyEgHgUIpYxATGC8RQvFxk9qDKR/u2m8ZdtAeE=", + "owner": "Cian-H", + "repo": "Nixers", + "rev": "e9e7eb48cc9a0c6f543218af8ae50a9aa4fcec9e", + "type": "github" + }, + "original": { + "owner": "Cian-H", + "repo": "Nixers", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1764242076, @@ -111,6 +152,22 @@ "type": "github" } }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1762977756, @@ -144,22 +201,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1771207753, - "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -175,28 +216,57 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1771714954, + "narHash": "sha256-nhZJPnBavtu40/L2aqpljrfUNb2rxmWTmSjK2c9UKds=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "afbbf774e2087c3d734266c22f96fca2e78d3620", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "elephant": "elephant", "home-manager": "home-manager", - "hyprcursor-phinger": "hyprcursor-phinger", - "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", - "sops-nix": "sops-nix", - "walker": "walker", - "zen-browser": "zen-browser" + "nixers-repo": "nixers-repo", + "nixpkgs": "nixpkgs_5", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1771735105, - "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=", + "lastModified": 1771889317, + "narHash": "sha256-YV17Q5lEU0S9ppw08Y+cs4eEQJBuc79AzblFoHORLMU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f", + "rev": "b027513c32e5b39b59f64626b87fbe168ae02094", "type": "github" }, "original": { @@ -238,9 +308,10 @@ "walker": { "inputs": { "elephant": [ + "nixers-repo", "elephant" ], - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "systems": "systems_2" }, "locked": { @@ -261,15 +332,16 @@ "inputs": { "home-manager": "home-manager_2", "nixpkgs": [ + "nixers-repo", "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1771840410, - "narHash": "sha256-fxtvkgQLVhHAjWXPhqahYrVky6KjmS3hwhsb1UX/c/8=", + "lastModified": 1771876204, + "narHash": "sha256-nTX+Qa3W+xsFxBl+lr4RsWvC4vgZocLt/qDeIvnf4+w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "24e003a8ad4ab99cabbba6821bd985bb81dbe656", + "rev": "2f951adfab1f5a090fe5ea4c5eaf11efca7f1039", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 572c741..e9a035d 100644 --- a/flake.nix +++ b/flake.nix @@ -6,30 +6,20 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; # Nixpkgs-unstable nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + # Nixers + nixers-repo.url = "github:Cian-H/Nixers"; # Home manager home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Add sops for secret management sops-nix.url = "github:Mic92/sops-nix"; - # Add phinger hyprcursor flake - hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger"; - # Add walker as an option for a launcher - elephant.url = "github:abenz1267/elephant"; - walker = { - url = "github:abenz1267/walker"; - inputs.elephant.follows = "elephant"; - }; - # Add zen browser flake - zen-browser = { - url = "github:0xc000022070/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; }; outputs = { self, nixpkgs, nixpkgs-unstable, + nixers-repo, home-manager, ... } @ inputs: let @@ -75,6 +65,7 @@ specialArgs = { inherit inputs outputs; unstablePkgs = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; + nixers = inputs.nixers-repo.packages.x86_64-linux; theme = worklaptopTheme pkgs; }; modules = [ @@ -85,6 +76,7 @@ specialArgs = { inherit inputs outputs; unstablePkgs = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux; + nixers = inputs.nixers-repo.packages.x86_64-linux; }; modules = [ ./nixos/homeserver.nix @@ -95,7 +87,7 @@ # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { - "cianh@core" = home-manager.lib.homeManagerConfiguration { + "cianh@core" = let pkgs = import nixpkgs { # Home-manager requires 'pkgs' instance system = "x86_64-linux"; @@ -105,21 +97,25 @@ allowUnfreePredicate = _: true; }; }; - extraSpecialArgs = { - inherit inputs outputs; - unstablePkgs = import nixpkgs-unstable { - # We also need to do the same for unstable - system = "x86_64-linux"; - config = { - allowUnfree = true; - allowUnfreePredicate = _: true; + in + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + extraSpecialArgs = { + inherit inputs outputs; + unstablePkgs = import nixpkgs-unstable { + # We also need to do the same for unstable + system = pkgs.system; + config = { + allowUnfree = true; + allowUnfreePredicate = _: true; + }; }; + nixers = inputs.nixers-repo.packages.${pkgs.system}; }; + modules = [ + ./home-manager/core.nix + ]; }; - modules = [ - ./home-manager/core.nix - ]; - }; "cianh@worklaptop" = let pkgs = import nixpkgs { system = "x86_64-linux"; @@ -143,6 +139,7 @@ allowUnfreePredicate = _: true; }; }; + nixers = inputs.nixers-repo.packages.${pkgs.system}; theme = worklaptopTheme pkgs; }; @@ -150,7 +147,7 @@ ./home-manager/worklaptop.nix ]; }; - "cianh@homeserver" = home-manager.lib.homeManagerConfiguration { + "cianh@homeserver" = let pkgs = import nixpkgs { # Home-manager requires 'pkgs' instance system = "x86_64-linux"; @@ -160,21 +157,25 @@ allowUnfreePredicate = _: true; }; }; - extraSpecialArgs = { - inherit inputs outputs; - unstablePkgs = import nixpkgs-unstable { - # We also need to do the same for unstable - system = "x86_64-linux"; - config = { - allowUnfree = true; - allowUnfreePredicate = _: true; + in + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + extraSpecialArgs = { + inherit inputs outputs; + unstablePkgs = import nixpkgs-unstable { + # We also need to do the same for unstable + system = "x86_64-linux"; + config = { + allowUnfree = true; + allowUnfreePredicate = _: true; + }; }; + nixers = inputs.nixers-repo.packages.${pkgs.system}; }; + modules = [ + ./home-manager/homeserver.nix + ]; }; - modules = [ - ./home-manager/homeserver.nix - ]; - }; }; }; } diff --git a/home-manager/core.nix b/home-manager/core.nix index 49ff3c7..0c6b7d9 100644 --- a/home-manager/core.nix +++ b/home-manager/core.nix @@ -13,7 +13,7 @@ ./core/packages.nix ./core/programs.nix ./core/services.nix - inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger + inputs.nixers-repo.homeManagerModules.hyprcursor-phinger ]; nix = { diff --git a/home-manager/worklaptop.nix b/home-manager/worklaptop.nix index 2f00d5c..be3f54d 100644 --- a/home-manager/worklaptop.nix +++ b/home-manager/worklaptop.nix @@ -14,6 +14,6 @@ ./worklaptop/programs.nix ./worklaptop/defaultapps.nix ./worklaptop/theming.nix - inputs.walker.homeManagerModules.default + inputs.nixers-repo.homeManagerModules.walker ]; } diff --git a/home-manager/worklaptop/packages.nix b/home-manager/worklaptop/packages.nix index 716106d..f09fa0b 100644 --- a/home-manager/worklaptop/packages.nix +++ b/home-manager/worklaptop/packages.nix @@ -5,9 +5,9 @@ config, pkgs, unstablePkgs, + nixers, ... }: let - myPkgs = import ./packages/my_pkgs.nix {inherit pkgs;}; in { home.packages = [ pkgs.bitwarden-desktop @@ -49,17 +49,17 @@ in { unstablePkgs.podman-desktop unstablePkgs.podman-tui pkgs.popsicle - myPkgs.python - myPkgs.rbw-autofill + nixers.python + nixers.rbw-autofill unstablePkgs.ruff pkgs.smile pkgs.sshs unstablePkgs.uv pkgs.vial - myPkgs.vivaldi-wayland + nixers.vivaldi-wayland unstablePkgs.visidata pkgs.vivaldi-ffmpeg-codecs - myPkgs.walker-obsidian-search + nixers.walker-obsidian-search pkgs.warpinator pkgs.xarchiver pkgs.yubikey-agent @@ -68,7 +68,7 @@ in { unstablePkgs.zeal unstablePkgs.zed-editor unstablePkgs.zotero - inputs.zen-browser.packages.x86_64-linux.default + nixers.zen-browser.packages.x86_64-linux.default # theming pkgs.adwaita-icon-theme pkgs.gtk-engine-murrine diff --git a/home-manager/worklaptop/packages/default.nix b/home-manager/worklaptop/packages/default.nix deleted file mode 100644 index 8503722..0000000 --- a/home-manager/worklaptop/packages/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs ? import {}}: { - python-env = pkgs.callPackage ./pkgs/python-env/default.nix {}; - rbw-autofill = pkgs.callPackage ./pkgs/rbw-autofill/default.nix {}; - vivaldi-wayland = pkgs.callPackage ./pkgs/vivaldi-wayland/default.nix {}; - walker-obsidian-search = pkgs.callPackage ./pkgs/walker-obsidian-search/default.nix {}; -} diff --git a/home-manager/worklaptop/packages/pkgs/python/default.nix b/home-manager/worklaptop/packages/pkgs/python/default.nix deleted file mode 100644 index 67e4bad..0000000 --- a/home-manager/worklaptop/packages/pkgs/python/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{pkgs}: -pkgs.python314.withPackages ( - python-pkgs: [ - python-pkgs.pkginfo - python-pkgs.setuptools - ] -) diff --git a/home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix b/home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix deleted file mode 100644 index 0671711..0000000 --- a/home-manager/worklaptop/packages/pkgs/rbw-autofill/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs}: -pkgs.writeShellApplication { - name = "rbw-autofill"; - runtimeInputs = [pkgs.bash pkgs.libsecret pkgs.zenity]; - text = builtins.readFile ./script.sh; -} diff --git a/home-manager/worklaptop/packages/pkgs/rbw-autofill/script.sh b/home-manager/worklaptop/packages/pkgs/rbw-autofill/script.sh deleted file mode 100644 index 3c43104..0000000 --- a/home-manager/worklaptop/packages/pkgs/rbw-autofill/script.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -echo "OK" -while read -r line; do - if [[ "$line" == "GETPIN" ]]; then - pass=$(secret-tool lookup application rbw 2>/dev/null) - if [[ -z "$pass" ]]; then - pass=$(zenity --password --title="rbw Setup" --text="Enter Bitwarden Master Password to save to Keyring:") - if [[ -n "$pass" ]]; then - printf "%s" "$pass" | secret-tool store --label="rbw" application rbw - else - echo "ERR 100 Password retrieval cancelled" - exit 1 - fi - fi - printf "D %s\n" "$pass" - echo "OK" - exit 0 - fi - echo "OK" -done diff --git a/home-manager/worklaptop/packages/pkgs/vivaldi-wayland/default.nix b/home-manager/worklaptop/packages/pkgs/vivaldi-wayland/default.nix deleted file mode 100644 index b1805f3..0000000 --- a/home-manager/worklaptop/packages/pkgs/vivaldi-wayland/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{pkgs}: -pkgs.symlinkJoin { - name = "vivaldi-wayland"; - paths = [pkgs.vivaldi]; - buildInputs = [pkgs.makeWrapper]; - postBuild = '' - wrapProgram $out/bin/vivaldi \ - --set NIXOS_OZONE_WL 1 \ - --add-flags "--ozone-platform=wayland --enable-features=UseOzonePlatform --ozone-platform-hint=auto" - ''; -} diff --git a/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix b/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix deleted file mode 100644 index 1040f0d..0000000 --- a/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - stdenv, - babashka, - ripgrep, - walker, - xdg-utils, -}: -stdenv.mkDerivation { - pname = "walker-obsidian-search"; - version = "0.1.0"; - src = ./.; - buildInputs = [babashka ripgrep walker xdg-utils]; - installPhase = '' - mkdir -p $out/bin - cp script.clj $out/bin/walker-obsidian-search - substituteInPlace $out/bin/walker-obsidian-search \ - --replace '"rg"' '"${ripgrep}/bin/rg"' \ - --replace '"walker' '"${walker}/bin/walker' \ - --replace '"xdg-open"' '"${xdg-utils}/bin/xdg-open"' - chmod +x $out/bin/walker-obsidian-search - ''; -} diff --git a/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/script.clj b/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/script.clj deleted file mode 100644 index 321ea2f..0000000 --- a/home-manager/worklaptop/packages/pkgs/walker-obsidian-search/script.clj +++ /dev/null @@ -1,39 +0,0 @@ - -#!/usr/bin/env bb - -(require '[clojure.string :as str] - '[babashka.process :refer [shell]] - '[babashka.fs :as fs]) - -(def vault-name "Work_Notes") -(def walker-sep " 󰘤 ") -(def rg-sep "") - -(def vault-path - (-> (or (System/getenv "OBSIDIAN_VAULT") - (str (fs/home) "/Documents/" vault-name)) - fs/expand-home - fs/absolutize)) - -(def rg-results - (let [output (:out (shell {:dir (str vault-path) :out :string} - "rg" "--no-config" "--field-match-separator" rg-sep - "--with-filename" "--line-number" "--no-heading" "--color=never" "-t" "md" "."))] - (for [line (str/split-lines output)] - (let [[file line-num content] (str/split line (re-pattern rg-sep) 3)] - {:file file :line line-num :content content :raw (str file walker-sep content)})))) - -(def selection - (let [input (str/join "\n" (map :raw rg-results))] - (-> (shell - {:out :string :in input :continue true} - "walker --dmenu --placeholder \"Search Obsidian Notes\"") - :out - str/trim))) - -(if (str/blank? selection) - (System/exit 0) - (let [selected-row (first (filter #(= (:raw %) selection) rg-results)) - encoded-file (str/replace (:file selected-row) " " "%20") - uri (str "obsidian://adv-uri?vault=" vault-name "&filepath=" encoded-file "&line=" (:line selected-row))] - (shell "xdg-open" uri))) diff --git a/nixos/worklaptop/packages.nix b/nixos/worklaptop/packages.nix index 37c700c..48c7b65 100644 --- a/nixos/worklaptop/packages.nix +++ b/nixos/worklaptop/packages.nix @@ -4,6 +4,7 @@ config, pkgs, unstablePkgs, + nixers, ... }: { environment.systemPackages = [ @@ -22,7 +23,7 @@ pkgs.qmk_hid pkgs.regreet pkgs.seahorse - pkgs.walker + nixers.walker pkgs.wayland pkgs.wayland-utils pkgs.xfce.thunar