summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock207
-rw-r--r--flake.nix47
-rw-r--r--modules/basic-tools/default.nix10
-rw-r--r--modules/basic-tools/nix-ld.nix15
4 files changed, 39 insertions, 240 deletions
diff --git a/flake.lock b/flake.lock
index f9421a9..52c28ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,63 +1,5 @@
{
"nodes": {
- "fenix": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs-unstable"
- ],
- "rust-analyzer-src": "rust-analyzer-src"
- },
- "locked": {
- "lastModified": 1689488573,
- "narHash": "sha256-diVASflKCCryTYv0djvMnP2444mFsIG0ge5pa7ahauQ=",
- "owner": "nix-community",
- "repo": "fenix",
- "rev": "39096fe3f379036ff4a5fa198950b8e79defe939",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "fenix",
- "type": "github"
- }
- },
- "flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-parts": {
- "inputs": {
- "nixpkgs-lib": [
- "lanzaboote",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1683560683,
- "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
"flake-utils": {
"inputs": {
"systems": "systems"
@@ -76,61 +18,13 @@
"type": "github"
}
},
- "gitignore": {
- "inputs": {
- "nixpkgs": [
- "lanzaboote",
- "pre-commit-hooks-nix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
- "lanzaboote": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-parts": "flake-parts",
- "flake-utils": [
- "flake-utils"
- ],
- "nixpkgs": [
- "nixpkgs-unstable"
- ],
- "pre-commit-hooks-nix": "pre-commit-hooks-nix"
- },
- "locked": {
- "lastModified": 1687124707,
- "narHash": "sha256-BEC2y7zwDI/Saeupr9rijLvwb0OoqTD9vntlcyciyrM=",
- "owner": "nix-community",
- "repo": "lanzaboote",
- "rev": "c758cdad465e0c8174db57dc493f51a89f0e3372",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "lanzaboote",
- "type": "github"
- }
- },
"microvm": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
- "nixpkgs-stable"
+ "nixpkgs"
]
},
"locked": {
@@ -147,29 +41,13 @@
"type": "github"
}
},
- "nixpkgs-stable": {
+ "nixpkgs": {
"locked": {
- "lastModified": 1678872516,
- "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+ "lastModified": 1689956312,
+ "narHash": "sha256-NV9yamMhE5jgz+ZSM2IgXeYqOvmGIbIIJ+AFIhfD7Ek=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-22.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_2": {
- "locked": {
- "lastModified": 1689605451,
- "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "53657afe29748b3e462f1f892287b7e254c26d77",
+ "rev": "6da4bc6cb07cba1b8e53d139cbf1d2fb8061d967",
"type": "github"
},
"original": {
@@ -179,7 +57,7 @@
"type": "github"
}
},
- "nixpkgs-stable_3": {
+ "nixpkgs-stable": {
"locked": {
"lastModified": 1689398528,
"narHash": "sha256-qVn/doWn20axR+KvmAAGexv0A5RVzcBbd5HfNMAMeVI=",
@@ -195,88 +73,21 @@
"type": "github"
}
},
- "nixpkgs-unstable": {
- "locked": {
- "lastModified": 1689373857,
- "narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "pre-commit-hooks-nix": {
- "inputs": {
- "flake-compat": [
- "lanzaboote",
- "flake-compat"
- ],
- "flake-utils": [
- "lanzaboote",
- "flake-utils"
- ],
- "gitignore": "gitignore",
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable"
- },
- "locked": {
- "lastModified": 1684842236,
- "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "61e567d6497bc9556f391faebe5e410e6623217f",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
"root": {
"inputs": {
- "fenix": "fenix",
"flake-utils": "flake-utils",
- "lanzaboote": "lanzaboote",
"microvm": "microvm",
- "nixpkgs-stable": "nixpkgs-stable_2",
- "nixpkgs-unstable": "nixpkgs-unstable",
+ "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix",
"tmux-yank": "tmux-yank"
}
},
- "rust-analyzer-src": {
- "flake": false,
- "locked": {
- "lastModified": 1689441253,
- "narHash": "sha256-4MSDZaFI4DOfsLIZYPMBl0snzWhX1/OqR/QHir382CY=",
- "owner": "rust-lang",
- "repo": "rust-analyzer",
- "rev": "996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8",
- "type": "github"
- },
- "original": {
- "owner": "rust-lang",
- "ref": "nightly",
- "repo": "rust-analyzer",
- "type": "github"
- }
- },
"sops-nix": {
"inputs": {
"nixpkgs": [
- "nixpkgs-stable"
+ "nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1689405598,
diff --git a/flake.nix b/flake.nix
index ef3c640..cee5bbe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,51 +1,33 @@
{
inputs = {
- nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-
- nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils";
sops-nix = {
url = "github:Mic92/sops-nix";
- inputs.nixpkgs.follows = "nixpkgs-stable";
+ inputs.nixpkgs.follows = "nixpkgs";
};
microvm = {
url = "github:astro/microvm.nix";
inputs = {
- nixpkgs.follows = "nixpkgs-stable";
+ nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
- fenix = {
- url = "github:nix-community/fenix";
- inputs.nixpkgs.follows = "nixpkgs-unstable";
- };
-
tmux-yank = {
url = "github:tmux-plugins/tmux-yank";
flake = false;
};
-
- lanzaboote = {
- url = "github:nix-community/lanzaboote";
- inputs = {
- nixpkgs.follows = "nixpkgs-unstable";
- flake-utils.follows = "flake-utils";
- };
- };
};
outputs =
inputs@{ self
- , fenix
, flake-utils
- , lanzaboote
, microvm
- , nixpkgs-stable
- , nixpkgs-unstable
+ , nixpkgs
, sops-nix
, ...
}:
@@ -53,12 +35,11 @@
flake-utils.lib.eachDefaultSystem
(system:
let
- pkgs-stable = nixpkgs-stable.legacyPackages.${system};
- pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
+ pkgs = nixpkgs.legacyPackages.${system};
in
{
- packages.slick = pkgs-unstable.callPackage "${self}/pkgs/slick.nix" { };
- # packages.imhex = pkgs-unstable.libsForQt5.callPackage "${self}/pkgs/imhex.nix" { };
+ packages.slick = pkgs.callPackage "${self}/pkgs/slick.nix" { };
+ # packages.imhex = pkgs.libsForQt5.callPackage "${self}/pkgs/imhex.nix" { };
})
//
{
@@ -68,7 +49,7 @@
};
nixosConfigurations = {
- cirrus = nixpkgs-stable.lib.nixosSystem {
+ cirrus = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -79,7 +60,7 @@
];
};
- dishwasher = nixpkgs-stable.lib.nixosSystem {
+ dishwasher = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -92,7 +73,7 @@
];
};
- nextcloud = nixpkgs-stable.lib.nixosSystem {
+ nextcloud = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -103,7 +84,7 @@
];
};
- music = nixpkgs-stable.lib.nixosSystem {
+ music = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -114,7 +95,7 @@
];
};
- news = nixpkgs-stable.lib.nixosSystem {
+ news = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -125,7 +106,7 @@
];
};
- noctilucent = nixpkgs-stable.lib.nixosSystem {
+ noctilucent = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = { inherit inputs; };
modules = [
@@ -144,6 +125,6 @@
let
get-toplevel = (host: nixSystem: nixSystem.config.microvm.declaredRunner or nixSystem.config.system.build.toplevel);
in
- nixpkgs-stable.lib.mapAttrs get-toplevel self.nixosConfigurations;
+ nixpkgs.lib.mapAttrs get-toplevel self.nixosConfigurations;
};
}
diff --git a/modules/basic-tools/default.nix b/modules/basic-tools/default.nix
index 4fd52ea..f7ef3c3 100644
--- a/modules/basic-tools/default.nix
+++ b/modules/basic-tools/default.nix
@@ -5,6 +5,7 @@
./fzf.nix
./multiplexers.nix
./nix.nix
+ ./nix-ld.nix
];
environment.systemPackages = with pkgs; [
@@ -97,15 +98,6 @@
'';
};
- programs.nix-ld.enable = true;
- environment.variables = {
- NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
- pkgs.stdenv.cc.cc
- ];
- NIX_LD = lib.fileContents "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
- };
-
-
programs.iftop.enable = true;
programs.mosh.enable = true;
diff --git a/modules/basic-tools/nix-ld.nix b/modules/basic-tools/nix-ld.nix
new file mode 100644
index 0000000..2462721
--- /dev/null
+++ b/modules/basic-tools/nix-ld.nix
@@ -0,0 +1,15 @@
+{ pkgs, lib, ... }:
+{
+ programs.nix-ld ={
+ enable = true;
+ libraries = [
+ pkgs.stdenv.cc.cc
+ ];
+ };
+ #environment.variables = {
+ # NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
+ # pkgs.stdenv.cc.cc
+ # ];
+ # #NIX_LD = "$(cat ${pkgs.stdenv.cc}/nix-support/dynamic-linker";
+ #};
+}
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-28 06:53:18 +0000