latest
Branches > main > latest > files
Merge branch 'main' of vps:/srv/website/git/dotfiles
Commit: dee51079622a7c1d0fbada4fdd3d7beb5e6b0b27
Parent: 829c2fd
Parent: fa52fa2
6 changed files:
nixos/flake.lock view file
@@ -28,42 +28,43 @@ ] }, "locked": {- "lastModified": 1761395627,- "narHash": "sha256-9wQpgBRW2PzYw1wx+MgCt1IbPAYz93csApLMgSZOJCk=",+ "lastModified": 1792818383,+ "narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=", "owner": "nix-community", "repo": "home-manager",- "rev": "7296022150cd775917e4c831c393026eae7c2427",+ "rev": "24f2190587513b9c2f73db112a17844ae912d965", "type": "github" }, "original": { "owner": "nix-community",+ "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": {- "lastModified": 1761114652,- "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",+ "lastModified": 1793183032,+ "narHash": "sha256-56mFMf8heLNfYhcgbrh4GpN5x+G9JOfTFXZC3n6w0qM=", "owner": "nixos", "repo": "nixpkgs",- "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",+ "rev": "08d3a97586f6b6343b3b5e799980773629432610", "type": "github" }, "original": { "owner": "nixos",- "ref": "nixos-unstable",+ "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } },- "nixpkgs-clojure": {+ "nixpkgs-unstable": { "locked": {- "lastModified": 1792773339,- "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=",+ "lastModified": 1793110635,+ "narHash": "sha256-dhoW6VgFWlaodSY5jrBn+CF2FLmaUvDVgM7+C7T2+NM=", "owner": "nixos", "repo": "nixpkgs",- "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504",+ "rev": "31ecbaca1bdefa45dffc409f0250bd8039ea0010", "type": "github" }, "original": {@@ -78,7 +79,7 @@ "claude-code": "claude-code", "home-manager": "home-manager", "nixpkgs": "nixpkgs",- "nixpkgs-clojure": "nixpkgs-clojure"+ "nixpkgs-unstable": "nixpkgs-unstable" } }, "systems": {nixos/flake.nix view file
@@ -1,28 +1,26 @@-## What the fuck is flakes this shit makes no sense {- description = "Grahp Flake";+ description = "Grahp Flake :D"; inputs = {- nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";- home-manager.url = "github:nix-community/home-manager";+ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-26.05";+ home-manager.url = "github:nix-community/home-manager?ref=release-26.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; claude-code.url = "github:sadjow/claude-code-nix"; claude-code.inputs.nixpkgs.follows = "nixpkgs";- ## Newer nixpkgs just for the clojure tooling, so I can bump it without updating everything- nixpkgs-clojure.url = "github:nixos/nixpkgs?ref=nixos-unstable";+ nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; }; - outputs = { self, nixpkgs, nixpkgs-clojure, home-manager, claude-code, ... }:+ outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, claude-code, ... }: let- clojure-overlay = final: prev:- let new = nixpkgs-clojure.legacyPackages.${prev.stdenv.hostPlatform.system};- in { inherit (new) clojure-lsp clj-kondo cljfmt; };+ unstable-overlay = final: prev:+ let new = nixpkgs-unstable.legacyPackages.${prev.stdenv.hostPlatform.system};+ in { inherit (new) clojure-lsp clj-kondo cljfmt signal-desktop; }; in { nixosConfigurations = { pc = nixpkgs.lib.nixosSystem { modules = [ ./machines/pc/configuration.nix- { nixpkgs.overlays = [ claude-code.overlays.default clojure-overlay ]; }+ { nixpkgs.overlays = [ claude-code.overlays.default unstable-overlay ]; } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true;@@ -38,7 +36,7 @@ chromebook = nixpkgs.lib.nixosSystem { modules = [ ./machines/chromebook/configuration.nix- { nixpkgs.overlays = [ claude-code.overlays.default clojure-overlay ]; }+ { nixpkgs.overlays = [ claude-code.overlays.default unstable-overlay ]; } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true;nixos/machines/pc/configuration.nix view file
@@ -70,8 +70,8 @@ services.openssh = { enable = true;- passwordAuthentication = false;- permitRootLogin = "no";+ settings.PasswordAuthentication = false;+ settings.PermitRootLogin = "no"; }; programs.fish.enable = true;nixos/machines/pc/home.nix view file
@@ -32,6 +32,14 @@ home.sessionVariables.SHELL = "/run/current-system/sw/bin/fish"; + ## Tree-sitter parsers + nvim-treesitter's queries, into nvim's site dir (on the runtimepath)+ xdg.dataFile = builtins.listToAttrs (builtins.concatMap (lang: [+ { name = "nvim/site/parser/${lang}.so";+ value.source = "${pkgs.tree-sitter-grammars."tree-sitter-${lang}"}/parser"; }+ { name = "nvim/site/queries/${lang}";+ value.source = "${pkgs.vimPlugins.nvim-treesitter}/queries/${lang}"; }+ ]) [ "elixir" "heex" "eex" ]);+ home.stateVersion = "23.11"; home.packages = with pkgs; [ nerd-fonts.jetbrains-mono@@ -97,6 +105,10 @@ clojure babashka + erlang+ elixir+ elixir-ls+ gcc lua54Packages.fennel@@ -104,7 +116,6 @@ luajit nodejs- bun cloc mpv@@ -115,10 +126,6 @@ obs-studio audacity - # Maybe should be in ./build shell.nix?- bundler- jekyll- shotcut amberol@@ -128,8 +135,6 @@ filezilla - signal-desktop- docker zig @@ -138,11 +143,11 @@ ntfs3g - signal-desktop- # Lord forgive me, again emacs + signal-desktop+ (callPackage ../../pkgs/plover.nix {}) ]; }nvim/ftplugin/elixir.lua view file
@@ -0,0 +1 @@+vim.treesitter.start()nvim/lua/lsp.lua view file
@@ -59,6 +59,10 @@ settings = {Lua = {diagnostics = {globals = {"vim"}}, format = {enable = false}}}, root_markers = {".luarc.json", ".luarc.jsonc", ".luacheckrc", ".stylua.toml", "stylua.toml", "selene.toml", "selene.yml", ".git"}}) +config({name = "elixir-ls",+ filetypes = {"elixir", "eelixir", "heex"},+ root_markers = {"mix.exs", ".git"}})+ local java_home = vim.fn.fnamemodify(vim.fn.resolve(vim.fn.exepath("java")), ":h:h") config({name = "jdtls",