From f40f2ae89d326de63c6b40169923892f9468246d Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 24 May 2025 21:48:24 +0200 Subject: [PATCH 1/4] update inputs to 25.05 --- base/services/auto-upgrade.nix | 4 ++-- flake.lock | 42 +++++++++++++++++----------------- flake.nix | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/base/services/auto-upgrade.nix b/base/services/auto-upgrade.nix index acd77a4..ad19a9c 100644 --- a/base/services/auto-upgrade.nix +++ b/base/services/auto-upgrade.nix @@ -2,12 +2,12 @@ { system.autoUpgrade = { enable = true; - flake = "git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git"; + flake = "git+https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git?ref=25.05"; flags = [ # --update-input is deprecated since nix 2.22, and removed in lix 2.90 # https://git.lix.systems/lix-project/lix/issues/400 "--refresh" - "--override-input" "nixpkgs" "github:nixos/nixpkgs/nixos-24.11-small" + "--override-input" "nixpkgs" "github:nixos/nixpkgs/nixos-25.05-small" "--override-input" "nixpkgs-unstable" "github:nixos/nixpkgs/nixos-unstable-small" "--no-write-lock-file" ]; diff --git a/flake.lock b/flake.lock index 6e5828d..cbac41a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1745502102, - "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", + "lastModified": 1747742835, + "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", "owner": "nix-community", "repo": "disko", - "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", + "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", "type": "github" }, "original": { @@ -139,27 +139,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526780, - "narHash": "sha256-LXXYBmFPMQU2lTb6alKWfjgQs08BKn+txMNcgbu00hI=", + "lastModified": 1748085680, + "narHash": "sha256-XG90Q/040NiV70gAVvoYbXg1lULbiwIzfkWmwSINyGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9204750b34cae1a8347ab4b5588115edfeebc6d7", + "rev": "4e6eeca5ed45465087274fc9dc6bc2011254a0f3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11-small", + "ref": "nixos-25.05-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745688173, - "narHash": "sha256-fgvG1O5JvSSjeQx+ea0DJ3GfMbLPVhAQta/DqQ2y6jc=", + "lastModified": 1748074755, + "narHash": "sha256-b3SC3Q3cXr4tdCN3WVTFqMP8I9OwaXXcj1aVoSVaygw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a2957c7978b189202e03721aab901c0a9dc1e1a", + "rev": "c3ee76c437067f1ae09d6e530df46a3f80977992", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1723850344, - "narHash": "sha256-aT37O9l9eclWEnqxASVNBL1dKwDHZUOqdbA4VO9DJvw=", + "lastModified": 1742225512, + "narHash": "sha256-OB0ndlrGLE5wMUeYP4lmxly9JUEpPCeZRQyMzITKCB0=", "ref": "refs/heads/main", - "rev": "38b66677ab8c01aee10cd59e745af9ce3ea88092", - "revCount": 19, + "rev": "c4a6a02c84d8227abf00305dc995d7242176e6f6", + "revCount": 21, "type": "git", "url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git" }, @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1741738148, - "narHash": "sha256-cJo6nbcJEOjkazkZ194NDnlsZe0W0wpxeUh2/886uC8=", + "lastModified": 1742344479, + "narHash": "sha256-9vzkDdcJPkZIHJ+fQZjC6MepicBQiMzldNhjBR58qWY=", "ref": "refs/heads/main", - "rev": "c1802e7cf27c7cf8b4890354c982a4eef5b11593", - "revCount": 486, + "rev": "20bab54235488b66f30acceece4f7721f280ef85", + "revCount": 493, "type": "git", "url": "https://git.pvv.ntnu.no/Projects/nettsiden.git" }, @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b385dcd..a7da813 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "PVV System flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small"; # remember to also update the url in base/services/auto-upgrade.nix + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small"; # remember to also update the url in base/services/auto-upgrade.nix nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; sops-nix.url = "github:Mic92/sops-nix"; From e8df081894320d00d0b66b4237eb63297f159a37 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 25 May 2025 09:48:11 +0200 Subject: [PATCH 2/4] kommode/gitea: use stable package again --- hosts/kommode/services/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/kommode/services/gitea/default.nix b/hosts/kommode/services/gitea/default.nix index ba719f4..4b41ec0 100644 --- a/hosts/kommode/services/gitea/default.nix +++ b/hosts/kommode/services/gitea/default.nix @@ -1,4 +1,4 @@ -{ config, values, lib, unstablePkgs, ... }: +{ config, values, lib, pkgs, ... }: let cfg = config.services.gitea; domain = "git.pvv.ntnu.no"; @@ -26,7 +26,7 @@ in { enable = true; appName = "PVV Git"; - package = unstablePkgs.gitea; + package = pkgs.gitea; database = { type = "postgres"; From 43d3ef1fede2f7b03be89899ed7b53368137e46a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 25 May 2025 10:30:25 +0200 Subject: [PATCH 3/4] georg: configure spotifyd to maybe not crash, might even be functional? --- hosts/georg/configuration.nix | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/hosts/georg/configuration.nix b/hosts/georg/configuration.nix index ee22a4f..f628c45 100644 --- a/hosts/georg/configuration.nix +++ b/hosts/georg/configuration.nix @@ -8,7 +8,7 @@ (fp /modules/grzegorz.nix) ]; - services.spotifyd.enable = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -25,6 +25,26 @@ # List services that you want to enable: + + + services.spotifyd = { + enable = true; + settings.global = { + device_name = "georg"; + use_mpris = false; + #dbus_type = "system"; + #zeroconf_port = 1234; + }; + }; + + networking.firewall.allowedTCPPorts = [ + # config.services.spotifyd.settings.zeroconf_port + 5353 # spotifyd is its own mDNS service wtf + ]; + + + + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave From 5d704840ce98c84c83f991c27f55e36ee9db2ac0 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 25 May 2025 11:32:44 +0200 Subject: [PATCH 4/4] brutally murder bob --- flake.nix | 6 ---- hosts/bob/configuration.nix | 46 ---------------------------- hosts/bob/disks.nix | 39 ----------------------- hosts/bob/hardware-configuration.nix | 24 --------------- values.nix | 4 --- 5 files changed, 119 deletions(-) delete mode 100644 hosts/bob/configuration.nix delete mode 100644 hosts/bob/disks.nix delete mode 100644 hosts/bob/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index a7da813..af3d5f9 100644 --- a/flake.nix +++ b/flake.nix @@ -111,12 +111,6 @@ inputs.pvv-nettsiden.nixosModules.default ]; }; - bob = stableNixosConfig "bob" { - modules = [ - disko.nixosModules.disko - { disko.devices.disk.disk1.device = "/dev/vda"; } - ]; - }; ildkule = stableNixosConfig "ildkule" { }; #ildkule-unstable = unstableNixosConfig "ildkule" { }; shark = stableNixosConfig "shark" { }; diff --git a/hosts/bob/configuration.nix b/hosts/bob/configuration.nix deleted file mode 100644 index 8b36198..0000000 --- a/hosts/bob/configuration.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, fp, pkgs, values, ... }: -{ - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - (fp /base) - (fp /misc/metrics-exporters.nix) - ./disks.nix - - (fp /misc/builder.nix) - ]; - - sops.defaultSopsFile = fp /secrets/bob/bob.yaml; - sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - sops.age.keyFile = "/var/lib/sops-nix/key.txt"; - sops.age.generateKey = true; - - boot.loader.grub = { - enable = true; - efiSupport = true; - efiInstallAsRemovable = true; - }; - - networking.hostName = "bob"; # Define your hostname. - - systemd.network.networks."30-all" = values.defaultNetworkConfig // { - matchConfig.Name = "en*"; - DHCP = "yes"; - gateway = [ ]; - }; - - # List packages installed in system profile - environment.systemPackages = with pkgs; [ - ]; - - # List services that you want to enable: - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? - -} diff --git a/hosts/bob/disks.nix b/hosts/bob/disks.nix deleted file mode 100644 index b2271dd..0000000 --- a/hosts/bob/disks.nix +++ /dev/null @@ -1,39 +0,0 @@ -# Example to create a bios compatible gpt partition -{ lib, ... }: -{ - disko.devices = { - disk.disk1 = { - device = lib.mkDefault "/dev/sda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; - esp = { - name = "ESP"; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/bob/hardware-configuration.nix b/hosts/bob/hardware-configuration.nix deleted file mode 100644 index a97a3c3..0000000 --- a/hosts/bob/hardware-configuration.nix +++ /dev/null @@ -1,24 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} diff --git a/values.nix b/values.nix index 0aef80a..9eab664 100644 --- a/values.nix +++ b/values.nix @@ -41,10 +41,6 @@ in rec { ipv4 = pvv-ipv4 209; ipv6 = pvv-ipv6 209; }; - bob = { - ipv4 = "129.241.152.254"; - # ipv6 = ; - }; knutsen = { ipv4 = pvv-ipv4 191; };