wip: trying to get obsidian working

not a working build, syntax issues, added options that are not available in stable home-manager
sway building
2025-08-08 22:10:47 -04:00 · 2025-07-30 22:33:23 -04:00 · 2025-07-30 08:29:27 -04:00
8 changed files with 104 additions and 152 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -37,43 +37,6 @@
        "type": "github"
      }
    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751685974,
-        "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
-        "ref": "refs/heads/main",
-        "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
-        "revCount": 92,
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/flake-compat.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.lix.systems/lix-project/flake-compat.git"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvf",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1753121425,
-        "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@@ -101,11 +64,11 @@
        "zon2nix": "zon2nix"
      },
      "locked": {
-        "lastModified": 1751123364,
-        "narHash": "sha256-Nb3pxs1onnbdhhnoNc+IfHzrW9dM+UbEdjK0AguR2J4=",
+        "lastModified": 1753816554,
+        "narHash": "sha256-eyFfBXb5IJaNTGTdkjpWKSMTs8wiJ0i+9n5jUKtVFa4=",
        "owner": "ghostty-org",
        "repo": "ghostty",
-        "rev": "f6d1c274b9c0e095dc0a1b411dec7410ad779bf5",
+        "rev": "c78d32074ebab14d2060e5cd3c7667cbe37ab8ee",
        "type": "github"
      },
      "original": {
@@ -121,11 +84,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750792728,
-        "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
+        "lastModified": 1753592768,
+        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
+        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
        "type": "github"
      },
      "original": {
@@ -135,21 +98,6 @@
        "type": "github"
      }
    },
-    "mnw": {
-      "locked": {
-        "lastModified": 1748710831,
-        "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
-        "owner": "Gerg-L",
-        "repo": "mnw",
-        "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "mnw",
-        "type": "github"
-      }
-    },
    "nix-flatpak": {
      "locked": {
        "lastModified": 1739444422,
@@ -181,11 +129,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1750969886,
-        "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
+        "lastModified": 1753749649,
+        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
+        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
        "type": "github"
      },
      "original": {
@@ -195,52 +143,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1753432016,
-        "narHash": "sha256-cnL5WWn/xkZoyH/03NNUS7QgW5vI7D1i74g48qplCvg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6027c30c8e9810896b92429f0092f624f7b1aace",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nvf": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts",
-        "mnw": "mnw",
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1754552918,
-        "narHash": "sha256-vbT+nGdMLNAeYZ1S5WBBLJTVWosGne2VRt46rqPfB2A=",
-        "owner": "notashelf",
-        "repo": "nvf",
-        "rev": "d61de135ce174f4e04b4e509de02e1afe040a834",
-        "type": "github"
-      },
-      "original": {
-        "owner": "notashelf",
-        "repo": "nvf",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "darwin": "darwin",
        "ghostty": "ghostty",
        "home-manager": "home-manager",
        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2",
-        "nvf": "nvf"
+        "nixpkgs": "nixpkgs_2"
      }
    },
    "systems": {
@@ -258,25 +167,11 @@
        "type": "github"
      }
    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "zig": {
      "inputs": {
        "flake-compat": [
-          "ghostty"
+          "ghostty",
+          "flake-compat"
        ],
        "flake-utils": [
          "ghostty",
@@ -322,8 +217,8 @@
      },
      "original": {
        "owner": "jcollie",
-        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
        "repo": "zon2nix",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@@ -2,33 +2,42 @@
  description = "Wyatt's nix configuration suite";
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
    home-manager = {
      url = "github:nix-community/home-manager/release-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    home-manager-unstable = {
+      url = "https://github.com/nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
    darwin = {
      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    ghostty.url = "github:ghostty-org/ghostty";
-    nvf.url = "github:notashelf/nvf";
  };

  outputs = inputs @ {
    self,
    nixpkgs,
+    nixpkgs-unstable,
    nix-flatpak,
    darwin,
    home-manager,
+    home-manager-unstable,
    ghostty,
-    nvf,
    ...
  }: let
    userName = "wyatt";
    userEmail = "wyatt@wyattjmiller.com";
    extraSpecialArgs = {
-      inherit userName userEmail ghostty nvf;
+      inherit userName userEmail ghostty;
+    };
+
+    obsidianOverlay = final: prev: {
+      obsidian = nixpkgs-unstable.legacyPackages.${final.system}.obsidian;
    };
  in {
    meta = import ./meta;
@@ -59,7 +68,7 @@
    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
      system = "x86_64-linux";
      specialArgs = {
-        inherit userName userEmail; 
+        inherit userName userEmail ghostty;
        hostname = "cloud";
        role = "devel";
      };
@@ -68,6 +77,10 @@
        ./modules/common
        ./modules/machine/cloud

+        {
+          nixpkgs.overlays = [ obsidianOverlay ];
+        }
+
        home-manager.nixosModules.home-manager
        {
          home-manager.useGlobalPkgs = true;
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,10 +1,10 @@
 {
+  config,
  lib,
  pkgs,
  userName,
  userEmail,
  ghostty,
-  nvf,
  ...
 }: let
  # Have a file sturcture that holds all the configuration files that can't be configured by Nix
@@ -14,7 +14,7 @@
  };
 in {
  # Import sub modules
-  imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty nvf;}) [
+  imports = map (module: import module {inherit config lib pkgs dirs userName userEmail ghostty;}) [
    ./atuin.nix
    ./shell.nix
    ./packages
@@ -28,6 +28,7 @@ in {
    ./browser.nix
    ./zellij.nix
    ./bat.nix
+    ./obsidian.nix
  ];

  # Home Manager needs a bit of information about you and the
@@ -57,7 +58,7 @@ in {
      size = 22;
    };

-    stateVersion = "24.11";
+    stateVersion = "25.05";
  };

  # Let Home Manager install and manage itself.
--- a/home/neovim.nix
+++ b/home/neovim.nix
@@ -1,22 +1,14 @@
-{ nvf, ...}: {
-  imports = [
-    nvf.homeManagerModules.default
-  ];
+{dirs, ...}: {
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    vimAlias = true;
+  };

-  programs.nvf.enable = true;
-
-  ### --- OLD NEOVIM CONFIG BASED ON LUA CONFIG ---
-  #
-  # programs.neovim = {
-  #   enable = true;
-  #   defaultEditor = true;
-  #   vimAlias = true;
-  # };
-  #
-  # xdg.configFile = {
-  #   nvim = {
-  #     onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
-  #     source = dirs.defaults + /nvim;
-  #   };
-  # };
+  xdg.configFile = {
+    nvim = {
+      onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
+      source = dirs.defaults + /nvim;
+    };
+  };
 }
--- a/home/obsidian.nix
+++ b/home/obsidian.nix
@@ -0,0 +1,53 @@
+{ config, home-manager-unstable, pkgs, ...}: {
+  home.packages = with pkgs; [
+    obsidian
+    obsidian-export
+  ];
+  programs.obsidian = {
+    enable = true;
+    package = 
+    vaults = {
+      "notes" = {
+        enable = true;
+        target = "${config.home.homeDirectory}/Documents/obsidian/notes";
+      };
+      "work-notes" = {
+        enable = true;
+        target = "${config.home.homeDirectory}/Documents/obsidian/work-notes";
+      };
+    };
+    # defaultSettings = {
+    #   themes = [ "catppuccin" ];
+    # };
+  };
+
+  home.activation.obsidianRepos = config.lib.dag.entryAfter ["writeBoundary"] ''
+    REPOS_DIR="${config.home.homeDirectory}/Documents/obsidian"
+    
+    # Create the repos directory if it doesn't exist
+    mkdir -p "$REPOS_DIR"
+    
+    # Function to clone or update a repository
+    clone_or_update() {
+      local repo_url="$1"
+      local vault_name="$2"
+      local vault_path="$REPOS_DIR/$vault_name"
+      
+      if [ -d "$vault_path/.git" ]; then
+        echo "Updating existing vault: $vault_name"
+        cd "$vault_path"
+        ${pkgs.git}/bin/git pull origin main || ${pkgs.git}/bin/git pull origin master || true
+      else
+        echo "Cloning new vault: $vault_name"
+        rm -rf "$vault_path"  # Remove if exists but not a git repo
+        ${pkgs.git}/bin/git clone "$repo_url" "$vault_path" || true
+      fi
+    }
+    
+    # Clone repositories
+    clone_or_update "https://scm.wyattjmiller.com/NoteFolio/notes.git" "notes"
+    clone_or_update "https://scm.wyattjmiller.com/NoteFolio/work-notes.git" "work-notes"
+    
+    echo "Obsidian repository vaults setup complete in $REPOS_DIR"
+  '';
+}
--- a/home/packages/common.nix
+++ b/home/packages/common.nix
@@ -23,7 +23,6 @@
    fh
    aria2
    yt-dlp
-    obsidian
    vscode
    weechat
    inetutils
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -149,18 +149,18 @@ in {
    systemd.enable = true;

    package = pkgs.waybar.overrideAttrs (old: {
-      version = "0.11.0";
+      version = "0.13.0";

      src = pkgs.fetchFromGitHub {
        owner = "Alexays";
        repo = "Waybar";
-        rev = "d56dd6ee7fdf8c5ba4e90790af62b7f7829d3a47";
-        sha256 = "sha256-3lc0voMU5RS+mEtxKuRayq/uJO09X7byq6Rm5NZohq8=";
+        rev = "0fcda9afa519eb84deda68c051f7938a6c6bdbce";
+        sha256 = "sha256-Puo/Y4qotb6uEEe9vbu/hyFXwLntr48R2C6mrmDKs0c=";
        fetchSubmodules = true;
      };

-      buildInputs = old.buildInputs ++ [ pkgs.fftw pkgs.libcava ];
-      # mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
+      buildInputs = old.buildInputs ++ [ pkgs.fftw ];
+      mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
    });
  };
 }
--- a/modules/machine/cloud/configuration.nix
+++ b/modules/machine/cloud/configuration.nix
@@ -11,7 +11,6 @@
    "info.beyondallreason.bar"
    "io.dbeaver.DBeaverCommunity"
    "io.openrct2.OpenRCT2"
-    "md.obsidian.Obsidian"
    "org.prismlauncher.PrismLauncher"
    "sh.cider.Cider"
  ];
Author	SHA1	Message	Date
Wyatt J. Miller	45de738d59	wip: trying to get obsidian working not a working build, syntax issues, added options that are not available in stable home-manager	2025-08-08 22:10:47 -04:00
Wyatt J. Miller	e6ae0c4c35	sway building	2025-07-30 22:33:23 -04:00
Wyatt J. Miller	739f2e125f	wip: added obsidian but waybar failed to build	2025-07-30 08:29:27 -04:00