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

Update

Browse Source
This commit is contained in:
Alexander Bantyev 2020-07-03 11:59:36 +03:00
parent 9773d434df
commit 8b73315235
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
7 changed files with 29 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
flake.lock generated
View File

@ -3,11 +3,11 @@
"NUR": { "NUR": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1592760432, "lastModified": 1593719873,
"narHash": "sha256-x9IcjohICpEhLAkdFKR090wR27B8SyTnVbw/9RVnt0s=", "narHash": "sha256-AK0s3BOp7qO/d1vGL6Lh7hLjbqv3Zjo9KIr61UjBD78=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f8162f2ee1d26d850f3ed56dec9337ca5f9a9e15", "rev": "8654e8b452aee888d4cc67c649b70ddf1f50ea5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,11 +53,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1589826413, "lastModified": 1591751635,
"narHash": "sha256-0qaxqdvPhRiaxtRLdhIYS384gP2VtHG2CzlxZzbfhwI=", "narHash": "sha256-KgGtyFlkI/fsp+j8VEgJ/ynY9B91aX35Xp04HlDLRTo=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7a96ab121a3df4386499ebaacf23e726f0c5711", "rev": "b3fee796fcd5531693d9b84ece76ad6836bb1cfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -122,11 +122,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1591915976, "lastModified": 1593628299,
"narHash": "sha256-roNsxAHI5gj+nFHrrqndKYj6EGmHXrYu1YmOm/4AZIk=", "narHash": "sha256-TG05BV4fbJdDW4RzoYBYaGdFtOq6NNet1JHjP1Au/VE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "7db879e65e83b1c65206b490d36a69e97c5a877a", "rev": "6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,11 +151,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1591946521, "lastModified": 1591748508,
"narHash": "sha256-Z9WtCDcSETJ6+wTIxNFjSFeWg3yJDAKc1nH2p6mm96s=", "narHash": "sha256-GdYYaYsSBgYUhbDT1JJQ7vEgo8FWeW/AW7/qqJuCvRA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e45ff84e2343b86022b92973a8e15d5dd31147ab", "rev": "1d8c4410687390f9b8f92dbe6ff39fd8fc2b17c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,23 +163,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-mopidy": {
"flake": false,
"locked": {
"lastModified": 1589905641,
"narHash": "sha256-cpyk1p3FAJ5mK4C012/1JFb7N5yx82dQhqcO/eTg6t8=",
"owner": "NickHU",
"repo": "nixpkgs",
"rev": "cf9ca59fbff587aa69c8ba71d1219a10b8c4444e",
"type": "github"
},
"original": {
"owner": "NickHU",
"ref": "mopidy",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-old": { "nixpkgs-old": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -200,11 +183,11 @@
"nixpkgs-wayland": { "nixpkgs-wayland": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1591943741, "lastModified": 1593705940,
"narHash": "sha256-/P3XmtsYkC4u0HwzXEanew/hcuqYJiGZG+wLMhS05iw=", "narHash": "sha256-e1c9uFMDLrHIcG4UywvptBc01tS69sgC3KQsBvfU4mY=",
"owner": "colemickens", "owner": "colemickens",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2ec4f2f1793d6434babe5ae506444119b9459a8b", "rev": "04252c283bbce2b5529caf5293f0f7b72b451f83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,11 +229,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1591946521, "lastModified": 1593760204,
"narHash": "sha256-Z9WtCDcSETJ6+wTIxNFjSFeWg3yJDAKc1nH2p6mm96s=", "narHash": "sha256-M/c2DTP6EUnSgnBYyVScApeHv5I+NbN57nn+px4bEaI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e45ff84e2343b86022b92973a8e15d5dd31147ab", "rev": "bdac777becdbb8780c35be4f552c9d4518fe0bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -284,7 +267,6 @@
"nix": "nix", "nix": "nix",
"nixos-fhs-compat": "nixos-fhs-compat", "nixos-fhs-compat": "nixos-fhs-compat",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-mopidy": "nixpkgs-mopidy",
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
@ -313,11 +295,11 @@
"weechat-notify-send": { "weechat-notify-send": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1584284218, "lastModified": 1592655950,
"narHash": "sha256-Fj9FuT1Q97yZMvAvH9oGZJWO8d1QutwBhDalPlRrQnA=", "narHash": "sha256-++mxafyBwg48rD6C2ZVpAG5NAg5gNLjFmOqEiJ7axcc=",
"owner": "s3rvac", "owner": "s3rvac",
"repo": "weechat-notify-send", "repo": "weechat-notify-send",
"rev": "3390f91a3af23fc49ebb77771d78732501738241", "rev": "cc701bdebdb1bf550e36aa8b13c59b47905db2dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +311,11 @@
"weechat-scripts": { "weechat-scripts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1591820790, "lastModified": 1593280070,
"narHash": "sha256-tPgorP9G6u0nCIvhp8PNedau3aGJK+UExW5gOK2dBcs=", "narHash": "sha256-fXRUySZRTwGVa0VWP9Uk8qCwS7s0IUGPCu1H09gPwvQ=",
"owner": "weechat", "owner": "weechat",
"repo": "scripts", "repo": "scripts",
"rev": "c64cc4acdcb746a1a6582150a4fe5a9eb8f38ef6", "rev": "ffe29d00cc316d6d38bce3fe028ab081e291b14d",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@ -3,13 +3,6 @@
"A collection of crap, hacks and copy-paste to make my localhosts boot"; "A collection of crap, hacks and copy-paste to make my localhosts boot";
inputs = { inputs = {
nixpkgs-mopidy = {
type = "github";
owner = "NickHU";
repo = "nixpkgs";
ref = "mopidy";
flake = false;
};
lambda-launcher = { lambda-launcher = {
type = "github"; type = "github";
owner = "balsoft"; owner = "balsoft";
@ -99,6 +92,7 @@
specialArgs = { inherit inputs name; }; specialArgs = { inherit inputs name; };
}; };
in genAttrs hosts mkHost; in genAttrs hosts mkHost;
legacyPackages.x86_64-linux = legacyPackages.x86_64-linux =
(builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs; (builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs;

1
modules/applications/emacs/default.nix
View File

@ -48,6 +48,7 @@
(github-pullrequest.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [pkgs.git]; })) (github-pullrequest.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [pkgs.git]; }))
scad-mode scad-mode
scad-preview scad-preview
languagetool
]; ];
}; };

6
modules/openvpn.nix
View File

@ -34,12 +34,6 @@ lib.mkIf (! isNull config.secrets.openvpn) {
#dhcp-option DNS 8.8.8.8 #dhcp-option DNS 8.8.8.8
#dhcp-option DNS 8.8.4.4 #dhcp-option DNS 8.8.4.4
route 149.154.160.0 255.255.240.0
route 149.154.164.0 255.255.252.0
route 91.108.4.0 255.255.252.0
route 91.108.56.0 255.255.252.0
route 91.108.8.0 255.255.252.0
<ca> <ca>
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
MIIEyzCCA7OgAwIBAgIJAKPYkg7opAaCMA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD MIIEyzCCA7OgAwIBAgIJAKPYkg7opAaCMA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD

10
modules/packages.nix
View File

@ -23,10 +23,10 @@ in {
inherit (nur.balsoft.pkgs) termNote nix-patch; inherit (nur.balsoft.pkgs) termNote nix-patch;
inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher;
inherit (old) mautrix-telegram; inherit (old) mautrix-telegram;
inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher;
inherit old; inherit old;
yt-utilities = yt-utilities =
@ -41,12 +41,6 @@ in {
buildInputs = [ self.libxslt ]; buildInputs = [ self.libxslt ];
}); });
}) })
(self: super: builtins.mapAttrs (_: v: pkgs.callPackage v.override { }) {
inherit (import inputs.nixpkgs-mopidy {
localSystem.system = "x86_64-linux";
})
mopidy mopidy-gmusic mopidy-mpd mopidy-mpris mopidy-youtube pykka;
})
]; ];
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;

1
modules/services.nix
View File

@ -35,7 +35,6 @@
services.nix-serve.enable = config.device == "AMD-Workstation"; services.nix-serve.enable = config.device == "AMD-Workstation";
services.pcscd.enable = true; services.pcscd.enable = true;
hardware.u2f.enable = true;
services.keybase.enable = true; services.keybase.enable = true;

1
modules/workspace/mopidy.nix
View File

@ -13,6 +13,7 @@
"") + '' "") + ''
[mpd] [mpd]
hostname = 0.0.0.0 hostname = 0.0.0.0
port = 6600
[audio] [audio]
output = pulsesink server=127.0.0.1 output = pulsesink server=127.0.0.1
''; '';