diff --git a/flake.lock b/flake.lock index ba454ca..800264d 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,39 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +56,11 @@ ] }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1757385184, + "narHash": "sha256-LCxtQn9ajvOgGRbQIRUJgfP7clMGGvV1SDW1HcSb0zk=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "26993d87fd0d3b14f7667b74ad82235f120d986e", "type": "github" }, "original": { @@ -36,17 +69,54 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1756426754, + "narHash": "sha256-EVJDo/KjdGtvJKelVPoL92TsPNrqnOJUnaLTIqP+F0o=", + "rev": "f4bdddf0fdaabc68546cf561c5343b83d95d2466", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f4bdddf0fdaabc68546cf561c5343b83d95d2466.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756511062, + "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", + "rev": "3f09a5eb772e02d98bb8878ab687d5b721f00d16", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/3f09a5eb772e02d98bb8878ab687d5b721f00d16.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + } + }, "nixos-wsl": { "inputs": { "flake-compat": "flake-compat", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1755261305, - "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", + "lastModified": 1757427959, + "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "203a7b463f307c60026136dd1191d9001c43457f", + "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161", "type": "github" }, "original": { @@ -58,11 +128,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754725699, - "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", + "lastModified": 1757068644, + "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", + "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "type": "github" }, "original": { @@ -74,11 +144,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1756125398, - "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=", + "lastModified": 1757347588, + "narHash": "sha256-tLdkkC6XnsY9EOZW9TlpesTclELy8W7lL2ClL+nma8o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5", + "rev": "b599843bad24621dcaa5ab60dac98f9b0eb1cabe", "type": "github" }, "original": { @@ -193,11 +263,28 @@ "root": { "inputs": { "home-manager": "home-manager", + "lix": "lix", + "lix-module": "lix-module", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2", "pydev": "pydev" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "uv2nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 104f845..60aa733 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,28 @@ inputs = { pydev.url ="./system/extras/pydev/"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + lix.flake = false; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; + }; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; }; - outputs = { self, nixpkgs, home-manager, pydev, nixos-wsl, ... }@inputs: + outputs = { + self, + nixpkgs, + lix-module, + lix, + home-manager, + pydev, + nixos-wsl, + ... + }@inputs: let system = "x86_64-linux"; @@ -51,12 +67,15 @@ }; nixosConfigurations = { "yukigekko" = nixpkgs.lib.nixosSystem{ + system = system; specialArgs = specialArgs; modules = [ ./system/yukigekko/configuration.nix + lix-module.nixosModules.default ]; }; "lesbos" = nixpkgs.lib.nixosSystem{ + system = system; specialArgs = specialArgs; modules = [ ./system/lesbos/configuration.nix diff --git a/home-manager/autumn/bundles/langs.nix b/home-manager/autumn/bundles/langs.nix index b986f6d..a785ecc 100644 --- a/home-manager/autumn/bundles/langs.nix +++ b/home-manager/autumn/bundles/langs.nix @@ -4,23 +4,25 @@ home.packages = with pkgs; [ ccls docker-language-server - nil - ty - rustc - rustup - gleam - ruff - ruby - rubyPackages_3_4.solargraph - nim-2_0 - nimlangserver - kdlfmt - superhtml - fish-lsp ember-cli ember-language-server - yaml-language-server + fish-lsp + gleam + kdlfmt + lessc + nil + nim-2_0 + nimlangserver odin ols + ruby + rubyPackages_3_4.solargraph + ruff + rustc + rustup + superhtml + ty + vscode-langservers-extracted + yaml-language-server ]; } diff --git a/home-manager/packages/direnv/direnv.nix b/home-manager/packages/direnv/direnv.nix index ec0ac13..9061ec5 100644 --- a/home-manager/packages/direnv/direnv.nix +++ b/home-manager/packages/direnv/direnv.nix @@ -1,7 +1,18 @@ { config, pkgs, ... }: { + programs.direnv = { enable = true; }; + + # home.file = { + # direnvrc = { + # enable = true; + # executable = true; + # target = ".config/direnv/"; + # source = "./direnvrc"; + # }; + # }; + } diff --git a/home-manager/packages/fish/fish.nix b/home-manager/packages/fish/fish.nix index 9437ba9..56fc655 100644 --- a/home-manager/packages/fish/fish.nix +++ b/home-manager/packages/fish/fish.nix @@ -2,9 +2,9 @@ { - home.packages = with pkgs; [ - oh-my-fish - ]; + home.packages = with pkgs; [ + oh-my-fish + ]; programs.fish = { enable = true; @@ -15,7 +15,7 @@ ".." = "cd .."; "..." = "cd ../.."; "...." = "cd ../../.."; - "ls" = "eza"; + "pls" = "pls -d typ -d perm -d user -d group -d size -d mtime -d git"; "z" = "zoxide"; }; }; diff --git a/system/lesbos/configuration.nix b/system/lesbos/configuration.nix index 26a68e2..ff151d8 100644 --- a/system/lesbos/configuration.nix +++ b/system/lesbos/configuration.nix @@ -60,7 +60,7 @@ nix.settings = { experimental-features = ["nix-command" "flakes"]; - download-buffer-size = 5245880000; + # download-buffer-size = 5245880000; }; system.stateVersion = "25.05"; # Did you read the comment? diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix index c92d284..34173d3 100644 --- a/system/yukigekko/configuration.nix +++ b/system/yukigekko/configuration.nix @@ -88,7 +88,7 @@ }; nix.settings.experimental-features = ["nix-command" "flakes"]; - nix.settings.download-buffer-size = 5242880000; + # nix.settings.download-buffer-size = 5242880000; # Some programs need SUID wrappers, can be configured further or are # started in user sessions.