Pare down zsh and refactor home manager a bit
This commit is contained in:
parent
ad63481835
commit
aa1213bb65
48
flake.lock
48
flake.lock
|
@ -445,26 +445,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"linger": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1670283645,
|
||||
"narHash": "sha256-SuC/SuQ8RUaM6RthNAkNTSnlpRXJxEmuym2OyPLLpWk=",
|
||||
"owner": "mindsbackyard",
|
||||
"repo": "linger-flake",
|
||||
"rev": "9f8632c0621dc562dd42e9eacfdb6dae82aebf8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mindsbackyard",
|
||||
"repo": "linger-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-filter": {
|
||||
"locked": {
|
||||
"lastModified": 1710156097,
|
||||
|
@ -733,32 +713,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pihole": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"linger": [
|
||||
"linger"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1670284048,
|
||||
"narHash": "sha256-lNyJ7vrDAdsPVcNBXqDUXseBBL9Kf2q64/A8ntEKXWI=",
|
||||
"owner": "mindsbackyard",
|
||||
"repo": "pihole-flake",
|
||||
"rev": "9daaf65415ad6d3f5a8daa617d8737bc405f9dd8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mindsbackyard",
|
||||
"repo": "pihole-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plasma-manager": {
|
||||
"inputs": {
|
||||
"home-manager": [
|
||||
|
@ -839,13 +793,11 @@
|
|||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
"lanzaboote": "lanzaboote",
|
||||
"linger": "linger",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-generators": "nixos-generators",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"pihole": "pihole",
|
||||
"plasma-manager": "plasma-manager",
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
||||
"sops-nix": "sops-nix"
|
||||
|
|
|
@ -16,11 +16,8 @@
|
|||
|
||||
# You can also split up your configuration and import pieces of it here:
|
||||
# ./nvim.nix
|
||||
../package-configs/zsh.nix
|
||||
../package-configs/firefox.nix
|
||||
../package-configs/helix.nix
|
||||
../package-configs/zellij.nix
|
||||
./plasma-desktop
|
||||
./package-configs/plasma-desktop.nix
|
||||
./package-configs/firefox.nix
|
||||
];
|
||||
nixpkgs = {
|
||||
# You can add overlays here
|
||||
|
@ -96,11 +93,9 @@
|
|||
nextcloud-client
|
||||
nitrokey-app
|
||||
protonvpn-gui
|
||||
sops
|
||||
virtualbox
|
||||
watchmate
|
||||
qbittorrent
|
||||
zsh
|
||||
|
||||
# Theming:
|
||||
catppuccin-cursors
|
||||
|
@ -119,12 +114,9 @@
|
|||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
#arrterian.nix-env-selector
|
||||
#ban.spellright
|
||||
catppuccin.catppuccin-vsc
|
||||
catppuccin.catppuccin-vsc-icons
|
||||
charliermarsh.ruff
|
||||
# dracula-theme.theme-dracula
|
||||
eamodio.gitlens
|
||||
github.vscode-pull-request-github
|
||||
jnoortheen.nix-ide
|
||||
|
@ -133,12 +125,9 @@
|
|||
ms-toolsai.jupyter
|
||||
ms-pyright.pyright
|
||||
ms-python.black-formatter
|
||||
#ms-python.python
|
||||
ms-python.vscode-pylance
|
||||
#ms-vscode-remote.remote-containers
|
||||
ms-vscode-remote.remote-ssh
|
||||
oderwat.indent-rainbow
|
||||
#redhat.java
|
||||
rust-lang.rust-analyzer
|
||||
yzhang.markdown-all-in-one
|
||||
];
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
# You can also split up your configuration and import pieces of it here:
|
||||
# ./nvim.nix
|
||||
../../desktop
|
||||
../../shared
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
# You can also split up your configuration and import pieces of it here:
|
||||
# ./nvim.nix
|
||||
../../desktop
|
||||
../../package-configs/helix.nix
|
||||
../../shared
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
@ -18,8 +18,7 @@
|
|||
|
||||
# You can also split up your configuration and import pieces of it here:
|
||||
# ./nvim.nix
|
||||
../../package-configs/zsh.nix
|
||||
../../package-configs/helix.nix
|
||||
../../shared
|
||||
];
|
||||
|
||||
nixpkgs = {
|
||||
|
|
|
@ -18,10 +18,10 @@
|
|||
|
||||
# You can also split up your configuration and import pieces of it here:
|
||||
# ./nvim.nix
|
||||
../../package-configs/zsh.nix
|
||||
../../package-configs/firefox.nix
|
||||
../../desktop/plasma-desktop
|
||||
../../package-configs/helix.nix
|
||||
|
||||
../../desktop/package-configs/plasma-desktop.nix
|
||||
../../desktop/package-configs/firefox.nix
|
||||
../../shared
|
||||
];
|
||||
nixpkgs = {
|
||||
# You can add overlays here
|
||||
|
@ -85,7 +85,7 @@
|
|||
catppuccin-sddm-corners
|
||||
|
||||
# Web browsing:
|
||||
librewolf
|
||||
firefox
|
||||
ungoogled-chromium
|
||||
];
|
||||
|
||||
|
|
24
home-manager/shared/default.nix
Normal file
24
home-manager/shared/default.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./shell/helix.nix
|
||||
./shell/zellij.nix
|
||||
./shell/zsh.nix
|
||||
];
|
||||
home = {
|
||||
username = "lillian";
|
||||
homeDirectory = "/home/lillian";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# System tools:
|
||||
sops
|
||||
zsh
|
||||
];
|
||||
}
|
|
@ -44,64 +44,14 @@
|
|||
enable = true;
|
||||
plugins = [
|
||||
"git"
|
||||
"adb"
|
||||
"battery"
|
||||
"branch"
|
||||
"coffee"
|
||||
"colored-man-pages"
|
||||
"colorize"
|
||||
"command-not-found"
|
||||
"common-aliases"
|
||||
"compleat"
|
||||
"composer"
|
||||
"copypath"
|
||||
"copybuffer"
|
||||
"copyfile"
|
||||
"cp"
|
||||
"dirhistory"
|
||||
"dirpersist"
|
||||
"docker"
|
||||
"docker-compose"
|
||||
"extract"
|
||||
"fancy-ctrl-z"
|
||||
"fastfile"
|
||||
"frontend-search"
|
||||
"git-auto-fetch"
|
||||
"git-escape-magic"
|
||||
"git-extras"
|
||||
"git-flow"
|
||||
"github"
|
||||
"gitignore"
|
||||
"gnu-utils"
|
||||
"gpg-agent"
|
||||
"history"
|
||||
"history-substring-search"
|
||||
"isodate"
|
||||
"jsontools"
|
||||
"keychain"
|
||||
"man"
|
||||
"nanoc"
|
||||
"pip"
|
||||
"pipenv"
|
||||
"pyenv"
|
||||
"python"
|
||||
"rsync"
|
||||
"rvm"
|
||||
"screen"
|
||||
"sdk"
|
||||
"sfdx"
|
||||
"shell-proxy"
|
||||
"sudo"
|
||||
"systemadmin"
|
||||
"systemd"
|
||||
"themes"
|
||||
"urltools"
|
||||
"web-search"
|
||||
"zsh-interactive-cd"
|
||||
"zsh-navigation-tools"
|
||||
"z"
|
||||
];
|
||||
theme = "jtriley";
|
||||
theme = "catppuccin-macchiato";
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in a new issue