Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

Merge pull request 'gitbutler-cli: init at 0.18.8' (#23) from continous-development into main

Browse source 
Reviewed-on: #23
This commit is contained in:
Christoph Hollizeck 2026-03-17 12:01:49 +01:00
commit 6dee806947
4 changed files with 40 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
flake.lock generated
View file

@ -1989,11 +1989,11 @@
}, },
"nixpkgs-latest-factorio": { "nixpkgs-latest-factorio": {
"locked": { "locked": {
"lastModified": 1773726764, "lastModified": 1773744283,
"narHash": "sha256-QmQKd/wYY1Xjfu1+TJ1i+C6nK7HH54qUtYboK70FseY=", "narHash": "sha256-LW6uTevl6UYRbKkv0nwVMyr4g+6Ohg92wfkFN7pfYkE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ade7e63e7b6c6069bb73373fd92bd17487a7d54d", "rev": "f1e2c6cda52aa82fd8ec02bc7056009971ad46c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2005,11 +2005,11 @@
}, },
"nixpkgs-latest-minecraft": { "nixpkgs-latest-minecraft": {
"locked": { "locked": {
"lastModified": 1773726764, "lastModified": 1773744283,
"narHash": "sha256-QmQKd/wYY1Xjfu1+TJ1i+C6nK7HH54qUtYboK70FseY=", "narHash": "sha256-LW6uTevl6UYRbKkv0nwVMyr4g+6Ohg92wfkFN7pfYkE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ade7e63e7b6c6069bb73373fd92bd17487a7d54d", "rev": "f1e2c6cda52aa82fd8ec02bc7056009971ad46c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2051,11 +2051,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1773726764, "lastModified": 1773744283,
"narHash": "sha256-QmQKd/wYY1Xjfu1+TJ1i+C6nK7HH54qUtYboK70FseY=", "narHash": "sha256-LW6uTevl6UYRbKkv0nwVMyr4g+6Ohg92wfkFN7pfYkE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ade7e63e7b6c6069bb73373fd92bd17487a7d54d", "rev": "f1e2c6cda52aa82fd8ec02bc7056009971ad46c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2130,6 +2130,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-temp": {
"locked": {
"lastModified": 1773742739,
"narHash": "sha256-aWFbxP2i0bfbPicu+ymfY4vS5+r8QINuN7ry7HDiF4Q=",
"owner": "Daholli",
"repo": "nixpkgs",
"rev": "4e67af585996176d4d24640b12b744f06df871cc",
"type": "github"
},
"original": {
"owner": "Daholli",
"repo": "nixpkgs",
"rev": "4e67af585996176d4d24640b12b744f06df871cc",
"type": "github"
}
},
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1773646010, "lastModified": 1773646010,
@ -2461,6 +2477,7 @@
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-rpi": "nixpkgs-rpi", "nixpkgs-rpi": "nixpkgs-rpi",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-temp": "nixpkgs-temp",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -2733,11 +2750,11 @@
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1773695806, "lastModified": 1773737882,
"narHash": "sha256-HYmp4Ym/dlkRIPap7GFznNUNuDTTW0iIcOtHmhRzl3w=", "narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "ced61240cc38dee9e659a7ced0cd9a839c6085d3", "rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -20,6 +20,7 @@
nixpkgs-latest-factorio = nixpkgs-master; nixpkgs-latest-factorio = nixpkgs-master;
nixpkgs-latest-minecraft = nixpkgs-master; nixpkgs-latest-minecraft = nixpkgs-master;
nixpkgs-temp.url = "github:Daholli/nixpkgs/4e67af585996176d4d24640b12b744f06df871cc";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";

7
modules/base/home/fish.nix
View file

@ -53,6 +53,7 @@
ls = "eza -lah --icons --git"; ls = "eza -lah --icons --git";
lss = "ls --total-size"; lss = "ls --total-size";
lt = "ls -T --git-ignore"; lt = "ls -T --git-ignore";
bs = "but status";
}; };
functions = { functions = {
checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)"; checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)";
@ -64,12 +65,6 @@
syncfactoriomodstoserver = ''rsync -aP ~/.factorio/mods/ root@loptland:/var/lib/factorio/mods/ --delete && ssh root@loptland "systemctl restart systemd-tmpfiles-resetup.service && systemctl restart factorio.service"''; syncfactoriomodstoserver = ''rsync -aP ~/.factorio/mods/ root@loptland:/var/lib/factorio/mods/ --delete && ssh root@loptland "systemctl restart systemd-tmpfiles-resetup.service && systemctl restart factorio.service"'';
}; };
plugins = with pkgs.fishPlugins; [
{
name = "forgit";
src = forgit.src;
}
];
}; };
yazi = { yazi = {

10
modules/base/home/git.nix
View file

@ -11,6 +11,7 @@ topLevel: {
homeManager.cholli = homeManager.cholli =
{ {
config, config,
inputs,
lib, lib,
osConfig, osConfig,
pkgs, pkgs,
@ -18,11 +19,18 @@ topLevel: {
}: }:
let let
username = topLevel.config.flake.meta.users.cholli.username; username = topLevel.config.flake.meta.users.cholli.username;
temp = import inputs.nixpkgs-temp {
system = pkgs.stdenv.hostPlatform.system;
config.allowUnfree = true;
};
in in
{ {
home.packages = [ home.packages = [
pkgs.git-credential-manager pkgs.git-credential-manager
]; temp.gitbutler-cli
]
++ lib.optional (osConfig.networking.hostName == "yggdrasil") pkgs.gitbutler;
programs.git = { programs.git = {
enable = true; enable = true;