Merge pull request #28 from tomasriveral/laptop

Weekly sync: laptop → main

flake.lock

@@ -34,11 +34,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1780996864,
+        "lastModified": 1781178648,
-        "narHash": "sha256-OIDk3FiSKjYLV4Dvfv6fMeVcV3Dk9+MBBKTORNqMsUg=",
+        "narHash": "sha256-z6V1T7MHShM7TfFIMCDp94Bi1Wk9LJfK96vm8YFGY5M=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "c46593d438a75fce42f28529662b678b79d94693",
+        "rev": "a16c957a8bd13e0cfd09928ca0a22fecd3681e44",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780894562,
+        "lastModified": 1781152676,
-        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -74,15 +74,14 @@
       "locked": {
         "lastModified": 1778716662,
         "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
         "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
-        "type": "github"
+        "revCount": 475,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.475%2Brev-f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb/019e2533-0324-7e90-93eb-29b02e1a61cd/source.tar.gz"
       },
       "original": {
-        "owner": "hercules-ci",
+        "type": "tarball",
-        "repo": "flake-parts",
+        "url": "https://flakehub.com/f/hercules-ci/flake-parts/%2A"
-        "type": "github"
       }
     },
     "flake-utils": {
@@ -92,15 +91,14 @@
       "locked": {
         "lastModified": 1731533236,
         "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
         "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
+        "revCount": 102,
+        "type": "tarball",
+        "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.102%2Brev-11707dc2f618dd54ca8739b309ec4fc024de578b/0193276d-5b8f-7dbc-acf1-41cb7b54ad2e/source.tar.gz"
       },
       "original": {
-        "owner": "numtide",
+        "type": "tarball",
-        "repo": "flake-utils",
+        "url": "https://flakehub.com/f/numtide/flake-utils/%2A"
-        "type": "github"
       }
     },
     "home-manager": {
@@ -110,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780883961,
+        "lastModified": 1781319724,
-        "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=",
+        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa",
+        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
         "type": "github"
       },
       "original": {
@@ -142,17 +140,17 @@
     "m3shapes": {
       "flake": false,
       "locked": {
-        "lastModified": 1777812556,
+        "lastModified": 1781017666,
-        "narHash": "sha256-E5nqOucRQBWKuT31AMekmfgMywRdHgSbU86R7t4BKKA=",
+        "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=",
         "owner": "soramanew",
         "repo": "m3shapes",
-        "rev": "356825d31f16052a782735cce264331cba0cb71b",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
         "type": "github"
       },
       "original": {
         "owner": "soramanew",
         "repo": "m3shapes",
-        "rev": "356825d31f16052a782735cce264331cba0cb71b",
+        "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6",
         "type": "github"
       }
     },
@@ -181,11 +179,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780734595,
+        "lastModified": 1780902259,
-        "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
         "type": "github"
       },
       "original": {
@@ -210,22 +208,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1780997039,
-        "narHash": "sha256-8pPXOCZkrySE3zwtix2MYxm9NzzHT/XQr0mHJsf3lis=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "872eb0174d0d5a1bc37388ff84eea2bca44b1065",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-notifier": {
       "inputs": {
         "flake-utils": [
@@ -236,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1780489272,
+        "lastModified": 1781273662,
-        "narHash": "sha256-hMWKTal0SqG2OdtT/wB6wj9jLaES40yJlUQAjtbjTpA=",
+        "narHash": "sha256-50dd7Cs1mUHq1srw7UojdzCYOB4TfrIXMv7XHHPU9zw=",
         "owner": "tomasriveral",
         "repo": "nixpkgs-notifier",
-        "rev": "276b61aecaf9c2700e7c3cb7310bac5c6a9e5b5a",
+        "rev": "12183f26e8b196d9906f82dc05f9672793c61038",
         "type": "github"
       },
       "original": {
@@ -251,11 +233,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1780930886,
+        "lastModified": 1781268102,
-        "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=",
+        "narHash": "sha256-Zn5KTggEmUB3lXn/ccERNcBdddE6IaOFber9dWViWDg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e",
+        "rev": "49a4bd0573c376468dd7996ddb6f9fa31d8c4d97",
         "type": "github"
       },
       "original": {
@@ -265,22 +247,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1780902259,
-        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-26.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "notewrapper": {
       "inputs": {
         "flake-utils": [
@@ -315,11 +281,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1780942898,
+        "lastModified": 1781158593,
-        "narHash": "sha256-cP4gUX4YE1kFe+15Zd1CbqL08XytPm1UXZuaXjYLG94=",
+        "narHash": "sha256-zxlheX4o1MK00dkYzoXm7Srj5SD9iOCSp4N7f1iShr0=",
         "owner": "r14dd",
         "repo": "patent",
-        "rev": "bbad654b6b65264d2ba267b5c87e8be0bd89b78e",
+        "rev": "68772d068088d62a030619090959165af5e71ed1",
         "type": "github"
       },
       "original": {
@@ -359,7 +325,9 @@
         "import-tree": "import-tree",
         "nix-git-cherry-picker": "nix-git-cherry-picker",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-master": "nixpkgs-master",
+        "nixpkgs-master": [
+          "nixpkgs-unstable"
+        ],
         "nixpkgs-notifier": "nixpkgs-notifier",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "notewrapper": "notewrapper",

modules/hosts/laptop.nix

@@ -69,7 +69,7 @@
       librewolf
       mullvad
       neovim
-      nixGitCherryPicker-laptop
+      nix-git-cherry-picker-laptop
       notewrapper
       oh-my-zsh
       ripgrep

modules/utilities/nixGitCherryPicker.nix

@@ -1,5 +1,4 @@
 {inputs, ...}: {
-<<<<<<< desktop
   flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: {
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
@@ -16,25 +15,6 @@
       force = true;
     };
   };
-  flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
-=======
-  flake.homeModules.nixGitCherryPicker-laptop = {pkgs, ...}: {
->>>>>>> main
-    home.packages = [
-      inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
-    ];
-    home.file.".config/nix-git-cherry-picker/config.json" = {
-      enable = true;
-      text = ''
-        {
-          "localBranch": "laptop",
-          "remoteBranch": "desktop",
-          "nixConfigPath": "/home/tomasr/nixos/"
-        }
-      '';
-      force = true;
-    };
-  };
   flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default