From aa1213bb659a63f752de8fa57d24c8b1922f677d Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 29 Apr 2024 20:30:22 +0200 Subject: [PATCH] Pare down zsh and refactor home manager a bit --- flake.lock | 50 +----------------- home-manager/desktop/default.nix | 15 +----- .../{ => desktop}/package-configs/firefox.nix | 0 .../plasma-desktop.nix} | 0 home-manager/hosts/GLaDOS/lillian.nix | 1 + home-manager/hosts/iso/lillian.nix | 2 +- home-manager/hosts/queen/lillian.nix | 3 +- home-manager/hosts/shodan/lillian.nix | 10 ++-- home-manager/shared/default.nix | 24 +++++++++ .../shell}/helix.nix | 0 .../shell}/zellij.kdl | 0 .../shell}/zellij.nix | 0 .../{package-configs => shared/shell}/zsh.nix | 52 +------------------ 13 files changed, 36 insertions(+), 121 deletions(-) rename home-manager/{ => desktop}/package-configs/firefox.nix (100%) rename home-manager/desktop/{plasma-desktop/default.nix => package-configs/plasma-desktop.nix} (100%) create mode 100644 home-manager/shared/default.nix rename home-manager/{package-configs => shared/shell}/helix.nix (100%) rename home-manager/{package-configs => shared/shell}/zellij.kdl (100%) rename home-manager/{package-configs => shared/shell}/zellij.nix (100%) rename home-manager/{package-configs => shared/shell}/zsh.nix (50%) diff --git a/flake.lock b/flake.lock index a19aee6..c43b49c 100644 --- a/flake.lock +++ b/flake.lock @@ -158,7 +158,7 @@ "type": "github" }, "original": { - "owner": "ipetkov", + "owner": "ipetkov", "repo": "crane", "type": "github" } @@ -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" diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix index 4181ff8..7970c5e 100644 --- a/home-manager/desktop/default.nix +++ b/home-manager/desktop/default.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 ]; diff --git a/home-manager/package-configs/firefox.nix b/home-manager/desktop/package-configs/firefox.nix similarity index 100% rename from home-manager/package-configs/firefox.nix rename to home-manager/desktop/package-configs/firefox.nix diff --git a/home-manager/desktop/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop.nix similarity index 100% rename from home-manager/desktop/plasma-desktop/default.nix rename to home-manager/desktop/package-configs/plasma-desktop.nix diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix index 69d5be2..3dcac9e 100644 --- a/home-manager/hosts/GLaDOS/lillian.nix +++ b/home-manager/hosts/GLaDOS/lillian.nix @@ -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; [ diff --git a/home-manager/hosts/iso/lillian.nix b/home-manager/hosts/iso/lillian.nix index 1fdbb27..192f9c3 100644 --- a/home-manager/hosts/iso/lillian.nix +++ b/home-manager/hosts/iso/lillian.nix @@ -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; [ diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix index c3778c3..3dc5e4f 100644 --- a/home-manager/hosts/queen/lillian.nix +++ b/home-manager/hosts/queen/lillian.nix @@ -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 = { diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix index 3587849..ee7fec6 100644 --- a/home-manager/hosts/shodan/lillian.nix +++ b/home-manager/hosts/shodan/lillian.nix @@ -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 ]; diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix new file mode 100644 index 0000000..80c814e --- /dev/null +++ b/home-manager/shared/default.nix @@ -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 + ]; +} diff --git a/home-manager/package-configs/helix.nix b/home-manager/shared/shell/helix.nix similarity index 100% rename from home-manager/package-configs/helix.nix rename to home-manager/shared/shell/helix.nix diff --git a/home-manager/package-configs/zellij.kdl b/home-manager/shared/shell/zellij.kdl similarity index 100% rename from home-manager/package-configs/zellij.kdl rename to home-manager/shared/shell/zellij.kdl diff --git a/home-manager/package-configs/zellij.nix b/home-manager/shared/shell/zellij.nix similarity index 100% rename from home-manager/package-configs/zellij.nix rename to home-manager/shared/shell/zellij.nix diff --git a/home-manager/package-configs/zsh.nix b/home-manager/shared/shell/zsh.nix similarity index 50% rename from home-manager/package-configs/zsh.nix rename to home-manager/shared/shell/zsh.nix index f5fde16..da9b4a5 100644 --- a/home-manager/package-configs/zsh.nix +++ b/home-manager/shared/shell/zsh.nix @@ -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"; }; }; }