diff options
| author | Mike Vink <ivi@vinkies.net> | 2024-01-08 23:34:58 +0100 |
|---|---|---|
| committer | Mike Vink <ivi@vinkies.net> | 2024-01-08 23:34:58 +0100 |
| commit | 25d9705750755aeddf093cb5834b385ae3ff8ffc (patch) | |
| tree | 76301a7080be4addca7cf7cf1a4eaeb731ac9466 | |
| parent | 9afed39b20971a296b1350c96ed632bb975279b2 (diff) | |
fixup
| -rw-r--r-- | iso.nix | 3 | ||||
| -rw-r--r-- | ivi/ivi.nix | 2 | ||||
| -rw-r--r-- | machines/cal.nix | 16 | ||||
| -rw-r--r-- | machines/kubo.nix | 3 | ||||
| -rw-r--r-- | machines/serber.nix | 2 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/events.fnl | 4 | ||||
| -rw-r--r-- | profiles/core/configuration.nix | 1 | ||||
| -rw-r--r-- | profiles/core/git.nix | 2 | ||||
| -rw-r--r-- | profiles/station/virtualisation.nix | 14 |
9 files changed, 25 insertions, 22 deletions
@@ -3,9 +3,7 @@ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ./profiles/core/configuration.nix ./profiles/core/hm.nix - ./profiles/core/home.nix ./profiles/core/git.nix - ./profiles/core/meta.nix ./profiles/core/neovim.nix ]; options = { @@ -17,5 +15,6 @@ warn-dirty = false; }; services.getty.autologinUser = mkForce ivi.username; + hm.xdg.configFile."nvim".source = ./mut/neovim; }; } diff --git a/ivi/ivi.nix b/ivi/ivi.nix index 542624a..ad6d79d 100644 --- a/ivi/ivi.nix +++ b/ivi/ivi.nix @@ -87,7 +87,7 @@ self: lib: with lib; let "server" ]; }; - cal = { + kubo = { isDeployed = true; profiles = [ "core" diff --git a/machines/cal.nix b/machines/cal.nix deleted file mode 100644 index 99b114e..0000000 --- a/machines/cal.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ modulesPath, config, pkgs, lib, ... }: with lib; { - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - - boot.loader.grub.device = "/dev/sda"; - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ]; - boot.initrd.kernelModules = [ "nvme" ]; - fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; - - sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"]; - system.stateVersion = "23.11"; - boot.tmp.cleanOnBoot = true; - zramSwap.enable = true; - networking.hostName = "vinkies"; - networking.domain = "net"; - services.openssh.enable = true; -} diff --git a/machines/kubo.nix b/machines/kubo.nix new file mode 100644 index 0000000..383ccf0 --- /dev/null +++ b/machines/kubo.nix @@ -0,0 +1,3 @@ +{ modulesPath, ... }: { + +} diff --git a/machines/serber.nix b/machines/serber.nix index c94cdb6..fc4bb26 100644 --- a/machines/serber.nix +++ b/machines/serber.nix @@ -1,4 +1,4 @@ -{ modulesPath, config, pkgs, lib, ... }: with lib; { +{ modulesPath, lib, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; networking = { diff --git a/mut/neovim/fnl/conf/events.fnl b/mut/neovim/fnl/conf/events.fnl index 18d602e..65e8f8d 100644 --- a/mut/neovim/fnl/conf/events.fnl +++ b/mut/neovim/fnl/conf/events.fnl @@ -32,7 +32,9 @@ (event :BufWritePost {:group "conf#events" - :callback #(do (local lint (require :lint)) (lint.try_lint) (vim.diagnostic.setloclist))}) + :callback #(do (local lint (require :lint)) + (lint.try_lint) + (vim.schedule #(vim.diagnostic.setloclist)))}) (local session-file (.. vim.env.HOME "/.vimsession.vim")) diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index 4694974..c79d6d9 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -53,6 +53,7 @@ inetutils usbutils zoxide + binwalk ]; nix.package = pkgs.nixUnstable; diff --git a/profiles/core/git.nix b/profiles/core/git.nix index 31136ee..70b4648 100644 --- a/profiles/core/git.nix +++ b/profiles/core/git.nix @@ -1,4 +1,4 @@ -{config, lib, ...}: with lib; { +{lib, ...}: with lib; { hm = { programs.git = { enable = true; diff --git a/profiles/station/virtualisation.nix b/profiles/station/virtualisation.nix new file mode 100644 index 0000000..63dd746 --- /dev/null +++ b/profiles/station/virtualisation.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + virt-viewer + ]; + virtualisation.libvirtd.enable = true; + programs.virt-manager.enable = true; + hm.dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = ["qemu:///system"]; + uris = ["qemu:///system"]; + }; + }; + ivi.extraGroups = [ "libvirtd" ]; +} |
