.gitignore

@@ -1,4 +1,5 @@
 private/
+home.nix
 *.swp
 result
 *.zip

flake.lock

@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758287904,
-        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
+        "lastModified": 1756115622,
+        "narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
+        "rev": "bafad29f89e83b2d861b493aa23034ea16595560",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759853171,
-        "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
+        "lastModified": 1756496801,
+        "narHash": "sha256-IYIsnPy+cJxe8RbDHBrCtfJY0ry2bG2H7WvMcewiGS8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
+        "rev": "77a71380c38fb2a440b4b5881bbc839f6230e1cb",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1759582739,
-        "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
+        "lastModified": 1756245047,
+        "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "3441b5242af7577230a78ffb03542add264179ab",
+        "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759733170,
-        "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
+        "lastModified": 1756386758,
+        "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
+        "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
         "type": "github"
       },
       "original": {
@@ -462,11 +462,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758728421,
-        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
+        "lastModified": 1755934250,
+        "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+        "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -12,6 +12,7 @@ let
     "gpg"
     #"gtk"
     #"keyring"
+    "syncthing"
     "tmux"
     "xdg"
     "zsh"
@@ -432,7 +433,7 @@ in
     }
   '';
 
-  services.syncthing.enable = true;
+  #services.poweralertd.enable = true;
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

home/modules/syncthing.nix

@@ -0,0 +1,21 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib;
+let
+  cfg = config.dadada.home.syncthing;
+in
+{
+  options.dadada.home.syncthing = {
+    enable = mkEnableOption "Enable Syncthing config";
+  };
+  config = mkIf cfg.enable {
+    services.syncthing = {
+      enable = true;
+      tray = false;
+    };
+  };
+}

home/modules/zsh.nix

@@ -35,6 +35,7 @@ in
       plugins = [
       ];
       initContent = ''
+        source ${pkgs.zsh-git-prompt}/share/zsh-git-prompt/zshrc.sh
         source ${pkgs.fzf}/share/fzf/key-bindings.zsh
         source ${pkgs.fzf}/share/fzf/completion.zsh
         eval "$(repo setup --root ~/src)"
@@ -75,6 +76,7 @@ in
     home.packages = with pkgs; [
       fzf
       eza
+      zsh-git-prompt
       tmux
     ];
   };

home/pkgs.nix

@@ -69,8 +69,7 @@ with pkgs;
   krita
   ldns
   liboping # oping, ping multiple hosts at once
-  # FIXME: broken in nixpkgs
-  #libreoffice
+  libreoffice
   libvirt
   lsof
   lynis
@@ -93,7 +92,6 @@ with pkgs;
   nodePackages.prettier
   map-cmd
   obs-studio
-  obsidian
   offlineimap
   openscad
   openssl
@@ -123,8 +121,7 @@ with pkgs;
   skim # fzf in Rust
   slurp
   socat
-  # FIXME: broken in nixpkgs
-  #solvespace
+  solvespace
   spotify
   sqlite
   sshfs-fuse

nixos/configurations.nix

@@ -19,7 +19,6 @@ let
       builtins.elem (nixpkgs.lib.getName pkg) [
         "aspell-dict-en-science"
         "brgenml1lpr"
-        "obsidian"
         "saleae-logic-2"
         "spotify"
         "steam"

nixos/modules/profiles/home.nix

@@ -1,6 +1,7 @@
 { pkgs, inputs, ... }:
 {
   home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
   home-manager.sharedModules = pkgs.lib.attrValues inputs.self.hmModules;
   home-manager.users.dadada = inputs.self.hmConfigurations.dadada;
 }

nixos/stolas/default.nix

@@ -45,12 +45,9 @@
   };
 
   environment.systemPackages = [
-    config.dadada.pkgs.repo-rs
     # For debugging and troubleshooting Secure Boot.
     pkgs.sbctl
-    # Framework embedded controller interface
-    # FIXME: build broken in nixpkgs
-    #pkgs.fw-ectool
+    config.dadada.pkgs.repo-rs
   ];
 
   hardware = {
@@ -63,8 +60,7 @@
       enable = true;
       extraPackages = with pkgs; [
         vaapiVdpau
-        # FIXME: broken in nixpkgs
-        # libvdpau-va-gl
+        libvdpau-va-gl
       ];
     };
   };