From 91e6c8e8274c49f2883338e2c27dab82c40db22b Mon Sep 17 00:00:00 2001 From: Joshua Yuen Date: Thu, 31 Jul 2025 01:40:36 -0400 Subject: [PATCH] Remove old configuration.nix, hardware-configuration.nix, and hyprland.nix files --- configuration.nix | 119 ------------------------------------- hardware-configuration.nix | 82 ------------------------- hyprland.nix | 47 --------------- 3 files changed, 248 deletions(-) delete mode 100644 configuration.nix delete mode 100644 hardware-configuration.nix delete mode 100644 hyprland.nix diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 5a6d71a..0000000 --- a/configuration.nix +++ /dev/null @@ -1,119 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page, on -# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). - -{ config, lib, pkgs, ... }: -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./hyprland.nix - ./modules/main-user.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # networking.hostName = "nixos"; # Define your hostname. - # Pick only one of the below networking options. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. - - # Set your time zone. - time.timeZone = "America/New_York"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkb.options in tty. - # }; - - # Enable the X11 windowing system. - #services.xserver.enable = true; - - # Enable the GNOME Desktop Environment - #services.xserver.displayManager.gdm.enable = true; - #services.xserver.desktopManager.gnome.enable = true; - - # Drivers - services.xserver.videoDrivers = [ - "nvidia" - ]; - - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # hardware.pulseaudio.enable = true; - # OR - # services.pipewire = { - # enable = true; - # pulse.enable = true; - # }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.libinput.enable = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This option defines the first version of NixOS you have installed on this particular machine, - # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. - # - # Most users should NEVER change this value after the initial install, for any reason, - # even if you've upgraded your system to a new NixOS release. - # - # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, - # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how - # to actually do that. - # - # This value being lower than the current NixOS release does NOT mean your system is - # out of date, out of support, or vulnerable. - # - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, - # and migrated your data accordingly. - # - # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? - -} - diff --git a/hardware-configuration.nix b/hardware-configuration.nix deleted file mode 100644 index 6c0543f..0000000 --- a/hardware-configuration.nix +++ /dev/null @@ -1,82 +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 = [ "nvme" "usbhid" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/1b805e8b-8c98-4822-ab83-4985313edde2"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - fileSystems."/.snapshots" = - { device = "/dev/disk/by-uuid/1b805e8b-8c98-4822-ab83-4985313edde2"; - fsType = "btrfs"; - options = [ "subvol=@.snapshots" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/1b805e8b-8c98-4822-ab83-4985313edde2"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; - - fileSystems."/var/cache/pacman/pkg" = - { device = "/dev/disk/by-uuid/1b805e8b-8c98-4822-ab83-4985313edde2"; - fsType = "btrfs"; - options = [ "subvol=@pkg" ]; - }; - - fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/1b805e8b-8c98-4822-ab83-4985313edde2"; - fsType = "btrfs"; - options = [ "subvol=@log" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/14F8-5905"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - fileSystems."/misc" = - { device = "/etc/autofs/auto.misc"; - fsType = "autofs"; - }; - - fileSystems."/net" = - { device = "-hosts"; - fsType = "autofs"; - }; - - 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.br-31542a7e57f0.useDHCP = lib.mkDefault true; - # networking.interfaces.br-69965655bcab.useDHCP = lib.mkDefault true; - # networking.interfaces.br-7032ce7b26c2.useDHCP = lib.mkDefault true; - # networking.interfaces.br-733a8e75a123.useDHCP = lib.mkDefault true; - # networking.interfaces.br-88821a6825f9.useDHCP = lib.mkDefault true; - # networking.interfaces.br-9876c096cccf.useDHCP = lib.mkDefault true; - # networking.interfaces.br-ce1af49d610b.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp14s0.useDHCP = lib.mkDefault true; - # networking.interfaces.virbr0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hyprland.nix b/hyprland.nix deleted file mode 100644 index 0c2b90c..0000000 --- a/hyprland.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - programs.hyprland = { - enable = true; - withUWSM = true; - xwayland.enable = true; - }; - - services.xserver.displayManager.gdm = { - enable = true; - wayland = true; - }; - - xdg.portal = { - enable = true; - extraPortals = [ - pkgs.xdg-desktop-portal-gtk - ]; - }; - - hardware = { - graphics.enable = true; - }; - - environment = { - systemPackages = [ - pkgs.kitty - - pkgs.waybar - - pkgs.dunst - pkgs.libnotify - - pkgs.swww - - pkgs.rofi-wayland - - pkgs.networkmanager - pkgs.networkmanagerapplet - ]; - - sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; - }; -}