Compare commits

...

3 commits

Author SHA1 Message Date
65720489b5
chore: make prompt and shell pretty
Some checks failed
Continuous Integration / Checks (push) Has been cancelled
2025-04-27 21:45:36 +02:00
a934dca7b6
feat: add dune 3d 2025-04-27 19:47:43 +02:00
687cb32400
feat: switch to unstable channel for gorgon 2025-04-27 19:38:01 +02:00
11 changed files with 34 additions and 109 deletions

24
flake.lock generated
View file

@ -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"
} }

View file

@ -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";

View file

@ -403,11 +403,11 @@ in
bindsym $mod+grave exec busctl --user call org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow lockAllDatabases && swaylock -c #fdf6e3 bindsym $mod+grave exec busctl --user call org.keepassxc.KeePassXC.MainWindow /keepassxc org.keepassxc.KeePassXC.MainWindow lockAllDatabases && swaylock -c #fdf6e3
# class border backgr. text indicator child_border # class border backgr. text indicator child_border
client.focused #${bright6} #${foreground} #${background} #${bright5} #${regular4} client.focused #${background} #${foreground} #${background} #${foreground} #${background}
client.focused_inactive #${regular0} #${regular0} #${foreground} #${bright5} #${regular0} client.focused_inactive #${background} #${background} #${foreground} #${foreground} #${background}
client.unfocused #${regular0} #${background} #${bright2} #${bright5} #${regular0} client.unfocused #${background} #${background} #${foreground} #${foreground} #${background}
client.urgent #${bright1} #${bright0} #${regular4} #${background} #${bright0} client.urgent #${background} #${background} #${foreground} #${foreground} #${background}
client.placeholder #${background} #${bright2} #${foreground} #${background} #${bright2} client.placeholder #${background} #${background} #${foreground} #${foreground} #${background}
client.background #${foreground} client.background #${foreground}

View file

@ -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"] }

View file

@ -43,7 +43,7 @@ in
preexec() { echo -n -e "\033]0;$1\007" } preexec() { echo -n -e "\033]0;$1\007" }
PROMPT="%F{red}%?%f %F{green}%m%f:%F{blue}%~%f " PROMPT="%F{red}%?%f %F{green}%m%f:%F{blue}%~%f"$'\n'"> "
RPROMPT='$(git_super_status)' RPROMPT='$(git_super_status)'
#NIX_BUILD_SHELL="${pkgs.zsh}/bin/zsh" #NIX_BUILD_SHELL="${pkgs.zsh}/bin/zsh"
''; '';

View file

@ -20,8 +20,8 @@ with pkgs; [
delta # feature-rich diff viewer delta # feature-rich diff viewer
dig dig
direnv direnv
dstat
duf # disk usage duf # disk usage
dune3d
dyff # diff tool for YAML dyff # diff tool for YAML
element-desktop element-desktop
evince evince
@ -38,7 +38,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 +64,6 @@ with pkgs; [
josm josm
jq jq
kanshi kanshi
kcachegrind
keepassxc keepassxc
kubetail kubetail
krita krita
@ -107,12 +105,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 +138,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

View file

@ -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";

View file

@ -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.

View file

@ -45,8 +45,7 @@ in
#linuxPackages.acpi_call #linuxPackages.acpi_call
pam_u2f pam_u2f
pamtester pamtester
yubikey-manager yubioath-flutter
yubikey-manager-qt
]; ];
}; };
} }

View file

@ -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;
};
} }

View file

@ -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 ];
};
}