Compare commits

...

8 Commits

13 changed files with 112 additions and 48 deletions

1
.envrc Normal file
View File

@@ -0,0 +1 @@
use flake

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
assets/** filter=lfs diff=lfs merge=lfs -text

6
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,6 @@
repos:
- repo: https://github.com/nixos/nixfmt
rev: v1.2.0
hooks:
- id: nixfmt-nix
args: [--, --check]

3
assets/lockscreen.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:47098eed6a818a4e6181e2cdd6d1244b2adc46d748da5944a7bf89068eb1c8ad
size 497830

3
assets/wallpaper.png Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d5ab6c3434f2b1b8ebac566fef17fad16dbb6415d76ab06e6abf483b563bc25
size 16097396

42
flake.lock generated
View File

@@ -284,11 +284,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1770681890, "lastModified": 1771545891,
"narHash": "sha256-ommto8XEvGMYGuvrIjj2VM1tFZkRoLLmSuie+fvTTOk=", "narHash": "sha256-aaVUfc/9q2pCsELZmYhf+uvYRMCUlBvccgL1VS27R+o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "3560c52c15aad8fccd4f62ae794b622969050202", "rev": "917b72d5e27bc217440655b81f701d7062bdd198",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -300,11 +300,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1770678367, "lastModified": 1771541613,
"narHash": "sha256-suvGeMX6UQdyGuSNRLH4zJ25b72XfQBDva7Fxm+PNiA=", "narHash": "sha256-1Rpt5B4pNW/MNkWoEamqwCa5I4/9G84dSqp4eHS5zsA=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "57fc77ed29ad9005d893a9dc2f37b3ad53aec4e6", "rev": "e3d46a63375c84b7bd409f1f07ef56eb985eae50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -351,11 +351,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1770537093, "lastModified": 1771207753,
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -367,11 +367,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1770713048, "lastModified": 1771612900,
"narHash": "sha256-YU2SCyrWaoGgpdsHvpX5wZgbRtWnp3FfN1fSWX1aSpc=", "narHash": "sha256-ToJ0wYbphG1ZN7bgGpCJxu69Tt3ij0+T6W4YljLCHak=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2123953aa6e9e1045857adac93ce7c9a4a5d81d8", "rev": "f65d4c996f96838b8f50253859cf7b17e956a792",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -383,11 +383,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1770537093, "lastModified": 1771207753,
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -399,11 +399,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1770617025, "lastModified": 1771419570,
"narHash": "sha256-1jZvgZoAagZZB6NwGRv2T2ezPy+X6EFDsJm+YSlsvEs=", "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2db38e08fdadcc0ce3232f7279bab59a15b94482", "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -516,11 +516,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1770308890, "lastModified": 1771429540,
"narHash": "sha256-7bx8Bn9B2g/loBaz+uLwdKI2rUW+RhDPyP/MqAgvrxU=", "narHash": "sha256-YKytDx8LOPOvE+dip1ja+1nbIpDVdqTaFbP4MaXwveM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "7e7fa955abac04a8e118b1cedf930a8fd41c34a6", "rev": "1a5c9d8be82127aeccc929f60b952e8a3df6b63c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -74,7 +74,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
format = "install-iso"; format = "install-iso";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ ./iso.nix ]; modules = [ ./hosts/live-iso/configuration.nix ];
}; };
nixosConfigurations = { nixosConfigurations = {
@@ -94,11 +94,22 @@
lib = nixpkgs.lib; lib = nixpkgs.lib;
} { }; } { };
} }
// flake-utils.lib.eachDefaultSystem (system: { // flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
packages = import ./packages { packages = import ./packages {
inherit my-lib; inherit my-lib;
lib = nixpkgs.lib; lib = nixpkgs.lib;
} (inputs // { inherit system; }); } (inputs // { inherit system; });
formatter = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
}); formatter = pkgs.nixfmt-tree;
devShells.default = pkgs.mkShell {
packages = [ pkgs.pre-commit ];
};
}
);
} }

View File

@@ -24,11 +24,6 @@ in
yubikey.enable = true; yubikey.enable = true;
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
stylix = { stylix = {
enable = true; enable = true;
polarity = "dark"; polarity = "dark";

26
justfile Normal file
View 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)

View File

@@ -18,22 +18,13 @@ let
user: import ../users/${user}/home-manager.nix { inherit inputs; } user: import ../users/${user}/home-manager.nix { inherit inputs; }
); );
gib_in_bytes = 1073741824;
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
modules = [ modules = [
{ ../nix.nix
nix.settings = {
download-buffer-size = 1 * gib_in_bytes;
experimental-features = [
"nix-command"
"flakes"
];
};
}
{ nixpkgs.overlays = overlays; } { nixpkgs.overlays = overlays; }
{ nixpkgs.config.allowUnfree = true; } { nixpkgs.config.allowUnfree = true; }

23
nix.nix Normal file
View 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" ];
};
};
}

View File

@@ -1,4 +0,0 @@
[formatter.nix]
command = "nix"
options = ["fmt"]
includes = [ "*.nix" ]

View File

@@ -24,8 +24,11 @@ in
pkgs.starship pkgs.starship
pkgs.claude-code
# git and co # git and co
pkgs.git pkgs.git
pkgs.git-lfs
packages.git-linearize packages.git-linearize
packages.ggman packages.ggman
@@ -56,6 +59,11 @@ in
home.file.".assets".source = "${inputs.self}/assets"; home.file.".assets".source = "${inputs.self}/assets";
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
stylix.targets.neovim.enable = false; stylix.targets.neovim.enable = false;
programs.neovim = { programs.neovim = {
enable = true; enable = true;