phundrak/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: update flakes to latest version

Browse Source
This commit is contained in:
Lucien Cartier-Tilet 2025-11-01 12:15:06 +01:00
parent 6a050e055a
commit 660239293e
7 changed files with 142 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
flake.lock generated
View File

@ -6,7 +6,8 @@
"devenv" "devenv"
], ],
"flake-compat": [ "flake-compat": [
"devenv" "devenv",
"flake-compat"
], ],
"git-hooks": [ "git-hooks": [
"devenv", "devenv",
@ -18,11 +19,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752264895, "lastModified": 1760971495,
"narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
"owner": "cachix", "owner": "cachix",
"repo": "cachix", "repo": "cachix",
"rev": "47053aef762f452e816e44eb9a23fbc3827b241a", "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +45,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759437797, "lastModified": 1761922975,
"narHash": "sha256-+MwJvMExEcRpDIVKMwL1ZsSnC4AuhnooM7PNJh02S5I=", "narHash": "sha256-j4EB5ku/gDm7h7W7A+k70RYj5nUiW/l9wQtXMJUD2hg=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "89ce1b7ac66ca381a335a60ad6acc723ef6f42f3", "rev": "c9f0b47815a4895fadac87812de8a4de27e0ace1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +61,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +82,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1760948891,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -125,11 +126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758108966, "lastModified": 1760663237,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +168,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759337100, "lastModified": 1761878381,
"narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -206,16 +207,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758763079, "lastModified": 1761648602,
"narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=", "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=",
"owner": "cachix", "owner": "cachix",
"repo": "nix", "repo": "nix",
"rev": "6f0140527c2b0346df4afad7497baa08decb929f", "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "cachix",
"ref": "devenv-2.30.5", "ref": "devenv-2.30.6",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@ -227,11 +228,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759032422, "lastModified": 1761451000,
"narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ec7a78cb0e098832d8acac091a4df393259c4839", "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +243,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759381078, "lastModified": 1761907660,
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +286,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759303785, "lastModified": 1761897390,
"narHash": "sha256-EUXrK7pUIzOQWR1dquZh26A6W8lsY2oiHEEZzQnsarM=", "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "9662234759eb57f2a1057f2a1c667da1bf128c1c", "rev": "fc704e6b5d445899a1565955268c91942a4f263f",
"revCount": 686, "revCount": 700,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell" "url": "https://git.outfoxxed.me/quickshell/quickshell"
}, },
@ -338,11 +339,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759188042, "lastModified": 1760998189,
"narHash": "sha256-f9QC2KKiNReZDG2yyKAtDZh0rSK2Xp1wkPzKbHeQVRU=", "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "9fcfabe085281dd793589bdc770a2e577a3caa5d", "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +374,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1759205174, "lastModified": 1761883599,
"narHash": "sha256-LMfGQsy3OibEqr3WtLCOqUVdOy5/6DJKWHV8h+1Vapk=", "narHash": "sha256-ntnfAAqSuXI/+uqXAWUjbY5arB7sRK9cpgFbHbCZgK8=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "afd770119e0f9fbb085665738f3fa4c28ff42f78", "rev": "5355c0dc6857a2aa34b126fb4a93a454ed702f52",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
users/modules/cli/bat.nix
View File

@ -19,7 +19,6 @@ in {
extraPackages = mkIf cfg.extras (with pkgs.bat-extras; [ extraPackages = mkIf cfg.extras (with pkgs.bat-extras; [
batman batman
batpipe batpipe
batgrep
]); ]);
}; };
} }

2
users/modules/dev/editors/emacs.nix
View File

@ -5,7 +5,7 @@
... ...
}: }:
with lib; let with lib; let
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages ( emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
epkgs: [ epkgs: [
epkgs.mu4e epkgs.mu4e
epkgs.pdf-tools epkgs.pdf-tools

193
users/modules/dev/vcs/git.nix
View File

@ -90,9 +90,47 @@ in {
else cfg.sendmail.user; else cfg.sendmail.user;
in { in {
enable = true; enable = true;
userEmail = cfg.email; ignores = [
userName = cfg.name; ".env"
extraConfig = { ".direnv/"
"*~"
"\#*\#"
"*.elc"
"auto-save-list"
".\#*"
"*_flymake.*"
"/auto/"
".projectile"
".dir-locals.el"
"# Org mode files"
".org-id-locations"
"*_archive"
"*.out"
"*.o"
"*.so"
"# Archives"
"*.7zz"
"*.dmg"
"*.gz"
"*.iso"
"*.jar"
"*.rar"
"*.tar"
"*.zip"
"*.log"
"*.sqlite"
"dist/"
];
settings = {
user = {
inherit (cfg) name email;
};
color.ui = "auto"; color.ui = "auto";
column.ui = "auto"; column.ui = "auto";
tag.sort = "version:refname"; tag.sort = "version:refname";
@ -180,99 +218,62 @@ in {
insteadOf = "labs:"; insteadOf = "labs:";
}; };
}; };
}; alias = {
ignores = [ a = "add --all";
".env" aca = "!git add --all && git commit --amend";
".direnv/" acan = "!git add --all && git commit --amend --no-edit";
ap = "add --patch";
"*~" b = "branch";
"\#*\#" bd = "branch -d";
"*.elc" bdd = "branch -D";
"auto-save-list" c = "commit -S";
".\#*" ca = "commit -Sa";
"*_flymake.*" can = "commit -Sa --no-edit";
"/auto/" cm = "commit -Sm";
".projectile" cam = "commit -Sam";
".dir-locals.el" co = "checkout";
cob = "checkout -b";
"# Org mode files" cod = "checkout develop";
".org-id-locations" cl = "clone";
"*_archive" cl1 = "clone --depth 1";
f = "fetch";
"*.out" fp = "fetch --prune";
"*.o" ps = "push";
"*.so" psf = "push --force-with-lease";
pso = "push origin";
"# Archives" psfo = "push --force-with-lease origin";
"*.7zz" pushall = "!git remote \vert{} xargs -L1 git push";
"*.dmg" psl = "!git remote \vert{} xargs -L1 git push";
"*.gz" pullall = "!git remote \vert{} xargs -L1 git pull";
"*.iso" pll = "!git remote \vert{} xargs -L1 git pull";
"*.jar" pl = "pull";
"*.rar" pb = "pull --rebase";
"*.tar" r = "rebase";
"*.zip" ra = "rebase --abort";
rc = "rebase --continue";
"*.log" rd = "rebase develop";
"*.sqlite" ri = "rebase -i";
rmf = "rm -f";
"dist/" rmd = "rm -r";
]; rmdf = "rm -rf";
aliases = { sm = "submodule";
a = "add --all"; sms = "submodule status";
aca = "!git add --all && git commit --amend"; sma = "submodule add";
acan = "!git add --all && git commit --amend --no-edit"; smu = "submodule update";
ap = "add --patch"; smui = "submodule update --init";
b = "branch"; smuir = "submodule update --init --recursive";
bd = "branch -d"; st = "stash";
bdd = "branch -D"; stc = "stash clear";
c = "commit -S"; stp = "stash pop";
ca = "commit -Sa"; stw = "stash show";
can = "commit -Sa --no-edit"; u = "reset --";
cm = "commit -Sm"; d = "diff -w";
cam = "commit -Sam"; l = "log --all --oneline --graph --decorate --pretty=format':%C(magenta)%h %C(white) %an %ar%C(auto) %D%n%s%n'";
co = "checkout"; s = "status";
cob = "checkout -b"; staged = "diff --cached";
cod = "checkout develop"; upstream = "!git push -u origin HEAD";
cl = "clone"; unstage = "reset --";
cl1 = "clone --depth 1"; };
f = "fetch";
fp = "fetch --prune";
ps = "push";
psf = "push --force-with-lease";
pso = "push origin";
psfo = "push --force-with-lease origin";
pushall = "!git remote \vert{} xargs -L1 git push";
psl = "!git remote \vert{} xargs -L1 git push";
pullall = "!git remote \vert{} xargs -L1 git pull";
pll = "!git remote \vert{} xargs -L1 git pull";
pl = "pull";
pb = "pull --rebase";
r = "rebase";
ra = "rebase --abort";
rc = "rebase --continue";
rd = "rebase develop";
ri = "rebase -i";
rmf = "rm -f";
rmd = "rm -r";
rmdf = "rm -rf";
sm = "submodule";
sms = "submodule status";
sma = "submodule add";
smu = "submodule update";
smui = "submodule update --init";
smuir = "submodule update --init --recursive";
st = "stash";
stc = "stash clear";
stp = "stash pop";
stw = "stash show";
u = "reset --";
d = "diff -w";
l = "log --all --oneline --graph --decorate --pretty=format':%C(magenta)%h %C(white) %an %ar%C(auto) %D%n%s%n'";
s = "status";
staged = "diff --cached";
upstream = "!git push -u origin HEAD";
unstage = "reset --";
}; };
}; };
}; };

1
users/modules/security/ssh.nix
View File

@ -17,6 +17,7 @@ in {
config = { config = {
programs.ssh = mkIf cfg.enable { programs.ssh = mkIf cfg.enable {
enable = true; enable = true;
enableDefaultConfig = false;
includes = lists.optional (cfg.hosts != null) cfg.hosts; includes = lists.optional (cfg.hosts != null) cfg.hosts;
}; };
}; };

2
users/phundrak/home.nix
View File

@ -11,7 +11,7 @@
]; ];
config = let config = let
emacsPkg = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages ( emacsPkg = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages (
epkgs: [ epkgs: [
epkgs.mu4e epkgs.mu4e
epkgs.pdf-tools epkgs.pdf-tools

4
users/phundrak/packages.nix
View File

@ -36,11 +36,11 @@ with lib; {
signal-desktop-bin signal-desktop-bin
# Misc # Misc
bitwarden bitwarden-desktop
gplates gplates
libnotify libnotify
nextcloud-client nextcloud-client
onlyoffice-bin onlyoffice-desktopeditors
scrcpy scrcpy
syncthing syncthing
watchmate watchmate