Compare commits

14 Commits

Author SHA1 Message Date
697a62bc89 Platform IO still doesn't run 2025-06-03 07:26:20 +02:00
da81594cdd Working VSCODE 2025-06-02 18:44:10 +02:00
a9d56b5eba Visual-Studio-Code - found noncompiling culprit in ms-vscode.cpptools 2025-05-28 13:50:14 +02:00
93739cb304 Deleted files from git 2025-05-28 08:32:46 +02:00
62b34d5d40 Reversing VScode (no X84 Darwin package availabie?!?) 2025-05-28 08:31:56 +02:00
911d98cd65 Developer and virtual studio stuff 2025-05-27 16:38:00 +02:00
77ac865b41 deleting a few files 2025-05-21 09:29:53 +02:00
4416f31887 typo 2025-05-21 09:28:01 +02:00
4fc3ecf3b8 error correction of wrongfull cut and paste 2025-05-20 20:40:40 +02:00
e902d172d2 libre office and oracle jdk 2025-05-20 20:39:03 +02:00
372e15742d ah well also emacs 2025-05-20 20:37:19 +02:00
00db155874 also emacs 2025-05-20 20:36:51 +02:00
a79999d465 emacs init teaking 2025-05-20 20:36:17 +02:00
61dc01881b Some additional casks 2025-05-18 13:13:27 +02:00
7 changed files with 88 additions and 14 deletions

View File

@ -2,7 +2,7 @@
description = "Starter Configuration with secrets (removed) for MacOS and NixOS";
inputs = {
nixpkgs = {
url = "github:nixos/nixpkgs/nixos-unstable";
url = "github:nixos/nixpkgs//nixpkgs-25.05-darwin";
};
home-manager = {
url = "github:nix-community/home-manager";
@ -11,7 +11,7 @@
url = "github:nix-community/nixd";
};
darwin = {
url = "github:LnL7/nix-darwin/master";
url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-homebrew = {
@ -37,6 +37,10 @@
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions";
};
};
outputs =
{
@ -51,6 +55,8 @@
disko,
nixd,
sops-nix,
nix-vscode-extensions,
}@inputs:
let
user = "olaf";

View File

@ -3,8 +3,10 @@ _:
[
# Development Tools
"homebrew/cask/docker"
"visual-studio-code"
"iterm2"
"oracle-jdk"
"arduino-ide"
# "visual-studio-code"
# Creatative tools
"spotify"
@ -18,7 +20,6 @@ _:
# Communication Tools
"discord"
"notion"
"slack"
"signal"
"whatsapp"
@ -41,9 +42,10 @@ _:
"jellyfin-media-player"
"vimediamanager"
"mediaelch"
"handbrake"
"obs"
# Productivity Tools
"raycast"
"1Password"
"zotero"
"gpg-suite"
@ -56,7 +58,15 @@ _:
"macdown"
"calibre"
"superslicer"
"element"
"mqtt-explorer"
"virtualbox"
"autodesk-fusion"
"qmk-toolbox"
"dbeaver-community"
"sqlitestudio"
"wireshark"
# Browsers
"google-chrome"
"firefox"

View File

@ -11,7 +11,7 @@ let
# Define the content of your file as a derivation
myEmacsLauncher = pkgs.writeScript "emacs-launcher.command" ''
#!/bin/sh
emacsclient -c -n &
emacs &
'';
sharedFiles = import ../shared/files.nix { inherit config pkgs; };
additionalFiles = import ./files.nix { inherit user config pkgs; };
@ -85,6 +85,7 @@ in
dock = {
enable = true;
entries = [
{ path = "/System/Applications/Launchpad.app/"; }
{ path = "/System/Applications/Mail.app/"; }
{ path = "/Applications/MailMate.app/"; }
{ path = "/Applications/1Password.app/"; }
@ -110,7 +111,7 @@ in
path = "/Applications/Jellyfin Media Player.app/";
options = "-l Jellyfin";
}
{ path = "/Applications/Visual Studio Code.app/"; }
{ path = "/run/current-system/Applications/Visual Studio Code.app/"; }
{ path = "/Applications/Home Assistant.app/"; }
{ path = "/Applications/reMarkable.app/"; }
{ path = "/Applications/LibreOffice.app/"; }
@ -118,6 +119,7 @@ in
{ path = "/Applications/Microsoft PowerPoint.app/"; }
{ path = "/Applications/Microsoft Teams.app/"; }
{ path = "/System/Applications/Utilities/Screen Sharing.app/"; }
{ path = "/run/current-system/Applications/Emacs.app/"; }
{
path = "/Applications/";
section = "others";

View File

@ -7,5 +7,4 @@
├── files.nix # Non-Nix, static configuration files (now immutable!)
├── home-manager.nix # Defines user programs
├── packages.nix # List of packages to install for NixOS
├── secrets.nix # Age-encrypted secrets with agenix
```

View File

@ -3,7 +3,7 @@
;; -------------------------
(defvar org-config-file "~/.local/share/src/nixos-config/modules/shared/config/emacs/config.org")
(defvar default-config-file "~/.emacs.d/default-config.org")
(defvar default-config-url "https://raw.githubusercontent.com/dustinlyons/nixos-config/9ad810c818b895c1f67f4daf21bbef31d8b5e8cd/shared/config/emacs/config.org")
(defvar default-config-url "https://git.kolkman.org/olaf/nixos-config_to_rule_them_all/raw/branch/main/modules/shared/config/emacs/config.org")
;; -------------------------
;; Package Manager Setup

View File

@ -11,6 +11,7 @@ let
in
{
# Shared shell configuration
zsh = {
enable = true;
@ -45,12 +46,14 @@ in
alias search=rg -p --glob '!node_modules/*' $@
# Emacs is my editor
export ALTERNATE_EDITOR=""
export EDITOR="emacsclient -t"
export VISUAL="emacsclient -c -a emacs"
export ALTERNATE_EDITOR="vim"
export EDITOR="emacs -nw"
export VISUAL="emacs"
# RMAPI remarkable
RMAPI_CONFIG=/Users/olaf/.config/rmapi
e() {
emacsclient -t "$@"
emacs -nw "$@"
}
# nix shortcuts

View File

@ -23,7 +23,18 @@ with pkgs;
mtr
nixfmt-rfc-style
difftastic
# Development
autoconf
autoconf-archive
automake
ccache
cmake
nasm
ninja
pkg-config
llvm
clang-tools
dfu-util
# Encryption and security tools
age
sops
@ -71,6 +82,49 @@ with pkgs;
# Rust Related
rustc
cargo
platformio-core
(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
eamodio.gitlens
james-yu.latex-workshop
ms-vscode.cmake-tools
shd101wyy.markdown-preview-enhanced
]
++ 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.0";
sha256 = "sha256-cH5x8fUN0n+hO1b3lNzau2MnyeYmsD0ZXAYGxCQjT0Y=";
}
{
name = "platformio-ide";
publisher = "platformio";
version = "3.3.4";
sha256 = "sha256-qfNz4IYjCmCMFLtAkbGTW5xnsVT8iDnFWjrgkmr2Slk=";
}
];
})
# Tex and LaTex
pandoc