balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Add fhs-compat container for future experiments

Browse Source
This commit is contained in:
Alexander Bantyev 2020-05-05 23:55:25 +03:00
parent 4e561767d1
commit 4ee3f8bf71
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
4 changed files with 83 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
flake.lock generated
View File

@ -1,17 +1,15 @@
{ {
"nodes": { "nodes": {
"NUR": { "NUR": {
"flake": false,
"info": { "info": {
"lastModified": 1587939076, "lastModified": 1588691104,
"narHash": "sha256-UI/Q4YXvhEoYYulOV6MnAx7dSuQYhQEN1OhGw/wD6mI=" "narHash": "sha256-q0CjiZH74tsusqTGZnwEUjrOrQIcXIlew4SUA+9Rq8I="
},
"inputs": {
"nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f0119b0c3041be14a7113b2e24b46b3c458377e4", "rev": "c5265614a05768a77ecb95c6bbbe18bba0756fb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,7 +60,7 @@
"narHash": "sha256-SmC1aP9TJImzHlNIWOTa+uwePeHoEcfGJEewXXWAtfc=" "narHash": "sha256-SmC1aP9TJImzHlNIWOTa+uwePeHoEcfGJEewXXWAtfc="
}, },
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"owner": "rycee", "owner": "rycee",
@ -98,13 +96,13 @@
"mobile-broadband-provider-info": { "mobile-broadband-provider-info": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1586238386, "lastModified": 1588667400,
"narHash": "sha256-a2mHxmTkQr9bwuzfS7h8NWPDnAutmorm1IaOb2Ytvag=", "narHash": "sha256-xkUehl/Z0WpRDoRdNiEcMSU3A+BG7lcJRnrvRcn/0UQ=",
"revCount": 595 "revCount": 597
}, },
"locked": { "locked": {
"ref": "master", "ref": "master",
"rev": "43755b833aa4f0c79f2d6f04c1a2231ba106ea85", "rev": "8053c3edb73bed639a6f45bbf48bfa5fd418b61a",
"type": "git", "type": "git",
"url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info" "url": "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"
}, },
@ -116,18 +114,18 @@
"mtxclient": { "mtxclient": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1582462474, "lastModified": 1587078014,
"narHash": "sha256-YKsewl0836v4ZWYDVh6m8vwmn3B4mfo2eK+VtNikVJU=" "narHash": "sha256-wmlXEd5IKZzkEonWzK7Kn7JNla0tPzf1piU6b2ztxW0="
}, },
"locked": { "locked": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "mtxclient", "repo": "mtxclient",
"rev": "7fc1d357afaabb134cb6d9c593f94915973d31fa", "rev": "61ddbb23893b1079e1b3d4bcf4aeca7718b7faa5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"ref": "0.3.0-dev", "ref": "v0.3.0",
"repo": "mtxclient", "repo": "mtxclient",
"type": "github" "type": "github"
} }
@ -135,34 +133,34 @@
"nheko": { "nheko": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1583199044, "lastModified": 1587684386,
"narHash": "sha256-/ZBsWmIO0+bNLZfCvO/BHr5qpOvUvf/lAfvErmppGYI=" "narHash": "sha256-vilOyK5pz3sozbkrykr4u9AjaZanZpnc7Dodm9eKXYs="
}, },
"locked": { "locked": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "nheko", "repo": "nheko",
"rev": "6f248e75421f3742fedd3b5ea3d4d907f885267e", "rev": "14ce840649f201281017aac957b61b1f2118f5a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nheko-reborn", "owner": "nheko-reborn",
"ref": "0.7.0-dev", "ref": "v0.7.1",
"repo": "nheko", "repo": "nheko",
"type": "github" "type": "github"
} }
}, },
"nix": { "nix": {
"info": { "info": {
"lastModified": 1588020791, "lastModified": 1588697973,
"narHash": "sha256-I+GqqEKT1WTD+nAp1qU/9+cT40YwkvF4CJikMtzri8c=" "narHash": "sha256-2iTpkBYFk/uSgqyBM/6MCShN5RmqrdQylBl1tcddJAY="
}, },
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "6521c92ce8289a5f9e959c6789ab24dacdad082e", "rev": "6f3244ce4517cc51ef3ffd39025152aa7046ef69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -170,14 +168,32 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs": { "nixos-fhs-compat": {
"info": { "info": {
"narHash": "sha256-OnpEWzNxF/AU4KlqBXM2s5PWvfI5/BS6xQrPvkF5tO8=" "lastModified": 1588706047,
"narHash": "sha256-hrJ99BwzO587/5UKlRwY626dF+KFMPCHFC39HRRqw44="
}, },
"locked": { "locked": {
"owner": "edolstra", "owner": "balsoft",
"repo": "nixos-fhs-compat",
"rev": "9bdfc4bcb183362ac68337d2a3ab19cd74165648",
"type": "github"
},
"original": {
"owner": "balsoft",
"repo": "nixos-fhs-compat",
"type": "github"
}
},
"nixpkgs": {
"info": {
"lastModified": 1588110642,
"narHash": "sha256-A5Sqy2PAJOYaTIjHOTo3ZFbUtd1r6uZf9ymcbSyMh9Q="
},
"locked": {
"owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7f8d4b088e2df7fdb6b513bc2d6941f1d422a013", "rev": "a0ebabf60a3febbd0ba4b401b13503e1fae24934",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,13 +242,13 @@
"nixpkgs-wayland": { "nixpkgs-wayland": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1587858280, "lastModified": 1588327603,
"narHash": "sha256-dDxUVUFMw3TGdiGVUT+QU0wRL1bleYmtvNf3Ah8aw14=" "narHash": "sha256-XtnlIHtMZWKebPMbovCXRP1GMVO4AFLFG+4FG/qVx4g="
}, },
"locked": { "locked": {
"owner": "colemickens", "owner": "colemickens",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "724ac75779a1d411e89ebe0ab4aab721e0af525b", "rev": "d3ecfac3b3533c02e7ac7e9afdf0acc7a3c25026",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,22 +258,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"info": {
"lastModified": 1587944902,
"narHash": "sha256-DS4R0WC23hcfTTuxb3b3lMdTQYaK5z/d+1ue9ZHUdtE="
},
"locked": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "92d9d07c61d06c044af0261ab1741340151e4d3b",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"info": { "info": {
"lastModified": 1585405475, "lastModified": 1585405475,
"narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE=" "narHash": "sha256-bESW0n4KgPmZ0luxvwJ+UyATrC6iIltVCsGdLiphVeE="
@ -274,13 +274,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"info": { "info": {
"lastModified": 1588110642, "lastModified": 1588110642,
"narHash": "sha256-A5Sqy2PAJOYaTIjHOTo3ZFbUtd1r6uZf9ymcbSyMh9Q=" "narHash": "sha256-A5Sqy2PAJOYaTIjHOTo3ZFbUtd1r6uZf9ymcbSyMh9Q="
}, },
"locked": { "locked": {
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a0ebabf60a3febbd0ba4b401b13503e1fae24934", "rev": "a0ebabf60a3febbd0ba4b401b13503e1fae24934",
"type": "github" "type": "github"
@ -290,7 +290,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"info": { "info": {
"lastModified": 1587390417, "lastModified": 1587390417,
"narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8=" "narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8="
@ -317,7 +317,8 @@
"mtxclient": "mtxclient", "mtxclient": "mtxclient",
"nheko": "nheko", "nheko": "nheko",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_4", "nixos-fhs-compat": "nixos-fhs-compat",
"nixpkgs": "nixpkgs_3",
"nixpkgs-mopidy": "nixpkgs-mopidy", "nixpkgs-mopidy": "nixpkgs-mopidy",
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
@ -331,13 +332,13 @@
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1587594197, "lastModified": 1588705666,
"narHash": "sha256-h1WOSGZ9y2HktNLBypphNovFIWuZ/on+WO0XFF72EPU=", "narHash": "sha256-MaDcYaTMkVVJHxqAXUgWYOp2w5MtbFMjik+SuoIjJK8=",
"revCount": 409 "revCount": 414
}, },
"locked": { "locked": {
"ref": "master", "ref": "master",
"rev": "899d68ac7ab8580ff0ca05860bf81381ae172ae3", "rev": "b7c49fa26a66a724e4e985851e34cf76bc01c9e1",
"type": "git", "type": "git",
"url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver" "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver"
}, },
@ -386,13 +387,13 @@
"weechat-scripts": { "weechat-scripts": {
"flake": false, "flake": false,
"info": { "info": {
"lastModified": 1585408181, "lastModified": 1588331138,
"narHash": "sha256-ytASrd9KqlB2vdeF/0CLgXPJrw+FU7m5BtHljVncErY=" "narHash": "sha256-fBZMLs38rGTiDItYX/V/JSvtMaVfy/81UQRU/EOHCDk="
}, },
"locked": { "locked": {
"owner": "weechat", "owner": "weechat",
"repo": "scripts", "repo": "scripts",
"rev": "5955bc4cabe8bdfa0c6b5f5ecfbe23df6e5560c1", "rev": "f86360d9fcc1d43eec4ca98ad255bf70c95efb8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,7 +410,7 @@
}, },
"inputs": { "inputs": {
"haskell-nix": "haskell-nix", "haskell-nix": "haskell-nix",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"ref": "flake", "ref": "flake",

9
flake.nix
View File

@ -40,7 +40,7 @@
type = "github"; type = "github";
owner = "nheko-reborn"; owner = "nheko-reborn";
repo = "mtxclient"; repo = "mtxclient";
ref = "0.3.0-dev"; ref = "v0.3.0";
flake = false; flake = false;
}; };
tweeny = { tweeny = {
@ -53,7 +53,7 @@
type = "github"; type = "github";
owner = "nheko-reborn"; owner = "nheko-reborn";
repo = "nheko"; repo = "nheko";
ref = "0.7.0-dev"; ref = "v0.7.1";
flake = false; flake = false;
}; };
nixpkgs-old = { nixpkgs-old = {
@ -97,6 +97,11 @@
url = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info"; url = "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info";
flake = false; flake = false;
}; };
nixos-fhs-compat = {
type = "github";
owner = "balsoft";
repo = "nixos-fhs-compat";
};
}; };
outputs = { nixpkgs, nix, ... }@inputs: { outputs = { nixpkgs, nix, ... }@inputs: {

4
modules/packages.nix
View File

@ -134,12 +134,14 @@ in {
trustedUsers = [ "root" "balsoft" "@wheel" ]; trustedUsers = [ "root" "balsoft" "@wheel" ];
nrBuildUsers = 16;
optimise.automatic = true; optimise.automatic = true;
binaryCachePublicKeys = binaryCachePublicKeys =
[ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
package = pkgs.nixFlakes; package = inputs.nix.packages.x86_64-linux.nix;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes

15
modules/workspace/misc.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { { pkgs, lib, config, inputs, ... }: {
programs.sway.enable = true; programs.sway.enable = true;
users.users.balsoft.extraGroups = [ "sway" ]; users.users.balsoft.extraGroups = [ "sway" ];
systemd.coredump.enable = true; systemd.coredump.enable = true;
@ -16,6 +16,19 @@
}; };
services.atd.enable = true; services.atd.enable = true;
containers.fhs-compat.config = {...}: {
imports = [ inputs.nixos-fhs-compat.nixosModules.combined ];
environment.fhs.enable = true;
environment.fhs.linkLibs = true;
environment.lsb.enable = true;
users.users.balsoft = {
isNormalUser = true;
password = "";
};
};
home-manager.users.balsoft = { home-manager.users.balsoft = {
xdg.enable = true; xdg.enable = true;