new formatting, nixvim is working

This commit is contained in:
Charlie Root 2024-05-22 14:29:45 +02:00
commit 0e22544a8a
88 changed files with 1994 additions and 1845 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{pkgs, ...}: {
boot.loader = {
efi.canTouchEfiVariables = true;
grub = {
@ -9,9 +9,8 @@
};
boot.plymouth = {
enable = false;
font =
"${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
themePackages = [ pkgs.catppuccin-plymouth ];
font = "${pkgs.jetbrains-mono}/share/fonts/truetype/JetBrainsMono-Regular.ttf";
themePackages = [pkgs.catppuccin-plymouth];
theme = "catppuccin-macchiato";
};
}

View file

@ -1,5 +1,10 @@
{ config, lib, pkgs, ... }:
let username = config.modules.other.system.username;
{
config,
lib,
pkgs,
...
}: let
username = config.modules.other.system.username;
in {
hardware.bluetooth = {
enable = true;
@ -11,8 +16,8 @@ in {
# Bluetooth headset media control buttons
systemd.user.services.mpris-proxy = {
description = "Mpris proxy";
after = [ "network.target" "sound.target" ];
wantedBy = [ "default.target" ];
after = ["network.target" "sound.target"];
wantedBy = ["default.target"];
serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
};
}

View file

@ -1,5 +1,10 @@
{ pkgs, config, inputs, ... }: {
services.xserver.videoDrivers = [ "nvidia" ];
{
pkgs,
config,
inputs,
...
}: {
services.xserver.videoDrivers = ["nvidia"];
hardware.opengl = {
enable = true;
# package = pkgs-unstable.mesa.drivers;
@ -13,13 +18,12 @@
powerManagement.finegrained = false;
nvidiaSettings = false;
#package = config.boot.kernelPackages.nvidiaPackages.beta;
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.42.02";
sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
openSha256 = "sha256-3/eI1VsBzuZ3Y6RZmt3Q5HrzI2saPTqUNs6zPh5zy6w=";
settingsSha256 = "";
persistencedSha256 = "";
};
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.42.02";
sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
openSha256 = "sha256-3/eI1VsBzuZ3Y6RZmt3Q5HrzI2saPTqUNs6zPh5zy6w=";
settingsSha256 = "";
persistencedSha256 = "";
};
};
}

View file

@ -1,5 +1,9 @@
{ config, lib, ... }:
let username = config.modules.other.system.username;
{
config,
lib,
...
}: let
username = config.modules.other.system.username;
in {
networking = {
networkmanager = {
@ -9,7 +13,7 @@ in {
};
services.resolved = {
enable = true;
fallbackDns = [ "9.9.9.9" "2620::fe::fe" ];
fallbackDns = ["9.9.9.9" "2620::fe::fe"];
};
users.users.${username}.extraGroups = [ "networkmanager" ];
users.users.${username}.extraGroups = ["networkmanager"];
}

View file

@ -1,3 +1,7 @@
{ inputs, lib, ... }: {
nix.registry = lib.mapAttrs (_: v: { flake = v; }) inputs;
{
inputs,
lib,
...
}: {
nix.registry = lib.mapAttrs (_: v: {flake = v;}) inputs;
}

View file

@ -1 +1 @@
{ self, ... }: { environment.etc."current-flake".source = self; }
{self, ...}: {environment.etc."current-flake".source = self;}

View file

@ -1,9 +1,9 @@
{ pkgs, ... }: {
{pkgs, ...}: {
fonts = {
packages = with pkgs; [
material-icons
material-design-icons
(nerdfonts.override { fonts = [ "Iosevka" "JetBrainsMono" ]; })
(nerdfonts.override {fonts = ["Iosevka" "JetBrainsMono"];})
noto-fonts
noto-fonts-cjk
noto-fonts-cjk
@ -17,10 +17,10 @@
# this fixes emoji stuff
fontconfig = {
defaultFonts = {
monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" ];
sansSerif = [ "Lexend" "Noto Color Emoji" ];
serif = [ "Noto Serif" "Noto Color Emoji" ];
emoji = [ "Noto Color Emoji" ];
monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"];
sansSerif = ["Lexend" "Noto Color Emoji"];
serif = ["Noto Serif" "Noto Color Emoji"];
emoji = ["Noto Color Emoji"];
};
};
};

View file

@ -1,9 +1,12 @@
{ config, lib, ... }:
{
config,
lib,
...
}:
with lib; {
options.modules.other.system.monitors = mkOption {
description = "\n List of monitors to use\n ";
default = [ ];
default = [];
type = with types;
types.listOf (submodule {
options = {
@ -69,5 +72,4 @@ with lib; {
};
});
};
}