From d4df25abdfe8e9064cd4a47e3d0d07f43b006a7f Mon Sep 17 00:00:00 2001 From: lulusilly Date: Thu, 5 Mar 2026 23:46:01 +0000 Subject: [PATCH] i did something but i forgot --- .gitignore | 0 nix/flake.lock | 0 nix/flake.nix | 4 +-- nix/hosts/cantor/configuration.nix | 0 nix/hosts/cantor/hardware-configuration.nix | 0 nix/hosts/common.nix | 0 nix/hosts/dotfiles/.emacs.d/init.el | 0 nix/hosts/dotfiles/ghostty/config | 0 nix/hosts/dotfiles/hypr/bg.jpg | Bin nix/hosts/dotfiles/hypr/hyprland.conf | 0 nix/hosts/dotfiles/hypr/start.sh | 0 nix/hosts/dotfiles/mpv/mpv.conf | 0 nix/hosts/dotfiles/neofetch/config.conf | 0 nix/hosts/dotfiles/nvim/init.lua | 0 nix/hosts/dotfiles/waybar/config | 0 nix/hosts/dotfiles/waybar/style.css | 0 nix/hosts/hilbert/configuration.nix | 27 ++++++++++++++++++ .../hardware-configuration.nix | 14 ++++----- nix/hosts/home.nix | 0 nix/hosts/mecca/configuration.nix | 16 ----------- nix/modules/efi.nix | 0 nix/modules/hypr.nix | 0 nix/modules/kanata/conf.kbd | 0 nix/modules/kanata/kanata.nix | 0 nix/modules/laptop.nix | 2 +- nix/modules/syncthing.nix | 0 nix/modules/virt.nix | 8 ++++++ 27 files changed, 45 insertions(+), 26 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 nix/flake.lock mode change 100755 => 100644 nix/flake.nix mode change 100755 => 100644 nix/hosts/cantor/configuration.nix mode change 100755 => 100644 nix/hosts/cantor/hardware-configuration.nix mode change 100755 => 100644 nix/hosts/common.nix mode change 100755 => 100644 nix/hosts/dotfiles/.emacs.d/init.el mode change 100755 => 100644 nix/hosts/dotfiles/ghostty/config mode change 100755 => 100644 nix/hosts/dotfiles/hypr/bg.jpg mode change 100755 => 100644 nix/hosts/dotfiles/hypr/hyprland.conf mode change 100755 => 100644 nix/hosts/dotfiles/hypr/start.sh mode change 100755 => 100644 nix/hosts/dotfiles/mpv/mpv.conf mode change 100755 => 100644 nix/hosts/dotfiles/neofetch/config.conf mode change 100755 => 100644 nix/hosts/dotfiles/nvim/init.lua mode change 100755 => 100644 nix/hosts/dotfiles/waybar/config mode change 100755 => 100644 nix/hosts/dotfiles/waybar/style.css create mode 100644 nix/hosts/hilbert/configuration.nix rename nix/hosts/{mecca => hilbert}/hardware-configuration.nix (71%) mode change 100755 => 100644 mode change 100755 => 100644 nix/hosts/home.nix delete mode 100755 nix/hosts/mecca/configuration.nix mode change 100755 => 100644 nix/modules/efi.nix mode change 100755 => 100644 nix/modules/hypr.nix mode change 100755 => 100644 nix/modules/kanata/conf.kbd mode change 100755 => 100644 nix/modules/kanata/kanata.nix mode change 100755 => 100644 nix/modules/laptop.nix mode change 100755 => 100644 nix/modules/syncthing.nix create mode 100644 nix/modules/virt.nix diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/nix/flake.lock b/nix/flake.lock old mode 100755 new mode 100644 diff --git a/nix/flake.nix b/nix/flake.nix old mode 100755 new mode 100644 index 399b174..0f53a39 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -9,12 +9,12 @@ }; outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations = { - mecca = nixpkgs.lib.nixosSystem { + hilbert = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs;}; modules = [ ./hosts/common.nix - ./hosts/mecca/configuration.nix + ./hosts/hilbert/configuration.nix ]; }; cantor = nixpkgs.lib.nixosSystem { diff --git a/nix/hosts/cantor/configuration.nix b/nix/hosts/cantor/configuration.nix old mode 100755 new mode 100644 diff --git a/nix/hosts/cantor/hardware-configuration.nix b/nix/hosts/cantor/hardware-configuration.nix old mode 100755 new mode 100644 diff --git a/nix/hosts/common.nix b/nix/hosts/common.nix old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/.emacs.d/init.el b/nix/hosts/dotfiles/.emacs.d/init.el old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/ghostty/config b/nix/hosts/dotfiles/ghostty/config old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/hypr/bg.jpg b/nix/hosts/dotfiles/hypr/bg.jpg old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/hypr/hyprland.conf b/nix/hosts/dotfiles/hypr/hyprland.conf old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/hypr/start.sh b/nix/hosts/dotfiles/hypr/start.sh old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/mpv/mpv.conf b/nix/hosts/dotfiles/mpv/mpv.conf old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/neofetch/config.conf b/nix/hosts/dotfiles/neofetch/config.conf old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/nvim/init.lua b/nix/hosts/dotfiles/nvim/init.lua old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/waybar/config b/nix/hosts/dotfiles/waybar/config old mode 100755 new mode 100644 diff --git a/nix/hosts/dotfiles/waybar/style.css b/nix/hosts/dotfiles/waybar/style.css old mode 100755 new mode 100644 diff --git a/nix/hosts/hilbert/configuration.nix b/nix/hosts/hilbert/configuration.nix new file mode 100644 index 0000000..c53b041 --- /dev/null +++ b/nix/hosts/hilbert/configuration.nix @@ -0,0 +1,27 @@ +{ config, pkgs, inputs, ... }: + +{ + imports = + [ + ./hardware-configuration.nix + ../../modules/kanata/kanata.nix + ../../modules/efi.nix + ../../modules/laptop.nix + ../../modules/hypr.nix + ../../modules/virt.nix + ]; + + fileSystems."/media/music" = { + device = "/dev/disk/by-uuid/dcd8c4de-96af-4d71-badb-5ed63b7c2c39"; + fsType = "xfs"; + }; + + fileSystems."/media/vm" = { + device = "/dev/disk/by-uuid/9678bbf2-bf4d-43bb-b0e4-d7cb68915da1"; + fsType = "xfs"; + }; + + networking.hostName = "hilbert"; + + system.stateVersion = "25.11"; +} diff --git a/nix/hosts/mecca/hardware-configuration.nix b/nix/hosts/hilbert/hardware-configuration.nix old mode 100755 new mode 100644 similarity index 71% rename from nix/hosts/mecca/hardware-configuration.nix rename to nix/hosts/hilbert/hardware-configuration.nix index 222db91..68587e1 --- a/nix/hosts/mecca/hardware-configuration.nix +++ b/nix/hosts/hilbert/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/9c7f9128-0371-4b7b-b0fb-86aeabe0491a"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/28c806ac-9082-40fc-8bd3-da38f4c12ae5"; + fsType = "xfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/BE22-C08F"; + { device = "/dev/disk/by-uuid/12CE-A600"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/8380ab37-d79c-4b25-888b-d457596dcfae"; } + [ { device = "/dev/disk/by-uuid/44fbfcf1-382f-4224-ae4c-60c3379f2daf"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -33,8 +33,8 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/nix/hosts/home.nix b/nix/hosts/home.nix old mode 100755 new mode 100644 diff --git a/nix/hosts/mecca/configuration.nix b/nix/hosts/mecca/configuration.nix deleted file mode 100755 index 88d51e5..0000000 --- a/nix/hosts/mecca/configuration.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, inputs, ... }: - -{ - imports = - [ - ./hardware-configuration.nix - ../../modules/kanata.nix - ../../modules/efi.nix - ../../modules/laptop.nix - ../../modules/hypr.nix - ]; - - networking.hostName = "mecca"; - - system.stateVersion = "25.05"; -} diff --git a/nix/modules/efi.nix b/nix/modules/efi.nix old mode 100755 new mode 100644 diff --git a/nix/modules/hypr.nix b/nix/modules/hypr.nix old mode 100755 new mode 100644 diff --git a/nix/modules/kanata/conf.kbd b/nix/modules/kanata/conf.kbd old mode 100755 new mode 100644 diff --git a/nix/modules/kanata/kanata.nix b/nix/modules/kanata/kanata.nix old mode 100755 new mode 100644 diff --git a/nix/modules/laptop.nix b/nix/modules/laptop.nix old mode 100755 new mode 100644 index 5af5317..2570629 --- a/nix/modules/laptop.nix +++ b/nix/modules/laptop.nix @@ -17,7 +17,7 @@ CPU_MIN_PERF_ON_BAT = 0; CPU_MAX_PERF_ON_BAT = 20; - START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge + START_CHARGE_THRESH_BAT0 = 80; # 80 and below it starts to charge STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging }; }; diff --git a/nix/modules/syncthing.nix b/nix/modules/syncthing.nix old mode 100755 new mode 100644 diff --git a/nix/modules/virt.nix b/nix/modules/virt.nix new file mode 100644 index 0000000..a1ac672 --- /dev/null +++ b/nix/modules/virt.nix @@ -0,0 +1,8 @@ +{ config, lib, pkgs, inputs, ...}: + +{ + programs.virt-manager.enable = true; + users.groups.libvirtd.members = ["lunita"]; + virtualisation.libvirtd.enable = true; + virtualisation.spiceUSBRedirection.enable = true; +}