From 73610ce2444711e8e34116889e31fb1c31611919 Mon Sep 17 00:00:00 2001 From: quinm0 Date: Mon, 16 Mar 2026 22:36:12 -0400 Subject: [PATCH] add desktop config --- flake.nix | 12 ++++++++ nix/qdhc.nix | 39 ++++++++++++++++++++++++++ nix/user-quin.nix | 2 ++ src/ansible/dietpi-inv.ini | 3 -- src/ansible/dietpiconfig-playbook.yaml | 4 --- src/ansible/playbook.yaml | 1 - 6 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 nix/qdhc.nix delete mode 100644 src/ansible/dietpi-inv.ini delete mode 100644 src/ansible/dietpiconfig-playbook.yaml diff --git a/flake.nix b/flake.nix index 0ee4126..1cc8778 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,18 @@ ./nix/mega.nix ]; }; + + nixosConfigurations.qmoran-desktop = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./nix/qdhc.nix + ./nix/common.nix + ./nix/user-quin.nix + ./nix/gui1.nix + ./nix/mega.nix + ]; + }; + }; } diff --git a/nix/qdhc.nix b/nix/qdhc.nix new file mode 100644 index 0000000..6eb4839 --- /dev/null +++ b/nix/qdhc.nix @@ -0,0 +1,39 @@ +# 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") + ]; + + networking.hostName = "qmoran-desktop"; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + 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-uuid/2f49d6b4-62dc-4751-b373-656cbc5dc203"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/03DA-79ED"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/cf4cff49-15d7-4145-86c2-8be30e71fe4c"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nix/user-quin.nix b/nix/user-quin.nix index 965b965..f287c9e 100644 --- a/nix/user-quin.nix +++ b/nix/user-quin.nix @@ -21,6 +21,8 @@ vscodium vivaldi libreoffice-qt-fresh + ansible_2_18 + trash-cli ]; }; } \ No newline at end of file diff --git a/src/ansible/dietpi-inv.ini b/src/ansible/dietpi-inv.ini deleted file mode 100644 index dfb8032..0000000 --- a/src/ansible/dietpi-inv.ini +++ /dev/null @@ -1,3 +0,0 @@ -[dietpi-inv] -; B407 Raspberry pi node -root@192.168.68.52 ansible_ssh_private_key_file=~/.ssh/id_ed25519 diff --git a/src/ansible/dietpiconfig-playbook.yaml b/src/ansible/dietpiconfig-playbook.yaml deleted file mode 100644 index e444a05..0000000 --- a/src/ansible/dietpiconfig-playbook.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- hosts: dietpi-inv - roles: - - dietpi diff --git a/src/ansible/playbook.yaml b/src/ansible/playbook.yaml index 1d09c0f..5c3646c 100644 --- a/src/ansible/playbook.yaml +++ b/src/ansible/playbook.yaml @@ -2,7 +2,6 @@ - hosts: qmoran-desktop become: yes roles: - - devtools - oneenv vars_files: - secrets.yaml