Compare commits

13 Commits

Author SHA1 Message Date
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 84 additions and 13 deletions

View File

@ -2,7 +2,7 @@
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/nixos-unstable"; url = "github:nixos/nixpkgs//nixpkgs-25.05-darwin";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -11,7 +11,7 @@
url = "github:nix-community/nixd"; url = "github:nix-community/nixd";
}; };
darwin = { darwin = {
url = "github:LnL7/nix-darwin/master"; url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-homebrew = { nix-homebrew = {
@ -37,6 +37,9 @@
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions";
};
}; };
outputs = outputs =
{ {
@ -51,6 +54,8 @@
disko, disko,
nixd, nixd,
sops-nix, sops-nix,
nix-vscode-extensions,
}@inputs: }@inputs:
let let
user = "olaf"; user = "olaf";

View File

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

View File

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

View File

@ -7,5 +7,4 @@
├── files.nix # Non-Nix, static configuration files (now immutable!) ├── files.nix # Non-Nix, static configuration files (now immutable!)
├── home-manager.nix # Defines user programs ├── home-manager.nix # Defines user programs
├── packages.nix # List of packages to install for NixOS ├── 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 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-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 ;; Package Manager Setup

View File

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

View File

@ -23,7 +23,18 @@ with pkgs;
mtr mtr
nixfmt-rfc-style nixfmt-rfc-style
difftastic difftastic
# Development
autoconf
autoconf-archive
automake
ccache
cmake
nasm
ninja
pkg-config
llvm
clang-tools
dfu-util
# Encryption and security tools # Encryption and security tools
age age
sops sops
@ -71,6 +82,47 @@ with pkgs;
# Rust Related # Rust Related
rustc rustc
cargo 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
# ]
# ++ 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 # Tex and LaTex
pandoc pandoc