From 687cb324007a548471dd9e1fa241fe0347747af1 Mon Sep 17 00:00:00 2001 From: Tim Schubert Date: Sun, 27 Apr 2025 19:38:01 +0200 Subject: [PATCH] feat: switch to unstable channel for gorgon --- flake.lock | 24 +++++++-- flake.nix | 3 +- home/modules/helix/config/themes/black.toml | 2 +- home/pkgs.nix | 10 +--- nixos/configurations.nix | 3 +- nixos/modules/profiles/laptop.nix | 6 --- nixos/modules/yubikey.nix | 3 +- overlays.nix | 21 -------- pkgs/recipemd.nix | 58 --------------------- 9 files changed, 27 insertions(+), 103 deletions(-) delete mode 100644 pkgs/recipemd.nix diff --git a/flake.lock b/flake.lock index c2ee325..e425e8b 100644 --- a/flake.lock +++ b/flake.lock @@ -144,16 +144,15 @@ ] }, "locked": { - "lastModified": 1744743431, - "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=", + "lastModified": 1745251259, + "narHash": "sha256-Hf8WEJMMoP6Fe+k+PYkVJFk5UKory2S0jW7HqRVqQFc=", "owner": "nix-community", "repo": "home-manager", - "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387", + "rev": "82ee14ff60611b46588ea852f267aafcc117c8c8", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -293,6 +292,22 @@ "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": { "inputs": { "agenix": "agenix", @@ -306,6 +321,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-full": "nixpkgs-full", + "nixpkgs-unstable": "nixpkgs-unstable", "systems": "systems", "treefmt-nix": "treefmt-nix" } diff --git a/flake.nix b/flake.nix index 7519d56..8dc1c74 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,14 @@ inputs = { 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"; flake-utils = { url = "github:numtide/flake-utils"; inputs.systems.follows = "systems"; }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/home/modules/helix/config/themes/black.toml b/home/modules/helix/config/themes/black.toml index 17ddd3d..88d1a35 100644 --- a/home/modules/helix/config/themes/black.toml +++ b/home/modules/helix/config/themes/black.toml @@ -17,7 +17,7 @@ "ui.popup" = { modifiers=["reversed"] } "ui.popup.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.window" = { bg="white" } "diagnostic" = { modifiers=["reversed"] } diff --git a/home/pkgs.nix b/home/pkgs.nix index c6ccc73..8615921 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -20,7 +20,6 @@ with pkgs; [ delta # feature-rich diff viewer dig direnv - dstat duf # disk usage dyff # diff tool for YAML element-desktop @@ -38,7 +37,6 @@ with pkgs; [ gimp glow glow # render markdown - gnome.gnome-tweaks gnumake gnupg gping # ping with graphs @@ -65,7 +63,6 @@ with pkgs; [ josm jq kanshi - kcachegrind keepassxc kubetail krita @@ -107,12 +104,8 @@ with pkgs; [ prusa-slicer pv pwgen - (python3.withPackages (python-pkgs: with python-pkgs; [ - pandas - requests - ])) + (python3.withPackages (pkgs: [pkgs.pandas pkgs.requests])) ranger - recipemd reptyr ripgrep ripgrep @@ -144,7 +137,6 @@ with pkgs; [ wireshark xdg-utils xmlstarlet - xsv # cut for csv unixtools.xxd xxh # portable shells yt-dlp diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 040ec6b..48d70cd 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -7,6 +7,7 @@ , homepage , nixos-hardware , nixos-generators +, nixpkgs-unstable , ... }@inputs: let @@ -25,7 +26,7 @@ let in { gorgon = nixosSystem rec { - n_nixpkgs = nixpkgs-full; + n_nixpkgs = nixpkgs-unstable; system = "x86_64-linux"; diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index 3ad8c11..bdba617 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -1,5 +1,4 @@ { config -, pkgs , lib , ... }: @@ -25,11 +24,6 @@ with lib; { age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - fonts.packages = mkDefault (with pkgs; [ - source-code-pro - vegur - ]); - users.mutableUsers = mkDefault true; # Use the systemd-boot EFI boot loader. diff --git a/nixos/modules/yubikey.nix b/nixos/modules/yubikey.nix index 3df9499..77f4394 100644 --- a/nixos/modules/yubikey.nix +++ b/nixos/modules/yubikey.nix @@ -45,8 +45,7 @@ in #linuxPackages.acpi_call pam_u2f pamtester - yubikey-manager - yubikey-manager-qt + yubioath-flutter ]; }; } diff --git a/overlays.nix b/overlays.nix index bf0588c..2c63c08 100644 --- a/overlays.nix +++ b/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; - }; } diff --git a/pkgs/recipemd.nix b/pkgs/recipemd.nix deleted file mode 100644 index 4879a9a..0000000 --- a/pkgs/recipemd.nix +++ /dev/null @@ -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 ]; - }; -}