Nvim and format

This commit is contained in:
2023-07-20 00:26:04 +01:00
parent 586df7389b
commit e1dfd3193e
7 changed files with 43 additions and 34 deletions

View File

@@ -1,29 +1,33 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/1abab84b-47d7-45bb-b31d-e5668f545d7f"; device = "/dev/disk/by-uuid/1abab84b-47d7-45bb-b31d-e5668f545d7f";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/1F77-6B2D"; device = "/dev/disk/by-uuid/1F77-6B2D";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -33,10 +33,10 @@
networking = { networking = {
hostName = "pingbox"; hostName = "pingbox";
interfaces.wlp170s0.useDHCP = true; interfaces.wlp170s0.useDHCP = true;
wireless = { wireless = {
enable = true; enable = true;
userControlled.enable = true; userControlled.enable = true;
}; };
}; };
services = { services = {

View File

@@ -39,7 +39,6 @@
backupPrepareCommand = '' backupPrepareCommand = ''
${pkgs.postgresql_13}/bin/pg_dumpall --clean -U postgres | ${pkgs.zstd}/bin/zstd --rsyncable > /var/backup/pgdump.sql.zst ${pkgs.postgresql_13}/bin/pg_dumpall --clean -U postgres | ${pkgs.zstd}/bin/zstd --rsyncable > /var/backup/pgdump.sql.zst
''; '';
}; };
}; };
} }

View File

@@ -14,12 +14,14 @@
})); }));
element = pkgs.element-web.override { element = pkgs.element-web.override {
conf = { conf =
default_server_config."m.homeserver" = { {
"base_url" = "https://broccoli.town"; default_server_config."m.homeserver" = {
"server_name" = "broccoli.town"; "base_url" = "https://broccoli.town";
}; "server_name" = "broccoli.town";
} // catppuccin; };
}
// catppuccin;
}; };
in { in {
enable = true; enable = true;

View File

@@ -28,7 +28,6 @@
repository = { repository = {
ENABLE_PUSH_CREATE_USER = true; ENABLE_PUSH_CREATE_USER = true;
}; };
};
}; };
}; };
} }

View File

@@ -1,5 +1,4 @@
{pkgs, ...}: {pkgs, ...}: {
{
home.packages = with pkgs; [ home.packages = with pkgs; [
tofi tofi
]; ];

View File

@@ -1,9 +1,15 @@
{...}: { {pkgs, ...}: let
nvim = pkgs.fetchgit {
url = "https://git.broccoli.town/dp/nvim";
sha256 = "sha256-yhbgfKarel8ACIWvIw2fM1qFoZnH8O+5+oNVnMZwdjo=";
};
in {
programs.neovim.enable = true; programs.neovim.enable = true;
home.file = { home.file = {
".config/nvim" = { ".config/nvim" = {
source = ./nvim; recursive = true;
source = nvim;
}; };
}; };
} }