mirror of https://git.jolheiser.com/dotnix.git
jolheiser
parent
43d6f7fe48
commit
147b2f4c12
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
../nogui
|
||||
./firefox.nix
|
||||
|
|
@ -24,24 +25,26 @@
|
|||
nodePackages.yaml-language-server
|
||||
];
|
||||
};
|
||||
dconf.settings = let
|
||||
wallpaper = pkgs.fetchurl {
|
||||
url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
|
||||
hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
|
||||
dconf.settings =
|
||||
let
|
||||
wallpaper = pkgs.fetchurl {
|
||||
url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
|
||||
hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
|
||||
};
|
||||
in
|
||||
{
|
||||
"org/cinnamon/desktop/background" = {
|
||||
picture-uri = "file://${wallpaper}";
|
||||
};
|
||||
"org/cinnamon/desktop/interface" = {
|
||||
font-name = "Monaspace Neon 10";
|
||||
};
|
||||
"org/cinnamon/desktop/wm/preferences" = {
|
||||
titlebar-font = "Monaspace Neon Bold 10";
|
||||
};
|
||||
"org/gnome/desktop/interface" = {
|
||||
document-font-name = "Monaspace Xenon 10";
|
||||
monospace-font-name = "Monaspace Argon 10";
|
||||
};
|
||||
};
|
||||
in {
|
||||
"org/cinnamon/desktop/background" = {
|
||||
picture-uri = "file://${wallpaper}";
|
||||
};
|
||||
"org/cinnamon/desktop/interface" = {
|
||||
font-name = "Monaspace Neon 10";
|
||||
};
|
||||
"org/cinnamon/desktop/wm/preferences" = {
|
||||
titlebar-font = "Monaspace Neon Bold 10";
|
||||
};
|
||||
"org/gnome/desktop/interface" = {
|
||||
document-font-name = "Monaspace Xenon 10";
|
||||
monospace-font-name = "Monaspace Argon 10";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,19 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
profiles.default = {
|
||||
search = {
|
||||
default = "Kagi";
|
||||
privateDefault = "DuckDuckGo";
|
||||
order = ["Kagi" "DuckDuckGo"];
|
||||
order = [
|
||||
"Kagi"
|
||||
"DuckDuckGo"
|
||||
];
|
||||
force = true;
|
||||
engines = {
|
||||
"Kagi" = {
|
||||
definedAliases = ["@k"];
|
||||
definedAliases = [ "@k" ];
|
||||
urls = [
|
||||
{
|
||||
template = "https://kagi.com/search";
|
||||
|
|
@ -23,7 +27,7 @@
|
|||
];
|
||||
};
|
||||
"DuckDuckGo" = {
|
||||
definedAliases = ["@d"];
|
||||
definedAliases = [ "@d" ];
|
||||
urls = [
|
||||
{
|
||||
template = "https://duckduckgo.com/";
|
||||
|
|
@ -57,9 +61,9 @@
|
|||
"browser.newtabpage.activity-stream.feeds.section.topstories" = false;
|
||||
"browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
|
||||
"browser.newtabpage.pinned" = builtins.toJSON [
|
||||
{url = "https://github.com/";}
|
||||
{url = "https://git.jojodev.com/";}
|
||||
{url = "https://git.jolheiser.com";}
|
||||
{ url = "https://github.com/"; }
|
||||
{ url = "https://git.jojodev.com/"; }
|
||||
{ url = "https://git.jolheiser.com"; }
|
||||
];
|
||||
"browser.fixup.domainwhitelist.go" = true; # golink
|
||||
};
|
||||
|
|
@ -73,31 +77,34 @@
|
|||
bookmarks = [
|
||||
{
|
||||
name = "github";
|
||||
tags = ["gitea"];
|
||||
tags = [ "gitea" ];
|
||||
keyword = "go-gitea";
|
||||
url = "https://github.com/go-gitea/gitea";
|
||||
}
|
||||
{
|
||||
name = "jojodev";
|
||||
tags = ["gitea"];
|
||||
tags = [ "gitea" ];
|
||||
keyword = "jojodev";
|
||||
url = "https://git.jojodev.com";
|
||||
}
|
||||
{
|
||||
name = "gist";
|
||||
tags = ["gitea" "gist"];
|
||||
tags = [
|
||||
"gitea"
|
||||
"gist"
|
||||
];
|
||||
keyword = "gist";
|
||||
url = "https://gist.jojodev.com";
|
||||
}
|
||||
{
|
||||
name = "gitea";
|
||||
tags = ["gitea"];
|
||||
tags = [ "gitea" ];
|
||||
keyword = "gitea";
|
||||
url = "https://gitea.com";
|
||||
}
|
||||
{
|
||||
name = "try";
|
||||
tags = ["gitea"];
|
||||
tags = [ "gitea" ];
|
||||
keyword = "try";
|
||||
url = "https://try.gitea.io";
|
||||
}
|
||||
|
|
@ -108,25 +115,28 @@
|
|||
bookmarks = [
|
||||
{
|
||||
name = "golink";
|
||||
tags = ["tailscale"];
|
||||
tags = [ "tailscale" ];
|
||||
keyword = "go";
|
||||
url = "http://go";
|
||||
}
|
||||
{
|
||||
name = "tclip";
|
||||
tags = ["tailscale"];
|
||||
tags = [ "tailscale" ];
|
||||
keyword = "paste";
|
||||
url = "http://paste";
|
||||
}
|
||||
{
|
||||
name = "ugit";
|
||||
tags = ["tailscale" "git"];
|
||||
tags = [
|
||||
"tailscale"
|
||||
"git"
|
||||
];
|
||||
keyword = "git";
|
||||
url = "http://git";
|
||||
}
|
||||
{
|
||||
name = "jellyfin";
|
||||
tags = ["jellyfin"];
|
||||
tags = [ "jellyfin" ];
|
||||
keyword = "jellyfin";
|
||||
url = "http://sencha:8096";
|
||||
}
|
||||
|
|
@ -134,20 +144,29 @@
|
|||
}
|
||||
{
|
||||
name = "ugit";
|
||||
tags = ["git" "ugit"];
|
||||
tags = [
|
||||
"git"
|
||||
"ugit"
|
||||
];
|
||||
keyword = "ugit";
|
||||
url = "https://git.jolheiser.com";
|
||||
}
|
||||
{
|
||||
name = "git-pr";
|
||||
tags = ["git" "pr"];
|
||||
tags = [
|
||||
"git"
|
||||
"pr"
|
||||
];
|
||||
keyword = "git-pr";
|
||||
url = "https://pr.jolheiser.com";
|
||||
}
|
||||
|
||||
{
|
||||
name = "todo";
|
||||
tags = ["vikunja" "todo"];
|
||||
tags = [
|
||||
"vikunja"
|
||||
"todo"
|
||||
];
|
||||
keyword = "todo";
|
||||
url = "https://todo.jolheiser.com";
|
||||
}
|
||||
|
|
@ -156,7 +175,7 @@
|
|||
# Not in the toolbar, but still usable via keyword/searching
|
||||
{
|
||||
name = "Go Playground";
|
||||
tags = ["golang"];
|
||||
tags = [ "golang" ];
|
||||
keyword = "play";
|
||||
url = "https://go.dev/play/";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
term = xterm-256color
|
||||
'';
|
||||
# zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast
|
||||
xdg.systemDirs.data = ["/home/jolheiser/.local/share/ghostty/share"];
|
||||
home.sessionPath = ["/home/jolheiser/.local/share/ghostty/bin"];
|
||||
xdg.systemDirs.data = [ "/home/jolheiser/.local/share/ghostty/share" ];
|
||||
home.sessionPath = [ "/home/jolheiser/.local/share/ghostty/bin" ];
|
||||
programs.bash.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
home.pointerCursor = {
|
||||
name = "catppuccin-cursors";
|
||||
package = pkgs.catppuccin-cursors.mochaLavender;
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
theme = {
|
||||
name = "Catppuccin-Mocha-Compact-Lavender-Dark";
|
||||
package = pkgs.catppuccin-gtk.override {
|
||||
accents = ["lavender"];
|
||||
accents = [ "lavender" ];
|
||||
variant = "mocha";
|
||||
size = "compact";
|
||||
};
|
||||
|
|
@ -41,9 +42,10 @@
|
|||
};
|
||||
};
|
||||
|
||||
xdg = let
|
||||
themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
|
||||
in
|
||||
xdg =
|
||||
let
|
||||
themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
|
||||
in
|
||||
lib.mkIf config.gtk.enable {
|
||||
configFile = {
|
||||
"gtk-4.0/assets" = {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,22 @@
|
|||
{pkgs, ...}: {
|
||||
xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (pkgs.fetchFromGitHub {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "spotify-player";
|
||||
rev = "002d51b02b3a2ebc0804e4839ee604dbdab4bec3";
|
||||
sha256 = "sha256-IUhzVrIBMi/Dn6+HV0m9i38Msg8zzzJlR85JeEVE7EU=";
|
||||
}
|
||||
+ "/src/theme.toml");
|
||||
xdg.configFile."spotify-player/app.toml".source = (pkgs.formats.toml {}).generate "spotify-player-config" {
|
||||
client_id = "41af4976ba70474fbd541ee8764a2cda";
|
||||
theme = "Catppuccin-mocha";
|
||||
enable_notify = false;
|
||||
enable_media_control = true;
|
||||
device.volume = 100;
|
||||
};
|
||||
+ "/src/theme.toml"
|
||||
);
|
||||
xdg.configFile."spotify-player/app.toml".source =
|
||||
(pkgs.formats.toml { }).generate "spotify-player-config"
|
||||
{
|
||||
client_id = "41af4976ba70474fbd541ee8764a2cda";
|
||||
theme = "Catppuccin-mocha";
|
||||
enable_notify = false;
|
||||
enable_media_control = true;
|
||||
device.volume = 100;
|
||||
};
|
||||
programs.nushell.shellAliases.spt = "spotify_player";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{config, ...}: {
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.tiny = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -8,9 +9,12 @@
|
|||
port = 6697;
|
||||
tls = true;
|
||||
realname = "jolheiser";
|
||||
nicks = ["jolheiser"];
|
||||
nicks = [ "jolheiser" ];
|
||||
alias = "LiberaChat";
|
||||
join = ["#gitea" "#gitea-devel"];
|
||||
join = [
|
||||
"#gitea"
|
||||
"#gitea-devel"
|
||||
];
|
||||
sasl = {
|
||||
username = "jolheiser";
|
||||
password = {
|
||||
|
|
@ -20,7 +24,7 @@
|
|||
}
|
||||
];
|
||||
defaults = {
|
||||
nicks = ["jolheiser"];
|
||||
nicks = [ "jolheiser" ];
|
||||
realname = "jolheiser";
|
||||
};
|
||||
key_map = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = [pkgs.zed-editor];
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = [ pkgs.zed-editor ];
|
||||
xdg.configFile."zed/settings.json".text = builtins.toJSON {
|
||||
buffer_font_family = "Monaspace Neon";
|
||||
buffer_font_size = 16;
|
||||
|
|
@ -10,7 +11,9 @@
|
|||
};
|
||||
terminal = {
|
||||
font_family = "Monaspace Neon";
|
||||
shell = {program = "nu";};
|
||||
shell = {
|
||||
program = "nu";
|
||||
};
|
||||
};
|
||||
theme = "Catppuccin Mocha";
|
||||
ui_font_size = 16;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.aerc = {
|
||||
enable = true;
|
||||
extraConfig = {
|
||||
|
|
@ -31,13 +32,15 @@
|
|||
};
|
||||
};
|
||||
stylesets = {
|
||||
catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
|
||||
catppuccin-mocha = builtins.readFile (
|
||||
pkgs.fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "aerc";
|
||||
rev = "c1f233bd22894d7ccf69846c3bd7bcd5af0fc2a2";
|
||||
sha256 = "sha256-YJdNPROhwgge14O1zuGh/ZK/qjHDxi+xdAyPEIXRI9c=";
|
||||
}
|
||||
+ "/dist/catppuccin-mocha");
|
||||
+ "/dist/catppuccin-mocha"
|
||||
);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
programs.atuin = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
flags = ["--disable-up-arrow"];
|
||||
flags = [ "--disable-up-arrow" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config = {theme = "ctp-mocha";};
|
||||
config = {
|
||||
theme = "ctp-mocha";
|
||||
};
|
||||
themes = {
|
||||
ctp-mocha = {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,14 @@
|
|||
table_header_color = "#f5e0dc";
|
||||
all_cpu_color = "#f5e0dc";
|
||||
avg_cpu_color = "#eba0ac";
|
||||
cpu_core_colors = ["#f38ba8" "#fab387" "#f9e2af" "#a6e3a1" "#74c7ec" "#cba6f7"];
|
||||
cpu_core_colors = [
|
||||
"#f38ba8"
|
||||
"#fab387"
|
||||
"#f9e2af"
|
||||
"#a6e3a1"
|
||||
"#74c7ec"
|
||||
"#cba6f7"
|
||||
];
|
||||
ram_color = "#a6e3a1";
|
||||
swap_color = "#fab387";
|
||||
rx_color = "#a6e3a1";
|
||||
|
|
@ -22,7 +29,14 @@
|
|||
high_battery_color = "#a6e3a1";
|
||||
medium_battery_color = "#f9e2af";
|
||||
low_battery_color = "#f38ba8";
|
||||
gpu_core_colors = ["#74c7ec" "#cba6f7" "#f38ba8" "#fab387" "#f9e2af" "#a6e3a1"];
|
||||
gpu_core_colors = [
|
||||
"#74c7ec"
|
||||
"#cba6f7"
|
||||
"#f38ba8"
|
||||
"#fab387"
|
||||
"#f9e2af"
|
||||
"#a6e3a1"
|
||||
];
|
||||
arc_color = "#89dceb";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./aerc.nix
|
||||
./atuin.nix
|
||||
|
|
@ -52,7 +49,7 @@
|
|||
jsonnet-language-server
|
||||
|
||||
# Formatters
|
||||
alejandra
|
||||
nixfmt-rfc-style
|
||||
gofumpt
|
||||
|
||||
# Flake overlays
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{lib, ...}: {
|
||||
{ lib, ... }:
|
||||
{
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
git = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
insteadOf = prefix: domain: {
|
||||
"https://${domain}/".insteadOf = "${prefix}:";
|
||||
"git@${domain}:".insteadOf = "ssh:${prefix}:";
|
||||
|
|
@ -17,7 +14,8 @@
|
|||
ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "jolheiser";
|
||||
|
|
@ -40,38 +38,37 @@ in {
|
|||
tui = "!lazygit";
|
||||
};
|
||||
lfs.enable = true;
|
||||
ignores = [".idea/" "result" "node_modules" "ve"];
|
||||
extraConfig =
|
||||
{
|
||||
init.defaultBranch = "main";
|
||||
merge.conflictstyle = "zdiff3";
|
||||
diff.colorMoved = "default";
|
||||
core.editor = "hx";
|
||||
push = {
|
||||
sutoSetupRemote = true;
|
||||
default = "current";
|
||||
gpgSign = "if-asked";
|
||||
};
|
||||
rerere.enabled = true;
|
||||
pull.rebase = true;
|
||||
diff.algorithm = "histogram";
|
||||
merge.tool = "hx";
|
||||
url =
|
||||
insteadOf "jo" "git.jolheiser.com"
|
||||
// insteadOf "gh" "github.com"
|
||||
// insteadOf "jj" "git.jojodev.com"
|
||||
// insteadOf "gt" "gitea.com"
|
||||
// insteadOf "gl" "gitlab.com"
|
||||
// insteadOf "cb" "codeberg.org";
|
||||
}
|
||||
// sshSigning;
|
||||
ignores = [
|
||||
".idea/"
|
||||
"result"
|
||||
"node_modules"
|
||||
"ve"
|
||||
];
|
||||
extraConfig = {
|
||||
init.defaultBranch = "main";
|
||||
merge.conflictstyle = "zdiff3";
|
||||
diff.colorMoved = "default";
|
||||
core.editor = "hx";
|
||||
push = {
|
||||
sutoSetupRemote = true;
|
||||
default = "current";
|
||||
gpgSign = "if-asked";
|
||||
};
|
||||
rerere.enabled = true;
|
||||
pull.rebase = true;
|
||||
diff.algorithm = "histogram";
|
||||
merge.tool = "hx";
|
||||
url =
|
||||
insteadOf "jo" "git.jolheiser.com"
|
||||
// insteadOf "gh" "github.com"
|
||||
// insteadOf "jj" "git.jojodev.com"
|
||||
// insteadOf "gt" "gitea.com"
|
||||
// insteadOf "gl" "gitlab.com"
|
||||
// insteadOf "cb" "codeberg.org";
|
||||
} // sshSigning;
|
||||
difftastic = {
|
||||
enable = true;
|
||||
};
|
||||
includes = [
|
||||
{
|
||||
path = config.age.secrets.git-send-email.path;
|
||||
}
|
||||
];
|
||||
includes = [ { path = config.age.secrets.git-send-email.path; } ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
let
|
||||
goPath = ".local/share/go";
|
||||
in {
|
||||
in
|
||||
{
|
||||
programs.go = {
|
||||
inherit goPath;
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
{pkgs, ...}: let
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
key = "0xB853ADA5DA7BBF7A";
|
||||
in {
|
||||
home.packages = with pkgs; [pinentry];
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [ pinentry ];
|
||||
home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = {
|
||||
enable = true;
|
||||
text = builtins.toJSON {
|
||||
|
|
@ -9,7 +11,7 @@ in {
|
|||
description = "JavaScript binding for GnuPG";
|
||||
path = pkgs.gpgme.dev + /bin/gpgme-json;
|
||||
type = "stdio";
|
||||
allowed_extensions = ["jid1-AQqSMBYb0a8ADg@jetpack"];
|
||||
allowed_extensions = [ "jid1-AQqSMBYb0a8ADg@jetpack" ];
|
||||
};
|
||||
};
|
||||
programs.gpg = {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,20 @@
|
|||
# This entire file is superceded by https://git.jolheiser.com/helix.drv
|
||||
{pkgs, ...}: let
|
||||
query = scm:
|
||||
builtins.readFile (pkgs.fetchFromGitea {
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
query =
|
||||
scm:
|
||||
builtins.readFile (
|
||||
pkgs.fetchFromGitea {
|
||||
domain = "git.jojodev.com";
|
||||
owner = "jolheiser";
|
||||
repo = "templ-helix";
|
||||
rev = "2a47b9c5af0fd9ae8bba8198fd66abc6d07fdf10";
|
||||
sha256 = "sha256-pTdOX9bPup626t+ko6k3Xq/tprAMAZCUBl+xeIBkhfs=";
|
||||
}
|
||||
+ "/queries/templ/${scm}.scm");
|
||||
in {
|
||||
+ "/queries/templ/${scm}.scm"
|
||||
);
|
||||
in
|
||||
{
|
||||
programs.helix = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
|
|
@ -25,12 +30,16 @@ in {
|
|||
normal = "block";
|
||||
select = "underline";
|
||||
};
|
||||
file-picker = {hidden = false;};
|
||||
file-picker = {
|
||||
hidden = false;
|
||||
};
|
||||
indent-guides = {
|
||||
render = true;
|
||||
skip-levels = 1;
|
||||
};
|
||||
soft-wrap = {enable = true;};
|
||||
soft-wrap = {
|
||||
enable = true;
|
||||
};
|
||||
statusline = {
|
||||
right = [
|
||||
"version-control"
|
||||
|
|
@ -40,7 +49,9 @@ in {
|
|||
"file-encoding"
|
||||
];
|
||||
};
|
||||
lsp = {display-messages = true;};
|
||||
lsp = {
|
||||
display-messages = true;
|
||||
};
|
||||
};
|
||||
keys = {
|
||||
normal = {
|
||||
|
|
@ -56,33 +67,61 @@ in {
|
|||
S-right = "goto_next_buffer";
|
||||
S-left = "goto_previous_buffer";
|
||||
C-b = ":buffer-close";
|
||||
C-s = ["select_all" "select_regex"];
|
||||
C-s = [
|
||||
"select_all"
|
||||
"select_regex"
|
||||
];
|
||||
|
||||
C-j = "shrink_selection";
|
||||
C-k = "expand_selection";
|
||||
C-l = "select_next_sibling";
|
||||
C-a = "select_all";
|
||||
C-u = ["half_page_up" "align_view_center"];
|
||||
C-d = ["half_page_down" "align_view_center"];
|
||||
C-u = [
|
||||
"half_page_up"
|
||||
"align_view_center"
|
||||
];
|
||||
C-d = [
|
||||
"half_page_down"
|
||||
"align_view_center"
|
||||
];
|
||||
|
||||
"{" = ["goto_prev_paragraph" "collapse_selection"];
|
||||
"}" = ["goto_next_paragraph" "collapse_selection"];
|
||||
"{" = [
|
||||
"goto_prev_paragraph"
|
||||
"collapse_selection"
|
||||
];
|
||||
"}" = [
|
||||
"goto_next_paragraph"
|
||||
"collapse_selection"
|
||||
];
|
||||
"0" = "goto_line_start";
|
||||
"$" = "goto_line_end";
|
||||
"^" = "goto_first_nonwhitespace";
|
||||
G = "goto_file_end";
|
||||
"%" = "match_brackets";
|
||||
V = ["select_mode" "extend_to_line_bounds"];
|
||||
C = ["collapse_selection" "extend_to_line_end" "change_selection"];
|
||||
D = ["extend_to_line_end" "delete_selection"];
|
||||
V = [
|
||||
"select_mode"
|
||||
"extend_to_line_bounds"
|
||||
];
|
||||
C = [
|
||||
"collapse_selection"
|
||||
"extend_to_line_end"
|
||||
"change_selection"
|
||||
];
|
||||
D = [
|
||||
"extend_to_line_end"
|
||||
"delete_selection"
|
||||
];
|
||||
S = "surround_add";
|
||||
|
||||
d = {
|
||||
d = ["extend_to_line_bounds" "delete_selection"];
|
||||
t = ["extend_till_char"];
|
||||
s = ["surround_delete"];
|
||||
i = ["select_textobject_inner"];
|
||||
a = ["select_textobject_around"];
|
||||
d = [
|
||||
"extend_to_line_bounds"
|
||||
"delete_selection"
|
||||
];
|
||||
t = [ "extend_till_char" ];
|
||||
s = [ "surround_delete" ];
|
||||
i = [ "select_textobject_inner" ];
|
||||
a = [ "select_textobject_around" ];
|
||||
};
|
||||
|
||||
x = "delete_selection";
|
||||
|
|
@ -101,16 +140,40 @@ in {
|
|||
"collapse_selection"
|
||||
];
|
||||
|
||||
w = ["move_next_word_start" "move_char_right" "collapse_selection"];
|
||||
e = ["move_next_word_end" "collapse_selection"];
|
||||
b = ["move_prev_word_start" "collapse_selection"];
|
||||
w = [
|
||||
"move_next_word_start"
|
||||
"move_char_right"
|
||||
"collapse_selection"
|
||||
];
|
||||
e = [
|
||||
"move_next_word_end"
|
||||
"collapse_selection"
|
||||
];
|
||||
b = [
|
||||
"move_prev_word_start"
|
||||
"collapse_selection"
|
||||
];
|
||||
|
||||
i = ["insert_mode" "collapse_selection"];
|
||||
a = ["append_mode" "collapse_selection"];
|
||||
i = [
|
||||
"insert_mode"
|
||||
"collapse_selection"
|
||||
];
|
||||
a = [
|
||||
"append_mode"
|
||||
"collapse_selection"
|
||||
];
|
||||
|
||||
esc = ["collapse_selection" "keep_primary_selection"];
|
||||
esc = [
|
||||
"collapse_selection"
|
||||
"keep_primary_selection"
|
||||
];
|
||||
};
|
||||
insert = {
|
||||
esc = [
|
||||
"collapse_selection"
|
||||
"normal_mode"
|
||||
];
|
||||
};
|
||||
insert = {esc = ["collapse_selection" "normal_mode"];};
|
||||
select = {
|
||||
space = {
|
||||
j = {
|
||||
|
|
@ -118,28 +181,60 @@ in {
|
|||
c = ":pipe jq -c";
|
||||
};
|
||||
};
|
||||
"{" = ["extend_to_line_bounds" "goto_prev_paragraph"];
|
||||
"}" = ["extend_to_line_bounds" "goto_next_paragraph"];
|
||||
"{" = [
|
||||
"extend_to_line_bounds"
|
||||
"goto_prev_paragraph"
|
||||
];
|
||||
"}" = [
|
||||
"extend_to_line_bounds"
|
||||
"goto_next_paragraph"
|
||||
];
|
||||
"0" = "goto_line_start";
|
||||
"$" = "goto_line_end";
|
||||
"^" = "goto_first_nonwhitespace";
|
||||
G = "goto_file_end";
|
||||
D = ["extend_to_line_bounds" "delete_selection" "normal_mode"];
|
||||
C = ["goto_line_start" "extend_to_line_bounds" "change_selection"];
|
||||
D = [
|
||||
"extend_to_line_bounds"
|
||||
"delete_selection"
|
||||
"normal_mode"
|
||||
];
|
||||
C = [
|
||||
"goto_line_start"
|
||||
"extend_to_line_bounds"
|
||||
"change_selection"
|
||||
];
|
||||
"%" = "match_brackets";
|
||||
S = "surround_add";
|
||||
|
||||
i = "select_textobject_inner";
|
||||
a = "select_textobject_around";
|
||||
|
||||
tab = ["insert_mode" "collapse_selection"];
|
||||
C-a = ["append_mode" "collapse_selection"];
|
||||
tab = [
|
||||
"insert_mode"
|
||||
"collapse_selection"
|
||||
];
|
||||
C-a = [
|
||||
"append_mode"
|
||||
"collapse_selection"
|
||||
];
|
||||
|
||||
k = ["extend_line_up" "extend_to_line_bounds"];
|
||||
j = ["extend_line_down" "extend_to_line_bounds"];
|
||||
k = [
|
||||
"extend_line_up"
|
||||
"extend_to_line_bounds"
|
||||
];
|
||||
j = [
|
||||
"extend_line_down"
|
||||
"extend_to_line_bounds"
|
||||
];
|
||||
|
||||
d = ["yank_main_selection_to_clipboard" "delete_selection"];
|
||||
x = ["yank_main_selection_to_clipboard" "delete_selection"];
|
||||
d = [
|
||||
"yank_main_selection_to_clipboard"
|
||||
"delete_selection"
|
||||
];
|
||||
x = [
|
||||
"yank_main_selection_to_clipboard"
|
||||
"delete_selection"
|
||||
];
|
||||
y = [
|
||||
"yank_main_selection_to_clipboard"
|
||||
"normal_mode"
|
||||
|
|
@ -156,7 +251,11 @@ in {
|
|||
p = "replace_selections_with_clipboard";
|
||||
P = "paste_clipboard_before";
|
||||
|
||||
esc = ["collapse_selection" "keep_primary_selection" "normal_mode"];
|
||||
esc = [
|
||||
"collapse_selection"
|
||||
"keep_primary_selection"
|
||||
"normal_mode"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -172,7 +271,7 @@ in {
|
|||
name = "lua";
|
||||
formatter = {
|
||||
command = "luafmt";
|
||||
args = ["--stdin"];
|
||||
args = [ "--stdin" ];
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -180,7 +279,10 @@ in {
|
|||
auto-format = true;
|
||||
formatter = {
|
||||
command = "black";
|
||||
args = ["--quiet" "-"];
|
||||
args = [
|
||||
"--quiet"
|
||||
"-"
|
||||
];
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -188,7 +290,7 @@ in {
|
|||
auto-format = true;
|
||||
formatter = {
|
||||
command = "alejandra";
|
||||
args = ["-qq"];
|
||||
args = [ "-qq" ];
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -196,16 +298,16 @@ in {
|
|||
auto-format = true;
|
||||
scope = "source.templ";
|
||||
injection-regex = "templ";
|
||||
file-types = ["templ"];
|
||||
roots = ["go.mod"];
|
||||
file-types = [ "templ" ];
|
||||
roots = [ "go.mod" ];
|
||||
comment-token = "//";
|
||||
language-server = {
|
||||
command = "templ";
|
||||
args = ["lsp"];
|
||||
args = [ "lsp" ];
|
||||
};
|
||||
formatter = {
|
||||
command = "templ";
|
||||
args = ["fmt"];
|
||||
args = [ "fmt" ];
|
||||
};
|
||||
}
|
||||
];
|
||||
|
|
@ -222,19 +324,19 @@ in {
|
|||
themes = {
|
||||
catppuccin_frappe_transparent = {
|
||||
inherits = "catppuccin_frappe";
|
||||
"ui.background" = {};
|
||||
"ui.background" = { };
|
||||
};
|
||||
catppuccin_latte_transparent = {
|
||||
inherits = "catppuccin_latte";
|
||||
"ui.background" = {};
|
||||
"ui.background" = { };
|
||||
};
|
||||
catppuccin_macchiato_transparent = {
|
||||
inherits = "catppuccin_macchiato";
|
||||
"ui.background" = {};
|
||||
"ui.background" = { };
|
||||
};
|
||||
catppuccin_mocha_transparent = {
|
||||
inherits = "catppuccin_mocha";
|
||||
"ui.background" = {};
|
||||
"ui.background" = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
@ -7,7 +8,12 @@
|
|||
email = "git@jolheiser.com";
|
||||
};
|
||||
ui = {
|
||||
diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
|
||||
diff.tool = [
|
||||
"${pkgs.difftastic}/bin/difft"
|
||||
"--color=always"
|
||||
"$left"
|
||||
"$right"
|
||||
];
|
||||
editor = "hx";
|
||||
};
|
||||
signing = {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{programs.jq.enable = true;}
|
||||
{ programs.jq.enable = true; }
|
||||
|
|
|
|||
|
|
@ -6,14 +6,17 @@
|
|||
update.method = "never";
|
||||
gui.theme = {
|
||||
lightTheme = false;
|
||||
activeBorderColor = ["#a6e3a1" "bold"];
|
||||
inactiveBorderColor = ["#cdd6f4"];
|
||||
optionsTextColor = ["#89b4fa"];
|
||||
selectedLineBgColor = ["#313244"];
|
||||
selectedRangeBgColor = ["#313244"];
|
||||
cherryPickedCommitBgColor = ["#94e2d5"];
|
||||
cherryPickedCommitFgColor = ["#89b4fa"];
|
||||
unstagedChangesColor = ["#f38ba8"];
|
||||
activeBorderColor = [
|
||||
"#a6e3a1"
|
||||
"bold"
|
||||
];
|
||||
inactiveBorderColor = [ "#cdd6f4" ];
|
||||
optionsTextColor = [ "#89b4fa" ];
|
||||
selectedLineBgColor = [ "#313244" ];
|
||||
selectedRangeBgColor = [ "#313244" ];
|
||||
cherryPickedCommitBgColor = [ "#94e2d5" ];
|
||||
cherryPickedCommitFgColor = [ "#89b4fa" ];
|
||||
unstagedChangesColor = [ "#f38ba8" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.nushell = {
|
||||
enable = true;
|
||||
configFile.source = ./nushell/config.nu;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
programs.oh-my-posh = {
|
||||
enable = true;
|
||||
settings =
|
||||
builtins.fromJSON (builtins.unsafeDiscardStringContext
|
||||
(builtins.readFile ./ohmyposh/config.json));
|
||||
settings = builtins.fromJSON (
|
||||
builtins.unsafeDiscardStringContext (builtins.readFile ./ohmyposh/config.json)
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
{config, ...}: {
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.senpai = {
|
||||
enable = true;
|
||||
config = {
|
||||
address = "ircs+insecure://irc.jolheiser.com:6697";
|
||||
nickname = "jolheiser";
|
||||
password-cmd = ["cat" "${config.age.secrets.irc-pw.path}"];
|
||||
password-cmd = [
|
||||
"cat"
|
||||
"${config.age.secrets.irc-pw.path}"
|
||||
];
|
||||
#channel = "#pico.sh #gitea";
|
||||
typings = false;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{config, ...}: {
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
includes = [
|
||||
config.age.secrets.ssh-config.path
|
||||
];
|
||||
includes = [ config.age.secrets.ssh-config.path ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{config, ...}: {
|
||||
{ config, ... }:
|
||||
{
|
||||
xdg = {
|
||||
enable = true;
|
||||
userDirs.enable = true;
|
||||
|
|
|
|||
267
flake.nix
267
flake.nix
|
|
@ -120,143 +120,148 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixos-hardware,
|
||||
agenix,
|
||||
wsl,
|
||||
...
|
||||
} @ inputs: let
|
||||
overlays = [
|
||||
(_: prev: {
|
||||
nur = import inputs.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
};
|
||||
jolheiser = {
|
||||
nur = inputs.jolheiser-nur.packages.${prev.system};
|
||||
helix = inputs.helix.packages.${prev.system}.default;
|
||||
website = inputs.website.packages.${prev.system}.default;
|
||||
resume = inputs.resume.packages.${prev.system}.default;
|
||||
git-age = inputs.git-age.packages.${prev.system}.default;
|
||||
gist = inputs.gist.packages.${prev.system}.default;
|
||||
tmpl = inputs.tmpl.packages.${prev.system}.default;
|
||||
gomodinit = inputs.gomodinit.packages.${prev.system}.default;
|
||||
cfg = inputs.cfg.packages.${prev.system}.default;
|
||||
blog = inputs.blog.packages.${prev.system}.default;
|
||||
bennet = inputs.bennet.packages.${prev.system}.default;
|
||||
};
|
||||
tclip = inputs.tclip.packages.${prev.system}.tclip;
|
||||
templ = inputs.templ.packages.${prev.system}.templ;
|
||||
})
|
||||
inputs.golink.overlay
|
||||
];
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit overlays system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
commonConfig = {config, ...}: {
|
||||
config = {
|
||||
nixpkgs.overlays = overlays;
|
||||
# TODO Remove when apps are updated
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"electron-25.9.0"
|
||||
];
|
||||
outputs =
|
||||
{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixos-hardware,
|
||||
agenix,
|
||||
wsl,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
overlays = [
|
||||
(_: prev: {
|
||||
nur = import inputs.nur {
|
||||
nurpkgs = prev;
|
||||
pkgs = prev;
|
||||
};
|
||||
jolheiser = {
|
||||
nur = inputs.jolheiser-nur.packages.${prev.system};
|
||||
helix = inputs.helix.packages.${prev.system}.default;
|
||||
website = inputs.website.packages.${prev.system}.default;
|
||||
resume = inputs.resume.packages.${prev.system}.default;
|
||||
git-age = inputs.git-age.packages.${prev.system}.default;
|
||||
gist = inputs.gist.packages.${prev.system}.default;
|
||||
tmpl = inputs.tmpl.packages.${prev.system}.default;
|
||||
gomodinit = inputs.gomodinit.packages.${prev.system}.default;
|
||||
cfg = inputs.cfg.packages.${prev.system}.default;
|
||||
blog = inputs.blog.packages.${prev.system}.default;
|
||||
bennet = inputs.bennet.packages.${prev.system}.default;
|
||||
};
|
||||
tclip = inputs.tclip.packages.${prev.system}.tclip;
|
||||
templ = inputs.templ.packages.${prev.system}.templ;
|
||||
})
|
||||
inputs.golink.overlay
|
||||
];
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit overlays system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
};
|
||||
username = "jolheiser";
|
||||
system = "x86_64-linux";
|
||||
homeManagerModules = [
|
||||
agenix.homeManagerModules.age
|
||||
{
|
||||
home = {
|
||||
inherit username;
|
||||
homeDirectory = "/home/${username}";
|
||||
};
|
||||
age = {
|
||||
secretsDir = "/home/${username}/.agenix/agenix";
|
||||
secretsMountPoint = "/home/${username}/.agenix/agenix.d";
|
||||
identityPaths = ["/home/${username}/.ssh/nix"];
|
||||
secrets = {
|
||||
ssh-config.file = ./secrets/shared/ssh-config.age;
|
||||
spotify = {
|
||||
file = ./secrets/shared/spotify.age;
|
||||
path = "/home/${username}/.cache/spotify-player/credentials.json";
|
||||
};
|
||||
irc-pw.file = ./secrets/shared/irc-pw.age;
|
||||
gist-pw.file = ./secrets/shared/gist-pw.age;
|
||||
git-send-email.file = ./secrets/shared/git-send-email.age;
|
||||
cachix = {
|
||||
file = ./secrets/shared/cachix.age;
|
||||
path = "/home/${username}/.config/cachix/cachix.dhall";
|
||||
};
|
||||
commonConfig =
|
||||
{ config, ... }:
|
||||
{
|
||||
config = {
|
||||
nixpkgs.overlays = overlays;
|
||||
# TODO Remove when apps are updated
|
||||
nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
./apps/gui
|
||||
];
|
||||
in {
|
||||
inherit homeManagerModules;
|
||||
homeConfigurations = {
|
||||
"jolheiser" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = homeManagerModules;
|
||||
};
|
||||
};
|
||||
nixosConfigurations = {
|
||||
"matcha" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./machines/matcha
|
||||
commonConfig
|
||||
];
|
||||
};
|
||||
"genmaicha" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
./machines/genmaicha
|
||||
commonConfig
|
||||
];
|
||||
};
|
||||
"sencha" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./machines/sencha
|
||||
commonConfig
|
||||
];
|
||||
};
|
||||
};
|
||||
colmena = {
|
||||
meta = {
|
||||
nixpkgs = import nixpkgs {
|
||||
inherit overlays system;
|
||||
username = "jolheiser";
|
||||
system = "x86_64-linux";
|
||||
homeManagerModules = [
|
||||
agenix.homeManagerModules.age
|
||||
{
|
||||
home = {
|
||||
inherit username;
|
||||
homeDirectory = "/home/${username}";
|
||||
};
|
||||
age = {
|
||||
secretsDir = "/home/${username}/.agenix/agenix";
|
||||
secretsMountPoint = "/home/${username}/.agenix/agenix.d";
|
||||
identityPaths = [ "/home/${username}/.ssh/nix" ];
|
||||
secrets = {
|
||||
ssh-config.file = ./secrets/shared/ssh-config.age;
|
||||
spotify = {
|
||||
file = ./secrets/shared/spotify.age;
|
||||
path = "/home/${username}/.cache/spotify-player/credentials.json";
|
||||
};
|
||||
irc-pw.file = ./secrets/shared/irc-pw.age;
|
||||
gist-pw.file = ./secrets/shared/gist-pw.age;
|
||||
git-send-email.file = ./secrets/shared/git-send-email.age;
|
||||
cachix = {
|
||||
file = ./secrets/shared/cachix.age;
|
||||
path = "/home/${username}/.config/cachix/cachix.dhall";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
./apps/gui
|
||||
];
|
||||
in
|
||||
{
|
||||
inherit homeManagerModules;
|
||||
homeConfigurations = {
|
||||
"jolheiser" = home-manager.lib.homeManagerConfiguration {
|
||||
inherit pkgs;
|
||||
modules = homeManagerModules;
|
||||
};
|
||||
};
|
||||
dragonwell = {pkgs, ...}: {
|
||||
imports = [
|
||||
inputs.agenix.nixosModules.default
|
||||
inputs.golink.nixosModules.default
|
||||
inputs.ugit.nixosModules.default
|
||||
inputs.git-pr.nixosModules.default
|
||||
inputs.actual.nixosModules.default
|
||||
inputs.tsnet-serve.nixosModules.default
|
||||
./modules/tclip
|
||||
./machines/dragonwell
|
||||
nixosConfigurations = {
|
||||
"matcha" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./machines/matcha
|
||||
commonConfig
|
||||
];
|
||||
};
|
||||
"genmaicha" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
./machines/genmaicha
|
||||
commonConfig
|
||||
];
|
||||
};
|
||||
"sencha" = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
./machines/sencha
|
||||
commonConfig
|
||||
];
|
||||
};
|
||||
};
|
||||
colmena = {
|
||||
meta = {
|
||||
nixpkgs = import nixpkgs { inherit overlays system; };
|
||||
};
|
||||
dragonwell =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.agenix.nixosModules.default
|
||||
inputs.golink.nixosModules.default
|
||||
inputs.ugit.nixosModules.default
|
||||
inputs.git-pr.nixosModules.default
|
||||
inputs.actual.nixosModules.default
|
||||
inputs.tsnet-serve.nixosModules.default
|
||||
./modules/tclip
|
||||
./machines/dragonwell
|
||||
];
|
||||
services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
|
||||
};
|
||||
};
|
||||
nixConfig = {
|
||||
extra-substitutors = [ "https://jolheiser.cachix.org" ];
|
||||
extra-trusted-public-keys = [
|
||||
"jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="
|
||||
];
|
||||
};
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
nativeBuildInputs = [
|
||||
agenix.packages.${system}.agenix
|
||||
pkgs.colmena
|
||||
];
|
||||
services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
|
||||
};
|
||||
};
|
||||
nixConfig = {
|
||||
extra-substitutors = ["https://jolheiser.cachix.org"];
|
||||
extra-trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
|
||||
};
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
nativeBuildInputs = [
|
||||
agenix.packages.${system}.agenix
|
||||
pkgs.colmena
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [../nogui];
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [ ../nogui ];
|
||||
|
||||
sound.enable = true;
|
||||
hardware.pulseaudio.enable = false;
|
||||
security = {rtkit.enable = true;};
|
||||
security = {
|
||||
rtkit.enable = true;
|
||||
};
|
||||
services = {
|
||||
pipewire = {
|
||||
enable = true;
|
||||
|
|
@ -20,6 +23,15 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
fonts.packages = with pkgs; [(nerdfonts.override {fonts = ["JetBrainsMono" "Iosevka" "Hack"];}) monaspace];
|
||||
environment.systemPackages = [pkgs.tailscale-systray];
|
||||
fonts.packages = with pkgs; [
|
||||
(nerdfonts.override {
|
||||
fonts = [
|
||||
"JetBrainsMono"
|
||||
"Iosevka"
|
||||
"Hack"
|
||||
];
|
||||
})
|
||||
monaspace
|
||||
];
|
||||
environment.systemPackages = [ pkgs.tailscale-systray ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
console.colors = [
|
||||
"1e1e2e"
|
||||
"585b70"
|
||||
|
|
@ -45,12 +46,20 @@
|
|||
gc.automatic = true;
|
||||
package = pkgs.nixVersions.stable;
|
||||
settings = {
|
||||
trusted-users = ["@sudo" "@wheel" "jolheiser"];
|
||||
experimental-features = ["flakes" "nix-command" "repl-flake"];
|
||||
trusted-users = [
|
||||
"@sudo"
|
||||
"@wheel"
|
||||
"jolheiser"
|
||||
];
|
||||
experimental-features = [
|
||||
"flakes"
|
||||
"nix-command"
|
||||
"repl-flake"
|
||||
];
|
||||
auto-optimise-store = true;
|
||||
warn-dirty = false;
|
||||
substituters = ["https://jolheiser.cachix.org"];
|
||||
trusted-public-keys = ["jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg="];
|
||||
substituters = [ "https://jolheiser.cachix.org" ];
|
||||
trusted-public-keys = [ "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -64,6 +73,10 @@
|
|||
services.tailscale.enable = true;
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [podman podman-compose podman-tui];
|
||||
systemPackages = with pkgs; [
|
||||
podman
|
||||
podman-compose
|
||||
podman-tui
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{pkgs, ...}: let
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
modules = import ./go.nix;
|
||||
in {
|
||||
in
|
||||
{
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
virtualHosts = {
|
||||
|
|
@ -8,15 +10,17 @@ in {
|
|||
extraConfig = ''
|
||||
handle_path /.well-known/webfinger {
|
||||
header Content-Type application/jrd+json
|
||||
respond ${builtins.toJSON {
|
||||
subject = "acct:john@jolheiser.com";
|
||||
links = [
|
||||
{
|
||||
rel = "http://openid.net/specs/connect/1.0/issuer";
|
||||
href = "https://auth.jolheiser.com";
|
||||
respond ${
|
||||
builtins.toJSON {
|
||||
subject = "acct:john@jolheiser.com";
|
||||
links = [
|
||||
{
|
||||
rel = "http://openid.net/specs/connect/1.0/issuer";
|
||||
href = "https://auth.jolheiser.com";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}}
|
||||
}
|
||||
}
|
||||
handle_path /bennet* {
|
||||
root * ${pkgs.jolheiser.bennet}
|
||||
|
|
@ -32,7 +36,7 @@ in {
|
|||
file_server
|
||||
}
|
||||
'';
|
||||
serverAliases = ["www.jolheiser.com"];
|
||||
serverAliases = [ "www.jolheiser.com" ];
|
||||
};
|
||||
"blog.jolheiser.com" = {
|
||||
extraConfig = ''
|
||||
|
|
|
|||
|
|
@ -1,8 +1,23 @@
|
|||
let
|
||||
username = "jolheiser";
|
||||
key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
|
||||
in {
|
||||
imports = [./actual.nix ./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./tclip.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./actual.nix
|
||||
./caddy.nix
|
||||
./dex.nix
|
||||
./git-pr.nix
|
||||
./golink.nix
|
||||
./gotosocial.nix
|
||||
./restic.nix
|
||||
./soju.nix
|
||||
./tandoor.nix
|
||||
./tclip.nix
|
||||
./ugit.nix
|
||||
./vikunja.nix
|
||||
./hardware.nix
|
||||
];
|
||||
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
zramSwap.enable = true;
|
||||
|
|
@ -12,7 +27,11 @@ in {
|
|||
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [80 443 6697];
|
||||
allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
6697
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -23,13 +42,15 @@ in {
|
|||
|
||||
users.users = {
|
||||
"${username}" = {
|
||||
extraGroups = ["wheel" "docker" "storage"];
|
||||
isNormalUser = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
key
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"docker"
|
||||
"storage"
|
||||
];
|
||||
isNormalUser = true;
|
||||
openssh.authorizedKeys.keys = [ key ];
|
||||
};
|
||||
"root".openssh.authorizedKeys.keys = [key];
|
||||
"root".openssh.authorizedKeys.keys = [ key ];
|
||||
};
|
||||
|
||||
system.stateVersion = "22.11";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -3,7 +3,9 @@
|
|||
enable = true;
|
||||
openFirewall = true;
|
||||
url = "pr.jolheiser.com";
|
||||
admins = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
|
||||
admins = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
|
||||
];
|
||||
sshPort = 7448;
|
||||
enableWeb = true;
|
||||
webPort = 7449;
|
||||
|
|
|
|||
|
|
@ -10,12 +10,13 @@ let
|
|||
}
|
||||
];
|
||||
in
|
||||
builtins.concatStringsSep "\n" (builtins.map (module: ''
|
||||
respond /${module.name}* `<html><head>
|
||||
<meta name="go-import" content="go.jolheiser.com/${module.name} git https://${module.repo}.git">
|
||||
<meta http-equiv="refresh" content="3; url=https://pkg.go.dev/go.jolheiser.com/${module.name}" />
|
||||
</head><body>
|
||||
Redirecting to <a href="https://pkg.go.dev/go.jolheiser.com/${module.name}">https://pkg.go.dev/go.jolheiser.com/${module.name}</a>
|
||||
</body></html>`
|
||||
'')
|
||||
modules)
|
||||
builtins.concatStringsSep "\n" (
|
||||
builtins.map (module: ''
|
||||
respond /${module.name}* `<html><head>
|
||||
<meta name="go-import" content="go.jolheiser.com/${module.name} git https://${module.repo}.git">
|
||||
<meta http-equiv="refresh" content="3; url=https://pkg.go.dev/go.jolheiser.com/${module.name}" />
|
||||
</head><body>
|
||||
Redirecting to <a href="https://pkg.go.dev/go.jolheiser.com/${module.name}">https://pkg.go.dev/go.jolheiser.com/${module.name}</a>
|
||||
</body></html>`
|
||||
'') modules
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.golink = {
|
||||
enable = true;
|
||||
tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
{modulesPath, ...}: {
|
||||
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
|
||||
{ modulesPath, ... }:
|
||||
{
|
||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
|
||||
boot.initrd.kernelModules = ["nvme"];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"ata_piix"
|
||||
"uhci_hcd"
|
||||
"xen_blkfront"
|
||||
"vmw_pvscsi"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "nvme" ];
|
||||
fileSystems."/" = {
|
||||
device = "/dev/sda1";
|
||||
fsType = "ext4";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{config, ...}: {
|
||||
{ config, ... }:
|
||||
{
|
||||
age.secrets = {
|
||||
restic-env.file = ../../secrets/personal/restic-env.age;
|
||||
restic-pass.file = ../../secrets/personal/restic-pass.age;
|
||||
|
|
@ -9,8 +10,12 @@
|
|||
environmentFile = config.age.secrets.restic-env.path;
|
||||
passwordFile = config.age.secrets.restic-pass.path;
|
||||
repositoryFile = config.age.secrets.restic-repo.path;
|
||||
paths = ["/var/lib/ugit/repos"];
|
||||
pruneOpts = ["--keep-daily 7" "--keep-weekly 2" "--keep-monthly 2"];
|
||||
paths = [ "/var/lib/ugit/repos" ];
|
||||
pruneOpts = [
|
||||
"--keep-daily 7"
|
||||
"--keep-weekly 2"
|
||||
"--keep-monthly 2"
|
||||
];
|
||||
timerConfig = {
|
||||
OnCalendar = "daily";
|
||||
Persistent = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{lib, ...}: let
|
||||
{ lib, ... }:
|
||||
let
|
||||
baseCertPath = "/var/lib/acme/irc.jolheiser.com";
|
||||
in {
|
||||
in
|
||||
{
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
email = "irc@jolheiser.com";
|
||||
|
|
@ -26,6 +28,6 @@ in {
|
|||
isSystemUser = true;
|
||||
group = "soju";
|
||||
};
|
||||
groups.soju = {};
|
||||
groups.soju = { };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
services.ugit = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
authorizedKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
|
||||
authorizedKeys = [
|
||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
|
||||
];
|
||||
tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key
|
||||
config = {
|
||||
ssh.clone-url = "ugit@git.jolheiser.com";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
{pkgs, ...}: let
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
username = "jolheiser";
|
||||
in {
|
||||
imports = [./hardware.nix ../common/gui];
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
../common/gui
|
||||
];
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["quiet" "splash"];
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
];
|
||||
loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
|
@ -28,7 +36,11 @@ in {
|
|||
virtualisation.docker.enable = true;
|
||||
|
||||
users.users."${username}" = {
|
||||
extraGroups = ["wheel" "docker" "storage"];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"docker"
|
||||
"storage"
|
||||
];
|
||||
isNormalUser = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,15 +6,20 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"thunderbolt"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/90652083-df9c-42df-8c8a-8d979a3e1e0c";
|
||||
|
|
@ -26,9 +31,7 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849";}
|
||||
];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/2034b9e4-011b-4715-a7a2-5f5445dc2849"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,11 +1,19 @@
|
|||
{pkgs, ...}: let
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
username = "jolheiser";
|
||||
in {
|
||||
imports = [./hardware.nix ../common/gui];
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
../common/gui
|
||||
];
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["quiet" "splash"];
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
];
|
||||
loader.grub = {
|
||||
enable = true;
|
||||
device = "/dev/sda";
|
||||
|
|
@ -14,7 +22,9 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
boot.initrd.secrets = {"/crypto_keyfile.bin" = null;};
|
||||
boot.initrd.secrets = {
|
||||
"/crypto_keyfile.bin" = null;
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
"luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".keyFile = "/crypto_keyfile.bin";
|
||||
|
|
@ -24,7 +34,9 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
hardware = {bluetooth.enable = true;};
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
};
|
||||
|
||||
networking = {
|
||||
hostName = "matcha";
|
||||
|
|
@ -41,7 +53,11 @@ in {
|
|||
virtualisation.docker.enable = true;
|
||||
|
||||
users.users."${username}" = {
|
||||
extraGroups = ["wheel" "docker" "storage"];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"docker"
|
||||
"storage"
|
||||
];
|
||||
isNormalUser = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
|
|
@ -18,9 +19,9 @@
|
|||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-intel"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/a3e3e496-9497-4340-9750-2104e2ab22ab";
|
||||
|
|
@ -34,7 +35,7 @@
|
|||
|
||||
boot.initrd.luks.devices."luks-1f9bde68-9c4c-423c-a95f-17aa170dd2b4".device = "/dev/disk/by-uuid/1f9bde68-9c4c-423c-a95f-17aa170dd2b4";
|
||||
|
||||
swapDevices = [{device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85";}];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/7e84d904-b00a-4c6c-aba4-ec1dde2dff85"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
@ -45,6 +46,5 @@
|
|||
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,16 @@
|
|||
{pkgs, ...}: {
|
||||
imports = [./hardware.nix ../common/gui];
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware.nix
|
||||
../common/gui
|
||||
];
|
||||
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["quiet" "splash"];
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
];
|
||||
};
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
|
|
@ -11,14 +18,16 @@
|
|||
|
||||
boot.initrd.luks.devices."luks-c1c666de-2c68-4d50-98f1-3974ef424ff3".device = "/dev/disk/by-uuid/c1c666de-2c68-4d50-98f1-3974ef424ff3";
|
||||
|
||||
hardware = {bluetooth.enable = true;};
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
};
|
||||
|
||||
networking = {
|
||||
hostName = "sencha";
|
||||
networkmanager.enable = true;
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [8096];
|
||||
allowedTCPPorts = [ 8096 ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -28,7 +37,10 @@
|
|||
pcscd.enable = true;
|
||||
printing = {
|
||||
enable = true;
|
||||
drivers = [pkgs.canon-cups-ufr2 pkgs.cnijfilter_4_00];
|
||||
drivers = [
|
||||
pkgs.canon-cups-ufr2
|
||||
pkgs.cnijfilter_4_00
|
||||
];
|
||||
};
|
||||
jellyfin.enable = true;
|
||||
mullvad-vpn = {
|
||||
|
|
@ -44,11 +56,19 @@
|
|||
users = {
|
||||
olheiser.isNormalUser = true;
|
||||
jolheiser = {
|
||||
extraGroups = ["wheel" "docker" "storage"];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"docker"
|
||||
"storage"
|
||||
];
|
||||
isNormalUser = true;
|
||||
};
|
||||
};
|
||||
groups.media.members = ["jolheiser" "olheiser" "jellyfin"];
|
||||
groups.media.members = [
|
||||
"jolheiser"
|
||||
"olheiser"
|
||||
"jellyfin"
|
||||
];
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -6,15 +6,22 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = [];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
"rtsx_usb_sdmmc"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/d1f561b1-bc50-4e34-9ca6-e973d2d9437a";
|
||||
|
|
@ -28,9 +35,7 @@
|
|||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504";}
|
||||
];
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504"; } ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.services.tclip;
|
||||
in {
|
||||
in
|
||||
{
|
||||
options.services.tclip = {
|
||||
enable = lib.mkEnableOption "tclip service";
|
||||
|
||||
|
|
@ -71,31 +69,29 @@ in {
|
|||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.tclip = {
|
||||
description = "tclip Service";
|
||||
after = ["network.target"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = let
|
||||
args =
|
||||
lib.optionals (cfg.httpPort != null) [
|
||||
"--http-port=${cfg.httpPort}"
|
||||
]
|
||||
++ lib.optionals (cfg.controlURL != null) [
|
||||
"--control-url=${cfg.controlURL}"
|
||||
]
|
||||
++ [
|
||||
(lib.optionalString cfg.disableHTTPS "--disable-https")
|
||||
"--hostname=${cfg.hostname}"
|
||||
"--data-location=${cfg.dataLocation}"
|
||||
(lib.optionalString cfg.tsnetVerbose "--tsnet-verbose")
|
||||
(lib.optionalString cfg.useFunnel "--use-funnel")
|
||||
(lib.optionalString cfg.hideFunnelUsers "--hide-funnel-users")
|
||||
];
|
||||
in "${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}";
|
||||
ExecStart =
|
||||
let
|
||||
args =
|
||||
lib.optionals (cfg.httpPort != null) [ "--http-port=${cfg.httpPort}" ]
|
||||
++ lib.optionals (cfg.controlURL != null) [ "--control-url=${cfg.controlURL}" ]
|
||||
++ [
|
||||
(lib.optionalString cfg.disableHTTPS "--disable-https")
|
||||
"--hostname=${cfg.hostname}"
|
||||
"--data-location=${cfg.dataLocation}"
|
||||
(lib.optionalString cfg.tsnetVerbose "--tsnet-verbose")
|
||||
(lib.optionalString cfg.useFunnel "--use-funnel")
|
||||
(lib.optionalString cfg.hideFunnelUsers "--hide-funnel-users")
|
||||
];
|
||||
in
|
||||
"${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}";
|
||||
Restart = "always";
|
||||
User = "tclip";
|
||||
Group = "tclip";
|
||||
Environment = ["TS_AUTHKEY=${cfg.authKey}"];
|
||||
Environment = [ "TS_AUTHKEY=${cfg.authKey}" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -107,6 +103,6 @@ in {
|
|||
createHome = true;
|
||||
};
|
||||
|
||||
users.groups.tclip = {};
|
||||
users.groups.tclip = { };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,19 +5,47 @@ let
|
|||
sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am";
|
||||
dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53";
|
||||
|
||||
all = [jolheiser matcha genmaicha sencha dragonwell];
|
||||
in {
|
||||
all = [
|
||||
jolheiser
|
||||
matcha
|
||||
genmaicha
|
||||
sencha
|
||||
dragonwell
|
||||
];
|
||||
in
|
||||
{
|
||||
"shared/cachix.age".publicKeys = all;
|
||||
"shared/ssh-config.age".publicKeys = all;
|
||||
"shared/spotify.age".publicKeys = all;
|
||||
"shared/irc-pw.age".publicKeys = all;
|
||||
"shared/gist-pw.age".publicKeys = all;
|
||||
"shared/git-send-email.age".publicKeys = all;
|
||||
"personal/restic-env.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/restic-pass.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/restic-repo.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/dex.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/dex-tandoor.age".publicKeys = [jolheiser dragonwell];
|
||||
"personal/restic-env.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
"personal/restic-pass.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
"personal/restic-repo.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
"personal/dex.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
"personal/dex-tailscale.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
"personal/dex-vikunja.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
"personal/dex-tandoor.age".publicKeys = [
|
||||
jolheiser
|
||||
dragonwell
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue