aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hosts/desktop/configuration.nix (renamed from hosts/nixos/configuration.nix)0
-rw-r--r--hosts/desktop/wooting.nix (renamed from hosts/nixos/wooting.nix)0
-rw-r--r--hosts/macbook/configuration.nix (renamed from hosts/darwin/configuration.nix)22
-rw-r--r--hosts/macbook/home.nix (renamed from hosts/darwin/home.nix)24
4 files changed, 2 insertions, 44 deletions
diff --git a/hosts/nixos/configuration.nix b/hosts/desktop/configuration.nix
index 9cee9a7..9cee9a7 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/desktop/configuration.nix
diff --git a/hosts/nixos/wooting.nix b/hosts/desktop/wooting.nix
index e6217cd..e6217cd 100644
--- a/hosts/nixos/wooting.nix
+++ b/hosts/desktop/wooting.nix
diff --git a/hosts/darwin/configuration.nix b/hosts/macbook/configuration.nix
index cc999a2..e7613de 100644
--- a/hosts/darwin/configuration.nix
+++ b/hosts/macbook/configuration.nix
@@ -29,39 +29,17 @@
loginwindow.GuestEnabled = false;
};
- programs.zsh.enable = true;
-
homebrew = {
enable = true;
- taps = [
- "vladdoster/formulae"
- ];
brews = [
- "keychain"
- "openjdk@17"
"openjdk@21"
- "plantuml"
- "pinentry-mac"
- "minio-mc"
];
casks = [
"nextcloud"
"bambu-studio"
- "vlc"
- "vladdoster/formulae/vimari"
"arduino-ide"
- "docker-desktop"
"anki"
- "mongodb-compass"
- "viscosity"
];
- masApps = {
- "Goodnotes 6" = 1444383602;
- "WhatsApp Messenger " = 310633997;
- "Adguard for Safari" = 1440147259;
- "WireGuard" = 1451685025;
- "Infuse" = 1136220934;
- };
onActivation.cleanup = "zap";
onActivation.autoUpdate = true;
onActivation.upgrade = true;
diff --git a/hosts/darwin/home.nix b/hosts/macbook/home.nix
index 3a10980..ded22ec 100644
--- a/hosts/darwin/home.nix
+++ b/hosts/macbook/home.nix
@@ -2,7 +2,7 @@
{
imports = [
- ../../modules
+ ../../modules/home-manager
];
home.username = "schererleander";
@@ -11,42 +11,22 @@
home.packages = with pkgs; [
htop
ffmpeg
- pfetch
wget
imagemagick
- mas
- #dev
gcc
maven
cmake
gnupg
- pinentry-curses
- lua-language-server
- pyright
- go
- nodejs
- typst
- tailwindcss
- obsidian
- iterm2
- appcleaner
- rectangle
- jetbrains.idea-community-bin
+ neovim
nerd-fonts.symbols-only
- nerd-fonts.space-mono
];
zsh.enable = true;
tmux.enable = true;
git.enable = true;
- nvf.enable = true;
-
- spicetify.enable = true;
- zathura.enable = true;
- vscode.enable = true;
home.stateVersion = "25.05";
}