diff --git a/homes/common/default.nix b/homes/common/default.nix
index 2d348b2..46ddf28 100644
--- a/homes/common/default.nix
+++ b/homes/common/default.nix
@@ -1,13 +1,14 @@
{ lib, ... }:
{
+
imports = [
./editor.nix
./network.nix
- #./oh-my-posh
./starship-rs
./packages.nix
./terminal.nix
./zfs.nix
];
+
options.gui.enable = lib.mkEnableOption "should GUI packages be anabled?";
}
diff --git a/homes/common/oh-my-posh/default.nix b/homes/common/oh-my-posh/default.nix
deleted file mode 100644
index b9d46f2..0000000
--- a/homes/common/oh-my-posh/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- pkgs,
- config,
- lib,
- ...
-}:
-with lib;
-{
- programs.oh-my-posh = {
- enable = true;
- # https://ohmyposh.dev/docs/themes
- #useTheme = "gmay"; # ganz nice, aber farben sind ein bisl schrill
- settings = builtins.fromJSON (builtins.readFile ./gmay.json);
- };
-}
diff --git a/homes/common/oh-my-posh/gmay.json b/homes/common/oh-my-posh/gmay.json
deleted file mode 100644
index a6d2468..0000000
--- a/homes/common/oh-my-posh/gmay.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
- "blocks": [
- {
- "alignment": "left",
- "segments": [
- {
- "background": "#076678",
- "foreground": "#EBDBB2",
- "leading_diamond": "\ue0b6",
- "style": "diamond",
- "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}} ",
- "type": "os"
- },
- {
- "background": "#AF3A03",
- "foreground": "#EBDBB2",
- "powerline_symbol": "\ue0b0",
- "style": "powerline",
- "template": " \uf0e7 ",
- "type": "root"
- },
- {
- "background": "#076678",
- "foreground": "#EBDBB2",
- "powerline_symbol": "\ue0b0",
- "style": "powerline",
- "template": " {{ if .SSHSession }}\ueba9 {{ end }}{{ .UserName }}@{{ .HostName }} ",
- "type": "session"
- },
- {
- "background": "#B57614",
- "foreground": "#EBDBB2",
- "powerline_symbol": "\ue0b0",
- "properties": {
- "style": "full"
- },
- "style": "powerline",
- "template": " \ue5ff {{ .Path }} ",
- "type": "path"
- },
- {
- "background": "#79740E",
- "foreground": "#EBDBB2",
- "powerline_symbol": "\ue0b0",
- "properties": {
- "time_format": "2006-01-02 15:04:05"
- },
- "style": "powerline",
- "template": " {{ .CurrentDate | date .Format }} ",
- "type": "time"
- },
- {
- "type": "project",
- "style": "powerline",
- "powerline_symbol": "",
- "foreground": "#193549",
- "background": "#ffeb3b",
- "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ if .Version }} {{.Version}}{{ end }} {{ if .Name }}{{ .Name }}{{ end }}{{ end }} "
- },
- {
- "type": "git",
- "style": "powerline",
- "powerline_symbol": "",
- "background": "#427b58",
- "foreground": "#EBDBB2",
- "background_templates": [
- "{{ if or (.Working.Changed) (.Staging.Changed) }}#8f3f71{{ end }}",
- "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#076678{{ end }}",
- "{{ if gt .Ahead 0 }}#076678{{ end }}",
- "{{ if gt .Behind 0 }}#076678{{ end }}"
- ],
- "template": "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }}",
- "properties": {
- "fetch_status": true,
- "fetch_upstream_icon": true,
- "untracked_modes": {
- "/Users/user/Projects/oh-my-posh/": "no"
- },
- "source": "cli",
- "mapped_branches": {
- "feat/*": "🚀 ",
- "bug/*": "🐛 "
- }
- }
- },
- {
- "background": "#427B58",
- "background_templates": [
- "{{ if gt .Code 0 }}#9D0006{{ end }}"
- ],
- "foreground": "#EBDBB2",
- "leading_diamond": "<transparent,background>\ue0b0</>",
- "properties": {
- "always_enabled": true
- },
- "style": "diamond",
- "template": " \ueb05 ",
- "trailing_diamond": "\ue0b4",
- "type": "status"
- }
- ],
- "type": "prompt"
- },
- {
- "alignment": "left",
- "newline": true,
- "segments": [
- {
- "foreground": "#076678",
- "style": "plain",
- "template": "\uf0a9 ",
- "type": "text"
- }
- ],
- "type": "prompt"
- }
- ],
- "final_space": true,
- "version": 2
-}
diff --git a/homes/common/oh-my-posh/gruvbox.json b/homes/common/oh-my-posh/gruvbox.json
deleted file mode 100644
index 3bf514a..0000000
--- a/homes/common/oh-my-posh/gruvbox.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
- "blocks": [
- {
- "alignment": "left",
- "segments": [
- {
- "background": "#3A3A3A",
- "foreground": "#ffffff",
- "style": "powerline",
- "template": "{{ if .WSL }}WSL at{{ end }} {{.Icon}} ",
- "type": "os"
- },
- {
- "background": "#fbf1c7",
- "background_templates": [
- "{{ if .Root }}#af3a03{{ end }}"
- ],
- "foreground": "#282828",
- "foreground_templates": [
- "{{ if .Root }}#fbf1c7{{ end }}"
- ],
- "powerline_symbol": "\ue0b0",
- "style": "powerline",
- "template": " {{ if .SSHSession }} {{ end }}{{ .HostName }} ",
- "type": "session"
- },
- {
- "background": "#458588",
- "foreground": "#282828",
- "powerline_symbol": "\ue0b0",
- "properties": {
- "style": "full"
- },
- "style": "powerline",
- "template": " {{ .Path }} ",
- "type": "path"
- },
- {
- "background": "#98971A",
- "background_templates": [
- "{{ if or (.Working.Changed) (.Staging.Changed) }}#FF9248{{ end }}",
- "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#ff4500{{ end }}",
- "{{ if gt .Ahead 0 }}#B388FF{{ end }}",
- "{{ if gt .Behind 0 }}#B388FF{{ end }}"
- ],
- "foreground": "#282828",
- "leading_diamond": "\ue0b6",
- "powerline_symbol": "\ue0b0",
- "properties": {
- "branch_max_length": 25,
- "fetch_stash_count": true,
- "fetch_status": true,
- "branch_icon": "\uE0A0 ",
- "branch_identical_icon": "\u25CF"
- },
- "style": "powerline",
- "template": " {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \ueb4b {{ .StashCount }}{{ end }} ",
- "trailing_diamond": "\ue0b4",
- "type": "git"
- }
- ],
- "type": "prompt"
- }
- ],
- "console_title_template": "{{ .Folder }}",
- "final_space": true,
- "version": 2
-}
diff --git a/homes/common/terminal.nix b/homes/common/terminal.nix
index 642830b..335ee0a 100644
--- a/homes/common/terminal.nix
+++ b/homes/common/terminal.nix
@@ -37,25 +37,4 @@
enableZshIntegration = true;
};
- # provide better `Ctrl+r` command in terminal
- programs.atuin = {
- enable = true;
- enableBashIntegration = true;
- enableZshIntegration = true;
- daemon.enable = true;
- settings = {
- auto_sync = true;
- sync_frequency = "5m";
- sync_address = "http://chungus.private:8888";
- search_mode = "fuzzy";
- style = "full";
- inline_height = 20;
- keymap_mode = "vim-normal";
-
- # With workspace filtering enabled, Atuin will filter for commands executed
- # in any directory within a git repository tree.
- workspaces = true;
-
- };
- };
}
diff --git a/homes/palo/atuin.nix b/homes/palo/atuin.nix
new file mode 100644
index 0000000..d7fa731
--- /dev/null
+++ b/homes/palo/atuin.nix
@@ -0,0 +1,25 @@
+{
+
+ # provide better `Ctrl+r` command in terminal
+ programs.atuin = {
+ enable = true;
+ enableBashIntegration = true;
+ enableZshIntegration = true;
+ daemon.enable = true;
+ settings = {
+ auto_sync = true;
+ sync_frequency = "5m";
+ sync_address = "http://chungus.private:8888";
+ search_mode = "fuzzy";
+ style = "full";
+ inline_height = 20;
+ keymap_mode = "vim-normal";
+
+ # With workspace filtering enabled, Atuin will filter for commands executed
+ # in any directory within a git repository tree.
+ workspaces = true;
+
+ };
+ };
+
+}
diff --git a/homes/palo/default.nix b/homes/palo/default.nix
index e6565b1..e4224f9 100644
--- a/homes/palo/default.nix
+++ b/homes/palo/default.nix
@@ -3,6 +3,7 @@
imports = [
../common
+ ./atuin.nix
./git.nix
./gpg.nix
./gui