From ec1d61a90224aeb7a28a12d9753d8ca67e000cfa Mon Sep 17 00:00:00 2001 From: hive Date: Sat, 1 Jul 2023 21:28:58 +0000 Subject: [PATCH] restructure file positions and remove unnecesary --- hosts/null/default.nix | 2 - hosts/qemu/default.nix | 6 -- hosts/qemu/hardware-configuration.nix | 39 --------- hosts/terra/default.nix | 33 -------- hosts/terra/hardware-configuration.nix | 42 ---------- hosts/terra/luks.nix | 10 --- hosts/uranus/default.nix | 21 ----- hosts/uranus/hardware-configuration.nix | 40 --------- hosts/vulkan/default.nix | 7 -- hosts/vulkan/hardware-configuration.nix | 41 ---------- hosts/vulkan/luks.nix | 13 --- saturn/system.nix.template | 10 --- default.nix => saturnOS/default.nix.baka | 0 {modules => saturnOS/modules}/default.nix | 0 {modules => saturnOS/modules}/machineInfo.nix | 0 .../modules}/saturnConfig.nix | 0 users/hive/default.nix | 75 ----------------- users/hive/home.nix | 81 ------------------- users/saturn/default.nix | 1 - users/saturn/home.nix | 2 - 20 files changed, 423 deletions(-) delete mode 100644 hosts/null/default.nix delete mode 100644 hosts/qemu/default.nix delete mode 100644 hosts/qemu/hardware-configuration.nix delete mode 100644 hosts/terra/default.nix delete mode 100644 hosts/terra/hardware-configuration.nix delete mode 100644 hosts/terra/luks.nix delete mode 100644 hosts/uranus/default.nix delete mode 100644 hosts/uranus/hardware-configuration.nix delete mode 100644 hosts/vulkan/default.nix delete mode 100644 hosts/vulkan/hardware-configuration.nix delete mode 100644 hosts/vulkan/luks.nix delete mode 100644 saturn/system.nix.template rename default.nix => saturnOS/default.nix.baka (100%) rename {modules => saturnOS/modules}/default.nix (100%) rename {modules => saturnOS/modules}/machineInfo.nix (100%) rename {modules => saturnOS/modules}/saturnConfig.nix (100%) delete mode 100644 users/hive/default.nix delete mode 100644 users/hive/home.nix delete mode 100644 users/saturn/default.nix delete mode 100644 users/saturn/home.nix diff --git a/hosts/null/default.nix b/hosts/null/default.nix deleted file mode 100644 index 42a6aa5..0000000 --- a/hosts/null/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -# an non-existant host for testing purposes -{...}:{} diff --git a/hosts/qemu/default.nix b/hosts/qemu/default.nix deleted file mode 100644 index ea30ecb..0000000 --- a/hosts/qemu/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ - ./hardware-configuration.nix - ]; -} diff --git a/hosts/qemu/hardware-configuration.nix b/hosts/qemu/hardware-configuration.nix deleted file mode 100644 index a65c50d..0000000 --- a/hosts/qemu/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# 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 + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/vda2"; - fsType = "ext4"; - }; - - fileSystems."/boot/efi" = - { device = "/dev/vda1"; - fsType = "vfat"; - }; - services.spice-vdagentd.enable = true; - services.spice-webdavd.enable = true; - - 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.enp1s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/terra/default.nix b/hosts/terra/default.nix deleted file mode 100644 index cf5255a..0000000 --- a/hosts/terra/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ ... }: -{ - imports = [ - ./hardware-configuration.nix - ./luks.nix - ]; - - programs.steam.enable = true; - programs.gamemode = { - enable = true; - settings = { - general = { - renice = 10; - }; - # Warning: GPU optimisations have the potential to damage hardware - gpu = { - apply_gpu_optimisations = "accept-responsibility"; - gpu_device = 0; - amd_performance_level = "high"; - }; - }; - }; - services.power-profiles-daemon.enable = false; - services.tlp = { - enable = true; - settings = { - START_CHARGE_THRESH_BAT0 = 75; - STOP_CHARGE_THRESH_BAT0 = 80; - }; - }; - - -} diff --git a/hosts/terra/hardware-configuration.nix b/hosts/terra/hardware-configuration.nix deleted file mode 100644 index 9ecb24d..0000000 --- a/hosts/terra/hardware-configuration.nix +++ /dev/null @@ -1,42 +0,0 @@ -# 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/39ab92ec-67bb-49ef-b458-90d43b63d1c6"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-8dd98ede-339f-470d-97f9-92dd2d6687f7".device = "/dev/disk/by-uuid/8dd98ede-339f-470d-97f9-92dd2d6687f7"; - - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/50A2-D8BD"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/825ae105-4f03-44a0-81c6-0da642d0c77d"; } - ]; - - # 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.enp0s25.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/terra/luks.nix b/hosts/terra/luks.nix deleted file mode 100644 index 8719833..0000000 --- a/hosts/terra/luks.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - # Setup keyfile - boot.initrd.secrets = { - "/crypto_keyfile.bin" = null; - }; - # Enable swap on luks - boot.initrd.luks.devices."luks-55171762-776c-4297-a762-1a570618a78a".device = "/dev/disk/by-uuid/55171762-776c-4297-a762-1a570618a78a"; - boot.initrd.luks.devices."luks-55171762-776c-4297-a762-1a570618a78a".keyFile = "/crypto_keyfile.bin"; -} diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix deleted file mode 100644 index 6df61f7..0000000 --- a/hosts/uranus/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: -{ - imports = [ - ./hardware-configuration.nix - ]; - - programs.steam.enable = true; - programs.gamemode = { - enable = true; - settings = { - general = { - renice = 10; - }; - # Warning: GPU optimisations have the potential to damage hardware - gpu = { - apply_gpu_optimisations = "accept-responsibility"; - gpu_device = 0; - }; - }; - }; -} diff --git a/hosts/uranus/hardware-configuration.nix b/hosts/uranus/hardware-configuration.nix deleted file mode 100644 index cf1d9c3..0000000 --- a/hosts/uranus/hardware-configuration.nix +++ /dev/null @@ -1,40 +0,0 @@ -# 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" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" "wl" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/bdad9443-41e0-4a8f-b5b3-a93f51dc3a2a"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-1e816279-2666-41a6-bcb9-f97c2f7b3102".device = "/dev/disk/by-uuid/1e816279-2666-41a6-bcb9-f97c2f7b3102"; - - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/993B-1245"; - 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.enp8s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20u3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/vulkan/default.nix b/hosts/vulkan/default.nix deleted file mode 100644 index 69f5152..0000000 --- a/hosts/vulkan/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - imports = [ - ./hardware-configuration.nix - ./luks.nix - ]; -} diff --git a/hosts/vulkan/hardware-configuration.nix b/hosts/vulkan/hardware-configuration.nix deleted file mode 100644 index c8191e3..0000000 --- a/hosts/vulkan/hardware-configuration.nix +++ /dev/null @@ -1,41 +0,0 @@ -# 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" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/f1a894aa-8e45-426b-b3ab-e4da09f5995f"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-f8bdd267-e062-42e4-813f-4f2acc51b335".device = "/dev/disk/by-uuid/f8bdd267-e062-42e4-813f-4f2acc51b335"; - - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/BD84-95A7"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/4d479659-d73d-4d60-9258-870d7a16662f"; } - ]; - - # 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.wlp0s12f0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/vulkan/luks.nix b/hosts/vulkan/luks.nix deleted file mode 100644 index bd66f18..0000000 --- a/hosts/vulkan/luks.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - # init keyfile - boot.initrd.secrets = { - "/crypto_keyfile.bin" = null; - }; - - # enable swap on luks - boot.initrd.luks.devices."luks-4130c26c-7546-42e9-9d61-8f112e244460".device = - "/dev/disk/by-uuid/4130c26c-7546-42e9-9d61-8f112e244460"; - boot.initrd.luks.devices."luks-4130c26c-7546-42e9-9d61-8f112e244460".keyFile = - "/crypto_keyfile.bin"; -} diff --git a/saturn/system.nix.template b/saturn/system.nix.template deleted file mode 100644 index 15d106f..0000000 --- a/saturn/system.nix.template +++ /dev/null @@ -1,10 +0,0 @@ -# copy this file to "system.nix" and configure it for your system ! -{ - user = "saturn"; - host = "qemu"; - prettyHost = "🪐 saturnOS"; - # packages = { - # } - # userPackages = { - # } -} diff --git a/default.nix b/saturnOS/default.nix.baka similarity index 100% rename from default.nix rename to saturnOS/default.nix.baka diff --git a/modules/default.nix b/saturnOS/modules/default.nix similarity index 100% rename from modules/default.nix rename to saturnOS/modules/default.nix diff --git a/modules/machineInfo.nix b/saturnOS/modules/machineInfo.nix similarity index 100% rename from modules/machineInfo.nix rename to saturnOS/modules/machineInfo.nix diff --git a/modules/saturnConfig.nix b/saturnOS/modules/saturnConfig.nix similarity index 100% rename from modules/saturnConfig.nix rename to saturnOS/modules/saturnConfig.nix diff --git a/users/hive/default.nix b/users/hive/default.nix deleted file mode 100644 index dab6ce0..0000000 --- a/users/hive/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ ... } : -# . + . . . . . . -# . . . * -# . * . . . . . . + . -# . . + . . . -# . . . . . . . -# . . . +. + . -# . . . . -# . . . * . . . . + . -# + . . . + -# . . + .+. .. * -# . 　　。　　　•　 　ﾟ　　。 　　. + -# 　　.　 　　　.　　　　。　　 。　. . . . . -# .　 。　　　　 ඞ 。 . 　 • . . + + -# 　　ﾟ　 Hive was an Impostor + . -# 　'　　 2 Impostors remain + .+. 　　　•　 -# 　ﾟ　　　.　　. ,　　　.　 . , +　　　.　 -# . . . + . . . + .+. . -# . . . . . . . . ! / -# * . . . + . . - O - -# . . . + . . * . . / | -# . + . . . .. + . -# . . . . * . * . +.. . * -# . . . . . . . . + . . + -{ - services.syncthing = { - enable = true; - user = "hive"; - configDir = "/home/hive/.config/syncthing"; - overrideDevices = false; - overrideFolders = false; - devices = { "impostor" = { - id = "XBG44HU-OVOC6RN-4DHMDRH-WPL7OPW-XBYYOMK-DV5GGGA-LEP6HCJ-QVPMSAI"; - introducer = true; - }; }; - folders = { - "ssh" = { - id = "mkkgo-chqwk"; - path = "~/.ssh"; - devices = [ "impostor" ]; - ignorePerms = false; - }; - "decsync" = { - id = "20lk1-ims07"; - path = "~/.local/share/decsync"; - devices = [ "impostor" ]; - }; - "scripts" = { - id = "6nunu-quun5"; - path = "~/.local/bin/scripts"; - devices = [ "impostor" ]; - }; - "dotfiles" = { - id = "sjgew-vdpfl"; - path = "~/.dotfiles"; - devices = [ "impostor" ]; - }; - "password-store" = { - id = "tadwa-1va0d"; - path = "~/.local/share/pass"; - devices = [ "impostor" ]; - }; - "notes" = { - id = "y0a00-2ha8l"; - path = "~/Notes"; - devices = [ "impostor" ]; - }; - "documents" = { - id = "y7ecb-v9ds7"; - path = "~/Documents"; - devices = [ "impostor" ]; - }; - }; - }; -} diff --git a/users/hive/home.nix b/users/hive/home.nix deleted file mode 100644 index bb88807..0000000 --- a/users/hive/home.nix +++ /dev/null @@ -1,81 +0,0 @@ -# all my home stuff :3 -sysConf: { config, pkgs, lib, ... }: -{ - home.sessionVariables = { - # system configuration - EDITOR = "nvim"; - - # cleanup homedir - CARGO_HOME = "${config.xdg.dataHome}/cargo"; - - # fish config - fish_greeting = "✨️ heya ${sysConf.user}, welcome to ${sysConf.prettyHost} ~"; - }; - # installing my packages uvu - home.packages = with pkgs; [ - bat - diceware - pwgen - kitty - schildichat-desktop - dino - mangohud - termpdfpy - lollypop - skim - syncthing - armcord - ripgrep - tmate - btop - firefox - apostrophe - warp - syncplay - mpv - wl-clipboard - adw-gtk3 - # some bullshit to get gnome apps to install withotu a prefix - ] ++ (with pkgs.gnome; with pkgs.gnomeExtensions; [ - gnome-tweaks - dconf-editor - night-theme-switcher - rounded-window-corners - appindicator - ]); - - # configure programs - programs.home-manager.enable = true; - programs.fish = { - enable = true; - shellAbbrs = { - nxs = "nix search nixpkgs"; - nxr = "nix run nixpkgs#"; - nxsh = "nix shell nixpkgs#"; - e = "edit"; - nxb = "sudo nixos-rebuild switch"; - nxu = "sudo nixos-rebuild boot --upgrade"; - nxc = "sudo nix-collect-garbage -d"; - }; - interactiveShellInit = '' -fish_add_path ~/.local/bin -fish_add_path ~/.local/bin/scripts -fish_add_path ~/.local/share/cargo/bin -fish_add_path /var/lib/flatpak/exports/bin -fish_vi_key_bindings -''; - }; - programs.password-store = { - enable = true; - package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); - settings = { - PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass"; - PASSWORD_STORE_CLIP_TIME = "60"; - }; - }; - programs.browserpass.enable = true; - programs.gpg.enable = true; - - # don't uh, change this or something might break lol idk - home.stateVersion = "22.11"; -} diff --git a/users/saturn/default.nix b/users/saturn/default.nix deleted file mode 100644 index c915eb0..0000000 --- a/users/saturn/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ ... }: { } diff --git a/users/saturn/home.nix b/users/saturn/home.nix deleted file mode 100644 index fb4b367..0000000 --- a/users/saturn/home.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ ... }: -{ }