Formatted

This commit is contained in:
willifan 2025-01-05 00:48:46 +01:00
parent d73191e526
commit fbfa70195b
63 changed files with 906 additions and 899 deletions

View file

@ -1,8 +1,8 @@
{ lib, config, inputs, hostname, ... }:
{
imports = [
./desktop
./nixvim

View file

@ -1,12 +1,12 @@
{ lib, config, ... }:
lib.mkIf config.desktop.autologin.enable {
security.pam.services.hyprlock = {};
security.pam.services.hyprlock = { };
services.greetd = {
enable = true;
settings = rec {
settings = rec {
initial_session = {
command = config.desktop.windowManager;
user = "willifan";

View file

@ -3,9 +3,9 @@ lib.mkIf config.desktop.enable {
boot = {
plymouth = {
enable = true;
# theme = "bgrt";
# logo = "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";
# font = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
# theme = "bgrt";
# logo = "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";
# font = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
};
consoleLogLevel = 0;

View file

@ -17,6 +17,6 @@
./thunar.nix
./udev.nix
];
}

View file

@ -13,24 +13,24 @@ lib.mkIf config.desktop.enable {
enable = true;
package = pkgs.libratbag.overrideAttrs (previousAttrs: {
postInstall = ''
# Ensure the target directory exists
mkdir -p $out/share/libratbag/
# cat the custom configuration file
cat << EOF > $out/share/libratbag/asus-rog-pugio-II.device
[Device]
Name=ASUS ROG Pugio II
DeviceMatch=usb:0b05:1906;usb:0b05:1908
Driver=asus
# Ensure the target directory exists
mkdir -p $out/share/libratbag/
# cat the custom configuration file
cat << EOF > $out/share/libratbag/asus-rog-pugio-II.device
[Device]
Name=ASUS ROG Pugio II
DeviceMatch=usb:0b05:1906;usb:0b05:1908
Driver=asus
[Driver/asus]
Profiles=3
Buttons=10
Leds=3
Dpis=4
Wireless=1
DpiRange=100:16000@100
ButtonMapping=f0;f1;f2;e4;e5;e6;0;e8;e9;e1;e2
EOF
[Driver/asus]
Profiles=3
Buttons=10
Leds=3
Dpis=4
Wireless=1
DpiRange=100:16000@100
ButtonMapping=f0;f1;f2;e4;e5;e6;0;e8;e9;e1;e2
EOF
'';
});
};

View file

@ -13,5 +13,5 @@
./yuzu.nix
];
}

View file

@ -12,5 +12,5 @@ lib.mkIf config.desktop.enable {
services.udev.extraRules = ''
SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
'';
}

View file

@ -4,7 +4,7 @@ lib.mkIf config.desktop.laser.enable {
services.udev.extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE:="0666"
'';
environment.systemPackages = with pkgs; [
k40-whisperer
];

View file

@ -6,13 +6,15 @@ lib.mkIf config.desktop.enable {
];
services.autofs = {
enable = true;
autoMaster = let
mapConf = pkgs.writeText "auto.nfs" ''
roms -fstype=nfs4 192.168.178.19:/roms
autoMaster =
let
mapConf = pkgs.writeText "auto.nfs" ''
roms -fstype=nfs4 192.168.178.19:/roms
'';
in
''
/mnt/nfs ${mapConf}
'';
in ''
/mnt/nfs ${mapConf}
'';
};
}

View file

@ -1,37 +1,37 @@
{ lib, config, ... }:
lib.mkIf config.desktop.enable {
nix.buildMachines = [
{
hostName = "Anton";
sshUser = "builder";
systems = [ "x86_64-linux" "aarch64-linux" ];
protocol = "ssh-ng";
# if the builder supports building for multiple architectures,
# replace the previous line by, e.g.
# systems = ["x86_64-linux" "aarch64-linux"];
maxJobs = 4;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}
{
hostName = "Puenktchen";
sshUser = "builder";
systems = [ "x86_64-linux" "aarch64-linux" ];
protocol = "ssh-ng";
# if the builder supports building for multiple architectures,
# replace the previous line by, e.g.
# systems = ["x86_64-linux" "aarch64-linux"];
maxJobs = 8;
speedFactor = 4;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}
nix.buildMachines = [
{
hostName = "Anton";
sshUser = "builder";
systems = [ "x86_64-linux" "aarch64-linux" ];
protocol = "ssh-ng";
# if the builder supports building for multiple architectures,
# replace the previous line by, e.g.
# systems = ["x86_64-linux" "aarch64-linux"];
maxJobs = 4;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}
{
hostName = "Puenktchen";
sshUser = "builder";
systems = [ "x86_64-linux" "aarch64-linux" ];
protocol = "ssh-ng";
# if the builder supports building for multiple architectures,
# replace the previous line by, e.g.
# systems = ["x86_64-linux" "aarch64-linux"];
maxJobs = 8;
speedFactor = 4;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}
];
nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = ''
builders-use-substitutes = true
'';
nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = ''
builders-use-substitutes = true
'';
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
}

View file

@ -18,5 +18,5 @@ lib.mkIf config.desktop.enable {
];
nix.settings.trusted-users = [ "willifan" ];
}

View file

@ -1,3 +1,2 @@
{ ... }:
{
}
{ }

View file

@ -2,10 +2,10 @@
{
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CACHE_HOME = "$HOME/.cache";
XDG_CONFIG_HOME = "$HOME/.config";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
XDG_DATA_HOME = "$HOME/.local/share";
XDG_STATE_HOME = "$HOME/.local/state";
# Not officially in the specification
#XDG_BIN_HOME = "$HOME/.local/bin";

View file

@ -8,8 +8,8 @@
settings = {
main = {
rightalt = "overload(altgr, rightalt)";
capslock = "overload(control, esc)";
};
capslock = "overload(control, esc)";
};
};
};
};

View file

@ -3,7 +3,7 @@
programs.nixvim.plugins.nvim-autopairs = {
enable = true;
settings = {
disable_filetype = ["TelescopePrompt" "vim"];
disable_filetype = [ "TelescopePrompt" "vim" ];
};
};
}

View file

@ -6,18 +6,18 @@
enable = true;
settings = {
autoEnableSources = true;
experimental = {ghost_text = false;};
experimental = { ghost_text = false; };
performance = {
debounce = 60;
fetchingTimeout = 200;
maxViewEntries = 30;
};
snippet = {expand = "luasnip";};
formatting = {fields = ["kind" "abbr" "menu"];};
snippet = { expand = "luasnip"; };
formatting = { fields = [ "kind" "abbr" "menu" ]; };
sources = [
{name = "git";}
{name = "nvim_lsp";}
{name = "emoji";}
{ name = "git"; }
{ name = "nvim_lsp"; }
{ name = "emoji"; }
{
name = "buffer"; # text within current buffer
option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
@ -34,16 +34,16 @@
];
window = {
completion = {border = "solid";};
documentation = {border = "solid";};
completion = { border = "solid"; };
documentation = { border = "solid"; };
};
};
};
cmp-nvim-lsp = {enable = true;}; # lsp
cmp-buffer = {enable = true;};
cmp-path = {enable = true;}; # file system paths
cmp_luasnip = {enable = true;}; # snippets
cmp-cmdline = {enable = false;}; # autocomplete for cmdline
cmp-nvim-lsp = { enable = true; }; # lsp
cmp-buffer = { enable = true; };
cmp-path = { enable = true; }; # file system paths
cmp_luasnip = { enable = true; }; # snippets
cmp-cmdline = { enable = false; }; # autocomplete for cmdline
};
}

View file

@ -5,16 +5,16 @@
hmts.enable = true;
lsp-lines = {enable = true;};
lsp-format = {enable = true;};
lsp-lines = { enable = true; };
lsp-format = { enable = true; };
lsp = {
enable = true;
inlayHints = true;
servers = {
clangd = {enable = true;};
html = {enable = true;};
lua_ls = {enable = true;};
nixd = {
clangd = { enable = true; };
html = { enable = true; };
lua_ls = { enable = true; };
nixd = {
enable = true;
settings = {
@ -22,15 +22,15 @@
nixpkgs.expr = "import <nixpkgs> {}";
};
};
pyright = {enable = true;};
gopls = {enable = true;};
jsonls = {enable = true;};
rust_analyzer = {
pyright = { enable = true; };
gopls = { enable = true; };
jsonls = { enable = true; };
rust_analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
yamlls = {enable = true;};
yamlls = { enable = true; };
};
keymaps = {

View file

@ -4,7 +4,7 @@
plugins = {
neo-tree = {
enable = true;
sources = ["filesystem" "buffers" "git_status" "document_symbols"];
sources = [ "filesystem" "buffers" "git_status" "document_symbols" ];
addBlankLineAtTop = false;
filesystem = {
@ -35,7 +35,7 @@
untracked = " ";
};
};
};
};
};
};
};

View file

@ -1,6 +1,6 @@
{ ... }:
{
{
programs.nixvim.plugins = {
which-key = {
enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [

View file

@ -27,7 +27,7 @@ in
polarity = "dark";
targets.plymouth.logo = plymouth_logo;
};
}

View file

@ -11,7 +11,7 @@ in
devices = lib.mkOption {
type = lib.types.attrsOf (lib.types.submodule {
options.id = lib.mkOption { type = lib.types.str; };
options.autoAcceptFolders = lib.mkOption {
type = lib.types.bool;