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:ab3f96a75428e799d0a9704a910efecb47f97d92
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
..
compare: jolheiser:37490438a571e2658719246b83f6f48599c02d9a
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

4 Commits
ab3f96a754 ... 37490438a5

Author SHA1 Message Date
jolheiser 37490438a5
feat: gomodsri 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2024-03-07 23:07:41 -06:00
jolheiser 5f16a3901e
chore: cleanup 
remove some unused packages and reformat some minor nits

Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2024-03-07 21:00:45 -06:00
jolheiser 8a6066d834
chore: update git insteadofs 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2024-03-07 20:37:46 -06:00
jolheiser f414c40128
chore: update ugit 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2024-03-07 20:04:45 -06:00
7 changed files with 15 additions and 19 deletions
Show Stats Expand all files Collapse all files

9
apps/gui/default.nix
View File

@ -18,20 +18,11 @@
spotify-player spotify-player
# LSPs # LSPs
lua-language-server
marksman marksman
nodePackages.yaml-language-server nodePackages.yaml-language-server
# Formatters
nodePackages.lua-fmt
python3Packages.black
# IDEs # IDEs
jetbrains.goland jetbrains.goland
# Flake overlays
jolheiser.nur.imp
jolheiser.nur.kv
]; ];
}; };
dconf.settings = let dconf.settings = let

2
apps/nogui/default.nix
View File

@ -64,5 +64,5 @@
domain: gist.jojodev.com domain: gist.jojodev.com
''; '';
programs = {home-manager.enable = true;}; programs.home-manager.enable = true;
} }

4
apps/nogui/git.nix
View File

@ -45,9 +45,7 @@ in {
diff.algorithm = "histogram"; diff.algorithm = "histogram";
merge.tool = "hx"; merge.tool = "hx";
url = url =
{ insteadOf "jo" "git.jolheiser.com"
"ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";
}
// insteadOf "gh" "github.com" // insteadOf "gh" "github.com"
// insteadOf "jj" "git.jojodev.com" // insteadOf "jj" "git.jojodev.com"
// insteadOf "gt" "gitea.com" // insteadOf "gt" "gitea.com"

1
apps/nogui/helix.nix
View File

@ -1,3 +1,4 @@
# This entire file is superceded by https://git.jolheiser.com/helix.drv
{pkgs, ...}: let {pkgs, ...}: let
query = scm: query = scm:
builtins.readFile (pkgs.fetchFromGitea { builtins.readFile (pkgs.fetchFromGitea {

8
apps/nogui/nushell/jolheiser.nu
View File

@ -60,6 +60,14 @@ def fg [args ...string] {
| ^fzf --ansi --color 'hl:-1:underline,hl+:-1:underline:reverse' --delimiter ':' --preview "bat --color=always {1} --theme='ctp-mocha' --highlight-line {2}" --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' --bind $"enter:become\(($env.EDITOR) +{2} {1}\)" | ^fzf --ansi --color 'hl:-1:underline,hl+:-1:underline:reverse' --delimiter ':' --preview "bat --color=always {1} --theme='ctp-mocha' --highlight-line {2}" --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' --bind $"enter:become\(($env.EDITOR) +{2} {1}\)"
} }
def gomodsri [] {
let tmp = (mktemp -d)
go mod vendor -o $tmp
let sri = (go run tailscale.com/cmd/nardump@latest --sri $tmp)
$sri | save -f go.mod.sri
rm -rf $tmp
}
## Other ## ## Other ##
$env.EDITOR = hx $env.EDITOR = hx
$env.config = ($env.config | upsert "shell_integration" ("WEZTERM_PANE" not-in $env and "SSH_CLIENT" not-in $env)) $env.config = ($env.config | upsert "shell_integration" ("WEZTERM_PANE" not-in $env and "SSH_CLIENT" not-in $env))

8
flake.lock
View File

@ -547,11 +547,11 @@
"tailwind-ctp-lsp": "tailwind-ctp-lsp" "tailwind-ctp-lsp": "tailwind-ctp-lsp"
}, },
"locked": { "locked": {
"lastModified": 1709333347, "lastModified": 1709863186,
"narHash": "sha256-XG6MKNrQWb1sFIcbl6bXQMEwS/yTd4IfL9TBjAdqeOQ=", "narHash": "sha256-Qba14UPPIWl95R+QSHJaxvAhL7Uo9LfO3kHovePcrPM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "67d16f4d3e3edbfaa209468f306850b00c9ae2be", "rev": "2615593c2f59ab25cb74d65d968a33cbc834e9c5",
"revCount": 28, "revCount": 29,
"type": "git", "type": "git",
"url": "https://git.jolheiser.com/ugit.git" "url": "https://git.jolheiser.com/ugit.git"
}, },

2
machines/genmaicha/default.nix
View File

@ -12,8 +12,6 @@ in {
}; };
}; };
hardware = {bluetooth.enable = true;};
networking = { networking = {
hostName = "genmaicha"; hostName = "genmaicha";
networkmanager.enable = true; networkmanager.enable = true;