Compare commits

..

5 commits

Author SHA1 Message Date
willifan
3a98b72e7f readded games 2025-01-07 23:28:53 +01:00
willifan
04d3ef23d0 test nixd fix 2025-01-07 23:28:53 +01:00
willifan
fbfa70195b Formatted 2025-01-07 23:28:53 +01:00
willifan
d73191e526 configured nixd 2025-01-07 23:28:53 +01:00
willifan
530eff03e7 added hmts nixvim plugin 2025-01-07 23:28:53 +01:00
64 changed files with 925 additions and 902 deletions

View file

@ -25,7 +25,7 @@
}; };
stylix = { stylix = {
url ="github:danth/stylix"; url = "github:danth/stylix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -59,7 +59,8 @@
{ {
nixosConfigurations = { nixosConfigurations = {
Lenni = let Lenni =
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {
@ -88,7 +89,8 @@
}; };
Puenktchen = let Puenktchen =
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {
@ -119,7 +121,8 @@
}; };
Anton = let Anton =
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {
@ -150,7 +153,8 @@
}; };
Lillie = let Lillie =
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {

View file

@ -1,14 +1,14 @@
{ ... }: { ... }:
{ {
# environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
# mergerfs # mergerfs
# ]; # ];
fileSystems."/mnt/data" = { fileSystems."/mnt/data" = {
device = "/dev/disk/by-id/wwn-0x500a0751e6b6c60f-part1"; device = "/dev/disk/by-id/wwn-0x500a0751e6b6c60f-part1";
fsType = "btrfs"; fsType = "btrfs";
options = [" noatime=true compress=zstd:12 "]; options = [ " noatime=true compress=zstd:12 " ];
}; };
} }

View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];

View file

@ -6,10 +6,10 @@
settings = { settings = {
db = { db = {
user = lib.mkForce "invidious"; user = lib.mkForce "invidious";
# password = lib.mkForce "invidious"; # password = lib.mkForce "invidious";
# host = lib.mkForce "localhost"; # host = lib.mkForce "localhost";
# port = 5432; # port = 5432;
# dbname = lib.mkForce "invidious"; # dbname = lib.mkForce "invidious";
}; };
popular_enabled = false; popular_enabled = false;

View file

@ -1,4 +1,4 @@
{ ...}: { ... }:
{ {
services.minecraft-server = { services.minecraft-server = {
eula = true; eula = true;

View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
@ -14,7 +15,8 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/e09e7d80-9d85-49e6-8b0e-1f31aea83840"; {
device = "/dev/disk/by-uuid/e09e7d80-9d85-49e6-8b0e-1f31aea83840";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" ]; options = [ "subvol=@" ];
}; };
@ -22,7 +24,8 @@
boot.initrd.luks.devices."luks-a2f76baf-2f27-42a4-ae48-1963c566a9ab".device = "/dev/disk/by-uuid/a2f76baf-2f27-42a4-ae48-1963c566a9ab"; boot.initrd.luks.devices."luks-a2f76baf-2f27-42a4-ae48-1963c566a9ab".device = "/dev/disk/by-uuid/a2f76baf-2f27-42a4-ae48-1963c566a9ab";
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2A99-D7CC"; {
device = "/dev/disk/by-uuid/2A99-D7CC";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };

View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];

View file

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];

View file

@ -1,4 +1,4 @@
{ lib, config, hostname, ... }: { lib, config, inputs, hostname, ... }:
{ {
@ -29,8 +29,12 @@
networkmanager.enable = true; networkmanager.enable = true;
hostName = "${hostname}"; hostName = "${hostname}";
}; };
console.keyMap = "en"; console.keyMap = "en";
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix = {
settings.experimental-features = [ "nix-command" "flakes" ];
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
};
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
lib.mkIf config.desktop.autologin.enable { lib.mkIf config.desktop.autologin.enable {
security.pam.services.hyprlock = {}; security.pam.services.hyprlock = { };
services.greetd = { services.greetd = {

View file

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

View file

@ -1,6 +1,8 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./games
./applications.nix ./applications.nix
./autostart.nix ./autostart.nix
./boot.nix ./boot.nix

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -16,7 +16,7 @@
./navic.nix ./navic.nix
./neotree.nix ./neotree.nix
./settings.nix ./settings.nix
./treesitter.nix #./treesitter.nix
./whichkey.nix ./whichkey.nix
./yazi.nix ./yazi.nix
]; ];

View file

@ -2,25 +2,35 @@
{ {
programs.nixvim = { programs.nixvim = {
plugins = { plugins = {
lsp-lines = {enable = true;};
lsp-format = {enable = true;}; hmts.enable = true;
lsp-lines = { enable = true; };
lsp-format = { enable = true; };
lsp = { lsp = {
enable = true; enable = true;
inlayHints = true; inlayHints = true;
servers = { servers = {
clangd = {enable = true;}; clangd = { enable = true; };
html = {enable = true;}; html = { enable = true; };
lua_ls = {enable = true;}; lua_ls = { enable = true; };
nixd = {enable = true;}; nixd = {
pyright = {enable = true;}; enable = true;
gopls = {enable = true;};
jsonls = {enable = true;}; settings = {
formatting.command = [ "nixpkgs-fmt" ];
nixpkgs.expr = "import <nixpkgs> {}";
};
};
pyright = { enable = true; };
gopls = { enable = true; };
jsonls = { enable = true; };
rust_analyzer = { rust_analyzer = {
enable = true; enable = true;
installCargo = true; installCargo = true;
installRustc = true; installRustc = true;
}; };
yamlls = {enable = true;}; yamlls = { enable = true; };
}; };
keymaps = { keymaps = {

View file

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

View file

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

View file

@ -1,9 +1,9 @@
{ pkgs, lib, config, ...}: { pkgs, lib, config, ... }:
lib.mkIf config.desktop.hyprland.enable { lib.mkIf config.desktop.hyprland.enable {
home-manager.users.willifan = { home-manager.users.willifan = {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
systemd.variables = ["--all"]; systemd.variables = [ "--all" ];
package = pkgs.hyprland; package = pkgs.hyprland;
settings = { settings = {
@ -11,7 +11,7 @@ lib.mkIf config.desktop.hyprland.enable {
"$SCRIPTS" = "$XDG_CONFIG_HOME/desktop-utils/scripts"; "$SCRIPTS" = "$XDG_CONFIG_HOME/desktop-utils/scripts";
misc = { misc = {
disable_hyprland_logo=true; disable_hyprland_logo = true;
}; };
monitor = [ monitor = [
@ -65,8 +65,8 @@ lib.mkIf config.desktop.hyprland.enable {
gaps_in = 2; gaps_in = 2;
gaps_out = 5; gaps_out = 5;
border_size = 2; border_size = 2;
# "col.active_border" = "rgba(ffa44bee)"; # "col.active_border" = "rgba(ffa44bee)";
# "col.inactive_border" = "rgba(595959aa)"; # "col.inactive_border" = "rgba(595959aa)";
layout = "dwindle"; layout = "dwindle";
@ -87,7 +87,7 @@ lib.mkIf config.desktop.hyprland.enable {
shadow.enabled = true; shadow.enabled = true;
shadow.range = 4; shadow.range = 4;
shadow.render_power = 3; shadow.render_power = 3;
# "col.shadow" = "rgba(1a1a1aee)"; # "col.shadow" = "rgba(1a1a1aee)";
}; };
misc = { misc = {

View file

@ -29,7 +29,7 @@
default = false; default = false;
type = lib.types.bool; type = lib.types.bool;
}; };
Lillie.enable = lib.mkOption{ Lillie.enable = lib.mkOption {
default = false; default = false;
type = lib.types.bool; type = lib.types.bool;
}; };

View file

@ -1,5 +1,2 @@
{ lib, ... }: { lib, ... }:
{ { }
}

View file

@ -15,6 +15,6 @@
}; };
# programs.bash.blesh.enable = true; # programs.bash.blesh.enable = true;
} }

View file

@ -10,13 +10,13 @@
lightness = 0.69; lightness = 0.69;
color_align = { color_align = {
mode = "horizontal"; mode = "horizontal";
custom_colors = []; custom_colors = [ ];
fore_back = null; fore_back = null;
}; };
backend = "fastfetch"; backend = "fastfetch";
args = null; args = null;
distro = null; distro = null;
pride_month_shown = []; pride_month_shown = [ ];
pride_month_disable = false; pride_month_disable = false;
}; };
}; };

View file

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

View file

@ -81,7 +81,7 @@
format = "[ $path](bold $style)($style)[$read_only](bold $style)"; format = "[ $path](bold $style)($style)[$read_only](bold $style)";
truncation_symbol = "/"; truncation_symbol = "/";
truncate_to_repo = true; truncate_to_repo = true;
read_only =" "; read_only = " ";
}; };
c = { c = {
@ -109,7 +109,7 @@
symbol = " "; symbol = " ";
version_format = "\${raw}"; version_format = "\${raw}";
style = "bg:fourth fg:white"; style = "bg:fourth fg:white";
python_binary = ["./venv/bin/python" "./env/Scripts/python" "python" "python3" "python2"]; python_binary = [ "./venv/bin/python" "./env/Scripts/python" "python" "python3" "python2" ];
format = "[$symbol($version)]($style)[ (\($virtualenv\)) ](bg:fourth fg:white)"; format = "[$symbol($version)]($style)[ (\($virtualenv\)) ](bg:fourth fg:white)";
}; };

View file

@ -26,23 +26,23 @@ in
}; };
fonts = { fonts = {
# packages = [ pkgs.nerdfonts ]; # packages = [ pkgs.nerdfonts ];
# emoji = { # emoji = {
# package = pkgs.; # package = pkgs.;
# name = ""; # name = "";
# }; # };
monospace = { monospace = {
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.jetbrains-mono;
name = "JetBrainsMono Nerd Font"; name = "JetBrainsMono Nerd Font";
}; };
# sansSerif = { # sansSerif = {
# package = pkgs.; # package = pkgs.;
# name = ""; # name = "";
# }; # };
# serif = { # serif = {
# package = pkgs.; # package = pkgs.;
# name = ""; # name = "";
# }; # };
}; };
image = wallpaper; image = wallpaper;

View file

@ -1,6 +1,6 @@
{ { appimageTools
appimageTools, , fetchurl
fetchurl, ,
}: }:
let let
pname = "UVtools"; pname = "UVtools";

View file

@ -1,6 +1,6 @@
{ { appimageTools
appimageTools, , fetchurl
fetchurl, ,
}: }:
let let
pname = "yuzu"; pname = "yuzu";