ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Remove nix dependency for dwarffs (works now out of the box)

Browse Source 
Add index db script (currently deactivated)
This commit is contained in:
Stefan Ellmauthaler 2022-05-31 14:42:01 +02:00
parent 7da4726b9c
commit 5356bb0183
Failed to extract signature
3 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
flake.lock generated
View File

@ -44,9 +44,7 @@
}, },
"dwarffs": { "dwarffs": {
"inputs": { "inputs": {
"nix": [ "nix": "nix",
"nix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -73,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1653971985, "lastModified": 1653994544,
"narHash": "sha256-BxahBocT7OuJkAOV3LwLTaAjhoBQOZnnpaVCswGVLXM=", "narHash": "sha256-AgUcuxeFEAqxp3rS2vUwvHhhgq6rfhdKKdrIcsfOtl8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "563a7a4b38efb5c99ef4638bfa8064136c05b19f", "rev": "00cbfa093fc1a9769271f0a9ea019b1ccc569482",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,24 +210,20 @@
"nix": { "nix": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src", "lowdown-src": "lowdown-src",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1653936575, "lastModified": 1646337190,
"narHash": "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74=", "narHash": "sha256-7rdubErpmKjNlmjR1GfwAyazJeqUnJUw/Xf1uon/BqQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "daa14b89103b1246e8d7297ffe8ac5b4f4c8c45c", "rev": "b09baf690bb00125805a02e0feae9636b2114599",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nix",
"ref": "latest-release", "type": "indirect"
"repo": "nix",
"type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
@ -250,18 +244,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653920503, "lastModified": 1632864508,
"narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixos-22.05", "ref": "nixos-21.05-small",
"repo": "nixpkgs", "type": "indirect"
"type": "github"
} }
}, },
"nixpkgs-21_05": { "nixpkgs-21_05": {
@ -358,6 +351,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1653920503,
"narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1626852498, "lastModified": 1626852498,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
@ -379,9 +388,8 @@
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix": "nix",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"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"
@ -390,7 +398,7 @@
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nixpkgs-21_05": "nixpkgs-21_05", "nixpkgs-21_05": "nixpkgs-21_05",
"nixpkgs-21_11": "nixpkgs-21_11", "nixpkgs-21_11": "nixpkgs-21_11",
"utils": "utils" "utils": "utils"

13
flake.nix
View File

@ -6,10 +6,11 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nix = { #nix = {
url = "github:NixOS/nix?ref=latest-release"; # url = "github:NixOS/nix?ref=latest-release";
inputs.nixpkgs.follows = "nixpkgs"; # url = "github:NixOS/nix";
}; # inputs.nixpkgs.follows = "nixpkgs";
#};
nixos-hardware = { nixos-hardware = {
url = "github:NixOS/nixos-hardware/master"; url = "github:NixOS/nixos-hardware/master";
@ -41,7 +42,7 @@
dwarffs = { dwarffs = {
url = "github:edolstra/dwarffs"; url = "github:edolstra/dwarffs";
inputs = { inputs = {
nix.follows = "nix"; #nix.follows = "nix";
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -85,7 +86,7 @@
unstable = channels.nixpkgs-unstable; unstable = channels.nixpkgs-unstable;
}) })
(flake-utils-plus.lib.genPkgOverlay inputs.comma "comma") (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma")
inputs.nix.overlay #inputs.nix.overlay
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
]; ];

3
machines/stel-xps/default.nix
View File

@ -22,6 +22,9 @@
# dpi = 180; # dpi = 180;
}; };
# enable deamon to generate nix-index-db
nix-index-db-update.enable = false;
# add TUD vpn # add TUD vpn
openvpn.enable = true; openvpn.enable = true;