diff --git a/flake.lock b/flake.lock
index 581f5da..9cbc08d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
},
"catppuccin": {
"locked": {
- "lastModified": 1731232837,
- "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
+ "lastModified": 1733001911,
+ "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
+ "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e",
"type": "github"
},
"original": {
@@ -80,11 +80,11 @@
]
},
"locked": {
- "lastModified": 1731549112,
- "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
+ "lastModified": 1733168902,
+ "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
"owner": "nix-community",
"repo": "disko",
- "rev": "5fd852c4155a689098095406500d0ae3d04654a8",
+ "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
"type": "github"
},
"original": {
@@ -100,11 +100,11 @@
"pyproject-nix": "pyproject-nix"
},
"locked": {
- "lastModified": 1731424167,
- "narHash": "sha256-nKKeRwq7mxcW8cBTmPKzSg0DR/inVrtuJudVM81GISU=",
+ "lastModified": 1732214960,
+ "narHash": "sha256-ViyEMSYwaza6y55XTDrsRi2K4YKCLsefMTorjWSE27s=",
"owner": "nix-community",
"repo": "dream2nix",
- "rev": "44d41411686bc798876bd6d9f36a4c1143138d85",
+ "rev": "a8dac99db44307fdecead13a39c584b97812d0d4",
"type": "github"
},
"original": {
@@ -119,11 +119,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1731574827,
- "narHash": "sha256-QneOtCpfBNkgJCs32Y8LaKDpontw7W9ATQxIW4qb6qc=",
+ "lastModified": 1733793776,
+ "narHash": "sha256-IKVxMIwXNzaij8oZVoVmcR2QX5nCnh7SnVFJ5pujtXs=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "4639038b0f5e66e7d0f3d103b8e44ded3ab7e337",
+ "rev": "c4de2fd2fe16d3cfff15d2db0e2b684972a82012",
"type": "github"
},
"original": {
@@ -230,11 +230,11 @@
]
},
"locked": {
- "lastModified": 1722555600,
- "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+ "lastModified": 1730504689,
+ "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+ "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -323,11 +323,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1730504689,
- "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+ "lastModified": 1733312601,
+ "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+ "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
@@ -361,11 +361,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1731363552,
- "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+ "lastModified": 1733665616,
+ "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+ "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
"type": "github"
},
"original": {
@@ -485,11 +485,11 @@
]
},
"locked": {
- "lastModified": 1733389730,
- "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=",
+ "lastModified": 1733769654,
+ "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f",
+ "rev": "e952e94955dcc6fa2120c1430789fc41363f5237",
"type": "github"
},
"original": {
@@ -546,11 +546,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
- "lastModified": 1730739295,
- "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=",
+ "lastModified": 1731941836,
+ "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=",
"owner": "nix-community",
"repo": "lanzaboote",
- "rev": "cef39a78679c266300874e7a7000b4da066228d4",
+ "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879",
"type": "github"
},
"original": {
@@ -564,6 +564,7 @@
"locked": {
"lastModified": 1728951119,
"narHash": "sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ=",
+ "ref": "refs/heads/main",
"rev": "f6077314fa6aff862758095bb55fe844e9162a1d",
"revCount": 16344,
"type": "git",
@@ -588,11 +589,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1732351635,
- "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=",
+ "lastModified": 1733522041,
+ "narHash": "sha256-KpKmFgcUGQlAWhLUHyBn3AnTJLp7Kt82q2Cxfp3Yf44=",
"ref": "refs/heads/main",
- "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a",
- "revCount": 617,
+ "rev": "df3edf37301cdc77ca5bd5f3f6fcccd6d0befee5",
+ "revCount": 619,
"type": "git",
"url": "https://git.lix.systems/lix-project/nix-eval-jobs"
},
@@ -613,11 +614,11 @@
]
},
"locked": {
- "lastModified": 1732603698,
- "narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
+ "lastModified": 1733522213,
+ "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=",
"ref": "refs/heads/main",
- "rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
- "revCount": 123,
+ "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea",
+ "revCount": 124,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@@ -629,11 +630,11 @@
"mobile-nixos": {
"flake": false,
"locked": {
- "lastModified": 1730912712,
- "narHash": "sha256-T5A9I6Tfh9zrv9sRWfu/ZKN6VkE670YQ6bjC5sbpTzk=",
+ "lastModified": 1733700802,
+ "narHash": "sha256-YuhtFJLVW3d3zr5+VoyApm6PUFoIHhOCi+VOfi2LNzA=",
"owner": "NixOS",
"repo": "mobile-nixos",
- "rev": "2268e358ed407d9c0a4499ae767d105eeaeec586",
+ "rev": "0532a626e69fa9451e50297011008851527b9259",
"type": "github"
},
"original": {
@@ -651,11 +652,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
- "lastModified": 1730278911,
- "narHash": "sha256-CrbqsC+lEA3w6gLfpqfDMDEKoEta2sl4sbQK6Z/gXak=",
+ "lastModified": 1733069686,
+ "narHash": "sha256-lThMnu0otRxDTso07OU72+RZrUNokXwLKTjzTWGrxUo=",
"owner": "Mic92",
"repo": "nix-fast-build",
- "rev": "8e7c9d76979381441facb8888f21408312cf177a",
+ "rev": "95f5dc09a725a1916fd064f01eb3be9a5f487095",
"type": "github"
},
"original": {
@@ -739,11 +740,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
- "lastModified": 1731454423,
- "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
+ "lastModified": 1733570843,
+ "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
+ "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github"
},
"original": {
@@ -762,11 +763,11 @@
"osx-kvm": "osx-kvm"
},
"locked": {
- "lastModified": 1731194612,
- "narHash": "sha256-xOvzIdIFzy1LUgGLlOcimeHruZPLJpVdeEoHVOpH7sM=",
+ "lastModified": 1732478008,
+ "narHash": "sha256-Axdo+bDlmFU19lBWIkhbAeV7RMO1JD9T1t51sfcWCTA=",
"owner": "MatthewCroughan",
"repo": "NixThePlanet",
- "rev": "ef5fad336a55fcbb0680ad21aa58812b2f826435",
+ "rev": "00d07c86548805eab1bc0dac2f95fce8d7e9aac6",
"type": "github"
},
"original": {
@@ -777,11 +778,11 @@
},
"nixosHardware": {
"locked": {
- "lastModified": 1731403644,
- "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
+ "lastModified": 1733481457,
+ "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
+ "rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"type": "github"
},
"original": {
@@ -840,14 +841,14 @@
},
"nixpkgs-lib": {
"locked": {
- "lastModified": 1730504152,
- "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+ "lastModified": 1733096140,
+ "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
}
},
"nixpkgs-lib_2": {
@@ -870,16 +871,16 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1731386116,
- "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
+ "lastModified": 1733550349,
+ "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "689fed12a013f56d4c4d3f612489634267d86529",
+ "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-24.05",
+ "ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -934,11 +935,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1731319897,
- "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
+ "lastModified": 1733581040,
+ "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
+ "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github"
},
"original": {
@@ -995,11 +996,11 @@
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1733212471,
- "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+ "lastModified": 1733759999,
+ "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+ "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
"type": "github"
},
"original": {
@@ -1304,11 +1305,11 @@
]
},
"locked": {
- "lastModified": 1723808491,
- "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
+ "lastModified": 1732894027,
+ "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
+ "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github"
},
"original": {
@@ -1324,11 +1325,11 @@
]
},
"locked": {
- "lastModified": 1730321837,
- "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+ "lastModified": 1733761991,
+ "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+ "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
"type": "github"
},
"original": {
diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el
index 11b765b..77c9157 100644
--- a/hmModules/emacs/init.el
+++ b/hmModules/emacs/init.el
@@ -882,7 +882,7 @@ This is meant to be an helper to be called from the window manager."
(gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH"))))
(gptel-model 'gpt-4o)
(gptel-default-mode 'org-mode)
- (gptel-org-branching-context 't)
+ (gptel-org-branching-context nil) ;; this is cool but I don't feel comfortable with it
:config
(require 'gptel-curl)
diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix
index 8b1dfd4..4f1cb71 100644
--- a/hmModules/git/default.nix
+++ b/hmModules/git/default.nix
@@ -14,6 +14,9 @@ in
../gitui
../lazygit
];
+
+ home.packages = [ pkgs.git-credential-manager ];
+
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
@@ -27,6 +30,9 @@ in
user.signingKey = "/home/${username}/.ssh/id_rsa";
gpg.format = "ssh";
commit.gpgsign = true;
+
+ credential.helper = "manager";
+ credential.credentialStore = "cache";
};
userName = config.name;
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index c2cf5b9..53278b2 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -172,4 +172,6 @@
enable = true;
policy = [ "magic" ];
};
+
+ hardware.hackrf.enable = true;
}
diff --git a/hosts/tpol/default.nix b/hosts/tpol/default.nix
index 7793f66..d73b62b 100644
--- a/hosts/tpol/default.nix
+++ b/hosts/tpol/default.nix
@@ -75,7 +75,7 @@
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = ''
- ${lib.getExe' pkgs.rtl-sdr "rtl_tcp"} -a ${vpn.${config.networking.hostName}}
+ ${lib.getExe' pkgs.rtl-sdr "rtl_tcp"} -a ${vpn.${config.networking.hostName}.ip}
'';
};
};
@@ -86,7 +86,7 @@
serviceConfig = {
ExecStart = ''
${lib.getExe' pkgs.sdrangel "sdrangelsrv"} --remote-tcp-hwtype RTLSDR --remote-tcp-port 1234 --remote-tcp-address ${
- vpn.${config.networking.hostName}
+ vpn.${config.networking.hostName}.ip
} --remote-tcp
'';
};
diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix
index b0e4a63..9da252d 100644
--- a/modules/home-assistant/default.nix
+++ b/modules/home-assistant/default.nix
@@ -50,6 +50,7 @@ in
"wyoming"
"wake_on_lan"
"prometheus"
+ "openai_conversation"
];
customComponents = with pkgs.home-assistant-custom-components; [
tuya_local