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

Merge branch 'nixos-2211' into consensus

Browse source
This commit is contained in:
Serĉanto de Scio 2022-12-23 03:11:20 +10:00
parent 43c719c5e3 649fba826f
commit 174f400da9
Signed by: sercanto
GPG key ID: 7DBA9F5689EFB6AA
14 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hardware/eeepc701.nix
View file

@ -64,5 +64,5 @@
swapDevices = [{device = "/dev/disk/by-label/swap";}];
networking.wireless.enable = true; # Enable wireless via wpa_supplicant.
nix.maxJobs = lib.mkDefault 1;
nix.settings.max-jobs = lib.mkDefault 1;
}

2
hardware/lenovo_x201.nix
View file

@ -20,7 +20,7 @@
swapDevices = [{device = "/dev/disk/by-label/swap";}];
hardware.opengl.extraPackages = with pkgs; [vaapiIntel];
nix.maxJobs = lib.mkDefault 4;
nix.settings.max-jobs = lib.mkDefault 4;
services.thinkfan = {
enable = true;

2
hardware/lenovo_yoga7i.nix
View file

@ -39,5 +39,5 @@
];
hardware.opengl.extraPackages = with pkgs; [vaapiIntel];
nix.maxJobs = lib.mkDefault 4;
nix.settings.max-jobs = lib.mkDefault 4;
}

2
hardware/linode_vm-encrypted.nix
View file

@ -50,5 +50,5 @@
swapDevices = [{device = "/dev/disk/by-label/swap";}];
nix.maxJobs = lib.mkDefault 8;
nix.settings.max-jobs = lib.mkDefault 8;
}

2
hardware/linode_vm.nix
View file

@ -35,5 +35,5 @@
swapDevices = [{device = "/dev/sdb";}];
nix.maxJobs = lib.mkDefault 4;
nix.settings.max-jobs = lib.mkDefault 4;
}

2
hardware/purism_librem_15.nix
View file

@ -37,5 +37,5 @@
swapDevices = [{device = "/dev/disk/by-uuid/ac308d76-cc12-4a73-83ee-64a2ad07b91e";}];
nix.maxJobs = lib.mkDefault 4;
nix.settings.max-jobs = lib.mkDefault 4;
}

2
hosts/cuallaidh.nix
View file

@ -9,7 +9,7 @@
../modules/tmate-ssh-server.nix
../networks/linode.nix
../profiles/coturn.nix
../profiles/cryptpad.nix
#../profiles/cryptpad.nix
../profiles/gitea.nix
#../profiles/hydra.nix
../profiles/iog.nix

2
hosts/dionach.nix
View file

@ -129,7 +129,6 @@
tcpdump # tcpdump
tectonic
tdesktop # Telegram Desktop messaging app
termonad-with-packages
texlive.combined.scheme-full
tmate # Instant Terminal Sharing
tpm-tools
@ -139,7 +138,6 @@
unrar
unzip
vcsh
vgo2nix # Required for packaging Golang applications
wget
wesnoth # Turn-based strategy game
xorg.xev

8
nix/sources.json
View file

@ -68,16 +68,16 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
"branch": "nixos-22.05",
"branch": "nixos-22.11",
"builtin": false,
"description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "695b3515251873e0a7e2021add4bba643c56cde3",
"sha256": "0hhn6li42s8awkpnc375zlzh3zk8lfsvg50mb03iq88lywbaikjg",
"rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"sha256": "1n524a44p2kprk65zx2v6793kmxjpz1qm1ilxk82vq0vg0c5jy32",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/695b3515251873e0a7e2021add4bba643c56cde3.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/596a8e828c5dfa504f91918d0fa4152db3ab5502.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgsUnstable": {

1
profiles/desktopCraige.nix
View file

@ -17,6 +17,7 @@
gopass # password file manager
shared-mime-info # A database of common MIME types
sweethome3d.application # design and visualise homes
termonad # Terminal emulator configurable in Haskell
yt-dlp # Command-line tool to download videos
whalebird # Mastodon, Pleroma and Misskey client
];

12
profiles/host_common.nix
View file

@ -66,12 +66,14 @@
dates = "weekly";
options = "--delete-older-than 90d";
};
autoOptimiseStore = true;
extraOptions = ''
show-trace = true # Enable --show-trace by default for nix
builders-use-substitutes = true # Set builders to use caches
'';
trustedUsers = ["craige"];
settings = {
trusted-users = ["craige"];
auto-optimise-store = true;
};
};
networking = {enableIPv6 = true;};
@ -89,9 +91,11 @@
bat # cat clone with syntax highlighting & Git integration
dnsutils # Bind DNS utilities
fd # A simple, fast and user-friendly alternative to find
(if config.services.xserver.enable
(
if config.services.xserver.enable
then gitAndTools.gitFull
else git) # Distributed version control system
else git
) # Distributed version control system
htop # interactive process viewer
hwinfo # Hardware detection tool
killall # kill processes by name

8
profiles/matrix.nix
View file

@ -9,8 +9,8 @@
i18n = {
extraLocaleSettings = {
LC_COLLATE = "C"; # Ensure correct locale for postgres
LC_CTYPE = "C"; # Ensure correct locale for postgres
LC_COLLATE = "C.UTF-8"; # Ensure correct locale for postgres
LC_CTYPE = "C.UTF-8"; # Ensure correct locale for postgres
};
};
@ -141,8 +141,8 @@
CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
TEMPLATE template0
LC_COLLATE = "C"
LC_CTYPE = "C";
LC_COLLATE = "C.UTF-8"
LC_CTYPE = "C.UTF-8";
'';
};
};

2
profiles/minecraftClient.nix
View file

@ -11,6 +11,6 @@
environment.systemPackages = with pkgs; [
jre # Required by Minecraft (via polymc)
minecraft # Official launcher for Minecraft
polymc # A free, open source launcher for Minecraft
prismlauncher # A free, open source launcher for Minecraft
];
}

3
profiles/nextcloud.nix
View file

@ -27,7 +27,8 @@
enable = true; # Run regular auto update of all apps installed
startAt = "01:00:00"; # When to run the update
};
package = pkgs.nextcloud24;
enableBrokenCiphersForSSE = false; # force upgrade to SSL v3
package = pkgs.nextcloud25;
};
systemd = {