diff --git a/flake.lock b/flake.lock index 6022fb9..9905ecc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1745502102, - "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", + "lastModified": 1752113600, + "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", "owner": "nix-community", "repo": "disko", - "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", + "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", "type": "github" }, "original": { @@ -48,11 +48,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746563623, - "narHash": "sha256-5DxgNFpSgxft/sWraZnHIUlb4S3Io73SVS7FZCbWSUY=", + "lastModified": 1752258704, + "narHash": "sha256-pRK99+MCgkeVptbJxXhVMXIXl8uwSdkZDpQzFi3OgkA=", "ref": "refs/heads/main", - "rev": "4e0408887f80e61a90286ff630a7855b828ae421", - "revCount": 45, + "rev": "9ff525339b62855d53a44b4dc0154a33ac19e44d", + "revCount": 48, "type": "git", "url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git" }, @@ -139,11 +139,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752247770, - "narHash": "sha256-WDk5Sx9JWr8A+EPfkTLEcVNrBlY700rSNH8nm/oaVGY=", - "rev": "739c8f530a2c5e0b9eefc8019d201654264cb974", + "lastModified": 1752439653, + "narHash": "sha256-mG27U2CFuggpAuozOu/4XAMKaOtJxzJVzdEemjQEBgg=", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.806236.739c8f530a2c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.806304.dfcd5b901dba/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -152,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748588304, - "narHash": "sha256-YCnUqO9k39p0oMIBndxYTbu8m0fOA/KVcq3IekXPy9c=", - "rev": "b8af95f4cf511c5f056b463c3a45d2b63c7cfb03", + "lastModified": 1752439402, + "narHash": "sha256-xDfOnjnKStgsgcn9SFPgOV6qzwac4JvGKYyfR++49Pw=", + "rev": "b47d4f01d4213715a1f09b999bab96bb6a5b675e", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre807945.b8af95f4cf51/nixexprs.tar.xz?rev=b8af95f4cf511c5f056b463c3a45d2b63c7cfb03" + "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre829909.b47d4f01d421/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -170,11 +170,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" }, @@ -190,11 +190,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" }, @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1746498961, - "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", + "lastModified": 1752201818, + "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", + "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1745310711, - "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "lastModified": 1751606940, + "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b1e2cb..72f2ab9 100644 --- a/flake.nix +++ b/flake.nix @@ -115,12 +115,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/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 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"; 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; };