diff --git a/flake.lock b/flake.lock index d2f3ad2..d54eec1 100644 --- a/flake.lock +++ b/flake.lock @@ -163,6 +163,27 @@ "type": "github" } }, + "crane_4": { + "inputs": { + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713979152, + "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", + "owner": "ipetkov", + "repo": "crane", + "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -359,6 +380,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -713,6 +752,22 @@ "type": "github" } }, + "nixpkgs_7": { + "locked": { + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -800,7 +855,8 @@ "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", "simple-nixos-mailserver": "simple-nixos-mailserver", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "zjstatus": "zjstatus" } }, "rust-analyzer-src": { @@ -845,6 +901,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "zjstatus", + "flake-utils" + ], + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714097613, + "narHash": "sha256-044xbpBszupqN3nl/CGOCJtTQ4O6Aca81mJpX45i8/I=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "2a42c742ab04b61d9b2f1edf392842cf9f27ebfd", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", @@ -946,6 +1027,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_4" @@ -963,6 +1059,27 @@ "repo": "flake-utils", "type": "github" } + }, + "zjstatus": { + "inputs": { + "crane": "crane_4", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1714117167, + "narHash": "sha256-Dw+x2AWL5BKmkZL1Aewlh8Elp+4bhsR0ukaukqnm2Uo=", + "owner": "dj95", + "repo": "zjstatus", + "rev": "cda2388764cc96832d7260e4114fc5c5c8699de3", + "type": "github" + }, + "original": { + "owner": "dj95", + "repo": "zjstatus", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7ffd836..4263779 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,8 @@ home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + zjstatus.url = "github:dj95/zjstatus"; + # Fix for steam cursor not being visible under wayland # Add any other flake you might need @@ -88,6 +90,7 @@ sops-nix, simple-nixos-mailserver, plasma-manager, + zjstatus, # linger, # pihole, lanzaboote, @@ -126,7 +129,7 @@ homeManagerModules = import ./modules/home-manager; # Your custom packages and modifications, exported as overlays - overlays = import ./overlays {inherit inputs;}; + overlays = import ./overlays {inherit inputs zjstatus;}; # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' diff --git a/home-manager/shared/shell/hyfetch.nix b/home-manager/shared/shell/hyfetch.nix index 64e676d..5d7d1c5 100644 --- a/home-manager/shared/shell/hyfetch.nix +++ b/home-manager/shared/shell/hyfetch.nix @@ -6,12 +6,11 @@ }: { programs.hyfetch = { enable = true; - # settings = { - # preset = "trans"; - # mode = "rgb"; - # color_align = { - # mode = "horizontal"; - # }; - # }; + settings = { + preset = "transgender"; + color_align = { + mode = "horizontal"; + }; + }; }; } diff --git a/overlays/default.nix b/overlays/default.nix index 267ba4c..b56db9c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,5 +1,9 @@ # This file defines overlays -{inputs, ...}: { +{ + inputs, + zjstatus, + ... +}: { # This one contains whatever you want to overlay # You can change versions, add patches, set compilation flags, anything really. # https://nixos.wiki/wiki/Overlays @@ -9,6 +13,12 @@ # }; }; + zjstatus = ( + final: prev: { + zjstatus = zjstatus.packages.${prev.system}.default; + } + ); + # This one brings our custom packages from the 'pkgs' directory additions = final: _prev: import ../pkgs {