From 2b2a1e0b10898d62f8bdfa8f3236ecc572cf143e Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Fri, 25 Apr 2025 15:58:29 -0400 Subject: [PATCH] remove dell --- flake.nix | 7 ---- hosts/dell/configuration.nix | 50 ------------------------ hosts/dell/hardware-configuration.nix | 43 -------------------- hosts/dell/home.nix | 45 --------------------- modules/home-manager/emacs/emacs/init.el | 9 ++++- result | 1 - 6 files changed, 7 insertions(+), 148 deletions(-) delete mode 100644 hosts/dell/configuration.nix delete mode 100644 hosts/dell/hardware-configuration.nix delete mode 100644 hosts/dell/home.nix delete mode 120000 result diff --git a/flake.nix b/flake.nix index 797ebab..c0c286c 100644 --- a/flake.nix +++ b/flake.nix @@ -50,13 +50,6 @@ ./hosts/thinkpad/configuration.nix ]; }; - dell = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - ./hosts/dell/configuration.nix - ]; - }; }; darwinConfigurations = { diff --git a/hosts/dell/configuration.nix b/hosts/dell/configuration.nix deleted file mode 100644 index 081b305..0000000 --- a/hosts/dell/configuration.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: { - imports = [ - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - inputs.nixos-hardware.nixosModules.dell-xps-15-9560 - ../../modules/nixos/bootloader.nix - ../../modules/nixos/user.nix - ../../modules/nixos/i3.nix - ../../modules/nixos/nvidia.nix - ../../modules/nixos/nm.nix - ../../modules/nixos/sound.nix - ../../modules/nixos/env.nix - ../../modules/nixos/1password.nix - ]; - - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["psmouse.synaptics_intertouch=0"]; - - networking.hostName = "dell"; - - time.timeZone = "America/Toronto"; - - i18n.defaultLocale = "en_CA.UTF-8"; - - nixpkgs.config.allowUnfree = true; - - nix.settings.experimental-features = ["nix-command" "flakes"]; - - environment.systemPackages = with pkgs; [ - wget - git - curl - ]; - - home-manager = { - extraSpecialArgs = {inherit inputs;}; - useGlobalPkgs = true; - useUserPackages = true; - users = { - mthomson = import ./home.nix; - }; - }; - - system.stateVersion = "23.11"; -} diff --git a/hosts/dell/hardware-configuration.nix b/hosts/dell/hardware-configuration.nix deleted file mode 100644 index c1b8fde..0000000 --- a/hosts/dell/hardware-configuration.nix +++ /dev/null @@ -1,43 +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 = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/b0a1038d-556d-46e9-9289-fc5544d911c7"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/32F4-C54C"; - fsType = "vfat"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/68b82471-92a3-4f6a-99a8-1dd5ae4f3f8b";} - ]; - - # 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.wlp2s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/dell/home.nix b/hosts/dell/home.nix deleted file mode 100644 index 412b9ae..0000000 --- a/hosts/dell/home.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - ../../modules/home-manager/i3 - ../../modules/home-manager/ssh - ../../modules/home-manager/git - ../../modules/home-manager/nixvim - ../../modules/home-manager/wezterm - ../../modules/home-manager/zsh - ../../modules/home-manager/tmux - ../../modules/home-manager/taskwarrior - ../../modules/home-manager/zoxide - ]; - home.username = "mthomson"; - home.homeDirectory = "/home/mthomson"; - home.stateVersion = "23.11"; - - programs = { - direnv = { - enable = true; - enableZshIntegration = true; # see note on other shells below - nix-direnv.enable = true; - }; - }; - - home.packages = with pkgs; [ - firefox - gcc - fzf - ripgrep - jq - protonup - lutris - pavucontrol - pasystray - networkmanagerapplet - upower - acpi - ]; - - programs.home-manager.enable = true; -} diff --git a/modules/home-manager/emacs/emacs/init.el b/modules/home-manager/emacs/emacs/init.el index 62fc3c3..5940e75 100644 --- a/modules/home-manager/emacs/emacs/init.el +++ b/modules/home-manager/emacs/emacs/init.el @@ -219,6 +219,7 @@ go-ts-mode java-ts-mode vue-mode + rust-ts-mode typescript-ts-mode) . eglot-ensure) :custom @@ -250,8 +251,8 @@ (use-package exec-path-from-shell :init - (setq exec-path-from-shell-arguments nil) - ;; (add-to-list 'exec-path "/etc/profiles/per-user/mthomson/bin") + ;; (setq exec-path-from-shell-arguments nil) + (add-to-list 'exec-path "/etc/profiles/per-user/mthomson/bin") (exec-path-from-shell-initialize)) (use-package treesit @@ -295,6 +296,8 @@ (use-package nix-mode :mode "\\.nix\\'") +(use-package rust-mode) + (use-package org :ensure nil :custom @@ -408,6 +411,8 @@ :config ;; mbsync + + (setq mu4e-mu-binary "mu") (setq mu4e-get-mail-command (concat (executable-find "mbsync") " -a")) (setq mu4e--get-mail-password-regexp "^Master Password: $") (setq mu4e-update-interval 300) diff --git a/result b/result deleted file mode 120000 index e5faef8..0000000 --- a/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/z7hnmxvi31i682y1dz47m4k3ssa390w6-nixos-system-thinkpad-25.05.20250412.2631b0b \ No newline at end of file