diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 3ed841b..0000000 --- a/configuration.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib, pkgs, ... }: - -{ - networking = { - hostName = "sanic"; - useNetworkd = true; - nameservers = [ - "172.23.42.1" - ]; - defaultGateway = { - address = "172.23.42.1"; - interface = "eth0"; - }; - interfaces.eth0 = { - ipv4.addresses = [{ - address = "172.23.43.102"; - prefixLength = 23; - }]; - }; - }; - services.resolved = { - enable = true; - llmnr = "true"; - dnssec = "allow-downgrade"; - dnsovertls = "opportunistic"; - }; - time.timeZone = "Europe/Berlin"; - i18n.defaultLocale = "en_US.UTF-8"; - - users.users.xengi = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - shell = pkgs.fish; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICW1+Ml8R9x1LCJaZ8bIZ1qIV4HCuZ6x7DziFW+0Nn5T xengi@kanae_2022-12-09" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICmb+mJfo84IagUaRoDEqY9ROjjQUOQ7tMclpN6NDPrX xengi@kota_2022-01-16" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICyklb7dvEHH0VBEMmTUQFKHN6ekBQqkDKj09+EilUIQ xengi@lucy_2018-09-08" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGhyfD+8jMl6FDSADb11sfAsJk0KNoVzjjiDRZjUOtmf xengi@nana_2019-08-16" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICjv9W8WXq9QGkgmANNPQR24/I1Pm1ghxNIHftEI+jlZ xengi@mayu_2021-06-11" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMPtGqhV7io3mhIoZho4Yf7eCo0sUZvjT2NziM2PkXSo xengi@nyu_2017-10-11" - ]; - packages = with pkgs; [ - kitty # for terminfo - ]; - }; - - nix = { - optimise = { - automatic = true; - dates = [ "00:00" ]; - }; - settings = { - auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" ]; - }; - gc = { - automatic = true; - options = "--delete-older-than 10d"; - }; - }; - - environment.systemPackages = with pkgs; [ - git # required for flakes - vim - nvd - ]; - - services = { - openssh = { - enable = true; - settings.PasswordAuthentication = false; - }; - }; - - programs = { - fish = { - enable = true; - interactiveShellInit = '' - function upgrade --description "Upgrade NixOS system" - cd /etc/nixos - nix flake update - cd - - nixos-rebuild switch --upgrade - nvd diff (ls -d1v /nix/var/nix/profiles/system-*-link|tail -n 2) - end - ''; - }; - vim.defaultEditor = true; - mtr.enable = true; - }; - - security = { - sudo.execWheelOnly = true; - }; - - networking.firewall = { - enable = true; - allowedTCPPorts = [ - 80 # HTTP/1 - 443 # HTTP/2 - ]; - allowedUDPPorts = [ - 443 # HTTP/3 - ]; - }; - - system.stateVersion = "24.05"; -} - diff --git a/flake.lock b/flake.lock index 14fcec4..11d6492 100644 --- a/flake.lock +++ b/flake.lock @@ -43,16 +43,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723282977, - "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d3e5102..7886891 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "sanic - chaos music control"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-24.05; + nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-unstable; flake-utils.url = github:numtide/flake-utils; gomod2nix = { url = github:tweag/gomod2nix; @@ -36,18 +36,6 @@ mpc-cli ]; }; - nixosConfigurations."sanic" = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - { - environment.systemPackages = with pkgs; [ - sanic - ]; - } - "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" - ./configuration.nix - ]; - }; } ); }