back to 24.05 💆

This commit is contained in:
Joseph Hanson 2024-07-03 17:45:35 -05:00
parent cd2122cdef
commit 1862ee4478
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
10 changed files with 96 additions and 26 deletions

View file

@ -118,16 +118,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719827439, "lastModified": 1720042825,
"narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -318,6 +318,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1719848872,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1709961763, "lastModified": 1709961763,
@ -336,16 +352,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1719848872, "lastModified": 1717179513,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -475,6 +491,7 @@
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur", "nur": "nur",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"talhelper": "talhelper" "talhelper": "talhelper"

View file

@ -3,7 +3,8 @@
inputs = { inputs = {
# Nixpkgs and unstable # Nixpkgs and unstable
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# impermanence # impermanence
# https://github.com/nix-community/impermanence # https://github.com/nix-community/impermanence
@ -22,7 +23,7 @@
# home-manager - unstable # home-manager - unstable
# https://github.com/nix-community/home-manager # https://github.com/nix-community/home-manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -33,6 +33,7 @@ with config;
termius termius
obsidian obsidian
jetbrains.datagrip jetbrains.datagrip
# talosctl
# cli # cli
brightnessctl brightnessctl

View file

@ -19,7 +19,7 @@
# Home-manager defaults # Home-manager defaults
config = { config = {
home.stateVersion = "24.11"; home.stateVersion = "24.05";
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;

View file

@ -76,9 +76,10 @@ in
COOKIE_NAME = "session"; COOKIE_NAME = "session";
}; };
}; };
secrets = { mailerPasswordFile = config.sops.secrets."services/forgejo/smtp/password".path;
mailer.PASSWD = config.sops.secrets."services/forgejo/smtp/password".path; # secrets = {
}; # mailer.PASSWD = config.sops.secrets."services/forgejo/smtp/password".path;
# };
}; };
# sops # sops
sops.secrets."services/forgejo/smtp/password" = { sops.secrets."services/forgejo/smtp/password" = {

View file

@ -1,22 +1,25 @@
{ inputs, ... }: { inputs, ... }:
let let
warpTerminal = import ./warp-terminal { warpTerminalOverlay = import ./warp-terminal {
inherit (inputs.nixpkgs) lib; inherit (inputs.nixpkgs) lib;
}; };
termiusApp = import ./termius { }; termiusOverlay = import ./termius { };
talosctlOverlay = import ./talosctl { };
goOverlay = import ./go { };
in in
{ {
nur = inputs.nur.overlay; nur = inputs.nur.overlay;
warp-terminal = warpTerminal; warp-terminal = warpTerminalOverlay;
termius = termiusApp; termius = termiusOverlay;
# talosctl = talosctlOverlay;
# go = goOverlay;
# The unstable nixpkgs set (declared in the flake inputs) will # The unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'
# great idea if I wasn't using unstable as my base. unstable-packages = final: _prev: {
# unstable-packages = final: _prev: { unstable = import inputs.nixpkgs-unstable {
# unstable = import inputs.nixpkgs-unstable { inherit (final) system;
# inherit (final) system; config.allowUnfree = true;
# config.allowUnfree = true; };
# }; };
# };
} }

View file

@ -0,0 +1,13 @@
{ ... }:
let
finalVersion = "1.22.4";
in
(final: prev: {
go = prev.go.overrideAttrs (oldAttrs: {
version = finalVersion;
src = prev.fetchurl {
url = "https://go.dev/dl/go${finalVersion}.src.tar.gz";
hash = "sha256-/tcgZ45yinyjC6jR3tHKr+J9FgKPqwIyuLqOIgCPt4Q=";
};
});
})

View file

@ -0,0 +1,18 @@
{ ...}:
let
finalVersion = "1.7.5";
in
(final: prev: {
talosctl = prev.talosctl.overrideAttrs (oldAttrs: {
version = finalVersion;
src = prev.fetchFromGitHub {
owner = "siderolabs";
repo = "talos";
rev = "v${finalVersion}";
hash = "sha256-lmDLlxiPyVhlSPplYkIaS5Uw19hir6XD8MAk8q+obhY=";
};
passthru = oldAttrs.passthru // {
updateScript = ./update.sh;
};
});
})

View file

@ -0,0 +1,16 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=/etc/nix/inputs/nixpkgs/ -i bash -p curl jq common-updater-scripts gnused nix coreutils
set -euo pipefail
latestVersion="$(curl -s "https://api.github.com/repos/siderolabs/talos/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')"
currentVersion=$(nix-instantiate --eval -E "with import /etc/nix/inputs/nixpkgs {}; talosctl.version or (lib.getVersion talosctl)" | tr -d '"')
if [[ "$currentVersion" == "$latestVersion" ]]; then
echo "talosctl is up-to-date: $currentVersion"
exit 0
fi
update-source-version talosctl "$latestVersion"
$(nix-build . -A talosctl --no-out-link)

View file

@ -8,6 +8,6 @@
''; '';
# Do not change unless you know what you are doing # Do not change unless you know what you are doing
stateVersion = "24.11"; stateVersion = "24.05";
}; };
} }