From f42c42b0a73f780bf74356ae63d4c344e696275f Mon Sep 17 00:00:00 2001 From: Vivian Date: Mon, 9 Sep 2024 08:36:20 +0200 Subject: [PATCH] cleanup & updates --- common/hm-modules/nvim/default.nix | 6 +- flake.lock | 186 ++++++++---------- flake.nix | 2 +- hosts/olympus/bastion/containers/default.nix | 5 +- hosts/olympus/bastion/containers/dns.nix | 7 + nixos/hosts/olympus/bastion/configuration.nix | 38 ---- .../olympus/bastion/containers/common.nix | 6 - .../olympus/bastion/containers/default.nix | 26 --- .../bastion/hardware-configuration.nix | 25 --- nixos/hosts/olympus/bastion/vms.nix | 32 --- nixos/hosts/olympus/dhcp/configuration.nix | 3 - nixos/hosts/olympus/eevee/configuration.nix | 53 ----- .../olympus/eevee/hardware-configuration.nix | 42 ---- nixos/hosts/olympus/eevee/hardware.nix | 48 ----- nixos/hosts/olympus/eevee/home/.gitignore | 1 - nixos/hosts/olympus/eevee/home/default.nix | 9 - nixos/hosts/olympus/nginx/configuration.nix | 1 - 17 files changed, 95 insertions(+), 395 deletions(-) create mode 100644 hosts/olympus/bastion/containers/dns.nix delete mode 100644 nixos/hosts/olympus/bastion/configuration.nix delete mode 100644 nixos/hosts/olympus/bastion/containers/common.nix delete mode 100644 nixos/hosts/olympus/bastion/containers/default.nix delete mode 100644 nixos/hosts/olympus/bastion/hardware-configuration.nix delete mode 100644 nixos/hosts/olympus/bastion/vms.nix delete mode 100644 nixos/hosts/olympus/eevee/configuration.nix delete mode 100644 nixos/hosts/olympus/eevee/hardware-configuration.nix delete mode 100644 nixos/hosts/olympus/eevee/hardware.nix delete mode 100644 nixos/hosts/olympus/eevee/home/.gitignore delete mode 100644 nixos/hosts/olympus/eevee/home/default.nix diff --git a/common/hm-modules/nvim/default.nix b/common/hm-modules/nvim/default.nix index dbb56629..8f86bdc7 100644 --- a/common/hm-modules/nvim/default.nix +++ b/common/hm-modules/nvim/default.nix @@ -219,10 +219,6 @@ with lib; folder = "daily"; }; workspaces = [ - { - name = "uni"; - path = "~/cloud/Documents/CESE/notes"; - } { name = "notes"; path = "~/cloud/Notes"; @@ -282,7 +278,7 @@ with lib; }; # surround.enable = true; fugitive.enable = true; - gitgutter.enable = true; + # gitgutter.enable = true; lualine = { enable = true; diff --git a/flake.lock b/flake.lock index 151aa7f5..9d026692 100644 --- a/flake.lock +++ b/flake.lock @@ -4,6 +4,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" @@ -11,11 +12,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1724226964, - "narHash": "sha256-cltFh4su2vcFidxKp7LuEgX3ZGLfPy0DCdrQZ/QTe68=", + "lastModified": 1725300620, + "narHash": "sha256-IdM+pZ6BnmD3o1fTJZ2BD43k7dwi1BbVfLDLpM1nE5s=", "owner": "zhaofengli", "repo": "attic", - "rev": "6d9aeaef0a067d664cb11bb7704f7ec373d47fb2", + "rev": "bea72d75b6165dfb529ba0c39cc6c7e9c7f0d234", "type": "github" }, "original": { @@ -42,11 +43,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1724156255, - "narHash": "sha256-rpUCeS/QZwQdJmDrvCm0hRi8bFvQNQKAnIMK5ZDBfpM=", + "lastModified": 1725509983, + "narHash": "sha256-NHCgHVqumPraFJnLrkanoLDuhOoUHUvRhvp/RIHJR+A=", "owner": "catppuccin", "repo": "nix", - "rev": "8886a68edadb1d93c7101337f995ffce4b410ff2", + "rev": "45745fe5960acaefef2b60f3455bcac6a0ca6bc9", "type": "github" }, "original": { @@ -180,28 +181,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "microvm", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1722580276, - "narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=", - "owner": "nix-community", - "repo": "fenix", - "rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -313,6 +292,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -333,7 +333,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1724227338, - "narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=", + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "type": "github" }, "original": { @@ -633,11 +633,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1725628988, + "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", "type": "github" }, "original": { @@ -654,11 +654,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -671,7 +671,7 @@ "inputs": { "crane": "crane_2", "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], @@ -679,11 +679,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722329086, - "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", + "lastModified": 1725379389, + "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", + "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", "type": "github" }, "original": { @@ -717,17 +717,16 @@ }, "microvm": { "inputs": { - "fenix": "fenix", "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_3", "spectrum": "spectrum" }, "locked": { - "lastModified": 1723470968, - "narHash": "sha256-W76xLG4thxkENM3MOoXWYqKPrgk1WgUWzTixUyuw/co=", + "lastModified": 1725664757, + "narHash": "sha256-kUMgeF3hHJM8aBpdazNgtCeeOTrWext6lHfrYmC6otU=", "owner": "astro", "repo": "microvm.nix", - "rev": "69e8ac63a7a4d40bb65e73af41ba60df2eba0419", + "rev": "caac7808d1e31f8a0fa408338cd3736947cb226d", "type": "github" }, "original": { @@ -744,11 +743,11 @@ ] }, "locked": { - "lastModified": 1724299755, - "narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=", + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a8968d88e5a537b0491f68ce910749cd870bdbef", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "type": "github" }, "original": { @@ -759,11 +758,11 @@ }, "nixlib": { "locked": { - "lastModified": 1723942470, - "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=", + "lastModified": 1725152544, + "narHash": "sha256-Tm344cnFM9f2YZsgWtJduvhIrvLr3Bi8J4Xc+UZDKYE=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "531a2e8416a6d8200a53eddfbdb8f2c8dc4a1251", + "rev": "7f0b9e4fbd91826cb9ce6babbc11c87903191051", "type": "github" }, "original": { @@ -780,11 +779,11 @@ ] }, "locked": { - "lastModified": 1724288137, - "narHash": "sha256-ZsDarezhjZ7kloarJlA2KxTrLHrLVUtLyYcXr/0wbCw=", + "lastModified": 1725497951, + "narHash": "sha256-fayKyVs/9FQdYH+3SCOkQM1GCsEPPVE+lSiVGlYQ7i0=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0552f784af9f211481c5dda6df9b918733492826", + "rev": "15a07ebf4a041bf232026263f1f96f2af390f3bc", "type": "github" }, "original": { @@ -795,11 +794,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724067415, - "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", + "lastModified": 1725477728, + "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", + "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "type": "github" }, "original": { @@ -841,16 +840,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -889,11 +888,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { @@ -905,26 +904,26 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1724306539, - "narHash": "sha256-9jF5qr44cnvWoXhE0cr114GHT5Adav3q/DKJ6n9tor8=", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c31eb9b990446880000e3297f69f4fdee5b69d7", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "type": "indirect" } }, "nixpkgs_5": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -954,7 +953,7 @@ "inputs": { "devshell": "devshell", "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", @@ -963,11 +962,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724340365, - "narHash": "sha256-SFJuLI6FpuLHI0PdZAIOAJoeR6Z+cRkbTUQ5TuqJw5s=", + "lastModified": 1725669404, + "narHash": "sha256-Bbp1GVgKVLz9mSfzgwBdQ96Pxm+RgPEdYjS4kKSFrAI=", "owner": "pta2002", "repo": "nixvim", - "rev": "1854d591cb0e5be6ad97f5091766cdf28e948265", + "rev": "86a4021597c860a6cd1953305a9995f44e60d4d5", "type": "github" }, "original": { @@ -978,11 +977,11 @@ }, "nur": { "locked": { - "lastModified": 1724348704, - "narHash": "sha256-h8HB+4AiVZAe3ie6zYOmJco7QkKRPC7iHfChsoSOHm4=", + "lastModified": 1725687722, + "narHash": "sha256-LPv282y5okYk8ebiBsEbDXy2WykwdBPpAthjKSmTfNI=", "owner": "nix-community", "repo": "NUR", - "rev": "bf3ebc298e0a5091f4f41cb45f38b31cac050e62", + "rev": "ff7f8143f33751c4f37caec678ed1eb63006c0d3", "type": "github" }, "original": { @@ -1000,11 +999,11 @@ ] }, "locked": { - "lastModified": 1723969429, - "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "owner": "NuschtOS", "repo": "search", - "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "type": "github" }, "original": { @@ -1063,23 +1062,6 @@ "vault-unseal": "vault-unseal" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1722521768, - "narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f149dc5029d8406fae8b2c541603bcac06e30deb", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -1297,11 +1279,11 @@ ] }, "locked": { - "lastModified": 1723808491, - "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5bab0ea6..d1a866e9 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # * https://github.com/Infinidoge/nix-minecraft inputs = { - nixpkgs.url = "nixpkgs/nixos-unstable-small"; + nixpkgs.url = "nixpkgs/nixos-unstable"; flake-utils-plus.url = "github:NULLx76/flake-utils-plus"; nur.url = "github:nix-community/NUR"; colmena.url = "github:zhaofengli/colmena"; diff --git a/hosts/olympus/bastion/containers/default.nix b/hosts/olympus/bastion/containers/default.nix index b88348a0..4f41ed31 100644 --- a/hosts/olympus/bastion/containers/default.nix +++ b/hosts/olympus/bastion/containers/default.nix @@ -3,7 +3,6 @@ let hostAddress = "10.42.99.1"; hostAddress6 = "fc00::1"; in { - # TODO: Loop over subdirs, create nixos container for each networking.nat = { enable = true; internalInterfaces = [ "ve-+" ]; @@ -24,7 +23,7 @@ in { dns = { autoStart = true; inherit hostAddress hostAddress6; - localAddress = "10.42.99.1"; + localAddress = "10.42.99.2"; localAddress6 = "fc00::2"; specialArgs = { inherit inputs; }; @@ -32,11 +31,11 @@ in { config = {pkgs, ...}: { imports = [ ./common.nix + # ./dns.nix inputs.home-manager.nixosModules.home-manager inputs.gnome-autounlock-keyring.nixosModules.default inputs.catppuccin.nixosModules.catppuccin ]; - }; }; }; diff --git a/hosts/olympus/bastion/containers/dns.nix b/hosts/olympus/bastion/containers/dns.nix new file mode 100644 index 00000000..530b642f --- /dev/null +++ b/hosts/olympus/bastion/containers/dns.nix @@ -0,0 +1,7 @@ +{ ... }: { + services.v.dns = { + enable = true; + openFirewall = true; + mode = "server"; + }; +} diff --git a/nixos/hosts/olympus/bastion/configuration.nix b/nixos/hosts/olympus/bastion/configuration.nix deleted file mode 100644 index 3cb429d7..00000000 --- a/nixos/hosts/olympus/bastion/configuration.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ pkgs, inputs, ... }: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ./containers - # ./vms.nix - ]; - - programs.nix-ld.enable = true; - - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; - - # 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 = "22.11"; # Did you read the comment? - - virtualisation.podman.enable = true; - - # Additional packages - environment.systemPackages = with pkgs; [ vault ]; - - networking.useNetworkd = true; - - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "curses"; - }; -} diff --git a/nixos/hosts/olympus/bastion/containers/common.nix b/nixos/hosts/olympus/bastion/containers/common.nix deleted file mode 100644 index 56ccdd5e..00000000 --- a/nixos/hosts/olympus/bastion/containers/common.nix +++ /dev/null @@ -1,6 +0,0 @@ -# common container config -{ lib, ... }: { - # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686 - networking.useHostResolvConf = lib.mkForce false; - services.resolved.enable = true; -} diff --git a/nixos/hosts/olympus/bastion/containers/default.nix b/nixos/hosts/olympus/bastion/containers/default.nix deleted file mode 100644 index d2e8299d..00000000 --- a/nixos/hosts/olympus/bastion/containers/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, ... }: -let - hostAddress = "10.42.99.1"; - hostAddress6 = "fc00::1"; -in { - # TODO: Loop over subdirs, create nixos container for each - networking.nat = { - enable = true; - internalInterfaces = [ "ve-+" ]; - externalInterface = "ens18"; - # Lazy IPv6 connectivity for the container - enableIPv6 = true; - - forwardPorts = [ - - ]; - }; - - # Containers network is - # * 10.42.99.0/24 - # * fc00:x - - containers = { - - }; -} diff --git a/nixos/hosts/olympus/bastion/hardware-configuration.nix b/nixos/hosts/olympus/bastion/hardware-configuration.nix deleted file mode 100644 index be7d9923..00000000 --- a/nixos/hosts/olympus/bastion/hardware-configuration.nix +++ /dev/null @@ -1,25 +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. -{ modulesPath, ... }: - -{ - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot = { - - initrd.availableKernelModules = - [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - initrd.kernelModules = [ ]; - kernelModules = [ ]; - extraModulePackages = [ ]; - }; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/e8427097-8545-4924-b033-2659fcf9adca"; - fsType = "ext4"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/63d90b92-cdde-4795-a3ab-9566ae88f43d"; }]; - -} diff --git a/nixos/hosts/olympus/bastion/vms.nix b/nixos/hosts/olympus/bastion/vms.nix deleted file mode 100644 index 6f8a57fc..00000000 --- a/nixos/hosts/olympus/bastion/vms.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, inputs, ... }: { - imports = [ - inputs.microvm.nixosModules.host - ]; - - microvm.vms = { - test-vm = { - inherit pkgs; - - # (Optional) A set of special arguments to be passed to the MicroVM's NixOS modules. - #specialArgs = {}; - - # The configuration for the MicroVM. - # Multiple definitions will be merged as expected. - config = { - # It is highly recommended to share the host's nix-store - # with the VMs to prevent building huge images. - microvm.hypervisor = "crosvm"; - microvm.shares = [{ - source = "/nix/store"; - mountPoint = "/nix/.ro-store"; - tag = "ro-store"; - proto = "virtiofs"; - }]; - - # Any other configuration for your MicroVM - # [...] - }; - - }; - }; -} diff --git a/nixos/hosts/olympus/dhcp/configuration.nix b/nixos/hosts/olympus/dhcp/configuration.nix index a2c642bd..13bcc0fb 100644 --- a/nixos/hosts/olympus/dhcp/configuration.nix +++ b/nixos/hosts/olympus/dhcp/configuration.nix @@ -41,8 +41,6 @@ in controlSocketPaths = [ "/tmp/kea-dhcp4.socket" ]; }; - # To make sure the control socket is accesible - services.kea.dhcp4 = { enable = true; settings = { @@ -57,7 +55,6 @@ in socket-type = "unix"; socket-name = "/tmp/kea-dhcp4.socket"; }; - # failed to initialize Kea server: configuration error using file '/etc/kea/dhcp4-server.conf': cannot create socket lockfile, /run/kea/kea-dhcp4.socket.lock, : No such file or directory lease-database = { name = "/var/lib/kea/dhcp4.leases"; diff --git a/nixos/hosts/olympus/eevee/configuration.nix b/nixos/hosts/olympus/eevee/configuration.nix deleted file mode 100644 index 6e4e1710..00000000 --- a/nixos/hosts/olympus/eevee/configuration.nix +++ /dev/null @@ -1,53 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ pkgs, ... }: { - imports = [ ./hardware-configuration.nix ./hardware.nix ]; - - # Bootloader. - boot = { - kernelPackages = pkgs.linuxPackages_latest; - initrd = { - kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; - }; - loader.systemd-boot.configurationLimit = 5; - }; - - fileSystems."/".options = [ "compress=zstd" ]; - - # Set your time zone. - time.timeZone = "Europe/Amsterdam"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_GB.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "nl_NL.UTF-8"; - LC_IDENTIFICATION = "nl_NL.UTF-8"; - LC_MEASUREMENT = "nl_NL.UTF-8"; - LC_MONETARY = "nl_NL.UTF-8"; - LC_NAME = "nl_NL.UTF-8"; - LC_NUMERIC = "nl_NL.UTF-8"; - LC_PAPER = "nl_NL.UTF-8"; - LC_TELEPHONE = "nl_NL.UTF-8"; - LC_TIME = "nl_NL.UTF-8"; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - environment.systemPackages = with pkgs; [ wireguard-tools ]; - - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - home-manager = { - users.vivian = import ./home; - }; - # 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/nixos/hosts/olympus/eevee/hardware-configuration.nix b/nixos/hosts/olympus/eevee/hardware-configuration.nix deleted file mode 100644 index efc77070..00000000 --- a/nixos/hosts/olympus/eevee/hardware-configuration.nix +++ /dev/null @@ -1,42 +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, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot = { - - initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - initrd.kernelModules = [ ]; - kernelModules = [ "kvm-intel" ]; - extraModulePackages = [ ]; - }; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/947a98af-9a4e-4811-a2ca-9aa00b319e9c"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/D883-F146"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/a99402e1-6f2a-4c4b-b69f-aae2fd13ffc0"; }]; - - # 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.enp0s31f6.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hosts/olympus/eevee/hardware.nix b/nixos/hosts/olympus/eevee/hardware.nix deleted file mode 100644 index cd1cb84d..00000000 --- a/nixos/hosts/olympus/eevee/hardware.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, ... }: { - hardware = { - enableAllFirmware = true; - nvidia = { - # package = config.boot.kernelPackages.nvidiaPackages.stable; - - # Open drivers cause gdm to crash - # open = true; - - # nvidia-drm.modeset=1 - modesetting.enable = true; - powerManagement.enable = false; - }; - - # Hardware acceleration - opengl = { - enable = true; - - # Vulkan - driSupport = true; - driSupport32Bit = true; - }; - - logitech.wireless = { - enable = true; - enableGraphical = true; - }; - }; - services = { - - hardware.bolt.enable = true; - - xserver.videoDrivers = [ "nvidia" ]; - - # udev - udev.packages = with pkgs; [ - android-udev-rules - logitech-udev-rules - wooting-udev-rules - ]; - - # SSD Trim - fstrim.enable = true; - }; - - # FS - fileSystems."/".options = [ "compress=zstd" ]; -} diff --git a/nixos/hosts/olympus/eevee/home/.gitignore b/nixos/hosts/olympus/eevee/home/.gitignore deleted file mode 100644 index 3e0fc8e7..00000000 --- a/nixos/hosts/olympus/eevee/home/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*dconf_dump* \ No newline at end of file diff --git a/nixos/hosts/olympus/eevee/home/default.nix b/nixos/hosts/olympus/eevee/home/default.nix deleted file mode 100644 index bf2d078a..00000000 --- a/nixos/hosts/olympus/eevee/home/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: { - dconf.settings."org/gnome/desktop/peripherals/mouse" = { - accel-profile = "flat"; - }; - - home.packages = with pkgs; [ - zoom-us - ]; -} diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix index b4f68c39..a686d487 100644 --- a/nixos/hosts/olympus/nginx/configuration.nix +++ b/nixos/hosts/olympus/nginx/configuration.nix @@ -172,7 +172,6 @@ in { }; security = { acme = { - defaults.email = "vivian@0x76.dev"; acceptTerms = true; preliminarySelfsigned = true;