From 25e9d06354a484f2b7ef0f410d917575ff974b54 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Mon, 23 Dec 2024 11:27:02 -0600 Subject: [PATCH] refactor for preparation of flake based systems --- configs/gpdPocket3/configuration.nix | 102 ++++++++++++++++++ configs/gpdPocket3/flake.nix | 0 configs/gpdPocket3/hardware-configuration.nix | 37 +++++++ configs/h002/configuration.nix | 41 +++++++ configs/h002/flake.nix | 0 configs/h002/hardware-configuration.nix | 37 +++++++ configs/lio/configuration.nix | 50 +++++++++ configs/lio/flake.nix | 0 configs/lio/hardware-configuration.nix | 65 +++++++++++ configs/oren/configuration.nix | 29 +++++ configs/oren/flake.nix | 0 configs/oren/hardware-configuration.nix | 60 +++++++++++ flake.nix | 2 +- modules/audio_pulse.nix | 39 ------- {modules => modules_old}/_template.nix | 0 modules_old/audio.nix | 27 +++++ {modules => modules_old}/boot/grub.nix | 0 {modules => modules_old}/boot/systemd.nix | 0 .../com.system76.CosmicBackground/v1/all | 0 .../v1/backgrounds | 0 .../v1/output.eDP-1 | 0 .../v1/same-on-all | 0 .../com.system76.CosmicComp/v1/active_hint | 0 .../v1/autotile_behavior | 0 .../v1/descale_xwayland | 0 .../com.system76.CosmicComp/v1/xkb_config | 0 .../config/com.system76.CosmicFiles/v1/tab | 0 .../com.system76.CosmicPanel.Dock/v1/anchor | 0 .../v1/anchor_gap | 0 .../com.system76.CosmicPanel.Dock/v1/autohide | 0 .../v1/background | 0 .../v1/border_radius | 0 .../v1/exclusive_zone | 0 .../v1/expand_to_edges | 0 .../v1/keyboard_interactivity | 0 .../com.system76.CosmicPanel.Dock/v1/layer | 0 .../com.system76.CosmicPanel.Dock/v1/margin | 0 .../com.system76.CosmicPanel.Dock/v1/name | 0 .../com.system76.CosmicPanel.Dock/v1/opacity | 0 .../com.system76.CosmicPanel.Dock/v1/output | 0 .../com.system76.CosmicPanel.Dock/v1/padding | 0 .../v1/plugins_center | 0 .../v1/plugins_wings | 0 .../com.system76.CosmicPanel.Dock/v1/size | 0 .../v1/size_center | 0 .../v1/size_wings | 0 .../com.system76.CosmicPanel.Dock/v1/spacing | 0 .../com.system76.CosmicPanel.Panel/v1/anchor | 0 .../v1/anchor_gap | 0 .../v1/autohide | 0 .../v1/background | 0 .../v1/border_radius | 0 .../v1/exclusive_zone | 0 .../v1/expand_to_edges | 0 .../v1/keyboard_interactivity | 0 .../com.system76.CosmicPanel.Panel/v1/layer | 0 .../com.system76.CosmicPanel.Panel/v1/margin | 0 .../com.system76.CosmicPanel.Panel/v1/name | 0 .../com.system76.CosmicPanel.Panel/v1/opacity | 0 .../com.system76.CosmicPanel.Panel/v1/output | 0 .../com.system76.CosmicPanel.Panel/v1/padding | 0 .../v1/plugins_center | 0 .../v1/plugins_wings | 0 .../com.system76.CosmicPanel.Panel/v1/size | 0 .../v1/size_center | 0 .../v1/size_wings | 0 .../com.system76.CosmicPanel.Panel/v1/spacing | 0 .../com.system76.CosmicPanel/v1/entries | 0 .../v1/custom | 0 .../v1/custom-colors | 0 .../v1/active-page | 0 .../v1/accent | 0 .../v1/active_hint | 0 .../v1/corner_radii | 0 .../v1/gaps | 0 .../v1/primary_container_bg | 0 .../v1/spacing | 0 .../com.system76.CosmicTheme.Dark/v1/accent | 0 .../v1/accent_button | 0 .../v1/active_hint | 0 .../v1/background | 0 .../com.system76.CosmicTheme.Dark/v1/button | 0 .../v1/corner_radii | 0 .../v1/destructive | 0 .../v1/destructive_button | 0 .../com.system76.CosmicTheme.Dark/v1/gaps | 0 .../v1/icon_button | 0 .../v1/link_button | 0 .../com.system76.CosmicTheme.Dark/v1/primary | 0 .../v1/secondary | 0 .../com.system76.CosmicTheme.Dark/v1/spacing | 0 .../com.system76.CosmicTheme.Dark/v1/success | 0 .../v1/text_button | 0 .../com.system76.CosmicTheme.Dark/v1/warning | 0 .../v1/warning_button | 0 .../v1/active_hint | 0 .../v1/corner_radii | 0 .../v1/gaps | 0 .../v1/spacing | 0 .../v1/active_hint | 0 .../v1/corner_radii | 0 .../com.system76.CosmicTheme.Light/v1/gaps | 0 .../com.system76.CosmicTheme.Light/v1/spacing | 0 .../com.system76.CosmicTk/v1/header_size | 0 .../v1/interface_density | 0 {modules => modules_old}/de/cosmic/cosmic.nix | 0 {modules => modules_old}/de/gnome_wayland.nix | 0 {modules => modules_old}/de/gnome_xorg.nix | 0 {modules => modules_old}/docker.nix | 0 {modules => modules_old}/fonts.nix | 0 {modules => modules_old}/home_manager.nix | 0 {modules => modules_old}/nebula.nix | 0 {modules => modules_old}/neovim.nix | 0 {modules => modules_old}/rustdesk.nix | 0 {modules => modules_old}/saber.nix | 0 {modules => modules_old}/shell/common.nix | 0 {modules => modules_old}/shell/common.sh | 0 {modules => modules_old}/ssh.nix | 0 {modules => modules_old}/stormd.nix | 0 {modules => modules_old}/tty_caps_esc.nix | 0 {modules => modules_old}/validations.nix | 0 121 files changed, 449 insertions(+), 40 deletions(-) create mode 100644 configs/gpdPocket3/configuration.nix create mode 100644 configs/gpdPocket3/flake.nix create mode 100644 configs/gpdPocket3/hardware-configuration.nix create mode 100644 configs/h002/configuration.nix create mode 100644 configs/h002/flake.nix create mode 100644 configs/h002/hardware-configuration.nix create mode 100644 configs/lio/configuration.nix create mode 100644 configs/lio/flake.nix create mode 100644 configs/lio/hardware-configuration.nix create mode 100644 configs/oren/configuration.nix create mode 100644 configs/oren/flake.nix create mode 100644 configs/oren/hardware-configuration.nix delete mode 100644 modules/audio_pulse.nix rename {modules => modules_old}/_template.nix (100%) create mode 100644 modules_old/audio.nix rename {modules => modules_old}/boot/grub.nix (100%) rename {modules => modules_old}/boot/systemd.nix (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicBackground/v1/all (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicBackground/v1/backgrounds (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicBackground/v1/output.eDP-1 (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicBackground/v1/same-on-all (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicComp/v1/active_hint (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicComp/v1/autotile_behavior (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicComp/v1/descale_xwayland (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicComp/v1/xkb_config (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicFiles/v1/tab (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor_gap (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/autohide (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/background (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/border_radius (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/exclusive_zone (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/expand_to_edges (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/keyboard_interactivity (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/layer (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/margin (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/name (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/opacity (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/output (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/padding (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_center (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_wings (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_center (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_wings (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/spacing (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor_gap (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/autohide (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/background (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/border_radius (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/exclusive_zone (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/expand_to_edges (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/keyboard_interactivity (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/layer (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/margin (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/name (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/opacity (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/output (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/padding (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_center (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_wings (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_center (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_wings (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/spacing (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicPanel/v1/entries (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicSettings.Shortcuts/v1/custom (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicSettings.Wallpaper/v1/custom-colors (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicSettings/v1/active-page (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/accent (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/active_hint (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/corner_radii (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/gaps (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/primary_container_bg (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/spacing (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent_button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/active_hint (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/background (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/corner_radii (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive_button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/gaps (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/icon_button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/link_button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/primary (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/secondary (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/spacing (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/success (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/text_button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning_button (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/active_hint (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/corner_radii (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/gaps (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/spacing (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light/v1/active_hint (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light/v1/corner_radii (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light/v1/gaps (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTheme.Light/v1/spacing (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTk/v1/header_size (100%) rename {modules => modules_old}/de/cosmic/config/com.system76.CosmicTk/v1/interface_density (100%) rename {modules => modules_old}/de/cosmic/cosmic.nix (100%) rename {modules => modules_old}/de/gnome_wayland.nix (100%) rename {modules => modules_old}/de/gnome_xorg.nix (100%) rename {modules => modules_old}/docker.nix (100%) rename {modules => modules_old}/fonts.nix (100%) rename {modules => modules_old}/home_manager.nix (100%) rename {modules => modules_old}/nebula.nix (100%) rename {modules => modules_old}/neovim.nix (100%) rename {modules => modules_old}/rustdesk.nix (100%) rename {modules => modules_old}/saber.nix (100%) rename {modules => modules_old}/shell/common.nix (100%) rename {modules => modules_old}/shell/common.sh (100%) rename {modules => modules_old}/ssh.nix (100%) rename {modules => modules_old}/stormd.nix (100%) rename {modules => modules_old}/tty_caps_esc.nix (100%) rename {modules => modules_old}/validations.nix (100%) diff --git a/configs/gpdPocket3/configuration.nix b/configs/gpdPocket3/configuration.nix new file mode 100644 index 0000000..4254430 --- /dev/null +++ b/configs/gpdPocket3/configuration.nix @@ -0,0 +1,102 @@ +{ + config, + lib, + pkgs, + settings, + ... +}: +{ + imports = [ + # Users this machine has + (settings.usersDir + "/root/configuration.nix") + (settings.usersDir + "/josh/configuration.nix") + ]; + + # My custom modules + mods = { + boot_systemd.enable = true; + shell_common.enable = true; + de_cosmic.enable = true; + neovim.enable = true; + tty_caps_esc.enable = true; + docker.enable = true; + fonts.enable = true; + stormd.enable = true; + nebula.enable = true; + ssh.enable = true; + rustdesk.enable = true; + }; + + + # machine specific configuration + # ============================== + hardware.enableAllFirmware = true; + # Connectivity + networking.networkmanager.enable = true; + hardware.bluetooth.enable = true; + environment.shellAliases = { + wifi = "nmtui"; + }; + + environment.systemPackages = with pkgs; [ + # [Laptop] Battery status + acpi + ]; + environment.shellAliases = { + battery = "acpi"; + }; + # [Laptop] screens with brightness settings + programs.light.enable = true; + + console = { + # We want to be able to read the screen so use a 32 sized font on this tiny panel + font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz"; + }; + + # ======== + + # FINGERPRINTS for the sensor on GPD P3 do not work on linux yet: todo find the source of this again online for tracking... + # Attempting to get fingerprint scanner to work... having issues though, no device detected with all methods + # services.fprintd = { + # enable = true; + # tod = { + # enable = true; + # driver = pkgs.libfprint-2-tod1-elan; + # }; + # }; + + # TODO evaluate if any of this kernal/hardware stuff is actually needed for our pocket. This is a hodge podge of shit from online + # The GPD Pocket3 uses a tablet OLED display, that is mounted rotated 90° counter-clockwise. + # This requires cusotm kernal params. + boot.kernelParams = [ + "video=DSI-1:panel_orientation=right_side_up" + "fbcon=rotate:1" + "mem_sleep_default=s2idel" + ]; + boot.kernelModules = [ "btusb" ]; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "usbhid" + ]; + services.xserver.videoDrivers = [ "intel" ]; + hardware.graphics.enable = true; + hardware.graphics.extraPackages = with pkgs; [ + intel-media-driver + intel-vaapi-driver + ]; + # Stuff from https://github.com/NixOS/nixos-hardware/blob/9a763a7acc4cfbb8603bb0231fec3eda864f81c0/gpd/pocket-3/default.nix + services.fstrim.enable = true; + services.libinput.enable = true; + services.tlp.enable = lib.mkDefault ( + (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") + || !config.services.power-profiles-daemon.enable + ); + + # KVM module video + environment.shellAliases = { + kvm = "ffplay -i /dev/video2"; + }; + + system.stateVersion = "23.11"; +} diff --git a/configs/gpdPocket3/flake.nix b/configs/gpdPocket3/flake.nix new file mode 100644 index 0000000..e69de29 diff --git a/configs/gpdPocket3/hardware-configuration.nix b/configs/gpdPocket3/hardware-configuration.nix new file mode 100644 index 0000000..081d553 --- /dev/null +++ b/configs/gpdPocket3/hardware-configuration.nix @@ -0,0 +1,37 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/boot" = + { device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + }; + + fileSystems."/" = + { device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # 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.enp175s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configs/h002/configuration.nix b/configs/h002/configuration.nix new file mode 100644 index 0000000..6f7248d --- /dev/null +++ b/configs/h002/configuration.nix @@ -0,0 +1,41 @@ +{ + pkgs, + settings, + ... +}: +{ + imports = [ + # Users this machine has + (settings.usersDir + "/root/configuration.nix") + (settings.usersDir + "/luser/configuration.nix") + ]; + + # My custom modules + mods = { + boot_grub.enable = true; + shell_common.enable = true; + # de_gnome_xorg.enable = true; + # audio.enable = true; + de_cosmic.enable = true; + neovim.enable = true; + tty_caps_esc.enable = true; + docker.enable = true; + stormd.enable = true; + nebula.enable = true; + ssh.enable = true; + }; + + # machine specific configuration + # ============================== + hardware.enableAllFirmware = true; + # Connectivity + networking.networkmanager.enable = true; + hardware.bluetooth.enable = true; + environment.shellAliases = { + wifi = "nmtui"; + }; + + environment.systemPackages = with pkgs; [ nvtopPackages.full ]; + + system.stateVersion = "23.11"; +} diff --git a/configs/h002/flake.nix b/configs/h002/flake.nix new file mode 100644 index 0000000..e69de29 diff --git a/configs/h002/hardware-configuration.nix b/configs/h002/hardware-configuration.nix new file mode 100644 index 0000000..d1fbb4c --- /dev/null +++ b/configs/h002/hardware-configuration.nix @@ -0,0 +1,37 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # 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.eno1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configs/lio/configuration.nix b/configs/lio/configuration.nix new file mode 100644 index 0000000..89620e6 --- /dev/null +++ b/configs/lio/configuration.nix @@ -0,0 +1,50 @@ +{ + settings, + ... +}: +{ + imports = [ + # Users this machine has + (settings.usersDir + "/root/configuration.nix") + (settings.usersDir + "/josh/configuration.nix") + ]; + + # My custom modules + mods = { + boot_systemd.enable = true; + shell_common.enable = true; + # de_cosmic.enable = true; + audio.enable = true; + de_gnome_xorg.enable = true; + # de_gnome_wayland.enable = true; + neovim.enable = true; + tty_caps_esc.enable = true; + docker.enable = true; + fonts.enable = true; + ssh.enable = true; + stormd.enable = true; + nebula.enable = true; + rustdesk.enable = true; + saber.enable = true; + }; + + # opening this port for dev purposes + networking.firewall.allowedTCPPorts = [ + 5173 # Vite + ]; + + # machine specific configuration + # ============================== + hardware.enableAllFirmware = true; + # Connectivity + networking.networkmanager.enable = true; + hardware.bluetooth.enable = true; + environment.shellAliases = { + wifi = "nmtui"; + }; + + # System76 + hardware.system76.enableAll = true; + + system.stateVersion = "23.11"; +} diff --git a/configs/lio/flake.nix b/configs/lio/flake.nix new file mode 100644 index 0000000..e69de29 diff --git a/configs/lio/hardware-configuration.nix b/configs/lio/hardware-configuration.nix new file mode 100644 index 0000000..d415837 --- /dev/null +++ b/configs/lio/hardware-configuration.nix @@ -0,0 +1,65 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + fileSystems."/mnt/nvme1tb" = { + device = "/dev/disk/by-uuid/7ddb48bd-160c-4049-a4fa-a5ac2b6a5402"; + fsType = "ext4"; + }; + + swapDevices = [ + { + device = "/.swapfile"; + size = 64 * 1024; # 64GB + } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # 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.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/configs/oren/configuration.nix b/configs/oren/configuration.nix new file mode 100644 index 0000000..b38eb59 --- /dev/null +++ b/configs/oren/configuration.nix @@ -0,0 +1,29 @@ +{ + settings, + ... +}: +{ + imports = [ + # Users this machine has + (settings.usersDir + "/root/configuration.nix") + (settings.usersDir + "/josh/configuration.nix") + ]; + + # My custom modules + mods = { + boot_systemd.enable = true; + shell_common.enable = true; + de_cosmic.enable = true; + neovim.enable = true; + tty_caps_esc.enable = true; + docker.enable = true; + fonts.enable = true; + stormd.enable = true; + nebula.enable = true; + ssh.enable = true; + # rustdesk.enable = true; + }; + + # Use the systemd-boot EFI boot loader. + system.stateVersion = "24.11"; # Did you read the comment? +} diff --git a/configs/oren/flake.nix b/configs/oren/flake.nix new file mode 100644 index 0000000..e69de29 diff --git a/configs/oren/hardware-configuration.nix b/configs/oren/hardware-configuration.nix new file mode 100644 index 0000000..8628cc6 --- /dev/null +++ b/configs/oren/hardware-configuration.nix @@ -0,0 +1,60 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { + device = "/.swapfile"; + size = 64 * 1024; # 64GB + } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # 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.enp196s0f4u1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/flake.nix b/flake.nix index 2d5a718..fbd00ab 100644 --- a/flake.nix +++ b/flake.nix @@ -167,7 +167,7 @@ settings.home-manager.nixosModules.home-manager ] ++ ylib.umport { - path = lib.fileset.maybeMissing ./modules; + path = lib.fileset.maybeMissing ./modules_old; recursive = true; } ++ [ ./hosts/configuration.nix ]; diff --git a/modules/audio_pulse.nix b/modules/audio_pulse.nix deleted file mode 100644 index 079d102..0000000 --- a/modules/audio_pulse.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; -let - name = "audio"; - cfg = config.mods.${name}; -in -{ - options = { - mods.${name} = { - enable = mkEnableOption (lib.mdDoc "Enable ${name}"); - }; - }; - - config = mkIf cfg.enable { - # Enable sound. - # sound.enable = true; - # services.pipewire.pulse.enable = false; - # services.pipewire.enable = false; - # services.pipewire.audio.enable =false; - # hardware.pulseaudio.enable = true; - # hardware.pulseaudio.package = pkgs.pulseaudioFull; - # environment.systemPackages = [ pkgs.pavucontrol ]; - - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - }; - }; -} diff --git a/modules/_template.nix b/modules_old/_template.nix similarity index 100% rename from modules/_template.nix rename to modules_old/_template.nix diff --git a/modules_old/audio.nix b/modules_old/audio.nix new file mode 100644 index 0000000..81ca57c --- /dev/null +++ b/modules_old/audio.nix @@ -0,0 +1,27 @@ +{ + config, + lib, + ... +}: +with lib; +let + name = "audio"; + cfg = config.mods.${name}; +in +{ + options = { + mods.${name} = { + enable = mkEnableOption (lib.mdDoc "Enable ${name}"); + }; + }; + + config = mkIf cfg.enable { + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + }; +} diff --git a/modules/boot/grub.nix b/modules_old/boot/grub.nix similarity index 100% rename from modules/boot/grub.nix rename to modules_old/boot/grub.nix diff --git a/modules/boot/systemd.nix b/modules_old/boot/systemd.nix similarity index 100% rename from modules/boot/systemd.nix rename to modules_old/boot/systemd.nix diff --git a/modules/de/cosmic/config/com.system76.CosmicBackground/v1/all b/modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/all similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicBackground/v1/all rename to modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/all diff --git a/modules/de/cosmic/config/com.system76.CosmicBackground/v1/backgrounds b/modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/backgrounds similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicBackground/v1/backgrounds rename to modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/backgrounds diff --git a/modules/de/cosmic/config/com.system76.CosmicBackground/v1/output.eDP-1 b/modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/output.eDP-1 similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicBackground/v1/output.eDP-1 rename to modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/output.eDP-1 diff --git a/modules/de/cosmic/config/com.system76.CosmicBackground/v1/same-on-all b/modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/same-on-all similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicBackground/v1/same-on-all rename to modules_old/de/cosmic/config/com.system76.CosmicBackground/v1/same-on-all diff --git a/modules/de/cosmic/config/com.system76.CosmicComp/v1/active_hint b/modules_old/de/cosmic/config/com.system76.CosmicComp/v1/active_hint similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicComp/v1/active_hint rename to modules_old/de/cosmic/config/com.system76.CosmicComp/v1/active_hint diff --git a/modules/de/cosmic/config/com.system76.CosmicComp/v1/autotile_behavior b/modules_old/de/cosmic/config/com.system76.CosmicComp/v1/autotile_behavior similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicComp/v1/autotile_behavior rename to modules_old/de/cosmic/config/com.system76.CosmicComp/v1/autotile_behavior diff --git a/modules/de/cosmic/config/com.system76.CosmicComp/v1/descale_xwayland b/modules_old/de/cosmic/config/com.system76.CosmicComp/v1/descale_xwayland similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicComp/v1/descale_xwayland rename to modules_old/de/cosmic/config/com.system76.CosmicComp/v1/descale_xwayland diff --git a/modules/de/cosmic/config/com.system76.CosmicComp/v1/xkb_config b/modules_old/de/cosmic/config/com.system76.CosmicComp/v1/xkb_config similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicComp/v1/xkb_config rename to modules_old/de/cosmic/config/com.system76.CosmicComp/v1/xkb_config diff --git a/modules/de/cosmic/config/com.system76.CosmicFiles/v1/tab b/modules_old/de/cosmic/config/com.system76.CosmicFiles/v1/tab similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicFiles/v1/tab rename to modules_old/de/cosmic/config/com.system76.CosmicFiles/v1/tab diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor_gap b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor_gap similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor_gap rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/anchor_gap diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/autohide b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/autohide similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/autohide rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/autohide diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/background b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/background similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/background rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/background diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/border_radius b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/border_radius similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/border_radius rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/border_radius diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/exclusive_zone b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/exclusive_zone similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/exclusive_zone rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/exclusive_zone diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/expand_to_edges b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/expand_to_edges similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/expand_to_edges rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/expand_to_edges diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/keyboard_interactivity b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/keyboard_interactivity similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/keyboard_interactivity rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/keyboard_interactivity diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/layer b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/layer similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/layer rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/layer diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/margin b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/margin similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/margin rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/margin diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/name b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/name similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/name rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/name diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/opacity b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/opacity similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/opacity rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/opacity diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/output b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/output similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/output rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/output diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/padding b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/padding similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/padding rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/padding diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_center b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_center similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_center rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_center diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_wings b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_wings similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_wings rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/plugins_wings diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_center b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_center similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_center rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_center diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_wings b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_wings similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_wings rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/size_wings diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/spacing b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/spacing similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/spacing rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Dock/v1/spacing diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor_gap b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor_gap similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor_gap rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/anchor_gap diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/autohide b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/autohide similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/autohide rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/autohide diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/background b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/background similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/background rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/background diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/border_radius b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/border_radius similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/border_radius rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/border_radius diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/exclusive_zone b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/exclusive_zone similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/exclusive_zone rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/exclusive_zone diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/expand_to_edges b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/expand_to_edges similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/expand_to_edges rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/expand_to_edges diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/keyboard_interactivity b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/keyboard_interactivity similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/keyboard_interactivity rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/keyboard_interactivity diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/layer b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/layer similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/layer rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/layer diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/margin b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/margin similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/margin rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/margin diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/name b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/name similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/name rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/name diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/opacity b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/opacity similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/opacity rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/opacity diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/output b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/output similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/output rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/output diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/padding b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/padding similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/padding rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/padding diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_center b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_center similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_center rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_center diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_wings b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_wings similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_wings rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/plugins_wings diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_center b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_center similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_center rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_center diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_wings b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_wings similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_wings rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/size_wings diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/spacing b/modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/spacing similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/spacing rename to modules_old/de/cosmic/config/com.system76.CosmicPanel.Panel/v1/spacing diff --git a/modules/de/cosmic/config/com.system76.CosmicPanel/v1/entries b/modules_old/de/cosmic/config/com.system76.CosmicPanel/v1/entries similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicPanel/v1/entries rename to modules_old/de/cosmic/config/com.system76.CosmicPanel/v1/entries diff --git a/modules/de/cosmic/config/com.system76.CosmicSettings.Shortcuts/v1/custom b/modules_old/de/cosmic/config/com.system76.CosmicSettings.Shortcuts/v1/custom similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicSettings.Shortcuts/v1/custom rename to modules_old/de/cosmic/config/com.system76.CosmicSettings.Shortcuts/v1/custom diff --git a/modules/de/cosmic/config/com.system76.CosmicSettings.Wallpaper/v1/custom-colors b/modules_old/de/cosmic/config/com.system76.CosmicSettings.Wallpaper/v1/custom-colors similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicSettings.Wallpaper/v1/custom-colors rename to modules_old/de/cosmic/config/com.system76.CosmicSettings.Wallpaper/v1/custom-colors diff --git a/modules/de/cosmic/config/com.system76.CosmicSettings/v1/active-page b/modules_old/de/cosmic/config/com.system76.CosmicSettings/v1/active-page similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicSettings/v1/active-page rename to modules_old/de/cosmic/config/com.system76.CosmicSettings/v1/active-page diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/accent b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/accent similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/accent rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/accent diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/active_hint b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/active_hint similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/active_hint rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/active_hint diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/corner_radii b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/corner_radii similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/corner_radii rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/corner_radii diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/gaps b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/gaps similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/gaps rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/gaps diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/primary_container_bg b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/primary_container_bg similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/primary_container_bg rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/primary_container_bg diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/spacing b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/spacing similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/spacing rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark.Builder/v1/spacing diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent_button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent_button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent_button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/accent_button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/active_hint b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/active_hint similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/active_hint rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/active_hint diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/background b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/background similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/background rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/background diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/corner_radii b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/corner_radii similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/corner_radii rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/corner_radii diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive_button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive_button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive_button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/destructive_button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/gaps b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/gaps similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/gaps rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/gaps diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/icon_button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/icon_button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/icon_button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/icon_button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/link_button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/link_button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/link_button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/link_button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/primary b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/primary similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/primary rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/primary diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/secondary b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/secondary similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/secondary rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/secondary diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/spacing b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/spacing similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/spacing rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/spacing diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/success b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/success similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/success rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/success diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/text_button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/text_button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/text_button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/text_button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning_button b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning_button similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning_button rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Dark/v1/warning_button diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/active_hint b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/active_hint similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/active_hint rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/active_hint diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/corner_radii b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/corner_radii similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/corner_radii rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/corner_radii diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/gaps b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/gaps similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/gaps rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/gaps diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/spacing b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/spacing similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/spacing rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light.Builder/v1/spacing diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/active_hint b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/active_hint similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/active_hint rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/active_hint diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/corner_radii b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/corner_radii similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/corner_radii rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/corner_radii diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/gaps b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/gaps similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/gaps rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/gaps diff --git a/modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/spacing b/modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/spacing similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTheme.Light/v1/spacing rename to modules_old/de/cosmic/config/com.system76.CosmicTheme.Light/v1/spacing diff --git a/modules/de/cosmic/config/com.system76.CosmicTk/v1/header_size b/modules_old/de/cosmic/config/com.system76.CosmicTk/v1/header_size similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTk/v1/header_size rename to modules_old/de/cosmic/config/com.system76.CosmicTk/v1/header_size diff --git a/modules/de/cosmic/config/com.system76.CosmicTk/v1/interface_density b/modules_old/de/cosmic/config/com.system76.CosmicTk/v1/interface_density similarity index 100% rename from modules/de/cosmic/config/com.system76.CosmicTk/v1/interface_density rename to modules_old/de/cosmic/config/com.system76.CosmicTk/v1/interface_density diff --git a/modules/de/cosmic/cosmic.nix b/modules_old/de/cosmic/cosmic.nix similarity index 100% rename from modules/de/cosmic/cosmic.nix rename to modules_old/de/cosmic/cosmic.nix diff --git a/modules/de/gnome_wayland.nix b/modules_old/de/gnome_wayland.nix similarity index 100% rename from modules/de/gnome_wayland.nix rename to modules_old/de/gnome_wayland.nix diff --git a/modules/de/gnome_xorg.nix b/modules_old/de/gnome_xorg.nix similarity index 100% rename from modules/de/gnome_xorg.nix rename to modules_old/de/gnome_xorg.nix diff --git a/modules/docker.nix b/modules_old/docker.nix similarity index 100% rename from modules/docker.nix rename to modules_old/docker.nix diff --git a/modules/fonts.nix b/modules_old/fonts.nix similarity index 100% rename from modules/fonts.nix rename to modules_old/fonts.nix diff --git a/modules/home_manager.nix b/modules_old/home_manager.nix similarity index 100% rename from modules/home_manager.nix rename to modules_old/home_manager.nix diff --git a/modules/nebula.nix b/modules_old/nebula.nix similarity index 100% rename from modules/nebula.nix rename to modules_old/nebula.nix diff --git a/modules/neovim.nix b/modules_old/neovim.nix similarity index 100% rename from modules/neovim.nix rename to modules_old/neovim.nix diff --git a/modules/rustdesk.nix b/modules_old/rustdesk.nix similarity index 100% rename from modules/rustdesk.nix rename to modules_old/rustdesk.nix diff --git a/modules/saber.nix b/modules_old/saber.nix similarity index 100% rename from modules/saber.nix rename to modules_old/saber.nix diff --git a/modules/shell/common.nix b/modules_old/shell/common.nix similarity index 100% rename from modules/shell/common.nix rename to modules_old/shell/common.nix diff --git a/modules/shell/common.sh b/modules_old/shell/common.sh similarity index 100% rename from modules/shell/common.sh rename to modules_old/shell/common.sh diff --git a/modules/ssh.nix b/modules_old/ssh.nix similarity index 100% rename from modules/ssh.nix rename to modules_old/ssh.nix diff --git a/modules/stormd.nix b/modules_old/stormd.nix similarity index 100% rename from modules/stormd.nix rename to modules_old/stormd.nix diff --git a/modules/tty_caps_esc.nix b/modules_old/tty_caps_esc.nix similarity index 100% rename from modules/tty_caps_esc.nix rename to modules_old/tty_caps_esc.nix diff --git a/modules/validations.nix b/modules_old/validations.nix similarity index 100% rename from modules/validations.nix rename to modules_old/validations.nix