Skip to content

Commit

Permalink
flake: upgrade from NixOS 23.05 to 23.11
Browse files Browse the repository at this point in the history
  • Loading branch information
jakubgs committed Nov 30, 2023
1 parent b8746c6 commit 712e38b
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 34 deletions.
26 changes: 13 additions & 13 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "NixOS configuration for my personal hosts.";

inputs = {
nixpkgs.url = "nixpkgs/nixos-23.05";
nixpkgs.url = "nixpkgs/nixos-23.11";
unstable.url = "nixpkgs/nixos-unstable";
hardware.url = "github:NixOS/nixos-hardware/master";
agenix = {
Expand Down
1 change: 0 additions & 1 deletion roles/locate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{
# Daemon
services.locate.enable = true;
services.locate.locate = pkgs.mlocate;
services.locate.interval = "daily";
services.locate.prunePaths = [ "/mnt/torrent" ];
services.locate.localuser = null; # Fix user warning
Expand Down
2 changes: 1 addition & 1 deletion roles/qemu.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
};

environment.systemPackages = with pkgs; [
virtmanager
virt-manager
qemu-utils
];

Expand Down
24 changes: 14 additions & 10 deletions roles/syncthing.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,27 @@
# Use when syncing gets stuck.
#extraFlags = ["--reset-deltas"];

devices = lib.filterAttrs (h: _: notThisHost h) config.syncthing.hosts;
settings = {
devices = lib.filterAttrs (h: _: notThisHost h) config.syncthing.hosts;

folders = {
"/mnt/git" = { id = "git"; type = "sendreceive"; devices = otherHosts; };
"/mnt/data" = { id = "data"; type = "sendreceive"; devices = otherHosts; };
"/mnt/music" = { id = "music"; type = "sendreceive"; devices = otherHosts; };
"/mnt/photos" = { id = "photos"; type = "sendreceive"; devices = otherHosts; };
"/mnt/mobile" = { id = "mobile"; type = "sendreceive"; devices = otherHosts; };
folders = {
"/mnt/git" = { id = "git"; type = "sendreceive"; devices = otherHosts; };
"/mnt/data" = { id = "data"; type = "sendreceive"; devices = otherHosts; };
"/mnt/music" = { id = "music"; type = "sendreceive"; devices = otherHosts; };
"/mnt/photos" = { id = "photos"; type = "sendreceive"; devices = otherHosts; };
"/mnt/mobile" = { id = "mobile"; type = "sendreceive"; devices = otherHosts; };
};
};
};

# Wait for volumes to be mounted.
systemd.services.syncthing = {
systemd.services.syncthing = let
syncthingFolderNames = lib.attrNames services.syncthing.settings.folders;
in {
after = lib.mkForce (["network.target"] ++
(map pkgs.lib.pathToMountUnit (lib.attrNames services.syncthing.folders))
(map pkgs.lib.pathToMountUnit syncthingFolderNames)
);
unitConfig.ConditionPathIsMountPoint = (lib.attrNames services.syncthing.folders);
unitConfig.ConditionPathIsMountPoint = syncthingFolderNames;
};

services.landing = {
Expand Down
2 changes: 1 addition & 1 deletion roles/users.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
isNormalUser = true;
useDefaultShell = true;
group = "jakubgs";
passwordFile = secret "hosts/users/jakubgs/pass-hash";
hashedPasswordFile = secret "hosts/users/jakubgs/pass-hash";
extraGroups = [
"wheel" "audio" "dialout" "video" "disk"
"adm" "tty" "systemd-journal" "docker"
Expand Down
7 changes: 1 addition & 6 deletions roles/work.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ let
];
myPython = pkgs.python310.withPackages myPythonPkgs;
in {
imports = [
# Useful for SQL development.
./postgres.nix
];

# Packages required for work
users.users.jakubgs.packages = with pkgs; [
# DevOps
Expand All @@ -49,7 +44,7 @@ in {
# NodeJS dev
nodejs-18_x (yarn.override { nodejs = nodejs-18_x; })
# GoLang dev
pkgs.unstable.go_1_19 gocode gopls go-protobuf protobuf3_19
pkgs.unstable.go_1_19 gocode gopls go-protobuf protobuf3_20
# Python dev
myPython
# Mobile dev
Expand Down
2 changes: 1 addition & 1 deletion roles/xserver.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ in {
monospace = [ "Inconsolata" ];
};
};
fonts = with pkgs; [
packages = with pkgs; [
inconsolata
terminus_font
corefonts
Expand Down

0 comments on commit 712e38b

Please sign in to comment.