From 3ce47107e62f651fb47c1f83e941a115c335ed16 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Thu, 12 Sep 2024 15:52:27 -0400 Subject: [PATCH] Give up on Deck, switching to Bazzite with Nix home manager on the SSH profile instead --- flake.nix | 17 ---------- home-manager/jimbo_deck.nix | 39 ---------------------- nixos/deck.nix | 46 -------------------------- nixos/deck/jovian.nix | 17 ---------- nixos/hardware/machines/deck.nix | 57 -------------------------------- 5 files changed, 176 deletions(-) delete mode 100644 home-manager/jimbo_deck.nix delete mode 100644 nixos/deck.nix delete mode 100644 nixos/deck/jovian.nix delete mode 100644 nixos/hardware/machines/deck.nix diff --git a/flake.nix b/flake.nix index 2a08485..9bd7d0a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,6 @@ nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - jovian-nixos.url = "github:Jovian-Experiments/Jovian-NixOS"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; # Home manager @@ -26,7 +25,6 @@ nur, nixos-mailserver, blender-bin, - jovian-nixos, home-manager, ... } @inputs: let @@ -61,13 +59,6 @@ nixos-mailserver.nixosModule ]; }; - JimDeck = nixpkgs-unstable.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [ - ./nixos/deck.nix - jovian-nixos.nixosModules.default - ]; - }; JimLenovo = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs outputs;}; modules = [ @@ -94,14 +85,6 @@ ./home-manager/jimbo_server.nix ]; }; - "jimbo@JimDeck" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - ./home-manager/jimbo_deck.nix - nur.nixosModules.nur - ]; - }; "jimbo@JimLenovo" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = {inherit inputs outputs;}; diff --git a/home-manager/jimbo_deck.nix b/home-manager/jimbo_deck.nix deleted file mode 100644 index f258fe5..0000000 --- a/home-manager/jimbo_deck.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - imports = [ - # Common modules - ./home.nix - ./users/jimbo.nix - ./tuiapps/git.nix - - # GUI Apps - ./misc/guifiles.nix - ./sway/sway.nix - ./guiapps/gtk.nix - ./guiapps/foot.nix - ./guiapps/librewolf.nix - ./guiapps/mangohud.nix - ./guiapps/mpv.nix - ./guiapps/obs.nix - ./guiapps/pcmanfm-qt.nix - ./guiapps/rofi.nix - ./guiapps/swappy.nix - ./guiapps/easyeffects.nix - ./tuiapps/ncmpcpp.nix - - # Misc apps and tools - ./misc/useful.nix - ./misc/avtools.nix - ./misc/filemanager.nix - ./misc/gaming.nix - ./misc/xash3d.nix - ./misc/emulators.nix - ./misc/remotedesktop.nix - ./misc/school.nix - ./misc/variables.nix - - # Services - ./services/gnome-keyring.nix - ./services/mako.nix - ./services/udiskie.nix - ]; -} diff --git a/nixos/deck.nix b/nixos/deck.nix deleted file mode 100644 index f970ef0..0000000 --- a/nixos/deck.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - imports = [ - # Base configs - ./base.nix - - # Import users and groups - ./users/jimbo.nix - ./users/groups.nix - - # Desktop only - ./desktop/misc.nix - ./desktop/sway.nix - ./desktop/gaming.nix - ./desktop/pipewire.nix - ./desktop/bluetooth.nix - ./desktop/firewall.nix - ./desktop/fonts.nix - ./desktop/qt.nix - - # Laptop/Portable only - ./hardware/wireless.nix - - # Steam Deck only - ./deck/jovian.nix - - # Modules - ./modules/security.nix - - # Hardware - ./hardware/machines/deck.nix - ./hardware/systemdboot.nix - - # Services - ./services/openssh.nix - ./services/mpd.nix - ]; - - # Set hostname - networking.hostName = "JimDeck"; - - # Force Electron to use Wayland - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - system.stateVersion = "24.11"; -} diff --git a/nixos/deck/jovian.nix b/nixos/deck/jovian.nix deleted file mode 100644 index 880a59e..0000000 --- a/nixos/deck/jovian.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - jovian = { - steam = { - enable = true; - autoStart = true; - user = "jimbo"; - desktopSession = "sway"; - }; - decky-loader.enable = true; - devices.steamdeck.enable = true; - steamos.useSteamOSConfig = true; - }; - - environment.systemPackages = with pkgs; [ - python3 - ]; -} diff --git a/nixos/hardware/machines/deck.nix b/nixos/hardware/machines/deck.nix deleted file mode 100644 index aae055a..0000000 --- a/nixos/hardware/machines/deck.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was initially made by 'nixos-generate-config', try not to edit too much -{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - # Set all boot options - boot = { - # Set a kernel version and load/blacklist drivers - blacklistedKernelModules = [ - "pcspkr" - ]; - kernel.sysctl."vm.max_map_count" = 2147483642; - initrd = { - availableKernelModules = [ - "nvme" - "xhci_pci" - "usbhid" - "usb_storage" - "sd_mod" - "sdhci_pci" - ]; - kernelModules = [ - "kvm-amd" - ]; - }; - - # Manage supported filesystems - supportedFilesystems = { - ntfs = true; - zfs = lib.mkForce false; - }; - }; - - # Mount everything as necessary - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/182b2841-88a8-4845-9a29-0c1cdc01102d"; - fsType = "btrfs"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/10A5-1022"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - }; - - # Set the swap partition - swapDevices = [ - { device = "/dev/disk/by-uuid/552f8899-a255-4e2b-a22c-e361ceaa527a"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. - networking.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -}