Compare commits
8 Commits
d4217d03e5
...
ffcbcbdea5
| Author | SHA1 | Date | |
|---|---|---|---|
|
ffcbcbdea5
|
|||
|
7960e2a975
|
|||
|
f656ea9eb9
|
|||
|
6fe546b632
|
|||
|
5e84ea16ea
|
|||
|
8bc0a85525
|
|||
|
b39822cdc9
|
|||
|
9e485d2351
|
6
.pre-commit-config.yaml
Normal file
6
.pre-commit-config.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
repos:
|
||||
- repo: https://github.com/nixos/nixfmt
|
||||
rev: v1.2.0
|
||||
hooks:
|
||||
- id: nixfmt-nix
|
||||
args: [--, --check]
|
||||
59
flake.lock
generated
59
flake.lock
generated
@@ -1,5 +1,21 @@
|
||||
{
|
||||
"nodes": {
|
||||
"assets": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1771625274,
|
||||
"narHash": "sha256-2wWMWsPnIweJWiojeTXdnsTsKzU9R4igc6p50rEAkpk=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "7eceaa56b64490ef15ce651e2376eae553d1d50a",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "https://git.janezic.dev/janezicmatej/assets.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.janezic.dev/janezicmatej/assets.git"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"fromYaml": "fromYaml"
|
||||
@@ -284,11 +300,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770681890,
|
||||
"narHash": "sha256-ommto8XEvGMYGuvrIjj2VM1tFZkRoLLmSuie+fvTTOk=",
|
||||
"lastModified": 1771545891,
|
||||
"narHash": "sha256-aaVUfc/9q2pCsELZmYhf+uvYRMCUlBvccgL1VS27R+o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "neovim-nightly-overlay",
|
||||
"rev": "3560c52c15aad8fccd4f62ae794b622969050202",
|
||||
"rev": "917b72d5e27bc217440655b81f701d7062bdd198",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -300,11 +316,11 @@
|
||||
"neovim-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1770678367,
|
||||
"narHash": "sha256-suvGeMX6UQdyGuSNRLH4zJ25b72XfQBDva7Fxm+PNiA=",
|
||||
"lastModified": 1771541613,
|
||||
"narHash": "sha256-1Rpt5B4pNW/MNkWoEamqwCa5I4/9G84dSqp4eHS5zsA=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "57fc77ed29ad9005d893a9dc2f37b3ad53aec4e6",
|
||||
"rev": "e3d46a63375c84b7bd409f1f07ef56eb985eae50",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -351,11 +367,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1770537093,
|
||||
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
|
||||
"lastModified": 1771207753,
|
||||
"narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
|
||||
"rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -367,11 +383,11 @@
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1770713048,
|
||||
"narHash": "sha256-YU2SCyrWaoGgpdsHvpX5wZgbRtWnp3FfN1fSWX1aSpc=",
|
||||
"lastModified": 1771612900,
|
||||
"narHash": "sha256-ToJ0wYbphG1ZN7bgGpCJxu69Tt3ij0+T6W4YljLCHak=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2123953aa6e9e1045857adac93ce7c9a4a5d81d8",
|
||||
"rev": "f65d4c996f96838b8f50253859cf7b17e956a792",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -383,11 +399,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1770537093,
|
||||
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
|
||||
"lastModified": 1771207753,
|
||||
"narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
|
||||
"rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -399,11 +415,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1770617025,
|
||||
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=",
|
||||
"lastModified": 1771419570,
|
||||
"narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482",
|
||||
"rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -463,6 +479,7 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"assets": "assets",
|
||||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"lanzaboote": "lanzaboote",
|
||||
@@ -516,11 +533,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770308890,
|
||||
"narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=",
|
||||
"lastModified": 1771429540,
|
||||
"narHash": "sha256-YKytDx8LOPOvE+dip1ja+1nbIpDVdqTaFbP4MaXwveM=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6",
|
||||
"rev": "1a5c9d8be82127aeccc929f60b952e8a3df6b63c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
32
flake.nix
32
flake.nix
@@ -40,6 +40,11 @@
|
||||
url = "github:nix-community/lanzaboote/v1.0.0";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
assets = {
|
||||
url = "git+https://git.janezic.dev/janezicmatej/assets.git";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
@@ -74,7 +79,7 @@
|
||||
system = "x86_64-linux";
|
||||
format = "install-iso";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [ ./iso.nix ];
|
||||
modules = [ ./hosts/live-iso/configuration.nix ];
|
||||
};
|
||||
|
||||
nixosConfigurations = {
|
||||
@@ -94,11 +99,22 @@
|
||||
lib = nixpkgs.lib;
|
||||
} { };
|
||||
}
|
||||
// flake-utils.lib.eachDefaultSystem (system: {
|
||||
packages = import ./packages {
|
||||
inherit my-lib;
|
||||
lib = nixpkgs.lib;
|
||||
} (inputs // { inherit system; });
|
||||
formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
|
||||
});
|
||||
// flake-utils.lib.eachDefaultSystem (
|
||||
system:
|
||||
let
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
packages = import ./packages {
|
||||
inherit my-lib;
|
||||
lib = nixpkgs.lib;
|
||||
} (inputs // { inherit system; });
|
||||
|
||||
formatter = pkgs.nixfmt-tree;
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
packages = [ pkgs.pre-commit ];
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -24,15 +24,10 @@ in
|
||||
|
||||
yubikey.enable = true;
|
||||
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
|
||||
stylix = {
|
||||
enable = true;
|
||||
polarity = "dark";
|
||||
image = "${inputs.self}/assets/wallpaper.png";
|
||||
image = "${inputs.assets}/wallpaper.png";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
|
||||
};
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ in
|
||||
stylix = {
|
||||
enable = true;
|
||||
polarity = "dark";
|
||||
image = "${inputs.self}/assets/wallpaper.png";
|
||||
image = "${inputs.assets}/wallpaper.png";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
|
||||
};
|
||||
|
||||
|
||||
26
justfile
Normal file
26
justfile
Normal file
@@ -0,0 +1,26 @@
|
||||
[private]
|
||||
default:
|
||||
@just --list
|
||||
|
||||
# rebuild and switch
|
||||
switch:
|
||||
nixos-rebuild switch --flake . --sudo
|
||||
|
||||
# fetch flake inputs
|
||||
sync:
|
||||
nix flake prefetch-inputs
|
||||
|
||||
# update flake inputs
|
||||
update:
|
||||
nix flake update
|
||||
|
||||
# update flake inputs, rebuild and switch
|
||||
bump: update switch
|
||||
|
||||
# build installation iso
|
||||
iso:
|
||||
nix build .#live-iso
|
||||
|
||||
# garbage collect old generations
|
||||
clean:
|
||||
sudo nix-collect-garbage $(nix eval --raw -f ./nix.nix nix.gc.options)
|
||||
@@ -18,22 +18,13 @@ let
|
||||
user: import ../users/${user}/home-manager.nix { inherit inputs; }
|
||||
);
|
||||
|
||||
gib_in_bytes = 1073741824;
|
||||
in
|
||||
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
|
||||
{
|
||||
nix.settings = {
|
||||
download-buffer-size = 1 * gib_in_bytes;
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
};
|
||||
}
|
||||
../nix.nix
|
||||
|
||||
{ nixpkgs.overlays = overlays; }
|
||||
{ nixpkgs.config.allowUnfree = true; }
|
||||
|
||||
23
nix.nix
Normal file
23
nix.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
download-buffer-size = 2 * 1024 * 1024 * 1024;
|
||||
warn-dirty = false;
|
||||
};
|
||||
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "monthly";
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
|
||||
optimise = {
|
||||
automatic = true;
|
||||
dates = [ "monthly" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
[formatter.nix]
|
||||
command = "nix"
|
||||
options = ["fmt"]
|
||||
includes = [ "*.nix" ]
|
||||
@@ -24,6 +24,8 @@ in
|
||||
|
||||
pkgs.starship
|
||||
|
||||
pkgs.claude-code
|
||||
|
||||
# git and co
|
||||
pkgs.git
|
||||
packages.git-linearize
|
||||
@@ -54,7 +56,12 @@ in
|
||||
pkgs.google-cloud-sql-proxy
|
||||
];
|
||||
|
||||
home.file.".assets".source = "${inputs.self}/assets";
|
||||
home.file.".assets".source = inputs.assets;
|
||||
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
stylix.targets.neovim.enable = false;
|
||||
programs.neovim = {
|
||||
|
||||
Reference in New Issue
Block a user