From 456c7addd777298d08d39b0a5b3f316766b7f760 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Tue, 9 Jul 2024 20:29:45 -0400 Subject: [PATCH] drop mandarin --- flake.nix | 1 - homes/morgan/default.nix | 46 -------------------- hosts/mandarin/default.nix | 76 ---------------------------------- hosts/mandarin/disko.nix | 56 ------------------------- hosts/mandarin/home.nix | 19 --------- userModules/default.nix | 1 - userModules/morgan/default.nix | 20 --------- userModules/options.nix | 1 - 8 files changed, 220 deletions(-) delete mode 100644 homes/morgan/default.nix delete mode 100644 hosts/mandarin/default.nix delete mode 100644 hosts/mandarin/disko.nix delete mode 100644 hosts/mandarin/home.nix delete mode 100644 userModules/morgan/default.nix diff --git a/flake.nix b/flake.nix index 987d31d3..04ab41fa 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,6 @@ forAllHosts = self.inputs.nixpkgs.lib.genAttrs [ "fallarbor" "lavaridge" - "mandarin" "mauville" "petalburg" "rustboro" diff --git a/homes/morgan/default.nix b/homes/morgan/default.nix deleted file mode 100644 index f5668b4e..00000000 --- a/homes/morgan/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -self: { - config, - lib, - pkgs, - ... -}: { - imports = [self.homeManagerModules.default]; - - home = { - username = "morgan"; - homeDirectory = "/home/morgan"; - stateVersion = "24.05"; - packages = with pkgs; [ - fractal - libreoffice-fresh - webcord - xfce.xfce4-taskmanager - ]; - }; - - programs = { - home-manager.enable = true; - git = { - enable = true; - userName = "Morgan Tamayo"; - userEmail = "mrgntamayo@gmail.com"; - }; - }; - - ar.home = { - apps = { - alacritty.enable = true; - bash.enable = true; - chromium.enable = true; - firefox.enable = true; - vsCodium.enable = true; - }; - - defaultApps.enable = true; - - theme = { - enable = true; - wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg"; - }; - }; -} diff --git a/hosts/mandarin/default.nix b/hosts/mandarin/default.nix deleted file mode 100644 index dfd83e99..00000000 --- a/hosts/mandarin/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -# Custom desktop with AMD Ryzen 5 5600x, 32GB RAM, AMD Rx 7800 XT, and 1TB SSD + 2TB SSD. -{ - config, - lib, - pkgs, - self, - ... -}: { - imports = [ - ../common.nix - ./disko.nix - ./home.nix - self.inputs.nixhw.nixosModules.common-amd-cpu - self.inputs.nixhw.nixosModules.common-amd-gpu - self.inputs.nixhw.nixosModules.common-bluetooth - self.inputs.nixhw.nixosModules.common-ssd - ]; - - boot = { - initrd.availableKernelModules = ["nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci"]; - kernelPackages = pkgs.linuxPackages_latest; - - loader = { - efi.canTouchEfiVariables = true; - systemd-boot.enable = true; - }; - }; - - environment.variables.GDK_SCALE = "1.25"; - hardware.enableAllFirmware = true; - networking.hostName = "mandarin"; - - services.ollama = { - enable = true; - acceleration = "rocm"; - }; - - system.stateVersion = "24.05"; - - ar = { - apps = { - firefox.enable = true; - podman.enable = true; - steam.enable = true; - virt-manager.enable = true; - }; - - desktop = { - greetd = { - enable = true; - - autologin = { - enable = true; - user = "morgan"; - }; - }; - - hyprland.enable = true; - steam.enable = true; - }; - - services.flatpak.enable = true; - - users = { - aly = { - enable = true; - password = "$y$j9T$NSS7QcEtN4yiigPyofwlI/$nxdgz0lpySa0heDMjGlHe1gX3BWf48jK6Tkfg4xMEs6"; - }; - - morgan = { - enable = true; - password = "$y$j9T$frYXYFwo4KuPWEqilfPCN1$CtRMMK4HFLKu90qkv1cCkvp1UdJocUbkySQlVElwkM2"; - }; - }; - }; -} diff --git a/hosts/mandarin/disko.nix b/hosts/mandarin/disko.nix deleted file mode 100644 index b3a7bdb0..00000000 --- a/hosts/mandarin/disko.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - disko.devices = { - disk = { - vdb = { - type = "disk"; - device = "/dev/nvme1n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "1024M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "umask=0077" - ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "crypted"; - content = { - type = "btrfs"; - extraArgs = ["-f"]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "persist" = { - mountpoint = "/persist"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/home" = { - mountpoint = "/home"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = ["compress=zstd" "noatime"]; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/mandarin/home.nix b/hosts/mandarin/home.nix deleted file mode 100644 index 3451b61b..00000000 --- a/hosts/mandarin/home.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - home-manager = { - sharedModules = [ - { - ar.home = { - desktop = { - hyprland.autoSuspend = false; - sway.autoSuspend = false; - }; - }; - } - ]; - }; -} diff --git a/userModules/default.nix b/userModules/default.nix index 1b6521f0..c44f7780 100644 --- a/userModules/default.nix +++ b/userModules/default.nix @@ -7,7 +7,6 @@ self: { imports = [ ./aly ./dustin - ./morgan ./options.nix ]; diff --git a/userModules/morgan/default.nix b/userModules/morgan/default.nix deleted file mode 100644 index a0b9b991..00000000 --- a/userModules/morgan/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - config, - inputs, - lib, - pkgs, - self, - ... -}: { - config = lib.mkIf config.ar.users.morgan.enable { - home-manager.users.morgan = self.homeManagerModules.morgan; - - users.users.morgan = { - description = "Morgan Tamayo"; - extraGroups = config.ar.users.defaultGroups; - hashedPassword = config.ar.users.morgan.password; - isNormalUser = true; - uid = 1002; - }; - }; -} diff --git a/userModules/options.nix b/userModules/options.nix index 934c4395..82c5164b 100644 --- a/userModules/options.nix +++ b/userModules/options.nix @@ -60,6 +60,5 @@ }; dustin = mkUser "dustin"; - morgan = mkUser "morgan"; }; }