diff --git a/flake.lock b/flake.lock index 28fc80b..2531a3b 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1696775529, - "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", + "lastModified": 1701216516, + "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "hardware": { "locked": { - "lastModified": 1700392353, - "narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=", + "lastModified": 1701250978, + "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a", + "rev": "8772491ed75f150f02552c60694e1beff9f46013", "type": "github" }, "original": { @@ -40,16 +40,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700403855, - "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=", + "lastModified": 1701156937, + "narHash": "sha256-jpMJOFvOTejx211D8z/gz0ErRtQPy6RXxgD2ZB86mso=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db", + "rev": "7c4c20509c4363195841faa6c911777a134acdf3", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "type": "indirect" } }, @@ -63,11 +63,11 @@ }, "unstable": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1701068326, + "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d513a1e..54ca0a1 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { diff --git a/roles/locate.nix b/roles/locate.nix index ae7b57b..6a65c34 100644 --- a/roles/locate.nix +++ b/roles/locate.nix @@ -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 diff --git a/roles/qemu.nix b/roles/qemu.nix index 8247094..76c0d82 100644 --- a/roles/qemu.nix +++ b/roles/qemu.nix @@ -7,7 +7,7 @@ }; environment.systemPackages = with pkgs; [ - virtmanager + virt-manager qemu-utils ]; diff --git a/roles/syncthing.nix b/roles/syncthing.nix index 194cedb..668a20d 100644 --- a/roles/syncthing.nix +++ b/roles/syncthing.nix @@ -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 = { diff --git a/roles/users.nix b/roles/users.nix index 2d81230..3c4d9f1 100644 --- a/roles/users.nix +++ b/roles/users.nix @@ -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" diff --git a/roles/work.nix b/roles/work.nix index 12a773a..59fc5ad 100644 --- a/roles/work.nix +++ b/roles/work.nix @@ -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 @@ -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 diff --git a/roles/xserver.nix b/roles/xserver.nix index 80a27fa..ef721f0 100644 --- a/roles/xserver.nix +++ b/roles/xserver.nix @@ -37,7 +37,7 @@ in { monospace = [ "Inconsolata" ]; }; }; - fonts = with pkgs; [ + packages = with pkgs; [ inconsolata terminus_font corefonts