diff options
Diffstat (limited to '')
| -rwxr-xr-x | Makefile | 1 | ||||
| -rw-r--r-- | flake.lock | 36 | ||||
| -rw-r--r-- | home/default.nix | 37 | ||||
| -rw-r--r-- | home/goose.nix | 4 | ||||
| -rw-r--r-- | home/nushell.nix | 2 | ||||
| -rw-r--r-- | home/nvim/default.nix | 7 | ||||
| -rw-r--r-- | home/nvim/lsp.lua | 3 | ||||
| -rw-r--r-- | home/nvim/plugins/treesitter.lua | 3 | ||||
| -rw-r--r-- | hosts/saarni/default.nix | 24 | ||||
| -rw-r--r-- | roles/shared.nix | 1 |
10 files changed, 85 insertions, 33 deletions
@@ -14,6 +14,7 @@ clean: run0 nix-env --delete-generations +2 --profile /nix/var/nix/profiles/system run0 nix-store --gc run0 nix-store --optimise + nix-collect-garbage --delete-older-than 10d validate: run0 nix-store --repair --verify --check-contents @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -53,11 +53,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1767758611, - "narHash": "sha256-ibG5QHWvuvclo5yh18+0fw3Ha/pbxhZ19quziyfvQ+w=", + "lastModified": 1770609827, + "narHash": "sha256-5J3I/ERia1xhWkPwugnpbucAE8lI5ip2ohTZ3xK2HrY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "fbd89131423a48ba82da06c6beef13a5ddde2818", + "rev": "60b2a2d7633b61981a694ad30bc1b19b64a949f1", "type": "gitlab" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1767619900, - "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -111,11 +111,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -125,11 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767634882, - "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=", + "lastModified": 1770464364, + "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c", + "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1767640445, - "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index e20e483..54a2737 100644 --- a/home/default.nix +++ b/home/default.nix @@ -3,6 +3,7 @@ config, vars, pkgs, + lib, ... }: let @@ -42,15 +43,23 @@ in ./zaread.nix ]; + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 14d"; + }; + home = { + activation.mySymlinks = lib.mkAfter '' + ln -sf /media/skydrive/Downloads /home/petri/Downloads; + ''; file = { ".cache/nix-index/.keep".text = ""; "Calendar/radicale/.keep".text = ""; "Contacts/radicale/.keep".text = ""; - Downloads.source = config.lib.file.mkOutOfStoreSymlink "/media/skydrive/Downloads"; }; enableNixpkgsReleaseCheck = true; - stateVersion = "25.05"; + stateVersion = "25.11"; shell = { enableBashIntegration = true; enableFishIntegration = true; @@ -170,9 +179,6 @@ in sqlite # simple database timg # show image in shell unstable.goose-cli # llm cli - unstable.vale # spellcheck - unstable.valeStyles.microsoft # spellcheck linters - unstable.valeStyles.write-good # spellcheck linters whisper-cpp # tts wlogout # logout helper xdg-utils @@ -188,11 +194,9 @@ in couchbase-shell # couchbase d2 # graphs gnumake # makefile - lean4 # theorem prover - broken + lean4 # theorem prover lld # c and rust linker nodePackages.jsdoc # javascript documentation - unstable.go - unstable.golint # linter for go uv # python package installer ]; }; @@ -258,6 +262,21 @@ in }; programs = { + tex-fmt = { + enable = true; + settings = { + wrap = false; + tabchar = "tab"; + tabsize = 1; + }; + }; + go = { + enable = true; + telemetry.mode = "off"; + env = { + CC = "clang"; + }; + }; obsidian = { enable = true; defaultSettings.app = { @@ -579,7 +598,7 @@ in nvim = { categories = [ ]; comment = "A text editor"; - exec = ''${pkgs.neovim}/bin/nvim''; + exec = "${pkgs.neovim}/bin/nvim"; genericName = "Editor"; name = "nvim"; terminal = true; diff --git a/home/goose.nix b/home/goose.nix index a277866..115386d 100644 --- a/home/goose.nix +++ b/home/goose.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { xdg.configFile."goose/config.yaml".source = (pkgs.formats.yaml { }).generate "goose-config" { - GOOSE_DISABLE_KEYRING = "true"; + GOOSE_DISABLE_KEYRING = true; GOOSE_MODE = "auto"; GOOSE_MODEL = "gpt-4.1-mini"; GOOSE_PROVIDER = "openai"; diff --git a/home/nushell.nix b/home/nushell.nix index b86625f..99f9fbb 100644 --- a/home/nushell.nix +++ b/home/nushell.nix @@ -19,7 +19,7 @@ wifi = "${pkgs.impala}/bin/impala"; youtube = "${pkgs.pipe-viewer}/bin/pipe-viewer"; }; - extraEnv = ''''; + extraEnv = ""; extraConfig = '' def ns [] { ${pkgs.nix-search-tv}/bin/nix-search-tv print | ${pkgs.fzf}/bin/fzf --preview "${pkgs.nix-search-tv}/bin/nix-search-tv preview {}" --scheme history diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 0c1a32a..efb19b4 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -30,8 +30,8 @@ # LSP biome # javascript, biome - clippy # rust error checking clang-tools # C + clippy # rust error checking dprint # format engine for multiple langeuages dprint-plugins.dprint-plugin-markdown # markdown dprint-plugins.dprint-plugin-toml # toml @@ -47,11 +47,14 @@ nodePackages.typescript-language-server # javascript validation ruff # python format and lint rust-analyzer - tex-fmt # latex + tex-fmt # latex fmt texlab # latex lsp tree-sitter # generate tree-sitter grammars ty # python type checker written in rust + vale # spellcheck vale-ls # prose (md, asciidoc) + valeStyles.microsoft # spellcheck linters + valeStyles.write-good # spellcheck linters ]; extraPython3Packages = ps: [ diff --git a/home/nvim/lsp.lua b/home/nvim/lsp.lua index 2b8a730..7e124bd 100644 --- a/home/nvim/lsp.lua +++ b/home/nvim/lsp.lua @@ -214,7 +214,7 @@ vim.lsp.config("clangd", { vim.lsp.config("vale_ls", { cmd = { "vale-ls" }, - filetypes = { "markdown", "text", "tex", "rst", "adoc", "asciidoc" }, + filetypes = { "markdown", "text", "tex", "rst", "adoc", "asciidoc", "html" }, root_markers = { ".vale.ini" }, }) @@ -289,6 +289,7 @@ vim.lsp.config("bashls", { vim.lsp.config("texlab", { cmd = { "texlab" }, filetypes = { "tex", "plaintex", "bib" }, + latexFormatter = "tex-fmt" }) vim.lsp.enable({ diff --git a/home/nvim/plugins/treesitter.lua b/home/nvim/plugins/treesitter.lua index c408901..7f470b0 100644 --- a/home/nvim/plugins/treesitter.lua +++ b/home/nvim/plugins/treesitter.lua @@ -9,4 +9,7 @@ require "nvim-treesitter".setup { max_file_lines = 2000, }, additional_vim_regex_highlighting = false, + indent = { + enable = true, + }, } diff --git a/hosts/saarni/default.nix b/hosts/saarni/default.nix index b614131..5043657 100644 --- a/hosts/saarni/default.nix +++ b/hosts/saarni/default.nix @@ -31,6 +31,30 @@ }; network = { networks = { + "13-shared" = { + matchConfig = { + MACAddress = "5a:c1:1b:77:fc:e5"; + }; + linkConfig = { + Multicast = true; + }; + networkConfig = { + DHCP = true; + IPv6AcceptRA = true; + MulticastDNS = true; + LinkLocalAddressing = "ipv6"; + DNSSEC = true; + UseDomains = true; + }; + dhcpV4Config = { + RouteMetric = 20; + UseDNS = true; + UseMTU = true; + }; + ipv6AcceptRAConfig = { + UseMTU = true; + }; + }; "10-lan" = { matchConfig = { Name = "enps0"; diff --git a/roles/shared.nix b/roles/shared.nix index 821c8f7..7d357a4 100644 --- a/roles/shared.nix +++ b/roles/shared.nix @@ -340,6 +340,7 @@ nixfmt-rfc-style shaderc.dev shaderc.static + busybox vulkan-headers vulkan-loader vulkan-tools |