NH and herdr

This commit is contained in:
2026-07-04 14:15:22 +02:00
parent e9c9670de2
commit 1ad01c35da
3 changed files with 51 additions and 7 deletions
Generated
+36 -1
View File
@@ -1,5 +1,23 @@
{ {
"nodes": { "nodes": {
"herdr": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1783165492,
"narHash": "sha256-xhaMqgcdK1xVBKg55r30xu80BlgLuQLUw//OKfG/swY=",
"owner": "ogulcancelik",
"repo": "herdr",
"rev": "c97e0986277e95144f79da3fce5b3fd443f3922f",
"type": "github"
},
"original": {
"owner": "ogulcancelik",
"repo": "herdr",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -22,6 +40,22 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1779357205,
"narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1782999065, "lastModified": 1782999065,
"narHash": "sha256-68sbHaR2H5mXnLSjtAii1YESzudwgaiVIK5N1kC/As8=", "narHash": "sha256-68sbHaR2H5mXnLSjtAii1YESzudwgaiVIK5N1kC/As8=",
@@ -37,8 +71,9 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"herdr": "herdr",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
} }
} }
}, },
+4 -1
View File
@@ -7,9 +7,11 @@
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-26.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
herdr.url = "github:ogulcancelik/herdr";
}; };
outputs = {self, home-manager, nixpkgs, ...}: { outputs = {self, home-manager, nixpkgs, herdr, ...}: {
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
@@ -21,6 +23,7 @@
useUserPackages = true; useUserPackages = true;
users.ulve = import ./home.nix; users.ulve = import ./home.nix;
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = { inherit herdr; };
}; };
} }
]; ];
+9 -3
View File
@@ -1,4 +1,4 @@
{config, pkgs, ...}: {config, pkgs, herdr, ...}:
{ {
imports = [ ./niri.nix ]; imports = [ ./niri.nix ];
@@ -15,7 +15,7 @@
shellAliases = { shellAliases = {
n = "nvim"; n = "nvim";
rebuild = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles"; rebuild = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles";
upgrade = "nix flake update --flake ~/nixos-dotfiles && sudo nixos-rebuild switch --flake ~/nixos-dotfiles"; upgrade = "nix flake update --flake ~/nixos-dotfiles && { command -v nh > /dev/null 2>&1 && nh os switch ~/nixos-dotfiles || sudo nixos-rebuild switch --flake ~/nixos-dotfiles; }";
}; };
}; };
@@ -31,7 +31,7 @@
shellAliases = { shellAliases = {
n = "nvim"; n = "nvim";
rebuild = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles"; rebuild = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles";
upgrade = "nix flake update --flake ~/nixos-dotfiles && sudo nixos-rebuild switch --flake ~/nixos-dotfiles"; upgrade = "nix flake update --flake ~/nixos-dotfiles && { command -v nh &>/dev/null && nh os switch ~/nixos-dotfiles || sudo nixos-rebuild switch --flake ~/nixos-dotfiles; }";
tree = "eza --tree --level=2"; tree = "eza --tree --level=2";
ls = "eza --icons --all --header --long --git"; ls = "eza --icons --all --header --long --git";
}; };
@@ -54,7 +54,11 @@
bindkey "^[OB" down-line-or-beginning-search bindkey "^[OB" down-line-or-beginning-search
function gc() { function gc() {
if command -v nh &>/dev/null; then
nh clean all --keep-since "''${1:-14}d"
else
sudo nix-collect-garbage --delete-older-than "''${1:-14}d" sudo nix-collect-garbage --delete-older-than "''${1:-14}d"
fi
} }
function mkenv() { function mkenv() {
@@ -261,6 +265,7 @@
# ── Packages ───────────────────────────────────────────────────────────────── # ── Packages ─────────────────────────────────────────────────────────────────
home.packages = with pkgs; [ home.packages = with pkgs; [
# general # general
herdr.packages.${pkgs.system}.default # wallpaper manager
claude-code # ai coding assistant claude-code # ai coding assistant
azure-cli # az cli azure-cli # az cli
git-credential-manager # git credential helper (azure devops PAT) git-credential-manager # git credential helper (azure devops PAT)
@@ -270,6 +275,7 @@
jq # json processor jq # json processor
powershell # yes powershell # yes
teams-for-linux # teams teams-for-linux # teams
nh # nix helper
unzip # compression unzip # compression
# terminal # terminal