Now running unstable....

This commit is contained in:
Olaf
2026-05-12 10:52:51 +02:00
parent 86d529fdd0
commit 5111cb4178
7 changed files with 65 additions and 33 deletions
+3 -2
View File
@@ -2,7 +2,8 @@
description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs//nixpkgs-25.11-darwin";
# url = "github:nixos/nixpkgs//nixpkgs-25.11-darwin";
url = "github:nixos/nixpkgs/nixpkgs-unstable";
};
home-manager = {
url = "github:nix-community/home-manager";
@@ -11,7 +12,7 @@
url = "github:nix-community/nixd";
};
darwin = {
url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
url = "github:nix-darwin/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-homebrew = {
+4 -2
View File
@@ -39,7 +39,9 @@ in
"https://nix-community.cachix.org"
"https://cache.nixos.org"
];
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
gc = {
@@ -79,7 +81,7 @@ in
(emacsWithPackagesFromUsePackage {
config = ../config/emacs/emacs.el;
defaultInitFile = true;
package = emacs-unstable;
package = emacs;
alwaysEnsure = true;
extraEmacsPackages = epkgs: with epkgs; [
magit
+2 -1
View File
@@ -62,7 +62,8 @@ in
"https://nix-community.cachix.org"
"https://cache.nixos.org"
];
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
};
package = pkgs.nix;
+3 -1
View File
@@ -31,6 +31,7 @@ _:
"blackhole-2ch"
"box-drive"
"box-tools"
"daisydisk"
"karabiner-elements"
"keybase"
"spamsieve"
@@ -56,7 +57,8 @@ _:
"macdown"
"mailmate"
"orcaslicer"
"qmk-toolbox"
"remanager"
"qmk-toolbox"
"smartsheet"
"spamsieve"
# "sqlitestudio" # Doesn't work without Rosetta
+1 -1
View File
@@ -51,7 +51,7 @@ in
"Affinity Designer 2" = 1616831348;
"Affinity Photo 2: Image Editor" = 1616822987;
"Affinity Publisher 2" = 1606941598;
"DaisyDisk" = 411643860; # (4.32)
# "DaisyDisk" = 411643860; # (4.32) # Don't use this, we need the official version that is not sandboxed
"Fantastical - Calendar" = 975937182;
"Home Assistant" = 1099568401; # (2025.7.1)
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
+1 -1
View File
@@ -22,7 +22,7 @@ in
(attrNames (readDir path)))
++ [(import (builtins.fetchTarball {
url = "https://github.com/dustinlyons/emacs-overlay/archive/refs/heads/master.tar.gz";
url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
sha256 = emacsOverlaySha256;
}))];
};
+51 -25
View File
@@ -8,13 +8,13 @@ with pkgs;
# The Web Browsers
brave
firefox
# google-chrome. #stopped working
firefox
# google-chrome. #stopped working
# security and some such
bitwarden-desktop
# bitwarden-cli
yubikey-manager # provides ykman
# bitwarden-cli
yubikey-manager # provides ykman
pinentry_mac
# General packages for development and system management
@@ -32,8 +32,8 @@ with pkgs;
minicom
mtr
ncdu
neofetch
nixfmt-rfc-style
fastfetch
nixfmt
openssh
postgresql
sqlite
@@ -51,14 +51,13 @@ with pkgs;
cmake
dfu-util
go
jd-diff-patch #json diff patch
jd-diff-patch # json diff patch
jq # json tool
llvm
nasm
ninja
pkg-config
# Encryption and security tools
age
gnupg
@@ -76,52 +75,79 @@ with pkgs;
fd
ffmpeg
font-awesome
# jetbrains-mono
hack-font
meslo-lgs-nf
noto-fonts
noto-fonts-color-emoji
# Node.js development tools
nodePackages.npm # globally install npm
nodePackages.prettier
#nodePackages.npm # globally install npm
#nodePackages.prettier
# Text and terminal utilities
xterm
xterm
htop
hunspell
iftop
# inetutils # includes Telnet
jetbrains-mono
inetutils # includes Telnet
jq
ripgrep
tmux
tree
unrar
unzip
# zsh-powerlevel10k
# Python packages
# python3
virtualenv
(python3.withPackages (python-pkgs: with python-pkgs; [
(python3.withPackages (
python-pkgs: with python-pkgs; [
bidict
blinker
certifi
charset-normalizer
click
flask
flask-socketio
h11
idna
importlib-metadata
itsdangerous
jinja2
markupsafe
mercantile
mlx-lm
numpy
pandas
pillow
pillow
python-engineio
python-socketio
requests
requests
shapely
simple-websocket
tkinter
tqdm
urllib3
werkzeug
wsproto
zipp
]
))
]))
# LLM
ollama
mlx42
# LLM
ollama
# Social
pidgin
# Social
pidgin
# Rust Related
rustc