From 48fb151e60778f1e35edbe1d03ae9712d39073fd Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 19:19:30 -0800 Subject: [PATCH 01/10] new host, rinnosuke --- nixvim/plugins/lsp.nix | 26 ++++++++++++++++- systems/rinnosuke.nix | 66 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 systems/rinnosuke.nix diff --git a/nixvim/plugins/lsp.nix b/nixvim/plugins/lsp.nix index 7528df11..d5dd6934 100644 --- a/nixvim/plugins/lsp.nix +++ b/nixvim/plugins/lsp.nix @@ -1,6 +1,7 @@ { lib, std, + pkgs, ... }: let inherit (std) set; @@ -37,6 +38,7 @@ in { plugins = let pluginsToGen = [ "lspconfig" + "treesitter" "cmp" "cmp-clippy" "cmp-cmdline" @@ -54,7 +56,29 @@ in { autoLoad = true; }; in - genAttrs pluginsToGen (_: basePlugin); + set.merge [ + (genAttrs pluginsToGen (_: basePlugin)) + { + treesitter = { + grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ + bash + json + make + markdown + regex + toml + xml + yaml + gleam + nix + ]; + settings = { + highlight.enable = true; + indent.enable = true; + }; + }; + } + ]; diagnostic.settings = { virtual_text = true; virtual_lines = true; diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix new file mode 100644 index 00000000..631ec061 --- /dev/null +++ b/systems/rinnosuke.nix @@ -0,0 +1,66 @@ +_: let + hostConfig = { + lib, + modulesPath, + tree, + ... + }: { + imports = + [ + (modulesPath + "/profiles/qemu-guest.nix") + ] + ++ (with tree.nixos.profiles; [ + server + ]); + + boot = { + initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; + kernelModules = ["kvm-amd"]; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/d7419452-7f03-40f1-ba9b-74d81cf2436a"; + fsType = "xfs"; + }; + + "/boot" = { + device = "/dev/disk/by-uuid/8B8C-6502"; + fsType = "vfat"; + options = ["fmask=0777" "dmask=0777"]; + }; + }; + + swapDevices = [ + {device = "/dev/disk/by-uuid/08b6efda-1bb5-4698-abae-fbfa8bff84fe";} + ]; + + networking = { + interfaces.ens18.ipv4.addresses = [ + { + address = "154.12.117.50"; + prefixLength = 27; + } + ]; + defaultGateway = "154.12.117.33"; + nameservers = [ + "1.1.1.1" + ]; + }; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + boot.loader.grub.enable = true; + system.stateVersion = "25.05"; + }; +in { + arch = "x86_64"; + type = "NixOS"; + deploy.hostname = "154.12.117.50"; + colmena.tags = [ + "server" + ]; + modules = [ + hostConfig + ]; +} From bad04dff5447032ee7e403b0ff5149509c9b7c53 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 19:41:53 -0800 Subject: [PATCH 02/10] fix(flake): attempt to use type tarball --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index c28a22a1..16c3028b 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ # to allow non-nix 2.4 evaluation flake-compat = { url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; + type = "tarball"; flake = false; }; rbw-bitw = { From 4539fa481ddba7a5b8f7dbe450e87340117a50c5 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 19:46:28 -0800 Subject: [PATCH 03/10] fix(rinnosuke): grub devices --- systems/rinnosuke.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix index 631ec061..3be99f19 100644 --- a/systems/rinnosuke.nix +++ b/systems/rinnosuke.nix @@ -16,6 +16,9 @@ _: let boot = { initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; kernelModules = ["kvm-amd"]; + loader.grub.devices = [ + "/dev/disk/by-uuid/8B8C-6502" + ]; }; fileSystems = { From 213d506e4c8dacef30fb6ca61c4a0136afb5424e Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:04:00 -0800 Subject: [PATCH 04/10] fix(niri): wtf --- home/environments/niri/niri.nix | 3 +++ nixos/environments/niri/niri.nix | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/home/environments/niri/niri.nix b/home/environments/niri/niri.nix index 78b61bbe..567e1f08 100644 --- a/home/environments/niri/niri.nix +++ b/home/environments/niri/niri.nix @@ -6,6 +6,9 @@ }: let inherit (lib.meta) getExe; in { + imports = [ + niri.hmModules.niri + ]; home.packages = with pkgs; [ wl-clipboard pamixer diff --git a/nixos/environments/niri/niri.nix b/nixos/environments/niri/niri.nix index b307c3fc..35372a78 100644 --- a/nixos/environments/niri/niri.nix +++ b/nixos/environments/niri/niri.nix @@ -1,4 +1,11 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { + imports = [ + inputs.niri.nixosModules.niri + ]; programs.niri = { enable = true; package = pkgs.niri-unstable; From 0178bff042d86e7267e0b958a91c2c9b36fa945c Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:06:11 -0800 Subject: [PATCH 05/10] feat: ??? --- tree.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/tree.nix b/tree.nix index 003497c8..f7203a62 100644 --- a/tree.nix +++ b/tree.nix @@ -95,7 +95,6 @@ nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.platformOptimizations clipboard-sync.nixosModules.default - niri.nixosModules.niri nixos-cli.nixosModules.nixos-cli stylix.nixosModules.stylix microvm.nixosModules.host From 72759c3286f616761d5624d0d398af274392a619 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:21:53 -0800 Subject: [PATCH 06/10] fix: rinnosuke --- systems/rinnosuke.nix | 10 ++++++---- tree.nix | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix index 3be99f19..4f43f530 100644 --- a/systems/rinnosuke.nix +++ b/systems/rinnosuke.nix @@ -16,9 +16,12 @@ _: let boot = { initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; kernelModules = ["kvm-amd"]; - loader.grub.devices = [ - "/dev/disk/by-uuid/8B8C-6502" - ]; + loader.grub = { + enable = true; + device = [ + "/dev/disk/by-uuid/8B8C-6502" + ]; + }; }; fileSystems = { @@ -53,7 +56,6 @@ _: let nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - boot.loader.grub.enable = true; system.stateVersion = "25.05"; }; in { diff --git a/tree.nix b/tree.nix index f7203a62..003497c8 100644 --- a/tree.nix +++ b/tree.nix @@ -95,6 +95,7 @@ nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.platformOptimizations clipboard-sync.nixosModules.default + niri.nixosModules.niri nixos-cli.nixosModules.nixos-cli stylix.nixosModules.stylix microvm.nixosModules.host From e46369e77215b6e09739fed450607d7aef5f64de Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:22:12 -0800 Subject: [PATCH 07/10] fix: niri --- tree.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/tree.nix b/tree.nix index 003497c8..f7203a62 100644 --- a/tree.nix +++ b/tree.nix @@ -95,7 +95,6 @@ nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.platformOptimizations clipboard-sync.nixosModules.default - niri.nixosModules.niri nixos-cli.nixosModules.nixos-cli stylix.nixosModules.stylix microvm.nixosModules.host From 41fcc86983fb01787ebc632fe6066cb2658f66a9 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:30:36 -0800 Subject: [PATCH 08/10] fix: rinnosuke --- systems/rinnosuke.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix index 4f43f530..a21b6d5c 100644 --- a/systems/rinnosuke.nix +++ b/systems/rinnosuke.nix @@ -18,9 +18,7 @@ _: let kernelModules = ["kvm-amd"]; loader.grub = { enable = true; - device = [ - "/dev/disk/by-uuid/8B8C-6502" - ]; + device = "/dev/disk/by-uuid/8B8C-6502"; }; }; From ce594b6a99af7e74b18a6b26668c8c6ee6fbc3a7 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:33:21 -0800 Subject: [PATCH 09/10] fix(rinnosuke): try to fix f32 --- systems/rinnosuke.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix index a21b6d5c..9beb1c22 100644 --- a/systems/rinnosuke.nix +++ b/systems/rinnosuke.nix @@ -18,7 +18,7 @@ _: let kernelModules = ["kvm-amd"]; loader.grub = { enable = true; - device = "/dev/disk/by-uuid/8B8C-6502"; + device = "/dev/disk/by-uuid/EE23-9347"; }; }; @@ -29,7 +29,7 @@ _: let }; "/boot" = { - device = "/dev/disk/by-uuid/8B8C-6502"; + device = "/dev/disk/by-uuid/EE23-9347"; fsType = "vfat"; options = ["fmask=0777" "dmask=0777"]; }; From 8585f1749fd9bef9bc949612284d5d91e09c9a73 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 3 Dec 2025 20:35:45 -0800 Subject: [PATCH 10/10] fix(rinnosuke): oh. --- systems/rinnosuke.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/rinnosuke.nix b/systems/rinnosuke.nix index 9beb1c22..2e7d4d66 100644 --- a/systems/rinnosuke.nix +++ b/systems/rinnosuke.nix @@ -18,7 +18,7 @@ _: let kernelModules = ["kvm-amd"]; loader.grub = { enable = true; - device = "/dev/disk/by-uuid/EE23-9347"; + device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0"; }; };