Now running unstable....
This commit is contained in:
@@ -2,7 +2,8 @@
|
|||||||
description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
|
description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs = {
|
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 = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
@@ -11,7 +12,7 @@
|
|||||||
url = "github:nix-community/nixd";
|
url = "github:nix-community/nixd";
|
||||||
};
|
};
|
||||||
darwin = {
|
darwin = {
|
||||||
url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
|
url = "github:nix-darwin/nix-darwin";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nix-homebrew = {
|
nix-homebrew = {
|
||||||
|
|||||||
@@ -39,7 +39,9 @@ in
|
|||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://cache.nixos.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 = {
|
gc = {
|
||||||
@@ -79,7 +81,7 @@ in
|
|||||||
(emacsWithPackagesFromUsePackage {
|
(emacsWithPackagesFromUsePackage {
|
||||||
config = ../config/emacs/emacs.el;
|
config = ../config/emacs/emacs.el;
|
||||||
defaultInitFile = true;
|
defaultInitFile = true;
|
||||||
package = emacs-unstable;
|
package = emacs;
|
||||||
alwaysEnsure = true;
|
alwaysEnsure = true;
|
||||||
extraEmacsPackages = epkgs: with epkgs; [
|
extraEmacsPackages = epkgs: with epkgs; [
|
||||||
magit
|
magit
|
||||||
|
|||||||
@@ -62,7 +62,8 @@ in
|
|||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://cache.nixos.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;
|
package = pkgs.nix;
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ _:
|
|||||||
"blackhole-2ch"
|
"blackhole-2ch"
|
||||||
"box-drive"
|
"box-drive"
|
||||||
"box-tools"
|
"box-tools"
|
||||||
|
"daisydisk"
|
||||||
"karabiner-elements"
|
"karabiner-elements"
|
||||||
"keybase"
|
"keybase"
|
||||||
"spamsieve"
|
"spamsieve"
|
||||||
@@ -56,7 +57,8 @@ _:
|
|||||||
"macdown"
|
"macdown"
|
||||||
"mailmate"
|
"mailmate"
|
||||||
"orcaslicer"
|
"orcaslicer"
|
||||||
"qmk-toolbox"
|
"remanager"
|
||||||
|
"qmk-toolbox"
|
||||||
"smartsheet"
|
"smartsheet"
|
||||||
"spamsieve"
|
"spamsieve"
|
||||||
# "sqlitestudio" # Doesn't work without Rosetta
|
# "sqlitestudio" # Doesn't work without Rosetta
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ in
|
|||||||
"Affinity Designer 2" = 1616831348;
|
"Affinity Designer 2" = 1616831348;
|
||||||
"Affinity Photo 2: Image Editor" = 1616822987;
|
"Affinity Photo 2: Image Editor" = 1616822987;
|
||||||
"Affinity Publisher 2" = 1606941598;
|
"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;
|
"Fantastical - Calendar" = 975937182;
|
||||||
"Home Assistant" = 1099568401; # (2025.7.1)
|
"Home Assistant" = 1099568401; # (2025.7.1)
|
||||||
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
|
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ in
|
|||||||
(attrNames (readDir path)))
|
(attrNames (readDir path)))
|
||||||
|
|
||||||
++ [(import (builtins.fetchTarball {
|
++ [(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;
|
sha256 = emacsOverlaySha256;
|
||||||
}))];
|
}))];
|
||||||
};
|
};
|
||||||
|
|||||||
+51
-25
@@ -8,13 +8,13 @@ with pkgs;
|
|||||||
|
|
||||||
# The Web Browsers
|
# The Web Browsers
|
||||||
brave
|
brave
|
||||||
firefox
|
firefox
|
||||||
# google-chrome. #stopped working
|
# google-chrome. #stopped working
|
||||||
|
|
||||||
# security and some such
|
# security and some such
|
||||||
bitwarden-desktop
|
bitwarden-desktop
|
||||||
# bitwarden-cli
|
# bitwarden-cli
|
||||||
yubikey-manager # provides ykman
|
yubikey-manager # provides ykman
|
||||||
pinentry_mac
|
pinentry_mac
|
||||||
|
|
||||||
# General packages for development and system management
|
# General packages for development and system management
|
||||||
@@ -32,8 +32,8 @@ with pkgs;
|
|||||||
minicom
|
minicom
|
||||||
mtr
|
mtr
|
||||||
ncdu
|
ncdu
|
||||||
neofetch
|
fastfetch
|
||||||
nixfmt-rfc-style
|
nixfmt
|
||||||
openssh
|
openssh
|
||||||
postgresql
|
postgresql
|
||||||
sqlite
|
sqlite
|
||||||
@@ -51,14 +51,13 @@ with pkgs;
|
|||||||
cmake
|
cmake
|
||||||
dfu-util
|
dfu-util
|
||||||
go
|
go
|
||||||
jd-diff-patch #json diff patch
|
jd-diff-patch # json diff patch
|
||||||
jq # json tool
|
jq # json tool
|
||||||
llvm
|
llvm
|
||||||
nasm
|
nasm
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
||||||
|
|
||||||
# Encryption and security tools
|
# Encryption and security tools
|
||||||
age
|
age
|
||||||
gnupg
|
gnupg
|
||||||
@@ -76,52 +75,79 @@ with pkgs;
|
|||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
font-awesome
|
font-awesome
|
||||||
|
# jetbrains-mono
|
||||||
hack-font
|
hack-font
|
||||||
meslo-lgs-nf
|
meslo-lgs-nf
|
||||||
noto-fonts
|
noto-fonts
|
||||||
noto-fonts-color-emoji
|
noto-fonts-color-emoji
|
||||||
|
|
||||||
# Node.js development tools
|
# Node.js development tools
|
||||||
nodePackages.npm # globally install npm
|
#nodePackages.npm # globally install npm
|
||||||
nodePackages.prettier
|
#nodePackages.prettier
|
||||||
|
|
||||||
|
|
||||||
# Text and terminal utilities
|
# Text and terminal utilities
|
||||||
xterm
|
xterm
|
||||||
|
|
||||||
htop
|
htop
|
||||||
hunspell
|
hunspell
|
||||||
iftop
|
iftop
|
||||||
# inetutils # includes Telnet
|
inetutils # includes Telnet
|
||||||
jetbrains-mono
|
|
||||||
jq
|
jq
|
||||||
ripgrep
|
ripgrep
|
||||||
tmux
|
tmux
|
||||||
tree
|
tree
|
||||||
unrar
|
unrar
|
||||||
unzip
|
unzip
|
||||||
|
|
||||||
# zsh-powerlevel10k
|
# zsh-powerlevel10k
|
||||||
|
|
||||||
# Python packages
|
# Python packages
|
||||||
# python3
|
# python3
|
||||||
virtualenv
|
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
|
pandas
|
||||||
|
pillow
|
||||||
|
pillow
|
||||||
|
python-engineio
|
||||||
|
python-socketio
|
||||||
requests
|
requests
|
||||||
|
requests
|
||||||
|
shapely
|
||||||
|
simple-websocket
|
||||||
tkinter
|
tkinter
|
||||||
|
tqdm
|
||||||
|
urllib3
|
||||||
|
werkzeug
|
||||||
|
wsproto
|
||||||
|
zipp
|
||||||
|
]
|
||||||
|
))
|
||||||
|
|
||||||
]))
|
# LLM
|
||||||
|
ollama
|
||||||
|
mlx42
|
||||||
|
|
||||||
|
|
||||||
# LLM
|
# Social
|
||||||
ollama
|
pidgin
|
||||||
|
|
||||||
# Social
|
|
||||||
pidgin
|
|
||||||
|
|
||||||
# Rust Related
|
# Rust Related
|
||||||
rustc
|
rustc
|
||||||
|
|||||||
Reference in New Issue
Block a user