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

Update

Browse Source
This commit is contained in:
Alexander Bantyev 2021-07-07 14:44:12 +03:00
parent 0b8ff9ed42
commit d7a05ff58e
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
5 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
flake.lock generated
View File

@ -239,11 +239,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1623793605, "lastModified": 1625016439,
"narHash": "sha256-8LaC7Y+Z+TTZuTvBL/mlfkEQ6Ey0hwwAeVUmY95Tni4=", "narHash": "sha256-zHf7iCU9nYd6/7xwYx5gwDzXdXcJ9RUagdy0IgX39sQ=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "63af2d3e4cac0a84a87b72be0135f5bcec5a9d5d", "rev": "9ad0024d4d292c628d4c9a50c2347f23418d7000",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -377,11 +377,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1622809115, "lastModified": 1625241023,
"narHash": "sha256-0lfX3ihV+5VsOs40eSzNMUSNlmH6MRqkb+VDWaJNEzw=", "narHash": "sha256-2OcilszZVgis0xbSH8a0ZAq4w1c/QByROTNkqcy44Xc=",
"owner": "nixos", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "8e6ee1b9e924fbbbeb5594eb89e7a570f36ab6e1", "rev": "7a3f43cd58cbce62b2a5e7bbbb94cba20014e71e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,11 +520,12 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1622545032, "lastModified": 1625044227,
"narHash": "sha256-1Y+2LFqnMBEH9OZzMBdLWl6GWFt/xzNz0V5X+m05Ing=", "narHash": "sha256-e85OEQF3IrD4+R66VdH7uchcs775BpB13/W5bWpcGLA=",
"path": "/nix/store/ypgnj9x286v31wf3061j60vqmyq7pc45-source", "owner": "NixOS",
"rev": "1c2986bbb806c57f9470bf3231d8da7250ab9091", "repo": "nixpkgs",
"type": "path" "rev": "e4ee74de2d2003aa863177672b1383b55d40a7bf",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@ -548,11 +549,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1622593737, "lastModified": 1624862269,
"narHash": "sha256-9loxFJg85AbzJrSkU4pE/divZ1+zOxDy2FSjlrufCB8=", "narHash": "sha256-JFcsh2+7QtfKdJFoPibLFPLgIW6Ycnv8Bts9a7RYme0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bb8a5e54845012ed1375ffd5f317d2fdf434b20e", "rev": "f77036342e2b690c61c97202bf48f2ce13acc022",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -579,11 +580,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1623580589, "lastModified": 1624922035,
"narHash": "sha256-Ayp1cjXpwFCkAiWUE46rj9APTltsiEBdIs2+cj+U7+c=", "narHash": "sha256-OiIxJQuMRkICxaUwY3xMBbrPPu20de/n7tVYnWzLvS4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa0326ce5233f7d592271df52c9d0812bec47b84", "rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -674,11 +675,11 @@
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1622967674, "lastModified": 1624568578,
"narHash": "sha256-8RLe6Rqy2rKR/PGDMg/EVsWihsO+DQe/RYmlXdRZkLs=", "narHash": "sha256-E6mgpF2PVlPRWpyZBcpie6e03u2kAdWlveB6AI10Bos=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "5675b122a947b40e551438df6a623efad19fd2e7", "rev": "a9f87ca461a1f0e23e85a1ba8c696672ed9e11e2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

2
flake.nix
View File

@ -72,7 +72,7 @@
}; };
}; };
outputs = { nixpkgs, nix, self, deploy-rs, ... }@inputs: outputs = { nixpkgs, self, nix, deploy-rs, ... }@inputs:
let let
findModules = dir: findModules = dir:
builtins.concatLists (builtins.attrValues (builtins.mapAttrs builtins.concatLists (builtins.attrValues (builtins.mapAttrs

1
profiles/applications/packages.nix
View File

@ -36,5 +36,6 @@
papirus-icon-theme papirus-icon-theme
shellcheck shellcheck
proselint proselint
ripgrep
]; ];
} }

6
profiles/nix/default.nix
View File

@ -1,4 +1,4 @@
{ lib, inputs, ... }: { { pkgs, lib, inputs, ... }: {
nix = rec { nix = rec {
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ]; nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
binaryCaches = [ "https://cache.nixos.org" ]; binaryCaches = [ "https://cache.nixos.org" ];
@ -16,8 +16,10 @@
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
]; ];
package = inputs.nix.packages.x86_64-linux.nix.overrideAttrs (oa: { package = inputs.nix.defaultPackage.x86_64-linux.overrideAttrs (oa: {
patches = [./nix.patch] ++ oa.patches or []; patches = [./nix.patch] ++ oa.patches or [];
# HAHA
doInstallCheck = false;
}); });
extraOptions = '' extraOptions = ''

3
profiles/overlay.nix
View File

@ -26,9 +26,6 @@ in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(import inputs.emacs-overlay) (import inputs.emacs-overlay)
(self: super: rec { (self: super: rec {
nix = super.nix // {
meta = super.nix.meta // { platforms = lib.platforms.unix; };
};
my-lib = rec { my-lib = rec {
genIni = lib.generators.toINI { inherit mkKeyValue; }; genIni = lib.generators.toINI { inherit mkKeyValue; };