From f4f9a0029647ef4c4721b0ad00a3c8558d89c64d Mon Sep 17 00:00:00 2001 From: Jet Pham <55770902+jetpham@users.noreply.github.com> Date: Thu, 4 Jul 2024 05:19:21 +0000 Subject: [PATCH] uh --- hosts/desktop/hardware-configuration.nix | 31 ---------- hosts/desktop/user.nix | 24 ------- modules/nvim/default.nix | 2 +- modules/nvim/init.lua | 2 +- modules/packages/default.nix | 6 -- modules/system/configuration.nix | 4 +- modules/zsh/default.nix | 79 ------------------------ 7 files changed, 4 insertions(+), 144 deletions(-) delete mode 100644 hosts/desktop/hardware-configuration.nix delete mode 100644 hosts/desktop/user.nix delete mode 100755 modules/zsh/default.nix diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix deleted file mode 100644 index 6c7a573..0000000 --- a/hosts/desktop/hardware-configuration.nix +++ /dev/null @@ -1,31 +0,0 @@ -# USE YOUR OWN -{ config, lib, pkgs, modulesPath, ... }: -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - initrd.kernelModules = [ "amdgpu" ]; - kernelModules = [ "wireguard" "kvm-amd" "msr" ]; - extraModulePackages = [ ]; - }; - - hardware.opengl.extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/bd1e247e-9db1-4871-ae5a-f1d9dd0d09fb"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/62D7-547D"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/e8eac985-dcd4-4f52-8681-751e13b37e28"; } ]; - - powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; -} diff --git a/hosts/desktop/user.nix b/hosts/desktop/user.nix deleted file mode 100644 index 5b3df77..0000000 --- a/hosts/desktop/user.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, inputs, ...}: - -{ - imports = [ ../../modules/default.nix ]; - config.modules = { - # gui - firefox.enable = true; - eww.enable = true; - dunst.enable = true; - hyprland.enable = true; - wofi.enable = true; - - # cli - nvim.enable = true; - zsh.enable = true; - git.enable = true; - gpg.enable = true; - direnv.enable = true; - - # system - xdg.enable = true; - packages.enable = true; - }; -} diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix index 65cad85..a5013bd 100644 --- a/modules/nvim/default.nix +++ b/modules/nvim/default.nix @@ -23,7 +23,7 @@ in { sumneko-lua-language-server stylua # Lua ]; - programs.zsh = { + programs.nushell = { initExtra = '' export EDITOR="nvim" ''; diff --git a/modules/nvim/init.lua b/modules/nvim/init.lua index a34d108..4da3afa 100644 --- a/modules/nvim/init.lua +++ b/modules/nvim/init.lua @@ -32,7 +32,7 @@ g.mapleader = ' ' -- Performance o.lazyredraw = true; -o.shell = "zsh" +o.shell = "nushell" o.shadafile = "NONE" -- Colors diff --git a/modules/packages/default.nix b/modules/packages/default.nix index fb782ed..0a09f31 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -11,12 +11,6 @@ in { options.modules.packages = { enable = mkEnableOption "packages"; }; config = mkIf cfg.enable { home.packages = with pkgs; [ - # C - gcc - gdb - gnumake - clang - clang-tools # nix nil alejandra diff --git a/modules/system/configuration.nix b/modules/system/configuration.nix index d4627ef..7d80d8d 100755 --- a/modules/system/configuration.nix +++ b/modules/system/configuration.nix @@ -5,7 +5,7 @@ environment.defaultPackages = [ ]; services.xserver.desktopManager.xterm.enable = false; - programs.zsh.enable = true; + programs.nushell.enable = true; # Laptop-specific packages (the other ones are installed in `packages.nix`) environment.systemPackages = with pkgs; [ @@ -89,7 +89,7 @@ xdg = { users.users.jet = { isNormalUser = true; extraGroups = [ "input" "wheel" "networkmanager"]; - shell = pkgs.zsh; + shell = pkgs.nushell; }; # Set up networking and secure it diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix deleted file mode 100755 index aa5aed8..0000000 --- a/modules/zsh/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ pkgs, lib, config, ... }: -with lib; -let cfg = config.modules.zsh; -in { - options.modules.zsh = { enable = mkEnableOption "zsh"; }; - - config = mkIf cfg.enable { - home.packages = [ - pkgs.zsh - ]; - - programs.zsh = { - enable = true; - - # directory to put config files in - dotDir = ".config/zsh"; - - enableCompletion = true; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - - # .zshrc - initExtra = '' - PROMPT="%F{blue}%m %~%b "$'\n'"%(?.%F{green}%Bλ%b |.%F{red}?) %f" - - export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"; - export ZK_NOTEBOOK_DIR="~/stuff/notes"; - export DIRENV_LOG_FORMAT=""; - bindkey '^ ' autosuggest-accept - - edir() { tar -cz $1 | age -p > $1.tar.gz.age && rm -rf $1 &>/dev/null && echo "$1 encrypted" } - ddir() { age -d $1 | tar -xz && rm -rf $1 &>/dev/null && echo "$1 decrypted" } - ''; - - # basically aliases for directories: - # `cd ~dots` will cd into ~/.config/nixos - dirHashes = { - dots = "$HOME/.config/nixos"; - stuff = "$HOME/stuff"; - media = "/run/media/$USER"; - junk = "$HOME/stuff/other"; - }; - - # Tweak settings for history - history = { - save = 1000; - size = 1000; - path = "$HOME/.cache/zsh_history"; - }; - - # Set some aliases - shellAliases = { - c = "clear"; - mkdir = "mkdir -vp"; - rm = "rm -rifv"; - mv = "mv -iv"; - cp = "cp -riv"; - cat = "bat --paging=never --style=plain"; - ls = "exa -a --icons"; - tree = "exa --tree --icons"; - nd = "nix develop -c $SHELL"; - rebuild = "sudo nixos-rebuild switch --flake $NIXOS_CONFIG_DIR --fast; notify-send 'Rebuild complete\!'"; - }; - - # Source all plugins, nix-style - plugins = [ - { - name = "auto-ls"; - src = pkgs.fetchFromGitHub { - owner = "notusknot"; - repo = "auto-ls"; - rev = "62a176120b9deb81a8efec992d8d6ed99c2bd1a1"; - sha256 = "08wgs3sj7hy30x03m8j6lxns8r2kpjahb9wr0s0zyzrmr4xwccj0"; - }; - } - ]; - }; -}; -}