jolheiser
/
dotnix
mirror of https://git.jolheiser.com/dotnix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: jolheiser:f00799a7ab85fd25bd7eacdc48d1e06e841ac05d
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
...
compare: jolheiser:9c02a695271190fa6f89db8537667e140f9961a3
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

3 Commits
f00799a7ab ... 9c02a69527

Author SHA1 Message Date
jolheiser 9c02a69527
chore: move gtk and de-related things to specific dir, clean up statix 
Signed-off-by: jolheiser <git@jolheiser.com>
 2024-08-08 21:50:43 -05:00
jolheiser 66bc4569a3
feat: ghostty nix 
Signed-off-by: jolheiser <git@jolheiser.com>
 2024-08-08 21:29:29 -05:00
jolheiser 7785136999
feat: move remaining rsa keys to ed25519 
Signed-off-by: jolheiser <git@jolheiser.com>
 2024-08-08 17:24:50 -05:00
13 changed files with 327 additions and 78 deletions
Show Stats Expand all files Collapse all files

27
apps/de/default.nix 100644
View File

@ -0,0 +1,27 @@
{ pkgs, ... }:
{
imports = [ ./gtk.nix ];
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";
};
};
}

0
apps/gui/gtk.nix → apps/de/gtk.nix
View File

25
apps/gui/default.nix
View File

@ -5,9 +5,7 @@
./firefox.nix ./firefox.nix
./flameshot.nix ./flameshot.nix
./ghostty.nix ./ghostty.nix
./gtk.nix
./spotify.nix ./spotify.nix
#./tiny.nix
./wezterm.nix ./wezterm.nix
./zed.nix ./zed.nix
]; ];
@ -18,33 +16,10 @@
delve delve
discord discord
obsidian obsidian
spotify-player
# LSPs # LSPs
marksman marksman
nodePackages.yaml-language-server 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=";
};
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";
};
};
} }

8
apps/gui/ghostty.nix
View File

@ -1,3 +1,4 @@
{ pkgs, ... }:
{ {
xdg.configFile."ghostty/config".text = '' xdg.configFile."ghostty/config".text = ''
background-opacity = 0.9 background-opacity = 0.9
@ -8,7 +9,8 @@
term = xterm-256color term = xterm-256color
''; '';
# zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast # zig build -p ~/.local/share/ghostty -Doptimize=ReleaseFast
xdg.systemDirs.data = [ "/home/jolheiser/.local/share/ghostty/share" ]; # xdg.systemDirs.data = [ "/home/jolheiser/.local/share/ghostty/share" ];
home.sessionPath = [ "/home/jolheiser/.local/share/ghostty/bin" ]; # home.sessionPath = [ "/home/jolheiser/.local/share/ghostty/bin" ];
programs.bash.enable = true; # programs.bash.enable = true;
home.packages = [ pkgs.ghostty ];
} }

1
apps/gui/spotify.nix
View File

@ -1,5 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.spotify-player ];
xdg.configFile."spotify-player/theme.toml".text = builtins.readFile ( xdg.configFile."spotify-player/theme.toml".text = builtins.readFile (
pkgs.fetchFromGitHub { pkgs.fetchFromGitHub {
owner = "catppuccin"; owner = "catppuccin";

36
apps/gui/tiny.nix
View File

@ -1,36 +0,0 @@
{ config, ... }:
{
programs.tiny = {
enable = true;
settings = {
servers = [
{
addr = "irc.libera.chat";
port = 6697;
tls = true;
realname = "jolheiser";
nicks = [ "jolheiser" ];
alias = "LiberaChat";
join = [
"#gitea"
"#gitea-devel"
];
sasl = {
username = "jolheiser";
password = {
command = "cat ${config.age.secrets.irc-pw.path}";
};
};
}
];
defaults = {
nicks = [ "jolheiser" ];
realname = "jolheiser";
};
key_map = {
alt_left = "tab_prev";
alt_right = "tab_next";
};
};
};
}

2
apps/nogui/git.nix
View File

@ -69,6 +69,6 @@ in
difftastic = { difftastic = {
enable = true; enable = true;
}; };
includes = [ { path = config.age.secrets.git-send-email.path; } ]; includes = [ { inherit (config.age.secrets.git-send-email) path; } ];
}; };
} }

292
flake.lock
View File

@ -106,6 +106,22 @@
"url": "https://git.jolheiser.com/cfg.git" "url": "https://git.jolheiser.com/cfg.git"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -128,6 +144,60 @@
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": "systems_6"
},
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
@ -142,7 +212,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_6": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -157,9 +227,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_7": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -175,6 +245,27 @@
"type": "github" "type": "github"
} }
}, },
"ghostty": {
"inputs": {
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"zig": "zig",
"zls": "zls"
},
"locked": {
"lastModified": 1723168569,
"narHash": "sha256-VTo/HNmYQ1ctAzdCOvtInQf9grhSuRLGA8FGP/4pVew=",
"ref": "refs/heads/main",
"rev": "33d9c043ef828b062865f42db551d6ddc48e2def",
"revCount": 6848,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
"original": {
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
}
},
"gist": { "gist": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -239,6 +330,28 @@
} }
}, },
"gitignore": { "gitignore": {
"inputs": {
"nixpkgs": [
"ghostty",
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"templ", "templ",
@ -309,7 +422,7 @@
}, },
"gomod2nix_2": { "gomod2nix_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"templ", "templ",
"nixpkgs" "nixpkgs"
@ -331,7 +444,7 @@
}, },
"gomod2nix_3": { "gomod2nix_3": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_7",
"nixpkgs": [ "nixpkgs": [
"ugit", "ugit",
"nixpkgs" "nixpkgs"
@ -431,6 +544,18 @@
"url": "https://git.jolheiser.com/nur.git" "url": "https://git.jolheiser.com/nur.git"
} }
}, },
"langref": {
"flake": false,
"locked": {
"narHash": "sha256-O6p2tiKD8ZMhSX+DeA/o5hhAvcPkU2J9lFys/r11peY=",
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
},
"original": {
"type": "file",
"url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
}
},
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1722332872, "lastModified": 1722332872,
@ -463,6 +588,38 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1705957679,
"narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1719082008,
"narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9693852a2070b398ee123a329e68f0dab5526681",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1721562059, "lastModified": 1721562059,
@ -524,6 +681,7 @@
"blog": "blog", "blog": "blog",
"cfg": "cfg", "cfg": "cfg",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"ghostty": "ghostty",
"gist": "gist", "gist": "gist",
"git-age": "git-age", "git-age": "git-age",
"git-pr": "git-pr", "git-pr": "git-pr",
@ -604,6 +762,51 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tailwind-ctp": { "tailwind-ctp": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -712,7 +915,7 @@
}, },
"templ": { "templ": {
"inputs": { "inputs": {
"gitignore": "gitignore", "gitignore": "gitignore_2",
"gomod2nix": "gomod2nix_2", "gomod2nix": "gomod2nix_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -826,7 +1029,7 @@
}, },
"xc": { "xc": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_6",
"nixpkgs": [ "nixpkgs": [
"templ", "templ",
"nixpkgs" "nixpkgs"
@ -845,6 +1048,81 @@
"repo": "xc", "repo": "xc",
"type": "github" "type": "github"
} }
},
"zig": {
"inputs": {
"flake-compat": [
"ghostty"
],
"flake-utils": "flake-utils_2",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1717848532,
"narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"ghostty",
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1718539737,
"narHash": "sha256-hvQ900gSqzGnJWMRQwv65TixciIbC44iX0Nh5ENRwCU=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "6eb42ce6f85d247b1aecf854c45d80902821d0ad",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_3",
"gitignore": "gitignore",
"langref": "langref",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
],
"zig-overlay": "zig-overlay"
},
"locked": {
"lastModified": 1718930611,
"narHash": "sha256-FtfVhs6XHNfSQRQorrrz03nD0LCNp2FCnGllRntHBts=",
"owner": "zigtools",
"repo": "zls",
"rev": "0b9746b60c2020ab948f6556f1c729858b82a0f0",
"type": "github"
},
"original": {
"owner": "zigtools",
"ref": "master",
"repo": "zls",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

6
flake.nix
View File

@ -112,6 +112,9 @@
url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; url = "git+https://git.jolheiser.com/tsnet-serve-nix.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ghostty = {
url = "git+ssh://git@github.com/ghostty-org/ghostty";
};
}; };
outputs = outputs =
@ -144,6 +147,7 @@
}; };
tclip = inputs.tclip.packages.${prev.system}.tclip; tclip = inputs.tclip.packages.${prev.system}.tclip;
templ = inputs.templ.packages.${prev.system}.templ; templ = inputs.templ.packages.${prev.system}.templ;
ghostty = inputs.ghostty.packages.${prev.system}.ghostty;
}) })
inputs.golink.overlay inputs.golink.overlay
]; ];
@ -201,7 +205,7 @@
homeConfigurations = { homeConfigurations = {
"jolheiser" = home-manager.lib.homeManagerConfiguration { "jolheiser" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = homeManagerModules; modules = homeManagerModules ++ [ ./apps/de ];
}; };
}; };
nixosConfigurations = { nixosConfigurations = {

2
machines/dragonwell/default.nix
View File

@ -1,6 +1,6 @@
let let
username = "jolheiser"; username = "jolheiser";
key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa";
in in
{ {
imports = [ imports = [

4
machines/dragonwell/git-pr.nix
View File

@ -3,9 +3,7 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
url = "pr.jolheiser.com"; url = "pr.jolheiser.com";
admins = [ admins = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB" ];
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"
];
sshPort = 7448; sshPort = 7448;
enableWeb = true; enableWeb = true;
webPort = 7449; webPort = 7449;

2
machines/dragonwell/ugit.nix
View File

@ -3,7 +3,7 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
authorizedKeys = [ authorizedKeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXoiWcPkL5kUAqJfMxnPM/ND4qJ4kKShDhXdqnYv2ZB"
]; ];
tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key tsAuthKey = "tskey-auth-kRUJE7zxH621CNTRL-Td29STXSrtTUHdacaKaYtTD82uyDXZj7"; # One-time key
config = { config = {

BIN
secrets/shared/ssh-config.age
View File

Binary file not shown.