feat: switch to unstable channel for gorgon
This commit is contained in:
parent
fce74c64a9
commit
687cb32400
9 changed files with 27 additions and 103 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -144,16 +144,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744743431,
|
"lastModified": 1745251259,
|
||||||
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
|
"narHash": "sha256-Hf8WEJMMoP6Fe+k+PYkVJFk5UKory2S0jW7HqRVqQFc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
|
"rev": "82ee14ff60611b46588ea852f267aafcc117c8c8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-24.11",
|
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -293,6 +292,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1744932701,
|
||||||
|
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
@ -306,6 +321,7 @@
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-full": "nixpkgs-full",
|
"nixpkgs-full": "nixpkgs-full",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"systems": "systems",
|
"systems": "systems",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,13 +3,14 @@
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
|
||||||
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-full.url = "github:NixOS/nixpkgs/nixos-24.11";
|
nixpkgs-full.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||||
flake-utils = {
|
flake-utils = {
|
||||||
url = "github:numtide/flake-utils";
|
url = "github:numtide/flake-utils";
|
||||||
inputs.systems.follows = "systems";
|
inputs.systems.follows = "systems";
|
||||||
};
|
};
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-24.11";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
"ui.popup" = { modifiers=["reversed"] }
|
"ui.popup" = { modifiers=["reversed"] }
|
||||||
"ui.popup.info" = { modifiers=["reversed"] }
|
"ui.popup.info" = { modifiers=["reversed"] }
|
||||||
"ui.text.info" = { modifiers=["reversed"] }
|
"ui.text.info" = { modifiers=["reversed"] }
|
||||||
"ui.menu" = { modifiers=["reversed"] }
|
"ui.menu" = { bg="black", fg="white" }
|
||||||
"ui.menu.selected" = { bg="white", fg="black" }
|
"ui.menu.selected" = { bg="white", fg="black" }
|
||||||
"ui.window" = { bg="white" }
|
"ui.window" = { bg="white" }
|
||||||
"diagnostic" = { modifiers=["reversed"] }
|
"diagnostic" = { modifiers=["reversed"] }
|
||||||
|
|
|
@ -20,7 +20,6 @@ with pkgs; [
|
||||||
delta # feature-rich diff viewer
|
delta # feature-rich diff viewer
|
||||||
dig
|
dig
|
||||||
direnv
|
direnv
|
||||||
dstat
|
|
||||||
duf # disk usage
|
duf # disk usage
|
||||||
dyff # diff tool for YAML
|
dyff # diff tool for YAML
|
||||||
element-desktop
|
element-desktop
|
||||||
|
@ -38,7 +37,6 @@ with pkgs; [
|
||||||
gimp
|
gimp
|
||||||
glow
|
glow
|
||||||
glow # render markdown
|
glow # render markdown
|
||||||
gnome.gnome-tweaks
|
|
||||||
gnumake
|
gnumake
|
||||||
gnupg
|
gnupg
|
||||||
gping # ping with graphs
|
gping # ping with graphs
|
||||||
|
@ -65,7 +63,6 @@ with pkgs; [
|
||||||
josm
|
josm
|
||||||
jq
|
jq
|
||||||
kanshi
|
kanshi
|
||||||
kcachegrind
|
|
||||||
keepassxc
|
keepassxc
|
||||||
kubetail
|
kubetail
|
||||||
krita
|
krita
|
||||||
|
@ -107,12 +104,8 @@ with pkgs; [
|
||||||
prusa-slicer
|
prusa-slicer
|
||||||
pv
|
pv
|
||||||
pwgen
|
pwgen
|
||||||
(python3.withPackages (python-pkgs: with python-pkgs; [
|
(python3.withPackages (pkgs: [pkgs.pandas pkgs.requests]))
|
||||||
pandas
|
|
||||||
requests
|
|
||||||
]))
|
|
||||||
ranger
|
ranger
|
||||||
recipemd
|
|
||||||
reptyr
|
reptyr
|
||||||
ripgrep
|
ripgrep
|
||||||
ripgrep
|
ripgrep
|
||||||
|
@ -144,7 +137,6 @@ with pkgs; [
|
||||||
wireshark
|
wireshark
|
||||||
xdg-utils
|
xdg-utils
|
||||||
xmlstarlet
|
xmlstarlet
|
||||||
xsv # cut for csv
|
|
||||||
unixtools.xxd
|
unixtools.xxd
|
||||||
xxh # portable shells
|
xxh # portable shells
|
||||||
yt-dlp
|
yt-dlp
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
, homepage
|
, homepage
|
||||||
, nixos-hardware
|
, nixos-hardware
|
||||||
, nixos-generators
|
, nixos-generators
|
||||||
|
, nixpkgs-unstable
|
||||||
, ...
|
, ...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
|
@ -25,7 +26,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
gorgon = nixosSystem rec {
|
gorgon = nixosSystem rec {
|
||||||
n_nixpkgs = nixpkgs-full;
|
n_nixpkgs = nixpkgs-unstable;
|
||||||
|
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
{ config
|
{ config
|
||||||
, pkgs
|
|
||||||
, lib
|
, lib
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
@ -25,11 +24,6 @@ with lib; {
|
||||||
|
|
||||||
age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
|
|
||||||
fonts.packages = mkDefault (with pkgs; [
|
|
||||||
source-code-pro
|
|
||||||
vegur
|
|
||||||
]);
|
|
||||||
|
|
||||||
users.mutableUsers = mkDefault true;
|
users.mutableUsers = mkDefault true;
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
|
|
|
@ -45,8 +45,7 @@ in
|
||||||
#linuxPackages.acpi_call
|
#linuxPackages.acpi_call
|
||||||
pam_u2f
|
pam_u2f
|
||||||
pamtester
|
pamtester
|
||||||
yubikey-manager
|
yubioath-flutter
|
||||||
yubikey-manager-qt
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
21
overlays.nix
21
overlays.nix
|
@ -1,23 +1,2 @@
|
||||||
{
|
{
|
||||||
kanboard = final: prev: {
|
|
||||||
kanboard = prev.kanboard.overrideAttrs (oldAttrs: {
|
|
||||||
src = prev.fetchFromGitHub {
|
|
||||||
owner = "kanboard";
|
|
||||||
repo = "kanboard";
|
|
||||||
rev = "v${oldAttrs.version}";
|
|
||||||
sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
recipemd = final: prev: {
|
|
||||||
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
|
|
||||||
(
|
|
||||||
python-final: python-prev: {
|
|
||||||
recipemd = python-final.callPackage ./pkgs/recipemd.nix { };
|
|
||||||
}
|
|
||||||
)
|
|
||||||
];
|
|
||||||
recipemd = prev.python3Packages.toPythonApplication final.python3Packages.recipemd;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,58 +0,0 @@
|
||||||
{ lib
|
|
||||||
, buildPythonPackage
|
|
||||||
, fetchFromGitHub
|
|
||||||
, pytestCheckHook
|
|
||||||
, pythonPackages
|
|
||||||
, installShellFiles
|
|
||||||
, pythonOlder
|
|
||||||
, pythonAtLeast
|
|
||||||
}:
|
|
||||||
buildPythonPackage rec {
|
|
||||||
pname = "recipemd";
|
|
||||||
version = "4.0.8";
|
|
||||||
|
|
||||||
disabled = pythonOlder "3.7" || pythonAtLeast "4";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "tstehr";
|
|
||||||
repo = "RecipeMD";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-eumV2zm7TIJcTPRtWSckYz7jiyH3Ek4nIAVtuJs3sJc=";
|
|
||||||
};
|
|
||||||
|
|
||||||
propagatedBuildInputs = with pythonPackages; [
|
|
||||||
dataclasses-json
|
|
||||||
yarl
|
|
||||||
CommonMark
|
|
||||||
argcomplete
|
|
||||||
pyparsing
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
${pythonPackages.argcomplete}/bin/register-python-argcomplete -s bash ${pname} > $out/completions.bash
|
|
||||||
installShellCompletion --bash --name recipemd.bash $out/completions.bash
|
|
||||||
|
|
||||||
${pythonPackages.argcomplete}/bin/register-python-argcomplete -s fish ${pname} > $out/completions.fish
|
|
||||||
installShellCompletion --fish --name recipemd.fish $out/completions.fish
|
|
||||||
|
|
||||||
# The version of argcomplete in nixpkgs-stable does not have support for zsh
|
|
||||||
#${pythonPackages.argcomplete}/bin/register-python-argcomplete -s zsh ${pname} > $out/completions.zsh
|
|
||||||
#installShellCompletion --zsh --name _recipemd $out/completions.zsh
|
|
||||||
'';
|
|
||||||
|
|
||||||
checkInputs = [
|
|
||||||
pytestCheckHook
|
|
||||||
pythonPackages.pytestcov
|
|
||||||
];
|
|
||||||
|
|
||||||
doCheck = true;
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Markdown recipe manager, reference implementation of RecipeMD";
|
|
||||||
homepage = "https://recipemd.org";
|
|
||||||
license = [ licenses.lgpl3Only ];
|
|
||||||
maintainers = [ maintainers.dadada ];
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue