Compare commits

..

3 Commits

Author SHA1 Message Date
Olaf Kolkman
37c3dac5bb 1 password doesn't worlk with MAS it seems 2025-07-16 20:28:34 +02:00
Olaf
f542767018 Moving a bunch of packages from brew to apple store 2025-07-16 18:07:52 +02:00
Olaf
9d1b7596b1 Adding mac-app-util to make apps spotlight findalbe 2025-06-03 10:15:10 +02:00
6 changed files with 82 additions and 14 deletions

View File

@@ -40,6 +40,9 @@
nix-vscode-extensions = { nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions"; url = "github:nix-community/nix-vscode-extensions";
}; };
mac-app-util = {
url = "github:hraban/mac-app-util";
};
}; };
outputs = outputs =
{ {
@@ -55,7 +58,7 @@
nixd, nixd,
sops-nix, sops-nix,
nix-vscode-extensions, nix-vscode-extensions,
mac-app-util,
}@inputs: }@inputs:
let let
user = "olaf"; user = "olaf";
@@ -134,6 +137,7 @@
# sops-nix.nixosModules.sops # sops-nix.nixosModules.sops
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
nix-homebrew.darwinModules.nix-homebrew nix-homebrew.darwinModules.nix-homebrew
mac-app-util.darwinModules.default
{ {
nix-homebrew = { nix-homebrew = {
inherit user; inherit user;
@@ -146,6 +150,9 @@
mutableTaps = false; mutableTaps = false;
autoMigrate = true; autoMigrate = true;
}; };
home-manager.sharedModules = [
mac-app-util.homeManagerModules.default
];
} }
./hosts/darwin ./hosts/darwin
]; ];

View File

@@ -14,13 +14,13 @@ _:
"gimp" "gimp"
"inkscape" "inkscape"
"vcv-rack" "vcv-rack"
"affinity-designer" #"affinity-designer"
"affinity-photo" #"affinity-photo"
"affinity-publisher" #"affinity-publisher"
# Communication Tools # Communication Tools
"discord" "discord"
"slack" # "slack"
"signal" "signal"
"whatsapp" "whatsapp"
"zoom" "zoom"
@@ -49,24 +49,23 @@ _:
"1Password" "1Password"
"zotero" "zotero"
"gpg-suite" "gpg-suite"
"home-assistant" #"home-assistant"
"Fantastical" #"Fantastical"
"Remarkable" #"Remarkable"
"mailmate" "mailmate"
"spamsieve" "spamsieve"
"libreoffice"
"macdown" "macdown"
"calibre" "calibre"
"superslicer" "superslicer"
"element" "element"
"mqtt-explorer" # "mqtt-explorer"
"virtualbox" "virtualbox"
"autodesk-fusion" "autodesk-fusion"
"qmk-toolbox" "qmk-toolbox"
"dbeaver-community" "dbeaver-community"
"sqlitestudio" "sqlitestudio"
"wireshark" # "wireshark"
# Browsers # Browsers
"google-chrome" "google-chrome"
"firefox" "firefox"

View File

@@ -47,6 +47,21 @@ in
masApps = { masApps = {
"wireguard" = 1451685025; "wireguard" = 1451685025;
"private-internet-access" = 955626407;
"LibreOffice" = 1630474372;
"Affinity Designer 2" = 1616831348;
"Affinity Photo 2: Image Editor" = 1616822987;
"Affinity Publisher 2" = 1606941598;
"Home Assistant" = 1099568401; # (2025.7.1)
"Fantastical - Calendar" = 975937182;
### "1Password: Password Manager" = 1511601750; # (8.11.0) Does not seem to install
"1Password for Safari" = 1569813296; # (8.10.82)
"Slack for Desktop" = 803453959; # (4.45.60)
"Remarkable Desktop" = 1276493162; # (3.19.0)
"Ice Cubes for Mastodon" = 6444915884; # (1.11.3)
"MQTT Explorer" = 1455214828; # (0.3.5)
"WiFi Explorer: Scanner" = 494803304; # (3.5.6)
"Night Sky" = 475772902; # 475772902
}; };
}; };
@@ -106,6 +121,7 @@ in
{ path = "/System/Applications/System Settings.app/"; } { path = "/System/Applications/System Settings.app/"; }
{ path = "/Applications/Signal.app/"; } { path = "/Applications/Signal.app/"; }
{ path = "/Applications/WhatsApp.app/"; } { path = "/Applications/WhatsApp.app/"; }
{ path = "/Applications/Ice\ Cubes.app/"; }
{ {
path = "/Applications/Jellyfin Media Player.app/"; path = "/Applications/Jellyfin Media Player.app/";

View File

@@ -1,8 +1,11 @@
{ pkgs }: { pkgs }:
with pkgs; with pkgs;
let shared-packages = import ../shared/packages.nix { inherit pkgs; }; in let
shared-packages ++ [ shared-packages = import ../shared/packages.nix { inherit pkgs; };
in
shared-packages
++ [
# Security and authentication # Security and authentication
yubikey-agent yubikey-agent
@@ -13,6 +16,7 @@ shared-packages ++ [
gnumake gnumake
cmake cmake
home-manager home-manager
ansible
# Media and design tools # Media and design tools
vlc vlc

View File

@@ -0,0 +1,39 @@
(vscode-with-extensions.override {
vscodeExtensions =
with vscode-extensions;
[
#bbenoist.nix
jnoortheen.nix-ide
ms-python.python
ms-azuretools.vscode-docker
# ms-vscode-remote.remote-ssh
# ms-vscode.cpptools
eamodio.gitlens
]
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
# {
# name = "remote-ssh-edit";
# publisher = "ms-vscode-remote";
# version = "0.47.2";
# sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
# }
{
name = "cpptools";
publisher = "ms-vscode";
version = "1.26.1";
sha256 = "sha256-uVE7sEO8XN3ArFpElUw25/BKyCOzF1EmZ5nHBkdoL/0=";
}
# {
# name = "minifyall";
# publisher = "josee9988";
# version = "2.10";
# }
{
name = "platformio-ide";
publisher = "platformio";
version = "3.3.4";
sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
}
];
})

View File

@@ -4,6 +4,7 @@ with pkgs;
[ [
# Nix # Nix
nixd nixd
mas
# General packages for development and system management # General packages for development and system management
#alacritty #alacritty
aspell aspell
@@ -124,9 +125,11 @@ with pkgs;
# ]; # ];
# }) # })
# Tex and LaTex # XML, Tex and LaTex
pandoc pandoc
mdbook mdbook
xml2rfc
rubyPackages_3_4.kramdown-rfc2629
(texlive.combine { (texlive.combine {
inherit (texlive) inherit (texlive)