Merge pull request #88 from sbulav/dev

Dev

nix/flake.nix

@@ -6,6 +6,8 @@
     # Nixpkgs
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    stable.url = "github:nixos/nixpkgs/nixos-24.05";
+
     snowfall-lib = {
       url = "github:snowfallorg/lib?ref=v3.0.0";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -44,6 +46,11 @@
     wallpapers-nix = {
       url = "github:sbulav/wallpapers-nix";
     };
+
+    wezterm = {
+      url = "github:wez/wezterm/main?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs: let

nix/homes/aarch64-darwin/sab@mbp13/default.nix → nix/homes/aarch64-darwin/sab@mbp16/default.nix

@@ -1,9 +1,6 @@
 {
   lib,
-  pkgs,
   config,
-  osConfig ? {},
-  format ? "unknown",
   ...
 }:
 with lib.custom; {
@@ -12,6 +9,10 @@ with lib.custom; {
       enable = true;
       name = config.snowfallorg.user.name;
     };
+    apps = {
+      obsidian = enabled;
+      zoom-us = enabled;
+    };
 
     cli-apps = {
       argocd = enabled;
@@ -42,5 +43,5 @@ with lib.custom; {
     "$HOME/bin"
   ];
 
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
 }

nix/homes/x86_64-linux/sab@nz/default.nix

@@ -28,9 +28,18 @@ in {
         hyprlock = disabled;
         wezterm = enabled;
         wallpaper = "${wallpapers}/share/wallpapers/catppuccin/bench.png";
+
+        waypaper = {
+          enable = true;
+          wallpaperDirectory = "${wallpapers}/share/wallpapers";
+        };
       };
     };
 
+    apps = {
+      obsidian = enabled;
+    };
+
     cli-apps = {
       argocd = enabled;
       atuin = enabled;

nix/homes/x86_64-linux/sab@serverz/default.nix

@@ -0,0 +1,36 @@
+{
+  lib,
+  config,
+  inputs,
+  pkgs,
+  ...
+}:
+with lib.custom; let
+  wallpapers = inputs.wallpapers-nix.packages.${pkgs.system}.catppuccin;
+in {
+  custom = {
+    user = {
+      enable = true;
+      name = config.snowfallorg.user.name;
+    };
+
+    cli-apps = {
+      argocd = disabled;
+      atuin = enabled;
+      bottom = enabled;
+      fastfetch = enabled;
+      home-manager = enabled;
+      yazi = enabled;
+    };
+    tools = {
+      gh = disabled;
+      git = enabled;
+      direnv = disabled;
+    };
+    security = {
+      rbw = disabled;
+      vault = disabled;
+    };
+  };
+  home.stateVersion = "24.05";
+}

nix/modules/darwin/apps/obsidian/default.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  config,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.custom.apps.obsidian;
+in {
+  options.custom.apps.obsidian = {
+    enable = mkEnableOption "Enable Obsidian note-taking app";
+  };
+
+  config = mkIf cfg.enable {
+    homebrew = {
+      casks = ["obsidian"];
+    };
+  };
+}

nix/modules/darwin/desktop/addons/skhd/default.nix

@@ -35,8 +35,8 @@ in {
         alt - 9 : yabai -m space --focus 9
         alt - 0 : yabai -m space --focus 10
 
-        alt - up : yabai -m space --focus 3
-        alt - down : yabai -m space --focus 6
+        alt - up : yabai -m space --focus 4
+        alt - down : yabai -m space --focus 7
         alt - left : yabai -m space --focus prev
         alt - right : yabai -m space --focus next