Compare commits

..

3 Commits

Author SHA1 Message Date
f1a4fa002b declutter michael 2026-01-23 09:29:52 +00:00
385f92458f fix(neovim): update jj-diffconflicts hash 2026-01-23 09:29:52 +00:00
ed9f98493f flake 2026-01-23 09:29:52 +00:00
3 changed files with 19 additions and 32 deletions

36
flake.lock generated
View File

@@ -272,11 +272,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1769015285, "lastModified": 1769132734,
"narHash": "sha256-MlqzCJbckJsgwfkRs64H2xaX2Uxl4o6Z9XYfkYS1N/E=", "narHash": "sha256-gmU9cRplrQWqoback9PgQX7Dlsdx8JlhlVZwf0q1F7E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ec0247a7a19f641595c24ac1ea4df6461d1cdb36", "rev": "d055b309a6277343cb1033a11d7500f0a0f669fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -288,11 +288,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769069387, "lastModified": 1769156500,
"narHash": "sha256-Q3x7D2PltetXTSj7rH/LpyxOUsrFyC+R1+CthCmEFsg=", "narHash": "sha256-XjmYKnMOgp3cbshjGm6+YrueWPu1gizrViYE0e5E9+M=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "5af875eb8e8c86b77245b7e0148060c25e86f20f", "rev": "e153d74aeb3b2452cd417556ad402bab798553d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -304,11 +304,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1769072837, "lastModified": 1769151944,
"narHash": "sha256-74j2Q0WlB9VHJ9UBXww/BCD/jtxBIpMKxJeVqYIWH4Y=", "narHash": "sha256-PsK3NVpXqNoC8al5UF4yBI2tVhX1V10lXMSSV7rlq+s=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "7033cef31e428f60207a0a318121c90703808ba3", "rev": "26a067772d01ea678669de5da9e4df384e277445",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -359,11 +359,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1769073042, "lastModified": 1769139592,
"narHash": "sha256-4Ih4Tvcq5tbFdtzkJSc9xIY6ADc4QcFPmZgSqWYDZJc=", "narHash": "sha256-n9gZ6jpVgr5m3IRMzrSKJ+9ObrAdbuqwbC+GUaUan0I=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "f5511577c4ad5fb0210003400253bc39a51fdafb", "rev": "5c7ae84b6d1dae04a293897ce65a3bced63bc6d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -381,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1768830272, "lastModified": 1769112425,
"narHash": "sha256-AoKnv3NDK7jmcIHALA2aFavjDQw8tsxKy7X0A9XSW84=", "narHash": "sha256-YXT6nQ1TtizbO7Gcas10yuY6XJJmeFLUeSoepEizb5Q=",
"owner": "jnsahaj", "owner": "jnsahaj",
"repo": "lumen", "repo": "lumen",
"rev": "3fd17da47ccf263e57eccc5319d949c5adc2b98b", "rev": "fb0e429ff65113ba39d23c6ed8c7ba3592bb7eb6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -482,11 +482,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1769071976, "lastModified": 1769158310,
"narHash": "sha256-WrNElELLDZm5fw+rtue4o7b3wsdQXfuOs3SXQrrFEjg=", "narHash": "sha256-JP1PGafKB/p4nwMKwt5I/SZtxUMjag+eRGYbS43JrYc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1699857c020279694b95b6f9e24cb8fdbf886b9c", "rev": "3954326ce86914b3b2ece22d67ce24993757ab63",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -39,22 +39,9 @@
home-manager.users.${user} = { home-manager.users.${user} = {
imports = [ imports = [
../../profiles/bash.nix
../../profiles/bat.nix
../../profiles/direnv.nix
../../profiles/eza.nix
../../profiles/fish.nix ../../profiles/fish.nix
../../profiles/fzf.nix
../../profiles/git.nix
../../profiles/home.nix ../../profiles/home.nix
../../profiles/jjui.nix
../../profiles/jujutsu.nix
../../profiles/lazygit.nix
../../profiles/neovim
../../profiles/ripgrep.nix
../../profiles/ssh.nix ../../profiles/ssh.nix
../../profiles/starship.nix
../../profiles/zoxide.nix
inputs.nixvim.homeModules.nixvim inputs.nixvim.homeModules.nixvim
]; ];
}; };

View File

@@ -7,7 +7,7 @@
owner = "rafikdraoui"; owner = "rafikdraoui";
repo = "jj-diffconflicts"; repo = "jj-diffconflicts";
rev = "main"; rev = "main";
hash = "sha256-tyRTw3ENV7zlZF3Dp9zO4Huu02K5uyXb3brAJCW4w2M="; hash = "sha256-hvMXpslucywVYA9Sdxx6IcXQXYcYNWK8s9jr+KtStdI=";
}; };
}) })
]; ];