Compare commits

..
3 Commits
5 changed files with 65 additions and 102 deletions
Generated
+49 -80
View File
@@ -2,26 +2,16 @@
"nodes": { "nodes": {
"angrr": { "angrr": {
"inputs": { "inputs": {
"flake-compat": [
"flake-compat"
],
"flake-parts": [
"flake-parts"
],
"nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"treefmt-nix": [
"treefmt"
] ]
}, },
"locked": { "locked": {
"lastModified": 1784308004, "lastModified": 1784981413,
"narHash": "sha256-LZ4c1msj6C2Rs6bTP3GUjJv2Jrzu17H9j8is+l3tPgc=", "narHash": "sha256-F0Fx2C0bOmmvTovxySV612ltrtPc5FMzZ1IaK3VKy1o=",
"owner": "linyinfeng", "owner": "linyinfeng",
"repo": "angrr", "repo": "angrr",
"rev": "a66aa239575576fb1ee994a2cdb3928b7cedc13b", "rev": "b2a7ef31dfd2a03649b9483f2eabf6f48b4d6bd1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -221,11 +211,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1784849577, "lastModified": 1785001160,
"narHash": "sha256-vVJl1B6vuVkpmkGYxSaHHpjwCZCP59OsXlSo4bQontk=", "narHash": "sha256-iyjX3d/q7lqYP9wkJR4k9xI2J01BJGGyfVamP0v2LXU=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "fc06618ba2099eaec355764f3ec5c395d45cec7c", "rev": "126fa142775d8a6d89c97d69297f7095b6585e4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -242,11 +232,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1784795840, "lastModified": 1785054764,
"narHash": "sha256-Z5cDTnG/+k7lNMMyuNH2RDWmSuGw2d3nV9AlVrpGnNE=", "narHash": "sha256-qZ5lzSBKLXReYMf0+t+Ra4tmh+3reLgf8+IJaNdDTCA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "85164e3aaadbc35cbbb4a9fef6d358b607da09fc", "rev": "896e0b5796797f8f6ba3e61036d61b5597281b1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -475,11 +465,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1784877405, "lastModified": 1784913159,
"narHash": "sha256-W649GocILahx7Vb/JMx834217+OLKBrq014VmC/8+NM=", "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "32de400b6ac9f43042bca706f4a64f6ad08117e8", "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -543,11 +533,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1784877872, "lastModified": 1785052062,
"narHash": "sha256-Y270/EgraTJpT4uI84YJKpcqOcVFJwDBZpHYT4Ydtpw=", "narHash": "sha256-rrSIoNE0sqiFYbnhcf7duJPK3qyKoi09bXAO3aVdFm4=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "f9a30d16da12fcf83886b66d3df9b1b8c168a3f7", "rev": "dbf8bc592feb8a87bd8e4e70334448e808a8a8d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -610,11 +600,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1784765696, "lastModified": 1784938247,
"narHash": "sha256-jrAo+NMWWtKulUqpGf3ybqwM7Iu59C4Xm/Z35PIoZ3Q=", "narHash": "sha256-yO+L8iSAjvDA6gm+9Jmr+pLt9FkGU5j5mT1DdFpz9Wk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5453dbd159ee958f5d98dc963b877d6c945c7b4a", "rev": "baa586fdd74462f853e478cd3f2c60c57cbd08ae",
"revCount": 146, "revCount": 147,
"type": "git", "type": "git",
"url": "https://codeberg.org/bananad3v/niri-nix" "url": "https://codeberg.org/bananad3v/niri-nix"
}, },
@@ -679,27 +669,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-darwin": {
"inputs": {
"nixpkgs": [
"angrr",
"nixpkgs"
]
},
"locked": {
"lastModified": 1784123936,
"narHash": "sha256-IOWwQMJhUxcojm0MRvuKs1fKLH727u4+hHeEOPhdUyA=",
"owner": "nix-darwin",
"repo": "nix-darwin",
"rev": "a4cf1d10853b0d2be19b9eca35d749e201d70b55",
"type": "github"
},
"original": {
"owner": "nix-darwin",
"repo": "nix-darwin",
"type": "github"
}
},
"nix2container": { "nix2container": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@@ -775,11 +744,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1784555310, "lastModified": 1784872115,
"narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", "narHash": "sha256-THPEF2po0fsoH8gNtp+Ae0XFDJH3N/ol7xO3v6VMTJU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", "rev": "335f0738cb2fa9708f3f428e39d2eae975d1338d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -789,34 +758,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1784881335,
"narHash": "sha256-noWrrlWpxVhlUuAs4Jeg+Rc+MHqQzPjxssB9EGk+wPg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d6f70286e7e93df15d675dd89f8d86c5101bdb55",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1783375776, "lastModified": 1785067121,
"narHash": "sha256-pg6hLjDeAWaUOzh2JM2Cw0BwYpGtOyNr6A4FBwP9Ymo=", "narHash": "sha256-rdJdWxAcg5fnntU4DjPivPdVEN4F+VJavw+UWpEMeUI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd648d6ea62bc0ffba91e61fcfe5e33c1e2004b1", "rev": "329c3d2af6d1b618705150ea39f72c15eb4e613e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -837,6 +790,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1785049614,
"narHash": "sha256-egAcKSNrBM9rkCUC6m+0/9Y9HoExE0aulPI4bU9dzHA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d99c896dc3d08b7f7eb87ca240a069f38a3c9613",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"noctalia": { "noctalia": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -931,9 +900,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-unstable-small": "nixpkgs-unstable-small",
"noctalia": "noctalia", "noctalia": "noctalia",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
@@ -946,11 +915,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1784667699, "lastModified": 1785010335,
"narHash": "sha256-853teJQOgTTKRfNxcIJ53ziJOGNeg3c74PvQl5l61Jc=", "narHash": "sha256-fHb7HPztVRBp1pzQEnoMZ4k4cM4nJsZ5qXZ1TEspVSY=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "1174734d9c6453d13d2b5e3d578512c579ca37f1", "rev": "b5aa6668ae12f439169ea84b67a15f6b579f1041",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1205,11 +1174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1784834038, "lastModified": 1785039979,
"narHash": "sha256-7kFP+NUILPvdhO7mQk90h2MnseMNvYzGPpclhmJEKF0=", "narHash": "sha256-vZjuRK0UgvChYGMeQ8daxiETJ5KQyGx+8u8YHdw5e/g=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "35443b74c3481fb963ee0a53175ab0e8001f2967", "rev": "6f5e680db7d105ecf02b4e0d752d48d9083da6c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
+2 -6
View File
@@ -4,11 +4,10 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.11"; nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-26.05";
# nixpkgs.follows = "nixpkgs-stable"; # nixpkgs.follows = "nixpkgs-stable";
nixpkgs.follows = "nixpkgs-unstable"; nixpkgs.follows = "nixpkgs-unstable";
# nixpkgs.follows = "nixpkgs-master";
# Home manager # Home manager
home-manager = { home-manager = {
@@ -67,9 +66,6 @@
angrr = { angrr = {
url = "github:linyinfeng/angrr"; url = "github:linyinfeng/angrr";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
inputs.flake-parts.follows = "flake-parts";
inputs.treefmt-nix.follows = "treefmt";
}; };
darkly = { darkly = {
url = "github:Bali10050/Darkly"; url = "github:Bali10050/Darkly";
+12 -16
View File
@@ -4,6 +4,14 @@
config, config,
... ...
}: }:
let
channel = channel: final: _prev: {
${channel} = import inputs."nixpkgs-${channel}" {
inherit (final.stdenv.hostPlatform) system;
inherit (config.nixpkgs) config;
};
};
in
[ [
( (
final: prev: final: prev:
@@ -13,22 +21,10 @@
easytier.__assign = final.stable.easytier; easytier.__assign = final.stable.easytier;
angrr.__output.patches.__append = [ vaultwarden.__assign = final.unstable-small.vaultwarden;
(import <nix/fetchurl.nix> {
url = "https://github.com/linyinfeng/angrr/pull/54.patch";
hash = "sha256-esJq0SkQkmpC/GWdcQJ9fTiHd67CG7z0iRIaZNYZyAc=";
})
];
} }
) )
(final: _prev: { (channel "stable")
stable = import inputs.nixpkgs-stable { (channel "unstable-small")
inherit (final.stdenv.hostPlatform) system; (channel "master")
inherit (config.nixpkgs) config;
};
master = import inputs.nixpkgs-master {
inherit (final.stdenv.hostPlatform) system;
inherit (config.nixpkgs) config;
};
})
] ]
+1
View File
@@ -23,6 +23,7 @@ in
"rustfmt" "rustfmt"
"rust-analyzer" "rust-analyzer"
]) ])
stdenv.cc # linker
evcxr # rust repl evcxr # rust repl
pest-ide-tools pest-ide-tools
+1
View File
@@ -28,6 +28,7 @@ in
mutableUsers = false; mutableUsers = false;
users.${username} = { users.${username} = {
isNormalUser = true; isNormalUser = true;
uid = 1000;
description = userdesc; description = userdesc;
extraGroups = [ extraGroups = [
username username