mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mir:c5b64c9501f5fdda438967fe9484a44c06278e76
Branches Tags
mir:main
..
compare: mir:dea910a7b12ef2d201648b873efdeece3039fda3
Branches Tags
mir:main

No commits in common. "c5b64c9501f5fdda438967fe9484a44c06278e76" and "dea910a7b12ef2d201648b873efdeece3039fda3" have entirely different histories.
c5b64c9501 ... dea910a7b1

3 changed files with 7 additions and 23 deletions
Show Stats Expand all files Collapse all files

23
configuration.nix
View File

@ -7,11 +7,7 @@
{ {
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
# boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
# boot.kernelPackages = pkgs.linuxPackages_6_6;
# boot.extraModulePackages = [ pkgs.zfsUnstable ];
# boot.kernelModules = [ "zfs" ];
boot.supportedFilesystems = [ "zfs" ];
imports = [ imports = [
./modules/networking.nix ./modules/networking.nix
@ -67,22 +63,13 @@
desktopManager = { desktopManager = {
xterm.enable = false; xterm.enable = false;
gnome.enable = true; gnome.enable = true;
# xfce = {
# enable = true;
# # noDesktop = true;
# enableXfwm = false;
# };
# plasma6.enable = true; # plasma6.enable = true;
}; };
displayManager.gdm.enable = true; displayManager.gdm.enable = true;
# displayManager.defaultSession = "xfce+stumpwm"; # displayManager.defaultSession = "plasmax11";
# windowManager = {
# stumpwm.enable = true;
# # xmonad.enable = true;
# };
}; };
# console.useXkbConfig = true; # console.useXkbConfig = true;
# console.keyMap = ./galvatron/keys.map; console.keyMap = ./galvatron/keys.map;
environment.gnome.excludePackages = with pkgs.gnome; [ environment.gnome.excludePackages = with pkgs.gnome; [
baobab baobab
cheese cheese
@ -103,7 +90,7 @@
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; nssmdns4 = true;
publish = { publish = {
enable = true; enable = true;
addresses = true; addresses = true;
@ -167,6 +154,7 @@
vim vim
emacs29-pgtk emacs29-pgtk
nfs-utils nfs-utils
devenv
cmake cmake
fontconfig fontconfig
harfbuzz harfbuzz
@ -198,7 +186,6 @@
ACTION=="add", ATTRS{idProduct}=="1500", ATTRS{idVendor}=="05ac", DRIVERS=="usb", RUN+="${pkgs.sg3_utils}/bin/sg_raw /dev/$kernel EA 00 00 00 00 00 01" ACTION=="add", ATTRS{idProduct}=="1500", ATTRS{idVendor}=="05ac", DRIVERS=="usb", RUN+="${pkgs.sg3_utils}/bin/sg_raw /dev/$kernel EA 00 00 00 00 00 01"
''; '';
xdg.portal.enable = true;
services.flatpak.enable = true; services.flatpak.enable = true;
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

5
flake.nix
View File

@ -142,10 +142,7 @@
./configuration.nix { ./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ]; services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking = { networking.hostName = "knockout";
hostName = "knockout";
hostId = "499130bf";
};
sound.enable = true; sound.enable = true;
} }
./modules/droidcam-obs.nix # only this machine ./modules/droidcam-obs.nix # only this machine

2
hardware/knockout-hw.nix
View File

@ -10,7 +10,7 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "zfs" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =