Compare commits

...

2 Commits

Author SHA1 Message Date
jolheiser de1493ef91
chore: move from LFS to hosted image
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2024-01-15 17:58:05 -06:00
jolheiser e413d1de3f
feat: ugit
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2024-01-15 17:26:44 -06:00
10 changed files with 106 additions and 15 deletions

3
.gitattributes vendored
View File

@ -1,6 +1,3 @@
# Age
apps/gui/firefox/work.nix filter=git-age diff=git-age
machines/chai/cifs.nix filter=git-age diff=git-age
# Git LFS
*.png filter=lfs diff=lfs merge=lfs -text

View File

@ -34,9 +34,14 @@
jolheiser.nur.kv
];
};
dconf.settings = {
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/nixppuccin.png}";
picture-uri = "file://${wallpaper}";
};
"org/cinnamon/desktop/interface" = {
font-name = "Monaspace Neon 10";

BIN
apps/gui/wallpaper/nixppuccin.png (Stored with Git LFS)

Binary file not shown.

View File

@ -42,7 +42,10 @@ in {
};
pull.rebase = true;
url =
insteadOf "gh" "github.com"
{
"ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";
}
// insteadOf "gh" "github.com"
// insteadOf "jj" "git.jojodev.com"
// insteadOf "gt" "gitea.com"
// insteadOf "gl" "gitlab.com"

View File

@ -372,6 +372,7 @@
"tclip": "tclip",
"templ": "templ",
"tmpl": "tmpl",
"ugit": "ugit",
"website": "website",
"wsl": "wsl"
}
@ -394,7 +395,7 @@
"tailwind-ctp": {
"inputs": {
"nixpkgs": [
"website",
"ugit",
"nixpkgs"
]
},
@ -413,6 +414,27 @@
}
},
"tailwind-ctp-lsp": {
"inputs": {
"nixpkgs": [
"ugit",
"nixpkgs"
]
},
"locked": {
"lastModified": 1699401590,
"narHash": "sha256-nx8ExuBRUux9eXSUgkWp1LJMvA3dmA76+2xggZjHTU0=",
"ref": "refs/heads/master",
"rev": "b321333ad08bf21db242f246b10ad4a50b8fc8a0",
"revCount": 848,
"type": "git",
"url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"
},
"original": {
"type": "git",
"url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"
}
},
"tailwind-ctp-lsp_2": {
"inputs": {
"nixpkgs": [
"website",
@ -433,6 +455,27 @@
"url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"
}
},
"tailwind-ctp_2": {
"inputs": {
"nixpkgs": [
"website",
"nixpkgs"
]
},
"locked": {
"lastModified": 1695841587,
"narHash": "sha256-fgiZd5AV+hi8Ne0bJ8SyAx5nppseW4aXJQEIDSr0VNA=",
"ref": "refs/heads/main",
"rev": "afca060674b20e0ccecde2d6fe88c887790219a5",
"revCount": 1,
"type": "git",
"url": "https://git.jojodev.com/jolheiser/tailwind-ctp"
},
"original": {
"type": "git",
"url": "https://git.jojodev.com/jolheiser/tailwind-ctp"
}
},
"tclip": {
"inputs": {
"gomod2nix": "gomod2nix",
@ -499,6 +542,28 @@
"url": "https://git.jojodev.com/jolheiser/tmpl"
}
},
"ugit": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"tailwind-ctp": "tailwind-ctp",
"tailwind-ctp-lsp": "tailwind-ctp-lsp"
},
"locked": {
"lastModified": 1705360631,
"narHash": "sha256-zDmp6FmuTI6D1XvN191rcep+9kOTPEQ5f+HHYioUQro=",
"ref": "refs/heads/main",
"rev": "c7ec799170d3d911117a00e9f9286423058aaecb",
"revCount": 4,
"type": "git",
"url": "https://git.jolheiser.com/ugit.git"
},
"original": {
"type": "git",
"url": "https://git.jolheiser.com/ugit.git"
}
},
"website": {
"inputs": {
"flake-utils": [
@ -510,8 +575,8 @@
"nur": [
"jolheiser-nur"
],
"tailwind-ctp": "tailwind-ctp",
"tailwind-ctp-lsp": "tailwind-ctp-lsp"
"tailwind-ctp": "tailwind-ctp_2",
"tailwind-ctp-lsp": "tailwind-ctp-lsp_2"
},
"locked": {
"lastModified": 1699404161,

View File

@ -66,6 +66,11 @@
url = "git+https://git.jojodev.com/jolheiser/gomodinit";
inputs.nixpkgs.follows = "nixpkgs";
};
ugit = {
url = "git+https://git.jolheiser.com/ugit.git";
#url = "git+https://git.jojodev.com/jolheiser/ugit.git";
inputs.nixpkgs.follows = "nixpkgs";
};
# Other flakes
golink = {
url = "github:tailscale/golink";
@ -232,6 +237,7 @@
dragonwell = {
imports = [
inputs.golink.nixosModules.default
inputs.ugit.nixosModules.default
./machines/dragonwell
];
};

View File

@ -45,7 +45,7 @@
};
"git.jolheiser.com" = {
extraConfig = ''
redir https://git.jojodev.com/jolheiser{uri}
reverse_proxy localhost:8449
'';
};
};

View File

@ -2,7 +2,7 @@ let
username = "jolheiser";
key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
in {
imports = [./caddy.nix ./golink.nix ./hardware.nix];
imports = [./caddy.nix ./golink.nix ./ugit.nix ./hardware.nix];
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true;
@ -17,7 +17,6 @@ in {
};
services.openssh.enable = true;
virtualisation.docker.enable = true;
users.users = {
"${username}" = {

View File

@ -0,0 +1,19 @@
{
services.ugit = {
enable = true;
openFirewall = true;
authorizedKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
config = {
ssh.clone-url = "ugit@git.jolheiser.com";
http.clone-url = "https://git.jolheiser.com";
profile = {
username = "jolheiser";
email = "john+ugit@jolheiser.com";
links = [
"Github,https://github.com/jolheiser"
"Gitea,https://gitea.com/jolheiser"
];
};
};
};
}

Binary file not shown.