diff --git a/hosts/default.nix b/hosts/default.nix index 8c49165..621e23d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -213,39 +213,21 @@ in ]; }; - q920 = lib.nixosSystem { # Laptop profile - inherit system; - specialArgs = { inherit inputs user location ; }; - modules = [ - ./q920 - ./configuration.nix - - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user; }; - home-manager.users.${user} = { - imports = [(import ./home.nix)] ++ [(import ./q920/home.nix)]; - }; - } - ]; - }; - - vm = lib.nixosSystem { # VM profile - inherit system; - specialArgs = { inherit inputs user location; }; - modules = [ - ./vm - ./configuration.nix - - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user; }; - home-manager.users.${user} = { - imports = [(import ./home.nix)] ++ [(import ./vm/home.nix)]; - }; - } - ]; - }; +# vm = lib.nixosSystem { # VM profile +# inherit system; +# specialArgs = { inherit inputs user location; }; +# modules = [ +# ./vm +# ./configuration.nix +# +# home-manager.nixosModules.home-manager { +# home-manager.useGlobalPkgs = true; +# home-manager.useUserPackages = true; +# home-manager.extraSpecialArgs = { inherit user; }; +# home-manager.users.${user} = { +# imports = [(import ./home.nix)] ++ [(import ./vm/home.nix)]; +# }; +# } +# ]; +# }; } diff --git a/hosts/q920/default.nix b/hosts/q920/default.nix deleted file mode 100644 index d32552a..0000000 --- a/hosts/q920/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -# -# Specific system configuration settings for desktop -# -# flake.nix -# ├─ ./hosts -# │ └─ ./laptop -# │ ├─ default.nix * -# │ └─ hardware-configuration.nix -# └─ ./modules -# ├─ ./desktop -# │ └─ ./hyprland -# │ └─ hyprland.nix -# ├─ ./modules -# │ └─ ./programs -# │ └─ waybar.nix -# └─ ./hardware -# └─ default.nix -# - -{ config, pkgs, user, ... }: - -{ - imports = # For now, if applying to other system, swap files - [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix - [(import ../../modules/desktop/hyprland/default.nix)] ++ # Window Manager - [(import ../../modules/desktop/virtualisation/docker.nix)]; # ++ # Docker - #(import ../../modules/hardware); # Hardware devices - - boot = { # Boot options - kernelPackages = pkgs.linuxPackages_latest; - - loader = { # EFI Boot - systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - timeout = 1; # Grub auto select time - }; - }; - -# hardware.sane = { # Used for scanning with Xsane -# enable = false; -# extraBackends = [ pkgs.sane-airscan ]; -# }; - -# environment = { -# systemPackages = with pkgs; [ -# simple-scan -# ]; -# }; - - programs = { # No xbacklight, this is the alterantive -# dconf.enable = true; -# light.enable = true; - ssh.startAgent = false; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryFlavor = "curses"; - }; - }; - - services = { -# tlp.enable = true; # TLP and auto-cpufreq for power management - #logind.lidSwitch = "ignore"; # Laptop does not go to sleep when lid is closed - auto-cpufreq.enable = true; - blueman.enable = true; - pcscd.enable = true; - udev.packages = [ - pkgs.nitrokey-udev-rules - ]; - printing = { # Printing and drivers for TS5300 - enable = true; - drivers = [ pkgs.gutenprint ]; - }; - avahi = { # Needed to find wireless printer - enable = true; - nssmdns = true; - publish = { # Needed for detecting the scanner - enable = true; - addresses = true; - userServices = true; - }; - }; - - #xserver = { - # libinput = { # Trackpad support & gestures - # touchpad = { - # tapping = true; - # scrollMethod = "twofinger"; - # naturalScrolling = true; # The correct way of scrolling - # accelProfile = "adaptive"; # Speed settings - # #accelSpeed = "-0.5"; - # disableWhileTyping = true; - # }; - # }; - # resolutions = [ - # { x = 1600; y = 920; } - # { x = 1280; y = 720; } - # { x = 1920; y = 1080; } - # ]; - #}; - }; - - #temporary bluetooth fix -# systemd.tmpfiles.rules = [ -# "d /var/lib/bluetooth 700 root root - -" -# ]; -# systemd.targets."bluetooth".after = ["systemd-tmpfiles-setup.service"]; -} diff --git a/hosts/q920/hardware-configuration.nix b/hosts/q920/hardware-configuration.nix deleted file mode 100644 index 54face5..0000000 --- a/hosts/q920/hardware-configuration.nix +++ /dev/null @@ -1,82 +0,0 @@ -# -# Hardware settings for Teclast F5 10" Laptop -# NixOS @ sda2 -# -# flake.nix -# └─ ./hosts -# └─ ./laptop -# └─ hardware-configuration.nix * -# -# 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" "usbhid" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-label/ROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-label/ROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home" ]; - }; - - fileSystems."/srv" = - { device = "/dev/disk/by-label/ROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-label/BOOT"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - networking = { - useDHCP = false; # Deprecated - hostName = "q920"; - networkmanager.enable = true; - interfaces = { - enp0s25 = { - useDHCP = true; # For versatility sake, manually edit IP on nm-applet. - #ipv4.addresses = [ { - # address = "192.168.0.51"; - # prefixLength = 24; - #} ]; - }; -# wlo1 = { -# useDHCP = true; -# #ipv4.addresses = [ { -# # address = "192.168.0.51"; -# # prefixLength = 24; -# #} ]; -# }; - }; - #defaultGateway = "192.168.0.1"; - #nameservers = [ "192.168.0.4" ]; - #firewall = { - # enable = false; - # #allowedUDPPorts = [ 53 67 ]; - # #allowedTCPPorts = [ 53 80 443 9443 ]; - #}; - }; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; -} diff --git a/hosts/q920/home.nix b/hosts/q920/home.nix deleted file mode 100644 index 3e41024..0000000 --- a/hosts/q920/home.nix +++ /dev/null @@ -1,50 +0,0 @@ -# -# Home-manager configuration for laptop -# -# flake.nix -# ├─ ./hosts -# │ └─ ./laptop -# │ └─ home.nix * -# └─ ./modules -# └─ ./desktop -# └─ ./hyprland -# └─ hyprland.nix -# - -{ pkgs, ... }: - -{ - imports = - [ - ../../modules/desktop/hyprland/home.nix # Window Manager - ]; - - home = { # Specific packages for laptop - packages = with pkgs; [ - # Applications - libreoffice # Office packages - - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - - # Power Management - auto-cpufreq # Power management - #tlp # Power management - ]; - }; - - programs = { - alacritty.settings.font.size = 11; - }; - - services = { # Applets - blueman-applet.enable = true; # Bluetooth - network-manager-applet.enable = true; # Network -# cbatticon = { -# enable = true; -# criticalLevelPercent = 10; -# lowLevelPercent = 20; -# iconType = null; -# }; - }; -}