fix tofi-drun

flake.lock

@@ -91,16 +91,16 @@
     "brew-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1758543057,
+        "lastModified": 1761551821,
-        "narHash": "sha256-lw3V2jOGYphUFHYQ5oARcb6urlbNpUCLJy1qhsGdUmc=",
+        "narHash": "sha256-N3Zj73TAxclhLGgADbPVwcVrhYIBKUgAxjfQuOXre6s=",
         "owner": "Homebrew",
         "repo": "brew",
-        "rev": "5b236456eb93133c2bd0d60ef35ed63f1c0712f6",
+        "rev": "8f6719274133c5bcc24c058c5a6bcbb3b0cd48b3",
         "type": "github"
       },
       "original": {
         "owner": "Homebrew",
-        "ref": "4.6.12",
+        "ref": "4.6.19",
         "repo": "brew",
         "type": "github"
       }
@@ -111,11 +111,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1761256472,
+        "lastModified": 1762095388,
-        "narHash": "sha256-iDM8s8cSkncybNs5IGo7qqeErCh+lk0mF6aiVYEtDHA=",
+        "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "cdd5e78adf3d28a20a94628164188253bdfff2c1",
+        "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
         "type": "github"
       },
       "original": {
@@ -295,11 +295,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761395627,
+        "lastModified": 1762226328,
-        "narHash": "sha256-9wQpgBRW2PzYw1wx+MgCt1IbPAYz93csApLMgSZOJCk=",
+        "narHash": "sha256-N+blVILhS9bfu6OO3ZV40Rj9z5XJPM9AtEzZgidZ5+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7296022150cd775917e4c831c393026eae7c2427",
+        "rev": "6feb3685114e5807b5effe7806b425b75b1b75c0",
         "type": "github"
       },
       "original": {
@@ -330,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760721282,
+        "lastModified": 1762186368,
-        "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=",
+        "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168",
+        "rev": "69921864a70b58787abf5ba189095566c3f0ffd3",
         "type": "github"
       },
       "original": {
@@ -348,11 +348,11 @@
         "brew-src": "brew-src"
       },
       "locked": {
-        "lastModified": 1758598228,
+        "lastModified": 1761927470,
-        "narHash": "sha256-qr60maXGbZ4FX5tejPRI3nr0bnRTnZ3AbbbfO6/6jq4=",
+        "narHash": "sha256-KsFDGRGD8j1R6TvJ4HkebKsh3HXLY0XazanLrhO3wqE=",
         "owner": "zhaofengli",
         "repo": "nix-homebrew",
-        "rev": "f36e5db56e117f7df701ab152d0d2036ea85218c",
+        "rev": "3cae36b3a17b09a66435291619dce8cf2c4728ca",
         "type": "github"
       },
       "original": {
@@ -378,11 +378,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1761114652,
+        "lastModified": 1762111121,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1761016216,
+        "lastModified": 1761999846,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1761238604,
+        "lastModified": 1761920420,
-        "narHash": "sha256-xZ8SGSSndcvjZLUrMLrz4DjnPFtjZfSGZzEHPGnS2Eg=",
+        "narHash": "sha256-6kYN+5S+55iFete09uvoTGDo6RPPcE1owOZcdAs7dPo=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "dad8ece966760d5de956ffa69670ffce1a90f3e3",
+        "rev": "e6b2d28159a61b258eb53b84dc114a2db93a022f",
         "type": "github"
       },
       "original": {
@@ -514,11 +514,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1761028816,
+        "lastModified": 1762101397,
-        "narHash": "sha256-s1XiIeJHpODVWfzsPaK9e21iz1dQSCU3H4/1OxOsyps=",
+        "narHash": "sha256-wGiL2K3kAyBBmIZpJEskaSIgyzzpg0zwfvri+Sy6/CI=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "b81dc0a385443099e7d231fe6275189e32c3b760",
+        "rev": "8c0640d5722a02178c8ee80a62c5f019cab4b3c1",
         "type": "github"
       },
       "original": {

hosts/nixos/default.nix

@@ -14,6 +14,7 @@
   environment.systemPackages = with pkgs; [
     wget
     curl
+    dig
     rsync
     git
     age

modules/system/syncthing/default.nix

@@ -40,7 +40,7 @@ in {
         folders = {
           "holocron" = {
             path = "/home/blake/holocron";
-            devices = ["lugia" "zygarde" "CEN-IT-07"];
+            devices = ["lugia" "zygarde" "CEN-IT-07" "snowbelle"];
             id = "5voxg-c3he2";
             versioning = {
               type = "staggered";
@@ -50,7 +50,27 @@ in {
                 maxAge = "0";
               };
             };
-
+            ignorePerms = true;
+            ignorePatterns = [
+              "// syncthing"
+              "/.versions"
+              "/.versions/**"
+              "/.stversions"
+              "/.stversions/**"
+              "// macos system junk"
+              "(?d).DS_Store"
+              "(?d).AppleDouble"
+              "(?d).LSOverride"
+              "(?d)Icon?"
+              "(?d)._*"
+              "(?d).Spotlight-V100"
+              "(?d).Trashes"
+              "(?d).fseventsd"
+              "(?d).metadata_never_index"
+              "(?d).com.apple.timemachine.donotpresent"
+              "(?d).com.apple.*"
+              "(?d)~*.tmp"
+            ];
           };
         };
         options = {
@@ -69,6 +89,5 @@ in {
         group = "blake";
       };
     };
-
   };
 }

users/blake/dots/browser/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./librewolf
+    ./firefox
+  ];
+}

users/blake/dots/core/default.nix

@@ -0,0 +1,17 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./btop
+    ./nvf
+    ./lf
+    ./zsh
+    ./ssh
+    ./gpg
+    ./git
+    ./xdg
+  ];
+}

users/blake/dots/core/lf/default.nix

@@ -23,10 +23,10 @@ in {
 
     # link configs
     xdg.configFile."lf/lfrc" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/lfrc";
+      source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/core/lf/lfrc";
     };
     xdg.configFile."ctpv/config" = {
-      source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/lf/ctpv_config";
+      source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/core/lf/ctpv_config";
     };
   };
 }

users/blake/dots/default.nix

@@ -5,21 +5,9 @@
   ...
 }: {
   imports = [
-    ./librewolf
+    ./core
-    ./firefox
+    ./browser
-    ./kitty
+    ./desktop
-    ./dunst
+    ./programs
-    ./btop
-    ./waybar
-    ./stylix
-    ./hypr
-    ./tofi
-    ./nvf
-    ./lf
-    ./zsh
-    ./ssh
-    ./gpg
-    ./git
-    ./xdg
   ];
 }

users/blake/dots/desktop/default.nix

@@ -0,0 +1,15 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./kitty
+    ./dunst
+    ./waybar
+    ./stylix
+    ./hypr
+    ./tofi
+  ];
+}

users/blake/dots/desktop/hypr/default.nix

@@ -119,7 +119,7 @@ in {
           # programs
           "$mainMod, Return, exec, kitty"
           "$mainMod, E, exec, kitty lf"
-          "$mainMod, R, exec, tofi-drun --drun-launch=true --prompt-text=\"launch:\""
+          "$mainMod, R, exec, tofi-drun --drun-launch=true --prompt-text=\"launch: \""
           "$mainMod, B, exec, librewolf"
           "$mainMod, G, exec, lutris"
           "$mainMod, M, exec, thunderbird"

users/blake/dots/desktop/stylix/default.nix

@@ -7,8 +7,7 @@
 }: let
   program = "stylix";
   cfg = config.dots.${program};
-  #wallpaper = ../../assets/wallpapers/pingpong.jpg;
+  wallpaper = ../../../assets/wallpapers/yveltal.jpg;
-  wallpaper = ../../assets/wallpapers/yveltal.jpg;
 in {
 
   imports = [inputs.stylix.homeModules.default];
@@ -26,7 +25,7 @@ in {
       cursor = {
         package = pkgs.posy-cursors;
         name = "Posy_Cursor_Black";
-        size = 128;
+        size = 48;
       };
       fonts = {
         sizes = {

users/blake/dots/desktop/tofi/default.nix

@@ -36,5 +36,17 @@ in {
         padding-right = 0;
       };
     };
+
+    # this clears the tofi-drun cache on every rebuild
+    # if this isn't present then new programs will not
+    # appear in the list when using as app launcher
+    home.activation = {
+      # https://github.com/philj56/tofi/issues/115#issuecomment-1701748297
+      regenerateTofiCache = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        tofi_cache=${config.xdg.cacheHome}/tofi-drun
+        [[ -f "$tofi_cache" ]] && rm "$tofi_cache"
+      '';
+    };
+
   };
 }

users/blake/dots/desktop/waybar/default.nix

@@ -290,8 +290,6 @@ in {
       brightnessctl
       bluetuith
       bluez
-      nerd-fonts.ubuntu
-      nerd-fonts.ubuntu-mono
     ];
   };
 }

users/blake/dots/programs/.default.nix

@@ -0,0 +1,25 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  program = "<program name>";
+  cfg = config.dots.${program};
+in {
+  options.dots.${program} = {
+    enable = lib.mkEnableOption "enables ${program}";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    # enable with home-manager
+    programs.${program} = {
+      enable = true;
+    };
+
+    # just install package
+    home.packages = with pkgs; [];
+
+  };
+}

users/blake/dots/programs/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./gnucash
+    ./libreoffice
+    #./gaming
+  ];
+}

users/blake/dots/programs/gnucash/default.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  program = "gnucash";
+  cfg = config.dots.${program};
+in {
+  options.dots.${program} = {
+    enable = lib.mkEnableOption "enables ${program}";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    # just install package
+    home.packages = with pkgs; [gnucash];
+
+  };
+}

users/blake/dots/programs/libreoffice/default.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: let
+  program = "libreoffice";
+  cfg = config.dots.${program};
+in {
+  options.dots.${program} = {
+    enable = lib.mkEnableOption "enables ${program}";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    # just install package
+    home.packages = with pkgs; [libreoffice-qt6];
+
+  };
+}

users/blake/home.nix

@@ -21,15 +21,14 @@ in
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
-    #inputs.stylix.homeManagerModules.default
     ./dots
-    ./dots/nvf
+    ./dots/core/nvf
-    ./dots/lf
+    ./dots/core/lf
-    ./dots/zsh
+    ./dots/core/zsh
-    ./dots/ssh
+    ./dots/core/ssh
-    ./dots/gpg
+    ./dots/core/gpg
-    ./dots/git
+    ./dots/core/git
-    ./dots/xdg
+    ./dots/core/xdg
   ];
 
   # set home manager config based on system type

users/blake/hosts/yveltal.nix

@@ -15,7 +15,6 @@
     lf.enable = true;
     kitty.enable = true;
     librewolf.enable = true;
-    firefox.enable = true;
     stylix.enable = true;
     waybar.enable = true;
     dunst.enable = true;
@@ -29,6 +28,8 @@
     git.enable = true;
     xdg.enable = true;
  
+    libreoffice.enable = true;
+    gnucash.enable = true;
   };