sercanto/mio-ops
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

NixOS 20.03 migration changes

Browse source
This commit is contained in:
Craige McWhirter 2020-12-31 11:55:41 +10:00
parent d43d58a94d
commit 5f948152e5
Signed by: sercanto
GPG key ID: 7DBA9F5689EFB6AA
11 changed files with 23 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosts/dionach.nix
View file

@ -65,7 +65,8 @@
ddrescue ddrescue
docutils # Python Documentation Utilities docutils # Python Documentation Utilities
electrum # Bitcoin wallet electrum # Bitcoin wallet
emacs25-nox # Emacs, no X11 element-desktop # A feature-rich client for Matrix.org
emacs26-nox # Emacs, no X11
evince evince
exiftool # A tool to read, write and edit EXIF meta information exiftool # A tool to read, write and edit EXIF meta information
fd # A simple, fast and user-friendly alternative to find fd # A simple, fast and user-friendly alternative to find
@ -111,7 +112,6 @@
python37Packages.sphinx # A tool that makes it easy to create intelligent and beautifulul documentation for Python projects python37Packages.sphinx # A tool that makes it easy to create intelligent and beautifulul documentation for Python projects
radiotray-ng # Internet radio player radiotray-ng # Internet radio player
rdiff-backup # External backups rdiff-backup # External backups
riot-desktop # A feature-rich client for Matrix.org
shared_mime_info shared_mime_info
shotwell shotwell
signal-desktop signal-desktop

4
hosts/paidh-tri.nix
View file

@ -8,7 +8,7 @@
]; ];
# Comment out deployment when building the SD Image. # Comment out deployment when building the SD Image.
deployment.targetHost = "10.69.0.203"; deployment.targetHost = "10.42.0.203";
networking.hostName = "paidh-tri"; # Define your hostname. networking.hostName = "paidh-tri"; # Define your hostname.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -17,5 +17,5 @@
nixops # NixOS cloud provisioning and deployment tool nixops # NixOS cloud provisioning and deployment tool
]; ];
system.stateVersion = "19.09"; # The version of NixOS originally installed system.stateVersion = "20.09"; # The version of NixOS originally installed
} }

26
nix/sources.json
View file

@ -1,26 +1,26 @@
{ {
"cardano-node": { "cardano-node": {
"branch": "refs/tags/1.21.2", "branch": "refs/tags/1.23.0",
"description": "The core component that is used to participate in a Cardano decentralised blockchain.", "description": "The core component that is used to participate in a Cardano decentralised blockchain.",
"homepage": "https://cardano.org", "homepage": "https://cardano.org",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "cardano-node", "repo": "cardano-node",
"rev": "9577e0a514454fd59faeba79a1bb6d670eddb96d", "rev": "eed250546fa9acec4c9de557b3e3551c1f682a30",
"sha256": "0iby57rgwvhshnxlv3skrfaml5fgqmxhamjk70s69sifn6pih6sy", "sha256": "0n74w8s6py7v59dl09a3khlk2b4h2k6cnh6p916gv35bx5p712bz",
"type": "tarball", "type": "tarball",
"url": "https://github.com/input-output-hk/cardano-node/archive/9577e0a514454fd59faeba79a1bb6d670eddb96d.tar.gz", "url": "https://github.com/input-output-hk/cardano-node/archive/eed250546fa9acec4c9de557b3e3551c1f682a30.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"daedalus": { "daedalus": {
"branch": "release/2.3.0", "branch": "release/2.4.1",
"description": "The open source cryptocurrency wallet for ada, built to grow with the community", "description": "The open source cryptocurrency wallet for ada, built to grow with the community",
"homepage": "https://daedaluswallet.io/", "homepage": "https://daedaluswallet.io/",
"owner": "input-output-hk", "owner": "input-output-hk",
"repo": "daedalus", "repo": "daedalus",
"rev": "b0ddd082319aa456cdb61561703b0fa5358617b6", "rev": "aa9c7ce19ffe065ec80849b6886161d8dda112ed",
"sha256": "0k8mq2b4s1p8kj7qvrhmbav4ngp3xrka16667vyj83jwsyrxcmgi", "sha256": "01dps5l59lxk9pcrngjrfhsk1lxh20zcg9sj269qp463bv8ljlq4",
"type": "tarball", "type": "tarball",
"url": "https://github.com/input-output-hk/daedalus/archive/b0ddd082319aa456cdb61561703b0fa5358617b6.tar.gz", "url": "https://github.com/input-output-hk/daedalus/archive/aa9c7ce19ffe065ec80849b6886161d8dda112ed.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"niv": { "niv": {
@ -36,16 +36,16 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
"branch": "nixos-20.03", "branch": "nixos-20.09",
"builtin": false, "builtin": false,
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs", "homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs-channels", "repo": "nixpkgs",
"rev": "0d0660fde3bb53a3d013b65e5e141eb11d1efb82", "rev": "58f9c4c7d3a42c912362ca68577162e38ea8edfb",
"sha256": "13qpa916qq1kqvfj8q4zkmnfnbh2kpx0nxxg04nblai0smz97820", "sha256": "1517dy07jf4zhzknqbgm617lgjxsn7a6k1vgq61c67f6h55qs5ij",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs-channels/archive/0d0660fde3bb53a3d013b65e5e141eb11d1efb82.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/58f9c4c7d3a42c912362ca68577162e38ea8edfb.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

1
roles/coturn.nix
View file

@ -45,7 +45,6 @@
security.acme.certs = { security.acme.certs = {
"turn.mcwhirter.io" = { "turn.mcwhirter.io" = {
group = "turnserver"; group = "turnserver";
allowKeysForGroup = true;
postRun = "systemctl reload nginx.service"; postRun = "systemctl reload nginx.service";
email = "acme@mcwhirter.io"; email = "acme@mcwhirter.io";
}; };

12
roles/crystal0.32.nix
View file

@ -1,12 +0,0 @@
# This role utilizes a local version of nixpkgs that bumps Crystal from 0.30.1
# to 0.32.1
{ config, pkgs, lib, ... }:
{
environment.systemPackages = [ (import /home/craige/source/NixOS/nixpkgs {}).crystal ];
}

2
roles/cyclone-ibis.nix
View file

@ -17,6 +17,8 @@ in {
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
}; };
nixpkgs.config.allowBroken = true; # Hakyll is marked as broken in 20.09
services.nginx = { services.nginx = {
enable = true; # Enable Nginx enable = true; # Enable Nginx
recommendedGzipSettings = true; recommendedGzipSettings = true;

3
roles/desktop_common.nix
View file

@ -22,6 +22,7 @@
brave # Privacy-oriented browser brave # Privacy-oriented browser
google-chrome # A freeware web browser developed by Google google-chrome # A freeware web browser developed by Google
chromium chromium
element-desktop # A feature-rich client for Matrix.org
firefoxWrapper # install Firefox with support for plugins firefoxWrapper # install Firefox with support for plugins
gnome3.gnome-tweaks # A tool to customize advanced GNOME 3 options gnome3.gnome-tweaks # A tool to customize advanced GNOME 3 options
libreoffice-fresh libreoffice-fresh
@ -30,7 +31,6 @@
usbutils # Tools for working with USB devices, such as lsusb usbutils # Tools for working with USB devices, such as lsusb
user-manager user-manager
nextcloud-client # Nextcloud desktop client nextcloud-client # Nextcloud desktop client
riot-desktop # A feature-rich client for Matrix.org
xorg.libxcb # X C binding xorg.libxcb # X C binding
]; ];
@ -88,7 +88,6 @@
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
firefox = { firefox = {
enableGoogleTalkPlugin = true; # Required for Google Meet
enableAdobeFlash = false; # Disabled because Adobe Flash is just rubbish enableAdobeFlash = false; # Disabled because Adobe Flash is just rubbish
}; };
chromium = { chromium = {

4
roles/iohk.nix
View file

@ -31,19 +31,15 @@
systemPackages = with pkgs; [ systemPackages = with pkgs; [
awscli # Unified tool to manage your AWS services awscli # Unified tool to manage your AWS services
buildkite-agent # Buildkite for IOHK buildkite-agent # Buildkite for IOHK
#crystal # A compiled language with Ruby like syntax and type inference
docker # Pack, ship and run any application as a lightweight container docker # Pack, ship and run any application as a lightweight container
docker-compose # Multi-container orchestration for Docker docker-compose # Multi-container orchestration for Docker
freerdp # A Remote Desktop Protocol Client, xfreerdp freerdp # A Remote Desktop Protocol Client, xfreerdp
gist # Upload code to https://gist.github.com (or github enterprise) gist # Upload code to https://gist.github.com (or github enterprise)
gnupg # GNU Privacy Guard, a GPL OpenPGP implementation gnupg # GNU Privacy Guard, a GPL OpenPGP implementation
go-jira # Simple command line client for Atlassian's Jira service written in Go go-jira # Simple command line client for Atlassian's Jira service written in Go
#icr # Interactive console for the Crystal programming languag
jq # A lightweight and flexible command-line JSON processor jq # A lightweight and flexible command-line JSON processor
keybase-gui # The Keybase official client keybase-gui # The Keybase official client
s3fs # Mount an S3 bucket as filesystem through FUSE s3fs # Mount an S3 bucket as filesystem through FUSE
scry # Code analysis server for the Crystal programming language
shards # Dependency manager for the Crystal language
slack-dark # Slack desktop client slack-dark # Slack desktop client
magic-wormhole # Securely transfer data between computers magic-wormhole # Securely transfer data between computers
]; ];

7
roles/matrix.nix
View file

@ -21,7 +21,6 @@
enable = true; # Enable the synapse server enable = true; # Enable the synapse server
server_name = "mcwhirter.io"; # Server's public domain name server_name = "mcwhirter.io"; # Server's public domain name
public_baseurl = "https://synapse.mcwhirter.io:443/"; # Matrix target URL public_baseurl = "https://synapse.mcwhirter.io:443/"; # Matrix target URL
web_client = true; # Whether to serve a web client
enable_registration = true; # Toggle user registration enable_registration = true; # Toggle user registration
listeners = [ listeners = [
{ # federation { # federation
@ -96,7 +95,7 @@
"m.homeserver" = { "base_url" = "https://synapse.mcwhirter.io"; }; "m.homeserver" = { "base_url" = "https://synapse.mcwhirter.io"; };
"m.identity_server" = { "base_url" = "https://vector.im"; }; "m.identity_server" = { "base_url" = "https://vector.im"; };
}; };
# ACAO required to allow riot-web on any URL to request this json file # ACAO required to allow element-web on any URL to request this json file
in '' in ''
add_header Content-Type application/json; add_header Content-Type application/json;
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
@ -113,7 +112,7 @@
serverAliases = [ serverAliases = [
"chat.${config.networking.domain}" "chat.${config.networking.domain}"
]; ];
root = pkgs.riot-web; # Install RIOT web in the nginx root root = pkgs.element-web; # Install RIOT web in the nginx root
}; };
}; };
}; };
@ -146,13 +145,11 @@
certs = { certs = {
"chat.mcwhirter.io" = { "chat.mcwhirter.io" = {
group = "matrix-synapse"; group = "matrix-synapse";
allowKeysForGroup = true;
postRun = "systemctl reload nginx.service"; postRun = "systemctl reload nginx.service";
email = "acme@mcwhirter.io"; email = "acme@mcwhirter.io";
}; };
"synapse.mcwhirter.io" = { "synapse.mcwhirter.io" = {
group = "matrix-synapse"; group = "matrix-synapse";
allowKeysForGroup = true;
postRun = "systemctl reload nginx.service; systemctl restart matrix-synapse.service"; postRun = "systemctl reload nginx.service; systemctl restart matrix-synapse.service";
email = "acme@mcwhirter.io"; email = "acme@mcwhirter.io";
}; };

1
roles/mcwhirter.io.nix
View file

@ -43,7 +43,6 @@ in {
"${webdomain}" = { "${webdomain}" = {
email = "admin@${webdomain}"; email = "admin@${webdomain}";
group = "matrix-synapse"; group = "matrix-synapse";
allowKeysForGroup = true;
}; };
#"www.${webdomain}" = { #"www.${webdomain}" = {
# email = "admin@${webdomain}"; # email = "admin@${webdomain}";

3
roles/nextcloud.nix
View file

@ -12,7 +12,6 @@
services.nextcloud = { services.nextcloud = {
enable = true; # Enable Nextcloud enable = true; # Enable Nextcloud
hostName = "cloud.mcwhirter.io"; # FQDN for the Nextcloud instance hostName = "cloud.mcwhirter.io"; # FQDN for the Nextcloud instance
nginx.enable = true; # Whether to enable nginx virtual host management
https = true; # Use HTTPS for links https = true; # Use HTTPS for links
config = { # Configure Nextcloud config = { # Configure Nextcloud
dbtype = "pgsql"; # Set the database type dbtype = "pgsql"; # Set the database type
@ -28,7 +27,7 @@
enable = true; # Run regular auto update of all apps installed enable = true; # Run regular auto update of all apps installed
startAt = "01:00:00"; # When to run the update startAt = "01:00:00"; # When to run the update
}; };
package = pkgs.nextcloud18; package = pkgs.nextcloud20;
}; };
services.postgresql = { services.postgresql = {