jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: jolheiser:8862297726d2c9106f7e55da438590db841f5e6b
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
..
compare: jolheiser:b65c320ca27f7ba25efe6163d1adacfc3cc3e5c0
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

No commits in common. "8862297726d2c9106f7e55da438590db841f5e6b" and "b65c320ca27f7ba25efe6163d1adacfc3cc3e5c0" have entirely different histories.
8862297726 ... b65c320ca2

3 changed files with 129 additions and 103 deletions
Show Stats Expand all files Collapse all files

191
flake.lock
View File

@ -3,9 +3,7 @@
"agenix": {
"inputs": {
"darwin": [],
"home-manager": [
"home-manager"
],
"home-manager": [],
"nixpkgs": [
"nixpkgs"
],
@ -27,7 +25,9 @@
},
"cfg": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1729195705,
@ -98,10 +98,28 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghostty": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"zig": "zig",
@ -123,7 +141,9 @@
},
"gomodinit": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1734153556,
@ -141,14 +161,18 @@
},
"helix": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"jolheiser": "jolheiser",
"nixpkgs": [
"jolheiser",
"nixpkgs"
]
},
"locked": {
"lastModified": 1741361398,
"narHash": "sha256-IoOCg+MnV1wfpJovaSBskqVTr0pMR5mFMRNwJzs8T1c=",
"lastModified": 1739904284,
"narHash": "sha256-xlo5oP+dYXm5LU8biTPRLvjxgQcP/NTYWKk/dozzGjo=",
"ref": "refs/heads/main",
"rev": "4ea112b72e1cbabb8c82bb276d142762f2bc09a6",
"revCount": 24,
"rev": "859e1178eaa2b792b19059cddd0729e73ceee319",
"revCount": 23,
"type": "git",
"url": "https://git.jolheiser.com/helix.drv.git"
},
@ -177,6 +201,42 @@
"type": "github"
}
},
"jolheiser": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1739904102,
"narHash": "sha256-Oh+ckGaUrnH5mMCsPvU9XViSAIfbigW7H0Rq/ZbbhlI=",
"ref": "refs/heads/main",
"rev": "0abadd849d3d36ca87fda7ea9ed637f25a0e9dae",
"revCount": 3,
"type": "git",
"url": "https://git.jolheiser.com/nixpkgs.git"
},
"original": {
"type": "git",
"url": "https://git.jolheiser.com/nixpkgs.git"
}
},
"jolheiser_2": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1739904102,
"narHash": "sha256-Oh+ckGaUrnH5mMCsPvU9XViSAIfbigW7H0Rq/ZbbhlI=",
"ref": "refs/heads/main",
"rev": "0abadd849d3d36ca87fda7ea9ed637f25a0e9dae",
"revCount": 3,
"type": "git",
"url": "https://git.jolheiser.com/nixpkgs.git"
},
"original": {
"type": "git",
"url": "https://git.jolheiser.com/nixpkgs.git"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1734352517,
@ -195,11 +255,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1741246872,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"lastModified": 1739736696,
"narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github"
},
"original": {
@ -243,32 +303,32 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1741037377,
"narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
"lastModified": 1739736696,
"narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "02032da4af073d0f6110540c8677f16d4be0117f",
"rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1741037377,
"narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
"lastModified": 1734119587,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "02032da4af073d0f6110540c8677f16d4be0117f",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -290,54 +350,6 @@
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1734119587,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1741037377,
"narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "02032da4af073d0f6110540c8677f16d4be0117f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1741246872,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
@ -355,7 +367,7 @@
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix"
},
"locked": {
@ -374,7 +386,10 @@
},
"pokego": {
"inputs": {
"nixpkgs": "nixpkgs_6"
"nixpkgs": [
"jolheiser",
"nixpkgs"
]
},
"locked": {
"lastModified": 1741123315,
@ -394,12 +409,14 @@
"inputs": {
"agenix": "agenix",
"cfg": "cfg",
"flake-utils": "flake-utils",
"ghostty": "ghostty",
"gomodinit": "gomodinit",
"helix": "helix",
"home-manager": "home-manager",
"jolheiser": "jolheiser_2",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"nur": "nur",
"pokego": "pokego",
"spectre": "spectre",
@ -408,7 +425,9 @@
},
"spectre": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1732207908,
@ -471,8 +490,10 @@
},
"tclip": {
"inputs": {
"nixpkgs": "nixpkgs_8",
"utils": "utils"
"nixpkgs": "nixpkgs_5",
"utils": [
"flake-utils"
]
},
"locked": {
"lastModified": 1733922802,
@ -509,24 +530,6 @@
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"zig": {
"inputs": {
"flake-compat": [

39
flake.nix
View File

@ -3,6 +3,9 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git";
flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
@ -10,20 +13,40 @@
agenix = {
url = "github:ryantm/agenix";
inputs = {
darwin.follows = "";
home-manager.follows = "home-manager";
nixpkgs.follows = "nixpkgs";
darwin.follows = "";
home-manager.follows = "";
};
};
nixos-hardware.url = "github:nixos/nixos-hardware/master";
nur.url = "github:nix-community/NUR";
helix.url = "git+https://git.jolheiser.com/helix.drv.git";
gomodinit.url = "git+https://git.jolheiser.com/gomodinit.git";
cfg.url = "git+https://git.jolheiser.com/cfg.git";
spectre.url = "git+https://git.jolheiser.com/go-spectre.git";
pokego.url = "git+https://git.jolheiser.com/pokego.git";
helix = {
url = "git+https://git.jolheiser.com/helix.drv.git";
inputs.nixpkgs.follows = "jolheiser/nixpkgs";
};
gomodinit = {
url = "git+https://git.jolheiser.com/gomodinit.git";
inputs.nixpkgs.follows = "nixpkgs";
};
cfg = {
url = "git+https://git.jolheiser.com/cfg.git";
inputs.nixpkgs.follows = "nixpkgs";
};
spectre = {
url = "git+https://git.jolheiser.com/go-spectre.git";
inputs.nixpkgs.follows = "nixpkgs";
};
pokego = {
url = "git+https://git.jolheiser.com/pokego.git";
inputs.nixpkgs.follows = "jolheiser/nixpkgs";
};
ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
tclip.url = "github:tailscale-dev/tclip";
tclip = {
url = "github:tailscale-dev/tclip";
inputs = {
utils.follows = "flake-utils";
};
};
};
outputs =

2
machines/common/nogui/default.nix
View File

@ -55,7 +55,7 @@
"flakes"
"nix-command"
];
optimise = true;
auto-optimise-store = true;
warn-dirty = false;
substituters = [ "https://jolheiser.cachix.org" ];
trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ];