From 867912a6763f928413a08356a812827a0e5ce194 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Sun, 9 Jun 2024 23:01:34 +0200 Subject: [PATCH] Replace Bash with ZSH Uninstall some unneeded GNOME programs --- configuration.nix | 64 +++++++++++---- home.nix | 104 ++++++++++-------------- modules/home-manager/neovim/default.nix | 1 - 3 files changed, 90 insertions(+), 79 deletions(-) diff --git a/configuration.nix b/configuration.nix index c450893..451f90f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -42,29 +42,59 @@ }; environment = { - systemPackages = with pkgs; [ - wget - curl - git + # https://nix-community.github.io/home-manager/options.xhtml#opt-programs.zsh.enableCompletion + pathsToLink = [ "/share/zsh" ]; + + systemPackages = (with pkgs; [ + age + borgbackup btop - ripgrep - vim - dogdns - tree + btrfs-progs + curl dig - gnomeExtensions.pop-shell + exfat + f3 + fastfetch + file + git gnome.gnome-shell-extensions - gnomeExtensions.window-is-ready-remover - ]; - gnome.excludePackages = with pkgs; with pkgs.gnome; [ - totem - gnome-tour + jq + kubectl + nmap + poppler_utils # For pdfunite + ripgrep + sbctl + silicon + sops + tree + units + vim + wget + yq + ]) ++ (with pkgs.gnomeExtensions; [ + pop-shell + window-is-ready-remover + ]); + + gnome.excludePackages = (with pkgs; [ epiphany - geary + gnome-connections gnome-console - gnome-music + gnome-tour + ]) ++ (with pkgs.gnome; [ + geary gnome-calendar - ]; + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + seahorse + totem + yelp + gnome-weather + ]); }; system = { diff --git a/home.nix b/home.nix index d4a247c..e5b3afe 100644 --- a/home.nix +++ b/home.nix @@ -2,11 +2,10 @@ imports = [ ./modules/home-manager/neovim ./modules/home-manager/firefox - ./modules/home-manager/syncthing - ./modules/home-manager/keepassxc + ./modules/home-manager/syncthing.nix + ./modules/home-manager/keepassxc.nix ]; - # Let home-manager manage the X session xsession.enable = true; xdg.userDirs.enable = true; @@ -15,57 +14,47 @@ homeDirectory = "/home/pim"; stateVersion = "23.05"; - packages = with pkgs; [ - unstable.moonlight-qt - unstable.vlc - unstable.nicotine-plus - unstable.logseq - unstable.signal-desktop - unstable.telegram-desktop - unstable.strawberry - unstable.gimp - unstable.libreoffice - virt-manager + packages = (with pkgs; [ gnome.gnome-tweaks - unstable.impression - poppler_utils # For pdfunite - silicon - unstable.dbeaver-bin - unstable.wireshark - units - btrfs-progs - exfat - unstable.qFlipper - f3 - unstable.insomnia - unstable.vorta jellyfin-media-player - jq - kubectl - file - yq - age - sops - nmap - unstable.devenv - unstable.attic-client - unstable.hexchat - sbctl - borgbackup - unstable.krita - unstable.bottles-unwrapped - ]; + virt-manager + ]) ++ (with pkgs.unstable; [ + attic-client + dbeaver-bin + devenv + bottles-unwrapped + gimp + hexchat + impression + insomnia + krita + libreoffice + logseq + moonlight-qt + nicotine-plus + qFlipper + signal-desktop + strawberry + telegram-desktop + vlc + vorta + wireshark + ]); }; programs = { home-manager.enable = true; chromium.enable = true; - alacritty.enable = true; bat.enable = true; + alacritty = { + enable = true; + settings.shell.program = lib.getExe config.programs.zsh.package; + }; + thunderbird = { enable = true; - profiles.default = { isDefault = true; }; + profiles.default.isDefault = true; }; direnv = { @@ -79,21 +68,11 @@ enableBashIntegration = true; }; - bash = { + zsh = { enable = true; - shellAliases = { - htop = "btop"; - gp = "git push"; - gco = "git checkout"; - gd = "git diff"; - gc = "git commit"; - gpl = "git pull"; - gb = "git branch"; - ga = "git add"; - gl = "git log"; - gs = "git status"; - tf = "tofu"; - }; + autocd = true; + autosuggestion.enable = true; + prezto.enable = true; }; ssh = { @@ -101,15 +80,16 @@ extraConfig = "User root"; matchBlocks = { + lewis = lib.hm.dag.entryBefore [ "*" ] { hostname = "lewis.dmz"; }; + atlas = lib.hm.dag.entryBefore [ "*" ] { hostname = "atlas.dmz"; }; + jefke = lib.hm.dag.entryBefore [ "*" ] { hostname = "jefke.dmz"; }; + warwick = lib.hm.dag.entryBefore [ "*" ] { hostname = "warwick.dmz"; }; + github = lib.hm.dag.entryBefore [ "*" ] { hostname = "github.com"; user = "pizzapim"; identitiesOnly = true; }; - lewis = lib.hm.dag.entryBefore [ "*" ] { hostname = "lewis.dmz"; }; - atlas = lib.hm.dag.entryBefore [ "*" ] { hostname = "atlas.dmz"; }; - jefke = lib.hm.dag.entryBefore [ "*" ] { hostname = "jefke.dmz"; }; - warwick = lib.hm.dag.entryBefore [ "*" ] { hostname = "warwick.dmz"; }; }; }; @@ -117,11 +97,13 @@ enable = true; userName = "Pim Kunis"; userEmail = "pim@kunis.nl"; + extraConfig = { push.autoSetupRemote = true; commit.verbose = true; pull.rebase = true; }; + includes = [{ path = "~/git/suecode/.gitconfig"; condition = "gitdir:~/git/suecode/**"; diff --git a/modules/home-manager/neovim/default.nix b/modules/home-manager/neovim/default.nix index 009e1f2..e8fa607 100644 --- a/modules/home-manager/neovim/default.nix +++ b/modules/home-manager/neovim/default.nix @@ -11,7 +11,6 @@ extraPackages = with pkgs; [ nil nodePackages.pyright - neofetch gopls terraform-ls nixfmt-classic