diff --git a/.config/spacemacs/.spacemacs b/.config/spacemacs/.spacemacs index 536c372a..c0d03d01 100644 --- a/.config/spacemacs/.spacemacs +++ b/.config/spacemacs/.spacemacs @@ -881,11 +881,6 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ("@emergency" . ?e) (:endgroup . nil) - ;; Code TODOs tags - ("backend" . ?k) - ("frontend" . ?f) - ("devops" . ?d) - ;; tasks TODOs (:startgroup . nil) ("homelab" . ?h) @@ -893,6 +888,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ("maintenance" . ?m) ("planning" . ?p) ("workout" . ?w) + ("linux" . ?l) (:endgroup . nil) ;; chinese tags @@ -911,6 +907,7 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ("@spike" . (:foreground "#cba6f7" :background "#313244" :weight bold)) ; Mauve on surface0 ("@emergency" . (:foreground "#fab387" :background "#45475a" :weight bold :box t)) ; Peach on surface1 with box ("homelab" . (:foreground "#89b4fa" :weight bold)) ; Blue + ("linux" . (:foreground "#89b4fa" :weight bold)) ; Blue ("3d_printer" . (:foreground "#a6e3a1" :weight bold)) ; Green ("maintenance" . (:foreground "#f9e2af" :weight bold)) ; Yellow ("planning" . (:foreground "#f38ba8" :weight bold)) ; Red @@ -945,24 +942,28 @@ _p_rev _u_pper _=_: upper/lower _r_esolve (setq org-capture-templates '( ("j" "Work Log Entry" - entry (file+datetree "~/Documents/zettelkasten/org-roam/org/work/work-log.org") + entry (file+datetree "~/Documents/zettelkasten/org/work/work-log.org") "* %^{Task} \n:PROPERTIES:\n:END:\n" :empty-lines 0) ("c" "Code To-Do" - entry (file+headline "~/Documents/zettelkasten/org-roam/org/work/todo.org" "Code Related Tasks") + entry (file+headline "~/Documents/zettelkasten/org/work/todo.org" "Code Related Tasks") "* TODO [#C] %?\n:PROPERTIES:\n:Effort: $^{Effort}\n:Weight: $^{Weight}\n:END:\nDEADLINE: %^T\n:Created: %T\n%i\n%a\nShortcut Ticket: \nProposed Solution: \n" :empty-lines 0) ("g" "General To-Do" - entry (file+headline "~/Documents/zettelkasten/org-roam/org/home/todo.org" "General TODOS") + entry (file+headline "~/Documents/zettelkasten/org/home/todo.org" "General TODOS") "* TODO [#E] %?\n:Created: %T\n " :empty-lines 0) ("l" "Learning note" - entry (file+headline "~/Documents/zettelkasten/org-roam/org/home/learning.org" "Learning Notes") + entry (file+headline "~/Documents/zettelkasten/org/home/learning.org" "Learning Notes") "* %^{Subject} \n:PROPERTIES:\n:END:\n** %?" :empty-lines 0) + ("b" "Book note" + entry (file+headline "~/Documents/zettelkasten/org/home/books.org" "Book Notes") + "* %^{Subject}\n:PROPERTIES:\n:Title: %^{Title}\n:Author: %^{Author}\n:END:\n** Notes\n%?" + :empty-lines 0) ("m" "Meeting" - entry (file+datetree "~/Documents/zettelkasten/org-roam/org/work/meetings.org") - "* %? :meeting:%^g \n:Created: %T\n** Attendees\n*** \n** Notes\n** Action Items\n*** TODO [#A] " + entry (file+datetree "~/Documents/zettelkasten/org/work/meetings.org") + "* %^{meeting} :meeting:%^g\n:PROPERTIES:\n:Created: %T\n:END:\n** Attendees\n*** \n** Notes\n** Action Items\n*** TODO [#A] " :tree-type week :clock-in t :clock-resume t diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix index 998da348..21da9818 100644 --- a/nix-darwin/flake.nix +++ b/nix-darwin/flake.nix @@ -123,7 +123,7 @@ config = { allowUnfree = true; permittedInsecurePackages = [ - "electron-32.3.3" + "electron-35.7.1" "beekeeper-studio-5.2.12" ]; }; diff --git a/nix-darwin/home-modules/languages/nix.nix b/nix-darwin/home-modules/languages/nix.nix index e2bc49fa..8cf4da27 100644 --- a/nix-darwin/home-modules/languages/nix.nix +++ b/nix-darwin/home-modules/languages/nix.nix @@ -7,13 +7,13 @@ { options = { - nix.lsp.enable = lib.mkOption { + languages.nix.lsp.enable = lib.mkOption { type = lib.types.bool; description = "Enables nix lsp"; default = true; }; }; - config = lib.mkIf config.nix.lsp.enable { + config = lib.mkIf config.languages.nix.lsp.enable { home.packages = with pkgs; [ nixfmt-rfc-style nixd # https://emacs-lsp.github.io/lsp-mode/page/lsp-nix-nixd/ diff --git a/nix-darwin/home-modules/programs/zsh.nix b/nix-darwin/home-modules/programs/zsh.nix index e8123c89..0ed2f332 100644 --- a/nix-darwin/home-modules/programs/zsh.nix +++ b/nix-darwin/home-modules/programs/zsh.nix @@ -30,6 +30,13 @@ "..." = "cd ../.."; "...." = "cd ../../.."; }; + shellGlobalAliases = { + docker-crmAll = "docker rm -f (docker ps -aq)"; + docker-irmAll = "docker rmi -f (docker images -aq)"; + docker-vrmAll = "docker volume prune"; + docker-prmAll = "docker builder prune -af"; + docker-clean = "docker system prune -af"; # remove all containers, images, volumes, and networks without destroying running containers/images + }; }; }; } diff --git a/nix-darwin/users/henri.vandersleyen/configuration.nix b/nix-darwin/users/henri.vandersleyen/configuration.nix index 73142ded..8a50edf8 100644 --- a/nix-darwin/users/henri.vandersleyen/configuration.nix +++ b/nix-darwin/users/henri.vandersleyen/configuration.nix @@ -1,6 +1,6 @@ { pkgs, - username, + meta, inputs, ... }: @@ -28,6 +28,7 @@ }; nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # for nix.nix }; + nixpkgs = { hostPlatform = "aarch64-darwin"; config.allowUnfree = true; @@ -38,8 +39,8 @@ # system.configurationRevision = self.rev or self.dirtyRev or null; system.stateVersion = 5; - users.users.${username} = { - home = "/Users/${username}"; + users.users.${meta.username} = { + home = "/Users/${meta.username}"; shell = pkgs.nushell; }; home-manager.backupFileExtension = "backup"; @@ -53,7 +54,7 @@ ]; variables = { # XDG_CONFIG_HOME = "/Users/henri.vandersleyen"; # issue with nushell - SOPS_AGE_KEY_FILE = "/Users/${username}/.config/sops/age/keys.txt"; + SOPS_AGE_KEY_FILE = "/Users/${meta.username}/.config/sops/age/keys.txt"; }; }; @@ -62,7 +63,7 @@ ''; # Homebrew needs to be installed on its own! - system.primaryUser = username; + system.primaryUser = meta.username; homebrew = { enable = true; casks = [ diff --git a/nix-darwin/users/henri.vandersleyen/home.nix b/nix-darwin/users/henri.vandersleyen/home.nix index b9ed470e..f5560ee3 100644 --- a/nix-darwin/users/henri.vandersleyen/home.nix +++ b/nix-darwin/users/henri.vandersleyen/home.nix @@ -3,7 +3,7 @@ { config, - username, + meta, ... }: @@ -55,33 +55,38 @@ # wm wm.aerospace = { enable = false; - configPath = Users/${username}/Documents/dotfiles/.config/aerospace; + configPath = Users/${meta.username}/Documents/dotfiles/.config/aerospace; }; # languages - python.lsp.enable = true; - jsts.lsp.enable = true; + languages = { + python.lsp.enable = true; + jsts.lsp.enable = true; + }; # programs - codium.enable = true; - arc-browser.enable = true; - fish.enable = true; - zsh.enable = true; - nh.flakeLocation = "/Users/${username}/Documents/dotFiles/nix-darwin"; - keychain.enable = true; - keychain.keys = "/home/${username}/.ssh/knak"; - - git = { - # userEmail = config.sops.secrets."knak/email".path; - userEmail = "henri.vandersleyen@knak.com"; - # userName = config.sops.secrets."knak/git/userName".path; - userName = "vancycles-knak"; - signingKey = config.sops.secrets."knak/git/keyName".path; + program = { + arc-browser.enable = true; + codium.enable = false; + fish.enable = true; + zsh.enable = true; + nh.flakeLocation = "/Users/${meta.username}/Documents/dotFiles/nix-darwin"; + keychain = { + enable = true; + keys = [ "/home/${meta.username}/.ssh/knak" ]; + }; + git = { + # userEmail = config.sops.secrets."knak/email".path; + userEmail = "henri.vandersleyen@knak.com"; + # userName = config.sops.secrets."knak/git/userName".path; + userName = "vancycles-knak"; + signingKey = config.sops.secrets."knak/git/keyName".path; + }; }; home = { - username = username; - homeDirectory = "/Users/${username}"; + username = meta.username; + homeDirectory = "/Users/${meta.username}"; stateVersion = "23.05"; # Please read the comment before changing. # Makes sense for user specific applications that shouldn't be available system-wide diff --git a/nix-darwin/users/henri.vandersleyen/sops.nix b/nix-darwin/users/henri.vandersleyen/sops.nix index e46cc50f..e9d8b81f 100644 --- a/nix-darwin/users/henri.vandersleyen/sops.nix +++ b/nix-darwin/users/henri.vandersleyen/sops.nix @@ -1,6 +1,6 @@ { inputs, - username, + meta, config, ... }: @@ -12,7 +12,7 @@ defaultSopsFile = ./secrets/secrets.yaml; defaultSopsFormat = "yaml"; - age.keyFile = "/Users/${username}/.config/sops/age/keys.txt"; + age.keyFile = "/Users/${meta.username}/.config/sops/age/keys.txt"; secrets = { "knak/email" = { # owner = username;