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:1939f193eb1027c80a7d5f7f4a7d1c85bfa8bdc5
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity
..
compare: jolheiser:ce53fe0a11d5b409fe5b74a4310ebdc2a0148d6a
Branches Tags
jolheiser:main
jolheiser:jenkins
jolheiser:homepage
jolheiser:concourse
jolheiser:teamcity

No commits in common. "1939f193eb1027c80a7d5f7f4a7d1c85bfa8bdc5" and "ce53fe0a11d5b409fe5b74a4310ebdc2a0148d6a" have entirely different histories.
1939f193eb ... ce53fe0a11

4 changed files with 22 additions and 86 deletions
Show Stats Expand all files Collapse all files

4
apps/gui/zed.nix
View File

@ -15,9 +15,5 @@
theme = "Catppuccin Mocha"; theme = "Catppuccin Mocha";
ui_font_size = 16; ui_font_size = 16;
vim_mode = false; vim_mode = false;
assistant = {
version = "1";
provider.name = "anthropic";
};
}; };
} }

94
flake.lock
View File

@ -58,24 +58,6 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -141,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709087332, "lastModified": 1694102001,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,28 +184,6 @@
"type": "github" "type": "github"
} }
}, },
"gomod2nix_2": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"templ",
"nixpkgs"
]
},
"locked": {
"lastModified": 1710154385,
"narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=",
"owner": "nix-community",
"repo": "gomod2nix",
"rev": "872b63ddd28f318489c929d25f1f0a3c6039c971",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "gomod2nix",
"type": "github"
}
},
"gomodinit": { "gomodinit": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -271,11 +231,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717020155, "lastModified": 1712212014,
"narHash": "sha256-Xpyv9i02ineeGakmmzd45hkBgy2a7Zf/3d6amM6MUb4=", "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1b589257f72c9c54e92d1d631e988e5346156736", "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,11 +266,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1716987116, "lastModified": 1709410583,
"narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +282,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1716769173, "lastModified": 1715534503,
"narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -427,21 +387,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"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": [
@ -553,18 +498,17 @@
"templ": { "templ": {
"inputs": { "inputs": {
"gitignore": "gitignore", "gitignore": "gitignore",
"gomod2nix": "gomod2nix_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"xc": "xc" "xc": "xc"
}, },
"locked": { "locked": {
"lastModified": 1716757164, "lastModified": 1702159064,
"narHash": "sha256-GJOoRiwCyQ39ObWGdp7t4yNVrke1WMpzJjUbs3gakhM=", "narHash": "sha256-9tyQOybmptmDhIfQcuZ8Vq8l3fMLdZfGPw+tjJbWzeQ=",
"owner": "a-h", "owner": "a-h",
"repo": "templ", "repo": "templ",
"rev": "067cc686cd1e44cd0d3b6669a52e24ef115ccc5a", "rev": "ddb1610a81627f5c9c524bb66877477f401e4ecd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -669,18 +613,18 @@
}, },
"xc": { "xc": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"templ", "templ",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1709043057, "lastModified": 1696495449,
"narHash": "sha256-F/u9u1vevCUqgCz0WjcCOPcN+h9kLEP73nBqie86J2w=", "narHash": "sha256-dthZiJ2FX/eIC0l1mdfefJZXDTVLfwp7L7Arq5rsCWA=",
"owner": "joerdav", "owner": "joerdav",
"repo": "xc", "repo": "xc",
"rev": "52cfa7e7f2d5a0d97b45a6f69ff1403a901e78c6", "rev": "c8baab14d679fb276f11c576607010283be21220",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -122,7 +122,7 @@
}) })
inputs.golink.overlay inputs.golink.overlay
]; ];
pkgs = import inputs.nixpkgs { pkgs = import nixpkgs {
inherit overlays system; inherit overlays system;
config.allowUnfree = true; config.allowUnfree = true;
}; };

8
justfile
View File

@ -5,14 +5,14 @@ default:
[private] [private]
rebuild *args: rebuild *args:
@git add . @git add .
@sudo nixos-rebuild --flake . {{args}} |& nix run nixpkgs#nix-output-monitor @sudo nixos-rebuild --flake . {{args}}
# Rebuild the current machine # Rebuild the current machine
switch *args: switch *args:
@just rebuild switch {{args}} @just rebuild switch {{args}}
hm: hm:
@home-manager switch --flake . |& nix run nixpkgs#nix-output-monitor @home-manager switch --flake .
@systemctl --user start agenix.service @systemctl --user start agenix.service
# Rebuild the current machine for next boot # Rebuild the current machine for next boot
@ -31,7 +31,3 @@ update-flake:
# Update an individual input # Update an individual input
update input: update input:
@nix flake lock --update-input {{input}} @nix flake lock --update-input {{input}}
fetch:
@nix run nixpkgs#onefetch -- --true-color never --no-bots -d lines-of-code
@nix run nixpkgs#scc -- --no-cocomo .