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

Update

Browse Source
This commit is contained in:
Alexander Bantyev 2022-02-03 01:36:37 +03:00
parent b56950ab0b
commit f6882c909c
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
9 changed files with 175 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
flake.lock
View File

@ -81,23 +81,6 @@
"type": "github"
}
},
"crate2nix_2": {
"flake": false,
"locked": {
"lastModified": 1608814925,
"narHash": "sha256-GdFBG2LmpbY4C1OJBFfWLMKXzGyFq4mJBK+SVMNNE+8=",
"owner": "balsoft",
"repo": "crate2nix",
"rev": "68be3d90f31bf0bfd525da77e0ae6e89f48abd24",
"type": "github"
},
"original": {
"owner": "balsoft",
"ref": "tools-nix-version-comparison",
"repo": "crate2nix",
"type": "github"
}
},
"crdt": {
"flake": false,
"locked": {
@ -121,11 +104,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1642113498,
"narHash": "sha256-4tNIt2EGDppYQI06gsid0QKW5dtBEOAiNKfMYC8wxv8=",
"lastModified": 1643787431,
"narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "0ac333cdc03407538b5b19d60a8e7c64588490fb",
"rev": "4154ba1aaaf7333a916384c348d867d03b6f1409",
"type": "github"
},
"original": {
@ -136,11 +119,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1642676032,
"narHash": "sha256-KNSUJFbz3EGA+W6FhBR5qbauZgyRVa4uZawtRJdGRnw=",
"lastModified": 1643770667,
"narHash": "sha256-vVyCvkF7IVIf8ruMQS/fqQ/ahRFPjv0nxGUSqI2z594=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "04952c246412d1bd62df7df651db3e2134c75407",
"rev": "e267a3c53088c9ab2a77335b6740b37041fa450f",
"type": "github"
},
"original": {
@ -152,11 +135,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github"
},
"original": {
@ -199,11 +182,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1614513358,
"narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
@ -229,18 +212,18 @@
},
"himalaya": {
"inputs": {
"crate2nix": "crate2nix",
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_2",
"naersk": "naersk",
"nixpkgs": "nixpkgs_3",
"rust-overlay": "rust-overlay",
"utils": "utils_2"
},
"locked": {
"lastModified": 1635111672,
"narHash": "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI=",
"lastModified": 1643764895,
"narHash": "sha256-jqr7AcewjTKPgLc/RXwgAGvezsFMZatjt3sT0pw8cTk=",
"owner": "soywod",
"repo": "himalaya",
"rev": "f9775ae8afff236c7f948d4d2e0014146dcaed0e",
"rev": "8cdeba62a1d0763c7e819eae085814df48799183",
"type": "github"
},
"original": {
@ -251,14 +234,14 @@
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1642676973,
"narHash": "sha256-bLQ6n0pXYaIuNSyJnm30JGCfjmuTi59qAmj8S2ExDXI=",
"lastModified": 1643579427,
"narHash": "sha256-tV4M4+Aqd/3ZjEz1Q07j89KIlkt1oFH34RzpBkUeO/0=",
"owner": "rycee",
"repo": "home-manager",
"rev": "7eb5106548eaab99ebeb21c87f93092de54fe931",
"rev": "a52aed72c84a2a10102a92397339fa01fc0fe9cf",
"type": "github"
},
"original": {
@ -284,7 +267,7 @@
},
"lambda-launcher": {
"inputs": {
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1628894338,
@ -351,11 +334,11 @@
"mtxclient": {
"flake": false,
"locked": {
"lastModified": 1641267328,
"narHash": "sha256-NxgMNWEd0UkUXNFs2xkl3BJACRtheM9eHrZse+w9NCY=",
"lastModified": 1643380835,
"narHash": "sha256-GUqqbvI7QzXuEPtkyLUKokQcsSsdkDzQ3Z8LCmfCTLg=",
"owner": "nheko-reborn",
"repo": "mtxclient",
"rev": "3888ae70d51cdfe7b69d375560448f36991793e6",
"rev": "9781553b0186f2db9036d2abbde83c28828eb2b9",
"type": "github"
},
"original": {
@ -364,14 +347,32 @@
"type": "github"
}
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1639947939,
"narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
"owner": "nix-community",
"repo": "naersk",
"rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"nheko": {
"flake": false,
"locked": {
"lastModified": 1642514651,
"narHash": "sha256-71/jiUMCQttGBf3sy39vQCMv49ufZhnGz3NP77wCq5M=",
"lastModified": 1643662043,
"narHash": "sha256-zSWquPXLdhC7kSOVsV8La10o1lhLA2fq5R+6sD5KPVI=",
"owner": "nheko-reborn",
"repo": "nheko",
"rev": "34f049cc358b76a3f15309ad17d15ddd40bd2e7f",
"rev": "fcefdb7ca65c4922274ada9f617424e6c3d56aa2",
"type": "github"
},
"original": {
@ -383,14 +384,15 @@
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_7",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1642655591,
"narHash": "sha256-CtljkgWm9X6f/KObz9CRfpw1nfZ5EQX+/A3Oy8sIbYA=",
"lastModified": 1643838728,
"narHash": "sha256-ow8b33C/owhzXMBBIgkEGxVq/SG8l0sY7hks9HDdy/w=",
"owner": "nixos",
"repo": "nix",
"rev": "067076287bf601f8fa2ffe4feff3057b96fa5be8",
"rev": "fcb33440b6d3038e6761e546fc9434fa8e9a1666",
"type": "github"
},
"original": {
@ -402,7 +404,7 @@
"nix-direnv": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1641141639,
@ -435,11 +437,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1632086102,
"narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=",
"lastModified": 1643472818,
"narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e0ce3c683ae677cf5aab597d645520cddd13392b",
"rev": "7f65e4abd5ecaad12d2d26e4380d1a7d8edafea7",
"type": "github"
},
"original": {
@ -466,6 +468,21 @@
"type": "github"
}
},
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"id": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "indirect"
}
},
"nixpkgs-wayland": {
"flake": false,
"locked": {
@ -482,44 +499,28 @@
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1599773960,
"narHash": "sha256-5bL52aaUOOyOBjgKh9/6jQlFbeE+WfVX7dpvjohmD+w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5916b9637048446755629c84ae6f13361f623d13",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1627857416,
"narHash": "sha256-AV0MsFVzbWI2MZbJ2j0kc8ooFLGSCZHuM9ipaWR9ds4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "aaf9676fbb7fb4570216ca1e189a3dc769d62c45",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1617325113,
"narHash": "sha256-GksR0nvGxfZ79T91UUtWjjccxazv6Yh/MvEJ82v1Xmw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "54c1e44240d8a527a8f4892608c4bce5440c3ecb",
"type": "github"
},
"original": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1642336556,
"narHash": "sha256-QSPPbFEwy0T0DrIuSzAACkaANPQaR1lZR/nHZGz9z04=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f3d9d4bd898cca7d04af2ae4f6ef01f2219df3d6",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
@ -527,7 +528,51 @@
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1643472818,
"narHash": "sha256-qzVPxKDUubYIxKRSuDl/JgzXWSmGvUVYny9SxFMfPJM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7f65e4abd5ecaad12d2d26e4380d1a7d8edafea7",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1614531970,
"narHash": "sha256-cfsbJwD5t8b03YQW7/F4hlYO19ACV/BIDIiRJ4V43V4=",
@ -542,7 +587,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1632864508,
"narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
@ -557,7 +602,7 @@
"type": "indirect"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1622059058,
"narHash": "sha256-t1/ZMtyxClVSfcV4Pt5C1YpkeJ/UwFF3oitLD7Ch/UA=",
@ -573,13 +618,13 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1642281915,
"narHash": "sha256-jcMsXmmO1knyf99o242A+2cy1A0eKa9afly0cwBknPA=",
"lastModified": 1643524588,
"narHash": "sha256-Qh5AazxdOQRORbGkkvpKoovDl6ej/4PhDabFsqnueqw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d5dae6569ea9952f1ae4e727946d93a71c507821",
"rev": "efeefb2af1469a5d1f0ae7ca8f0dfd9bb87d5cfb",
"type": "github"
},
"original": {
@ -589,21 +634,6 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1599773960,
"narHash": "sha256-5bL52aaUOOyOBjgKh9/6jQlFbeE+WfVX7dpvjohmD+w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5916b9637048446755629c84ae6f13361f623d13",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"NUR": "NUR",
@ -625,7 +655,7 @@
"nix": "nix",
"nix-direnv": "nix-direnv",
"nixos-fhs-compat": "nixos-fhs-compat",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_9",
"nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland",
"rycee": "rycee",
@ -637,14 +667,14 @@
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1627957145,
"narHash": "sha256-cY5lS2S/RMsC1xFtkcmhLXlVP7ahZoxFeKedkXDvIzY=",
"lastModified": 1642838864,
"narHash": "sha256-pHnhm3HWwtvtOK7NdNHwERih3PgNlacrfeDwachIG8E=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ab6f3086de97980e4fdcb0560921852a407e0b79",
"rev": "9fb49daf1bbe1d91e6c837706c481f9ebb3d8097",
"type": "github"
},
"original": {
@ -687,8 +717,8 @@
},
"simple-osd-daemons": {
"inputs": {
"crate2nix": "crate2nix_2",
"nixpkgs": "nixpkgs_9"
"crate2nix": "crate2nix",
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1639393537,
@ -722,11 +752,11 @@
},
"utils": {
"locked": {
"lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {

2
machines/AMD-Workstation/hardware-configuration.nix
View File

@ -31,5 +31,5 @@
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 32;
nix.settings.max-jobs = lib.mkDefault 32;
}

8
machines/T420-Laptop/default.nix
View File

@ -1,7 +1,7 @@
{ inputs, ... }: {
imports = with inputs.self.nixosModules; with inputs.self.nixosProfiles; [
./hardware-configuration.nix
inputs.self.nixosRoles.base
inputs.self.nixosRoles.server
gitea
# jitsi
mailserver
@ -10,12 +10,14 @@
nextcloud
nginx
vsftpd
home-assistant
mastodon
# home-assistant
# mastodon
];
services.logind.lidSwitch = "ignore";
system.stateVersion = "21.11";
deviceSpecific.devInfo = {
legacy = true;
cpu = {

2
machines/T420-Laptop/hardware-configuration.nix
View File

@ -24,5 +24,7 @@
swapDevices = [ ];
nix.settings.max-jobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}

2
machines/T490s-Laptop/hardware-configuration.nix
View File

@ -29,6 +29,6 @@
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 8;
nix.settings.max-jobs = lib.mkDefault 8;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}

5
overlay.nix
View File

@ -94,8 +94,9 @@ in rec {
cmakeFlags = oa.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
})).override { mtxclient = final.mtxclient; };
nix = inputs.nix.defaultPackage.${system}.overrideAttrs
(oa: { patches = [ ./profiles/nix/nix.patch ] ++ oa.patches or [ ]; });
nix = inputs.nix.defaultPackage.${system};
# .overrideAttrs
# (oa: { patches = [ ./profiles/nix/nix.patch ] ++ oa.patches or [ ]; });
mako = prev.mako.overrideAttrs (_: {
postInstall =

2
profiles/applications/alacritty.nix
View File

@ -29,7 +29,7 @@
};
cursor = {
text = base02;
cursor = base00;
cursor = base05;
};
normal = {
black = base00;

30
profiles/nix/default.nix
View File

@ -1,32 +1,28 @@
{ pkgs, lib, inputs, config, ... }: {
nix = rec {
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
binaryCaches = [
"https://cache.nixos.org"
];
trustedBinaryCaches = [
"s3://serokell-private-cache?endpoint=s3.eu-central-1.wasabisys.com&profile=serokell-private-cache-wasabi"
];
registry.self.flake = inputs.self;
registry.np.flake = inputs.nixpkgs;
trustedUsers = [ "root" "balsoft" "@wheel" ];
nrBuildUsers = config.nix.maxJobs;
nrBuildUsers = config.nix.settings.max-jobs;
optimise.automatic = true;
binaryCachePublicKeys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0="
];
extraOptions = ''
experimental-features = nix-command flakes
'';
requireSignedBinaryCaches = true;
settings = {
trusted-users = [ "root" "balsoft" "@wheel" ];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"serokell-1:aIojg2Vxgv7MkzPJoftOO/I8HKX622sT+c0fjnZBLj0="
];
substituters = [ "https://cache.nixos.org" ];
trusted-substituters = [
"s3://serokell-private-cache?endpoint=s3.eu-central-1.wasabisys.com&profile=serokell-private-cache-wasabi"
];
};
};
persist.state.directories = [ "/home/balsoft/.local/share/nix" ];

2
profiles/workspace/misc.nix
View File

@ -24,7 +24,7 @@
persist.state.directories = [ "/var/lib/nixos" "/var/lib/systemd" ];
system.stateVersion = "18.03";
system.stateVersion = lib.mkDefault "18.03";
systemd.services.systemd-timesyncd.wantedBy = [ "multi-user.target" ];