From b4ad2ed4206aa1dbe4bcac4419c39590dce73251 Mon Sep 17 00:00:00 2001 From: dnscio Date: Fri, 9 May 2025 06:01:22 +0000 Subject: [PATCH 1/7] Update flake.nix --- flake.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/flake.nix b/flake.nix index cc97346..296d82b 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,12 @@ modules = [./hosts/dnsc-air]; }; + darwinConfigurations.dnsc-work = nix-darwin.lib.darwinSystem { + system = "aarch64-darwin"; + specialArgs = {inherit inputs outputs;}; + modules = [./hosts/dnsc-work]; + }; + homeConfigurations."dnsc-deck" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; modules = [ ./home/deck.nix ]; From 8d404c9e06ef051d8649942fa4cda1fe3dba66b6 Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 9 May 2025 08:26:06 +0200 Subject: [PATCH 2/7] Fixes dnsc-work config --- home/darwin-work.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home/darwin-work.nix b/home/darwin-work.nix index d4b0cb5..c841e62 100644 --- a/home/darwin-work.nix +++ b/home/darwin-work.nix @@ -2,9 +2,8 @@ { home.username = "dennis"; - home.homeDirectory = "/Users/dennis"; home.stateVersion = "24.11"; - + home.homeDirectory = "/Users/dennis"; home.sessionVariables = { EDITOR = "nvim"; GOPATH = "$HOME/go"; @@ -16,7 +15,7 @@ imports = [ ./modules/git - ./modules/fish/work + ./modules/fish/work.nix ./modules/atuin ./modules/wezterm ./modules/nvim From d6cf9722105becb1d1e91e82d0757250b749820d Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 9 May 2025 08:31:40 +0200 Subject: [PATCH 3/7] Removes nix settings in favor of determinate --- hosts/dnsc-work/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index bf682d7..871a0b6 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -20,8 +20,6 @@ description = "Dennis Schoepf"; }; - nix.settings.trusted-users = [ "dennis" ]; - nixpkgs.config.allowUnfree = true; # System Packages @@ -174,11 +172,5 @@ # Nix settings # Enable new Nix CLI and flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - nix.package = pkgs.nix; - nix.gc = { - automatic = true; - options = "--delete-older-than 1w"; - }; + nix.enable = false; } From bf1b444ec3159e54e8392c96048ba24ac893e6c9 Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 9 May 2025 10:45:14 +0200 Subject: [PATCH 4/7] Fixes homebrew config --- hosts/dnsc-work/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 871a0b6..6e8f2f0 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -49,6 +49,7 @@ # Homebrew homebrew = { enable = true; + brewfile = true; onActivation = { autoUpdate = false; From 0e147c42dff64b392b59c1252e23b46471fff5c2 Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 9 May 2025 11:52:29 +0200 Subject: [PATCH 5/7] Updates dnsc-work config --- home/modules/fish/work.nix | 56 +++++++++++++++++++++-- home/modules/wezterm/config/overrides.lua | 5 +- hosts/dnsc-work/default.nix | 9 +--- 3 files changed, 56 insertions(+), 14 deletions(-) diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix index a4289be..9637641 100644 --- a/home/modules/fish/work.nix +++ b/home/modules/fish/work.nix @@ -1,11 +1,57 @@ -{ - programs.fish = { +{ programs.fish = { enable = true; functions = { - # TODO: Add these two functions from work config - cdr = ''''; - rr = ''''; + cdr = '' + set folder (begin + fd . ~/dev/ride/apps/backend/edge-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1; + fd . ~/dev/ride/apps/frontend/projects -t d -d 1; + fd . ~/dev/ride/apps/native -t d -d 1; + fd . ~/dev/ride/packages -t d -d 1; + echo "$HOME/dev/ride/apps/frontend"; + echo "$HOME/dev/ride/apps/lib"; + echo "$HOME/dev/ride"; + end | fzf); + set service (basename $folder) + + cd $folder + ''; + rr = '' + set folder (begin + fd . ~/dev/ride/apps/backend/edge-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/tariff-service -t d -d 1; + fd . ~/dev/ride/apps/backend/backend-services/wallet-service -t d -d 1; + fd . ~/dev/ride/apps/frontend/projects -t d -d 1; + fd . ~/dev/ride/apps/native -t d -d 1; + echo "$HOME/dev/ride/apps/frontend"; + echo "$HOME/dev/ride/apps/lib"; + echo "$HOME/dev/ride"; + end | fzf); + + if test -n "$folder" + set service (basename $folder) + cd $folder + + # Check if package.json exists + if test -f "package.json" + # Extract and format npm scripts for fzf + set script_cmd (jq -r '.scripts | to_entries | .[] | "\(.key): \(.value)"' package.json | fzf) + + if test -n "$script_cmd" + # Extract just the script name before the colon + set script_name (string split ": " $script_cmd)[1] + if test -n "$script_name" + echo "Running: npm run $script_name" + npm run $script_name + end + end + end + end + ''; ff = '' set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case " set INITIAL_QUERY "$argv" diff --git a/home/modules/wezterm/config/overrides.lua b/home/modules/wezterm/config/overrides.lua index 9ceee1f..64402cf 100644 --- a/home/modules/wezterm/config/overrides.lua +++ b/home/modules/wezterm/config/overrides.lua @@ -5,8 +5,9 @@ local helpers = require("helpers") local M = {} function M.apply_to_config(config) - --if hn == "macbook.digital-h.de" then - --end + if hn == "dnsc-work" then + config.window_background_opacity = 0.9 + end if hn == "dnsc-desktop" then config.font = wezterm.font("Victor Mono", { weight = "DemiBold" }) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 6e8f2f0..d2f4852 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -49,17 +49,12 @@ # Homebrew homebrew = { enable = true; - brewfile = true; onActivation = { autoUpdate = false; cleanup = "zap"; }; - taps = [ - "homebrew/services" - ]; - masApps = { Bitwarden = 1352778147; XCode = 497799835; @@ -83,7 +78,7 @@ casks = [ "arc" "microsoft-teams" - "zen-browser" + "tailscale" "font-victor-mono" "font-victor-mono-nerd-font" "vlc" @@ -172,6 +167,6 @@ }; # Nix settings - # Enable new Nix CLI and flakes + # Use determinate systems nix.enable = false; } From caf060821e10b36fade95f053b2df8ca53045677 Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 9 May 2025 11:55:04 +0200 Subject: [PATCH 6/7] Adds pnpm to work config --- hosts/dnsc-work/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index d2f4852..3b8bddb 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -73,6 +73,7 @@ "imagemagick" "todo-txt" "watchman" + "pnpm" ]; casks = [ From 3a055f8269c914b68575383564a147a539ea5b11 Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 9 May 2025 14:29:07 +0200 Subject: [PATCH 7/7] Adds dependencies for node-canvas --- hosts/dnsc-work/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix index 3b8bddb..06b5f7c 100644 --- a/hosts/dnsc-work/default.nix +++ b/hosts/dnsc-work/default.nix @@ -74,6 +74,15 @@ "todo-txt" "watchman" "pnpm" + "pkg-config" + "cairo" + "pango" + "libpng" + "jpeg" + "giflib" + "librsvg" + "pixman" + "python-setuptools" ]; casks = [