willifan/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: willifan:3a98b72e7f39ef6fdc17c538b453ace51c8c32fd
Branches Tags
willifan:main
..
compare: willifan:81fa1208f3d14b7c534114e6c476941d2c1e7370
Branches Tags
willifan:main

No commits in common. "3a98b72e7f39ef6fdc17c538b453ace51c8c32fd" and "81fa1208f3d14b7c534114e6c476941d2c1e7370" have entirely different histories.
3a98b72e7f ... 81fa1208f3

64 changed files with 908 additions and 931 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

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

8
hosts/Anton/data.nix
View file

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

3
hosts/Anton/hardware-configuration.nix
View file

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

8
hosts/Anton/invidious.nix
View file

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

2
hosts/Anton/minecraft.nix
View file

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

9
hosts/Lenni/hardware-configuration.nix
View file

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

3
hosts/Lillie/hardware-configuration.nix
View file

@ -5,8 +5,7 @@
{
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" ];

3
hosts/Puenktchen/hardware-configuration.nix
View file

@ -5,8 +5,7 @@
{
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" ];

8
modules/default/common/default.nix
View file

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

2
modules/default/common/desktop/autostart.nix
View file

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

6
modules/default/common/desktop/boot.nix
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;

2
modules/default/common/desktop/default.nix
View file

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

26
modules/default/common/desktop/games/ROG_Pugio_II_fixes.nix
View file

@ -17,20 +17,20 @@ lib.mkIf config.desktop.enable {
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
[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
'';
});
};

6
modules/default/common/desktop/nfs-client.nix
View file

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

3
modules/default/common/desktop/udev.nix
View file

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

2
modules/default/common/nixvim/autopairs.nix
View file

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

26
modules/default/common/nixvim/cmp.nix
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
};
}

2
modules/default/common/nixvim/default.nix
View file

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

30
modules/default/common/nixvim/lsp.nix
View file

@ -2,35 +2,25 @@
{
programs.nixvim = {
plugins = {
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 = {
enable = true;
settings = {
formatting.command = [ "nixpkgs-fmt" ];
nixpkgs.expr = "import <nixpkgs> {}";
};
};
pyright = { enable = true; };
gopls = { enable = true; };
jsonls = { enable = true; };
clangd = {enable = true;};
html = {enable = true;};
lua_ls = {enable = true;};
nixd = {enable = true;};
pyright = {enable = true;};
gopls = {enable = true;};
jsonls = {enable = true;};
rust_analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
yamlls = { enable = true; };
yamlls = {enable = true;};
};
keymaps = {

2
modules/default/common/nixvim/neotree.nix
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 = {

2
modules/default/common/packages.nix
View file

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

12
modules/default/home-manager/desktop/hyprland/hyprland.nix
View file

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

2
modules/default/home-manager/desktop/hyprland/options.nix
View file

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

5
modules/default/home-manager/options.nix
View file

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

2
modules/default/home-manager/shell/bash.nix
View file

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

4
modules/default/home-manager/shell/hyfetch.nix
View file

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

3
modules/default/home-manager/shell/ssh.nix
View file

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

4
modules/default/home-manager/shell/starship.nix
View file

@ -81,7 +81,7 @@
format = "[ $path](bold $style)($style)[$read_only](bold $style)";
truncation_symbol = "…/";
truncate_to_repo = true;
read_only = " ";
read_only =" ";
};
c = {
@ -109,7 +109,7 @@
symbol = " ";
version_format = "\${raw}";
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)";
};

26
modules/default/home-manager/stylix.nix
View file

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

6
pkgs/UVtools/default.nix
View file

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

6
pkgs/yuzu/default.nix
View file

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