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:de1493ef9100cf9d698ecadc543769d4229aa204
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
..
compare: jolheiser:f842b41e6643c02dce2818a9750e767c0700b499
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

No commits in common. "de1493ef9100cf9d698ecadc543769d4229aa204" and "f842b41e6643c02dce2818a9750e767c0700b499" have entirely different histories.
de1493ef91 ... f842b41e66

10 changed files with 15 additions and 106 deletions
Show Stats Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -1,3 +1,6 @@
# Age # Age
apps/gui/firefox/work.nix filter=git-age diff=git-age apps/gui/firefox/work.nix filter=git-age diff=git-age
machines/chai/cifs.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

9
apps/gui/default.nix
View File

@ -34,14 +34,9 @@
jolheiser.nur.kv jolheiser.nur.kv
]; ];
}; };
dconf.settings = let dconf.settings = {
wallpaper = pkgs.fetchurl {
url = "https://user.fm/files/v2-3834da30df507c4ba97a551571e98e33/nixppuccin.png";
hash = "sha256-dwM+Wi2gse7Eu4f/suU2BsVACPHMfSaXYOpZPqx6/SQ=";
};
in {
"org/cinnamon/desktop/background" = { "org/cinnamon/desktop/background" = {
picture-uri = "file://${wallpaper}"; picture-uri = "file://${./wallpaper/nixppuccin.png}";
}; };
"org/cinnamon/desktop/interface" = { "org/cinnamon/desktop/interface" = {
font-name = "Monaspace Neon 10"; font-name = "Monaspace Neon 10";

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

Binary file not shown.

5
apps/nogui/git.nix
View File

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

71
flake.lock
View File

@ -372,7 +372,6 @@
"tclip": "tclip", "tclip": "tclip",
"templ": "templ", "templ": "templ",
"tmpl": "tmpl", "tmpl": "tmpl",
"ugit": "ugit",
"website": "website", "website": "website",
"wsl": "wsl" "wsl": "wsl"
} }
@ -395,7 +394,7 @@
"tailwind-ctp": { "tailwind-ctp": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"ugit", "website",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -414,27 +413,6 @@
} }
}, },
"tailwind-ctp-lsp": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"website", "website",
@ -455,27 +433,6 @@
"url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense" "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": { "tclip": {
"inputs": { "inputs": {
"gomod2nix": "gomod2nix", "gomod2nix": "gomod2nix",
@ -542,28 +499,6 @@
"url": "https://git.jojodev.com/jolheiser/tmpl" "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": { "website": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -575,8 +510,8 @@
"nur": [ "nur": [
"jolheiser-nur" "jolheiser-nur"
], ],
"tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp": "tailwind-ctp",
"tailwind-ctp-lsp": "tailwind-ctp-lsp_2" "tailwind-ctp-lsp": "tailwind-ctp-lsp"
}, },
"locked": { "locked": {
"lastModified": 1699404161, "lastModified": 1699404161,

6
flake.nix
View File

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

2
machines/dragonwell/caddy.nix
View File

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

3
machines/dragonwell/default.nix
View File

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

19
machines/dragonwell/ugit.nix
View File

@ -1,19 +0,0 @@
{
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"
];
};
};
};
}

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

Binary file not shown.