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

12
flake.nix
View file

@ -59,8 +59,7 @@
{ {
nixosConfigurations = { nixosConfigurations = {
Lenni = Lenni = let
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {
@ -89,8 +88,7 @@
}; };
Puenktchen = Puenktchen = let
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {
@ -121,8 +119,7 @@
}; };
Anton = Anton = let
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {
@ -153,8 +150,7 @@
}; };
Lillie = Lillie = let
let
system = "x86_64-linux"; system = "x86_64-linux";
in in
lib.nixosSystem { lib.nixosSystem {

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

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

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

@ -5,8 +5,7 @@
{ {
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" ];
@ -15,8 +14,7 @@
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=@" ];
}; };
@ -24,8 +22,7 @@
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" ];
}; };

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

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

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

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

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; networkmanager.enable = true;
hostName = "${hostname}"; hostName = "${hostname}";
}; };
console.keyMap = "en"; console.keyMap = "en";
nix = { nix.settings.experimental-features = [ "nix-command" "flakes" ];
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";
} }

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

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

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

@ -6,13 +6,11 @@ lib.mkIf config.desktop.enable {
]; ];
services.autofs = { services.autofs = {
enable = true; enable = true;
autoMaster = autoMaster = let
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}
''; '';
}; };

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

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

2
modules/default/common/nixvim/default.nix
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
]; ];

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

@ -2,9 +2,6 @@
{ {
programs.nixvim = { programs.nixvim = {
plugins = { plugins = {
hmts.enable = true;
lsp-lines = {enable = true;}; lsp-lines = {enable = true;};
lsp-format = {enable = true;}; lsp-format = {enable = true;};
lsp = { lsp = {
@ -14,14 +11,7 @@
clangd = {enable = true;}; clangd = {enable = true;};
html = {enable = true;}; html = {enable = true;};
lua_ls = {enable = true;}; lua_ls = {enable = true;};
nixd = { nixd = {enable = true;};
enable = true;
settings = {
formatting.command = [ "nixpkgs-fmt" ];
nixpkgs.expr = "import <nixpkgs> {}";
};
};
pyright = {enable = true;}; pyright = {enable = true;};
gopls = {enable = true;}; gopls = {enable = true;};
jsonls = {enable = true;}; jsonls = {enable = true;};

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

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

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

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

6
pkgs/UVtools/default.nix
View file

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

6
pkgs/yuzu/default.nix
View file

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