Compare commits
No commits in common. "598c25d4bce83cac1a9bc4be957bcf10aafb2593" and "af3918ffab833fcf072daec13eb41b9bad5ae86b" have entirely different histories.
598c25d4bc
...
af3918ffab
|
@ -37,7 +37,6 @@
|
||||||
"tools"
|
"tools"
|
||||||
"ytproxy"
|
"ytproxy"
|
||||||
"nitter"
|
"nitter"
|
||||||
"changedetect"
|
|
||||||
] (name: {cname.data = "cluster";})
|
] (name: {cname.data = "cluster";})
|
||||||
// lib.attrsets.genAttrs [
|
// lib.attrsets.genAttrs [
|
||||||
# Externally hosted applications with Tunnels
|
# Externally hosted applications with Tunnels
|
||||||
|
|
54
flake.lock
54
flake.lock
|
@ -27,11 +27,11 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710590710,
|
"lastModified": 1672175240,
|
||||||
"narHash": "sha256-944FyFvgVl1fLUgWCdh6gS6Zi/Wmk7zusfMCoKTv2zE=",
|
"narHash": "sha256-znVCx+4j9961QJJGI5RHIFrv2SGFd799Hao+LRThm+I=",
|
||||||
"owner": "alexbakker",
|
"owner": "alexbakker",
|
||||||
"repo": "alertmanager-ntfy",
|
"repo": "alertmanager-ntfy",
|
||||||
"rev": "b60d1feee3844f091cfa911d9125bd836039dc08",
|
"rev": "1e8a0901410207fa4357799f4e9f6d8f26e15626",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -183,11 +183,11 @@
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1709126324,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -239,11 +239,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710532761,
|
"lastModified": 1709938482,
|
||||||
"narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=",
|
"narHash": "sha256-2Vw2WOFmEXWQH8ziFNOr0U48Guh5FacuD6BOEIcE99s=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
|
"rev": "17431970b4ebc75a92657101ccffcfc9e1f9d8f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -279,11 +279,11 @@
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710184940,
|
"lastModified": 1709467759,
|
||||||
"narHash": "sha256-FzYm4td3FJfzOAuEkCXt3KdUgZuA072OAQXqIq+IAMo=",
|
"narHash": "sha256-ojIpNROGKk56wyvpMAlBVor3CvPez3pFMORrocxW4io=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lib-aggregate",
|
"repo": "lib-aggregate",
|
||||||
"rev": "45b75bf534592c0c1c881a1c447f7fdb37a87eaf",
|
"rev": "206e40afdc468d0658e30e1644e2473dc6285cf2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -355,11 +355,11 @@
|
||||||
},
|
},
|
||||||
"nixlib": {
|
"nixlib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710031547,
|
"lastModified": 1709426687,
|
||||||
"narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=",
|
"narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6",
|
"rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -397,11 +397,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710398463,
|
"lastModified": 1709887845,
|
||||||
"narHash": "sha256-fQlYanU84E8uwBpcoTCcLCwU8cqn0eQ7nwTcrWfSngc=",
|
"narHash": "sha256-803UIoB8+vGkm/VK/g55aBAAOf/ncTGvxXyjTF4ydm0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-generators",
|
"repo": "nixos-generators",
|
||||||
"rev": "efd4e38532b5abfaa5c9fc95c5a913157dc20ccb",
|
"rev": "bef32a05496d9480b02be586fa7827748b9e597b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -428,11 +428,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710031547,
|
"lastModified": 1709426687,
|
||||||
"narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=",
|
"narHash": "sha256-jLBZmwXf0WYHzLkmEMq33bqhX55YtT5edvluFr0RcSA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6",
|
"rev": "7873d84a89ae6e4841528ff7f5697ddcb5bdfe6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -451,11 +451,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710631003,
|
"lastModified": 1709975798,
|
||||||
"narHash": "sha256-6bOCj2BUwOYDO1Lq3DgwIfrdUiieKkm1fCHFQRkLK4Y=",
|
"narHash": "sha256-LdHYxpw7N7inGInX3i6Z6Rm3hl0ai7YXkbzJn+WV0l4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "bce941770aa96005f08c7b60851037352bf76156",
|
"rev": "639141e297f4fe7c1bbf0662e1fde05fa964efa9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -514,11 +514,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710534455,
|
"lastModified": 1709780214,
|
||||||
"narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=",
|
"narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212",
|
"rev": "f945939fd679284d736112d3d5410eb867f3b31c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,97 +0,0 @@
|
||||||
let
|
|
||||||
appName = "changedetection";
|
|
||||||
changedetection-Image = "dgtlmoon/changedetection.io:latest";
|
|
||||||
browserless-Image = "browserless/chrome:latest";
|
|
||||||
in
|
|
||||||
{...}: {
|
|
||||||
kubernetes.resources.services.changedetection = {
|
|
||||||
spec = {
|
|
||||||
selector.app = appName;
|
|
||||||
ports.http = {
|
|
||||||
port = 5000;
|
|
||||||
targetPort = 5000;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
kubernetes.resources.statefulSets.changedetection.spec = {
|
|
||||||
selector.matchLabels.app = appName;
|
|
||||||
serviceName = appName;
|
|
||||||
template = {
|
|
||||||
metadata.labels.app = appName;
|
|
||||||
spec = {
|
|
||||||
volumes = {
|
|
||||||
config.configMap.name = appName;
|
|
||||||
};
|
|
||||||
containers = {
|
|
||||||
changedetection = {
|
|
||||||
image = changedetection-Image;
|
|
||||||
imagePullPolicy = "Always";
|
|
||||||
ports.http.containerPort = 5000;
|
|
||||||
env = [
|
|
||||||
{
|
|
||||||
name = "PLAYWRIGHT_DRIVER_URL";
|
|
||||||
value = "ws://localhost:3000";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
volumeMounts = [
|
|
||||||
{
|
|
||||||
name = "data";
|
|
||||||
mountPath = "/datastore";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
browserless = {
|
|
||||||
image = browserless-Image;
|
|
||||||
imagePullPolicy = "Always";
|
|
||||||
ports.webdriver.containerPort = 3000;
|
|
||||||
resources = {
|
|
||||||
requests.memory = "768Mi";
|
|
||||||
limits.memory = "2Gi";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
volumeClaimTemplates = [
|
|
||||||
{
|
|
||||||
metadata.name = "data";
|
|
||||||
spec = {
|
|
||||||
storageClassName = "nfs-client";
|
|
||||||
accessModes = ["ReadWriteOnce"];
|
|
||||||
resources.requests.storage = "1Gi";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
kubernetes.resources.ingresses.changedetection = {
|
|
||||||
metadata = {
|
|
||||||
name = appName;
|
|
||||||
annotations = {
|
|
||||||
"cert-manager.io/issuer" = "le-issuer";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
spec = {
|
|
||||||
tls = [
|
|
||||||
{
|
|
||||||
hosts = ["changedetect.gmem.ca"];
|
|
||||||
secretName = "gmem-ca-wildcard";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
rules = [
|
|
||||||
{
|
|
||||||
host = "changedetect.gmem.ca";
|
|
||||||
http.paths = [
|
|
||||||
{
|
|
||||||
path = "/";
|
|
||||||
pathType = "Prefix";
|
|
||||||
backend.service = {
|
|
||||||
name = appName;
|
|
||||||
port.name = "http";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -7,7 +7,7 @@ spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: cloudflared
|
app: cloudflared
|
||||||
replicas: 3
|
replicas: 1
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -15,15 +15,12 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: cloudflared
|
- name: cloudflared
|
||||||
image: cloudflare/cloudflared:2024.2.1
|
image: cloudflare/cloudflared:2023.10.0-arm64
|
||||||
args:
|
args:
|
||||||
- tunnel
|
- tunnel
|
||||||
- --config
|
- --config
|
||||||
- /etc/cloudflared/config/config.yaml
|
- /etc/cloudflared/config/config.yaml
|
||||||
- run
|
- run
|
||||||
ports:
|
|
||||||
- containerPort: 2000
|
|
||||||
name: metrics
|
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
# Cloudflared has a /ready endpoint which returns 200 if and only if
|
# Cloudflared has a /ready endpoint which returns 200 if and only if
|
||||||
|
@ -50,29 +47,4 @@ spec:
|
||||||
items:
|
items:
|
||||||
- key: config.yaml
|
- key: config.yaml
|
||||||
path: config.yaml
|
path: config.yaml
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: cloudflared-metrics
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: cloudflared
|
|
||||||
ports:
|
|
||||||
- name: metrics
|
|
||||||
port: 2000
|
|
||||||
targetPort: 2000
|
|
||||||
---
|
|
||||||
apiVersion: monitoring.coreos.com/v1
|
|
||||||
kind: PodMonitor
|
|
||||||
metadata:
|
|
||||||
name: cloudflared
|
|
||||||
labels:
|
|
||||||
release: prometheus
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: cloudflared
|
|
||||||
podMetricsEndpoints:
|
|
||||||
- port: metrics
|
|
||||||
interval: 30s
|
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
};
|
};
|
||||||
# arbitrary attrset passed as values to the helm release
|
# arbitrary attrset passed as values to the helm release
|
||||||
values = {
|
values = {
|
||||||
image.tag = "v1.98.2";
|
image.tag = "v1.95.1";
|
||||||
machine-learning.enabled = false;
|
machine-learning.enabled = false;
|
||||||
immich.persistence.library.existingClaim = "immich";
|
immich.persistence.library.existingClaim = "immich";
|
||||||
redis.enabled = true;
|
redis.enabled = true;
|
||||||
|
|
|
@ -22,6 +22,5 @@
|
||||||
(import ./irc.nix)
|
(import ./irc.nix)
|
||||||
(import ./netboot.nix)
|
(import ./netboot.nix)
|
||||||
(import ./nitter.nix)
|
(import ./nitter.nix)
|
||||||
(import ./changedetection.nix)
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,52 @@ prometheus:
|
||||||
prometheusSpec:
|
prometheusSpec:
|
||||||
podMonitorSelectorNilUsesHelmValues: false
|
podMonitorSelectorNilUsesHelmValues: false
|
||||||
serviceMonitorSelectorNilUsesHelmValues: false
|
serviceMonitorSelectorNilUsesHelmValues: false
|
||||||
ruleSelectorNilUsesHelmValues: false
|
additionalScrapeConfigs:
|
||||||
|
- job_name: kubernetes-service-endpoints
|
||||||
|
kubernetes_sd_configs:
|
||||||
|
- role: service
|
||||||
|
relabel_configs:
|
||||||
|
|
||||||
|
# annotation 'prometheus.io/scrape' must be set to 'true'
|
||||||
|
- action: keep
|
||||||
|
regex: true
|
||||||
|
source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
|
||||||
|
|
||||||
|
# service cannot be in kube-system or prom namespaces
|
||||||
|
- action: drop
|
||||||
|
regex: (kube-system|prom)
|
||||||
|
source_labels: [__meta_kubernetes_namespace]
|
||||||
|
|
||||||
|
# service port name must end with word 'metrics'
|
||||||
|
- action: keep
|
||||||
|
regex: .*metrics
|
||||||
|
source_labels: [__meta_kubernetes_service_port_name]
|
||||||
|
|
||||||
|
# allow override of http scheme
|
||||||
|
- action: replace
|
||||||
|
regex: (https?)
|
||||||
|
source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme]
|
||||||
|
target_label: __scheme__
|
||||||
|
|
||||||
|
# allow override of default /metrics path
|
||||||
|
- action: replace
|
||||||
|
regex: (.+)
|
||||||
|
source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path]
|
||||||
|
target_label: __metrics_path__
|
||||||
|
|
||||||
|
# allow override of default port
|
||||||
|
- action: replace
|
||||||
|
regex: ([^:]+)(?::\d+)?;(\d+)
|
||||||
|
replacement: $1:$2
|
||||||
|
source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
|
||||||
|
target_label: __address__
|
||||||
|
- {action: labelmap, regex: __meta_kubernetes_service_label_(.+)}
|
||||||
|
- action: replace
|
||||||
|
source_labels: [__meta_kubernetes_namespace]
|
||||||
|
target_label: kubernetes_namespace
|
||||||
|
- action: replace
|
||||||
|
source_labels: [__meta_kubernetes_service_name]
|
||||||
|
target_label: kubernetes_name
|
||||||
remoteWrite:
|
remoteWrite:
|
||||||
- name: monitoring
|
- name: monitoring
|
||||||
url: http://grafana.gmem.ca:9001/api/v1/write
|
url: http://grafana.gmem.ca:9001/api/v1/write
|
||||||
|
|
|
@ -15,7 +15,11 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kubernetes.resources.services.tclip = {
|
kubernetes.resources.services.tclip = {
|
||||||
metadata.labels.app = appName;
|
metadata.annotations = {
|
||||||
|
"prometheus.io/port" = "9090";
|
||||||
|
"prometheus.io/scrape" = "true";
|
||||||
|
"prometheus.io/path" = "/metrics";
|
||||||
|
};
|
||||||
spec = {
|
spec = {
|
||||||
selector.app = appName;
|
selector.app = appName;
|
||||||
ports.metrics = {
|
ports.metrics = {
|
||||||
|
@ -86,10 +90,7 @@ in {
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
envFrom = [{secretRef.name = "tclip-litestream-s3";}];
|
envFrom = [{secretRef.name = "tclip-litestream-s3";}];
|
||||||
ports.metrics = {
|
ports.metrics.containerPort = 9090;
|
||||||
containerPort = 9090;
|
|
||||||
name = "metrics";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -33,6 +33,7 @@ spec:
|
||||||
envFrom:
|
envFrom:
|
||||||
- secretRef:
|
- secretRef:
|
||||||
name: vaultwarden-litestream-s3
|
name: vaultwarden-litestream-s3
|
||||||
|
|
||||||
containers:
|
containers:
|
||||||
- name: vaultwarden
|
- name: vaultwarden
|
||||||
image: docker.io/vaultwarden/server:testing
|
image: docker.io/vaultwarden/server:testing
|
||||||
|
@ -90,8 +91,10 @@ apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: vaultwarden
|
name: vaultwarden
|
||||||
labels:
|
annotations:
|
||||||
app: vaultwarden
|
prometheus.io/port: "9090"
|
||||||
|
prometheus.io/scrape: "true"
|
||||||
|
prometheus.io/path: "/metrics"
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
app: vaultwarden
|
app: vaultwarden
|
||||||
|
@ -101,7 +104,7 @@ spec:
|
||||||
name: web
|
name: web
|
||||||
- port: 9090
|
- port: 9090
|
||||||
targetPort: 9090
|
targetPort: 9090
|
||||||
name: metrics
|
name: litestream-metrics
|
||||||
---
|
---
|
||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: ServiceMonitor
|
kind: ServiceMonitor
|
||||||
|
|
|
@ -14,7 +14,11 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
kubernetes.resources.services.vrchat-prometheus-adapter = {
|
kubernetes.resources.services.vrchat-prometheus-adapter = {
|
||||||
metadata.labels.app = appName;
|
metadata.annotations = {
|
||||||
|
"prometheus.io/port" = "6534";
|
||||||
|
"prometheus.io/scrape" = "true";
|
||||||
|
"prometheus.io/path" = "/metrics";
|
||||||
|
};
|
||||||
spec = {
|
spec = {
|
||||||
selector.app = appName;
|
selector.app = appName;
|
||||||
ports.metrics = {
|
ports.metrics = {
|
||||||
|
|
|
@ -140,11 +140,12 @@
|
||||||
xkb.layout = "us";
|
xkb.layout = "us";
|
||||||
xkb.variant = "";
|
xkb.variant = "";
|
||||||
enable = true;
|
enable = true;
|
||||||
displayManager.sddm.enable = true;
|
|
||||||
};
|
|
||||||
desktopManager = {
|
desktopManager = {
|
||||||
|
# plasma5.enable = true;
|
||||||
plasma6.enable = true;
|
plasma6.enable = true;
|
||||||
};
|
};
|
||||||
|
displayManager.sddm.enable = true;
|
||||||
|
};
|
||||||
pipewire = {
|
pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
alsa.enable = true;
|
alsa.enable = true;
|
||||||
|
@ -192,7 +193,7 @@
|
||||||
xdg.portal.enable = true;
|
xdg.portal.enable = true;
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
tmux.enable = true;
|
sway.enable = true;
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
fish.enable = true;
|
fish.enable = true;
|
||||||
|
@ -206,6 +207,7 @@
|
||||||
};
|
};
|
||||||
gnupg.agent = {
|
gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
pinentryFlavor = "qt";
|
||||||
enableSSHSupport = false;
|
enableSSHSupport = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -252,6 +254,7 @@
|
||||||
pinentry-curses
|
pinentry-curses
|
||||||
noisetorch
|
noisetorch
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
|
pinentry-gnome
|
||||||
xdg-utils
|
xdg-utils
|
||||||
dracula-theme
|
dracula-theme
|
||||||
yubikey-touch-detector
|
yubikey-touch-detector
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
in [
|
in [
|
||||||
(import (builtins.fetchTarball {
|
(import (builtins.fetchTarball {
|
||||||
url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
|
url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
|
||||||
sha256 = "0w843vgi0d7p2hmhlgq046r2gg7aid3xphnzibv17fp38wa1y6dm";
|
sha256 = "0i972nkqhjfpy8g7dmryw2fvkfda43624zfhsh35k795zbx38jc7";
|
||||||
}))
|
}))
|
||||||
discordOverlay
|
discordOverlay
|
||||||
];
|
];
|
||||||
|
@ -45,12 +45,6 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
alacritty = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
import = [ "${pkgs.alacritty-theme}/breeze.toml" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
bash.enable = false;
|
bash.enable = false;
|
||||||
fish = {
|
fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -83,7 +77,6 @@
|
||||||
gpgSign = true;
|
gpgSign = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
difftastic.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
emacs = {
|
emacs = {
|
||||||
|
@ -96,8 +89,8 @@
|
||||||
|
|
||||||
eza = {
|
eza = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
bat = {
|
bat = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
@ -122,6 +115,7 @@
|
||||||
thunderbird
|
thunderbird
|
||||||
prismlauncher
|
prismlauncher
|
||||||
ripgrep
|
ripgrep
|
||||||
|
kitty
|
||||||
virt-manager
|
virt-manager
|
||||||
jre8
|
jre8
|
||||||
parsec-bin
|
parsec-bin
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
function fish_greeting; end
|
function fish_greeting; end
|
||||||
function fish_title; end
|
function fish_title; end
|
||||||
end
|
end
|
||||||
|
atuin init fish | source
|
||||||
'';
|
'';
|
||||||
loginShellInit = ''
|
loginShellInit = ''
|
||||||
if test "$TERM" = "dumb"
|
if test "$TERM" = "dumb"
|
||||||
|
@ -44,13 +45,15 @@
|
||||||
|
|
||||||
programs.eza = {
|
programs.eza = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = true;
|
enableAliases = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.bat = {
|
programs.bat = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [atuin];
|
||||||
|
|
||||||
# This value determines the Home Manager release that your
|
# This value determines the Home Manager release that your
|
||||||
# configuration is compatible with. This helps avoid breakage
|
# configuration is compatible with. This helps avoid breakage
|
||||||
# when a new Home Manager release introduces backwards
|
# when a new Home Manager release introduces backwards
|
||||||
|
|
Loading…
Reference in a new issue