diff --git a/flake.lock b/flake.lock index d67a320..145e245 100644 --- a/flake.lock +++ b/flake.lock @@ -219,6 +219,28 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "owner": "numtide", + "repo": "devshell", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "emacs": { "inputs": { "flake-utils": "flake-utils_4", @@ -327,6 +349,20 @@ } }, "flake-compat_5": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -385,6 +421,46 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -469,6 +545,57 @@ "type": "github" } }, + "flake-utils_6": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore_3", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -513,6 +640,29 @@ "type": "github" } }, + "gitignore_3": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -533,6 +683,58 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730633670, + "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -600,6 +802,28 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730600078, + "narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4652874d014b82cb746173ffc64f6a70044daa7e", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -790,6 +1014,18 @@ "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, @@ -983,6 +1219,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1728093190, "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", @@ -998,6 +1250,54 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ], + "nixvim": "nixvim_2" + }, + "locked": { + "lastModified": 1730971082, + "narHash": "sha256-HGsEYyVaqTklSvEgb6dolExOTKl8BN8RtXtE3l0yoYM=", + "ref": "refs/heads/master", + "rev": "b65164cbbf3e100606c898d52bb292d5545acd83", + "revCount": 4, + "type": "git", + "url": "ssh://gitea@git.fuckwit.dev/fuckwit/nixvim" + }, + "original": { + "type": "git", + "url": "ssh://gitea@git.fuckwit.dev/fuckwit/nixvim" + } + }, + "nixvim_2": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_4", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs_6", + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1730792264, + "narHash": "sha256-Ue3iywjyaNOxXgw7esVSBX3bZzM2bSPubZamYsBKIG8=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "3d24cb72618738130e6af9c644c81fe42aa34ebc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, "nurpkgs": { "locked": { "lastModified": 1728635778, @@ -1013,6 +1313,30 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_6", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730515563, + "narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=", + "owner": "NuschtOS", + "repo": "search", + "rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -1158,6 +1482,7 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-f2k": "nixpkgs-f2k", "nixpkgs-stable": "nixpkgs-stable_4", + "nixvim": "nixvim", "nurpkgs": "nurpkgs", "rycee-nurpkgs": "rycee-nurpkgs", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -1230,7 +1555,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "nixpkgs" ], @@ -1253,7 +1578,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { @@ -1330,6 +1655,43 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index a27aaa3..e4f5206 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,11 @@ url = "github:cachix/devenv/latest"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nixvim = { + url = "git+ssh://gitea@git.fuckwit.dev/fuckwit/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {...} @ args: import ./outputs.nix args; diff --git a/home/configurations.nix b/home/configurations.nix index 4bc3c32..ef35eb6 100644 --- a/home/configurations.nix +++ b/home/configurations.nix @@ -3,10 +3,12 @@ nurpkgs, home-manager, devenv, + nixvim, ... }: let - pkgs = import nixpkgs { + pkgs = import nixpkgs rec { system = "x86_64-linux"; + overlays = [(final: prev: { nixvim = nixvim.packages.${system}.default; })]; }; nur = import nurpkgs { diff --git a/home/work/pkgs.nix b/home/work/pkgs.nix index efa9ff6..27724cb 100644 --- a/home/work/pkgs.nix +++ b/home/work/pkgs.nix @@ -22,7 +22,7 @@ with pkgs; [ mtr # traceroute mumble # voice call client ncdu # disk space info (a better du) - neovim-unwrapped # best code editor on the planet + # neovim-unwrapped # best code editor on the planet networkmanagerapplet # systray applet for NetworkManager # nitrogen # wallpapger manager nushell # A modern shell written in Rust @@ -40,4 +40,5 @@ with pkgs; [ zeal # offline documentation browser zellij # A terminal workspace with batteries included wl-clipboard + nixvim ] diff --git a/home/work/programs/nvim/default.nix b/home/work/programs/nvim/default.nix index 17946fa..b054dfc 100644 --- a/home/work/programs/nvim/default.nix +++ b/home/work/programs/nvim/default.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { programs.neovim = { - enable = true; + enable = false; defaultEditor = true; viAlias = true; vimAlias = true; diff --git a/nixos/primordial/configuration.nix b/nixos/primordial/configuration.nix index 6104245..2198da8 100644 --- a/nixos/primordial/configuration.nix +++ b/nixos/primordial/configuration.nix @@ -248,22 +248,22 @@ in { }; }; - keycloak = { - enable = true; - - database = { - type = "postgresql"; - createLocally = true; - passwordFile = config.sops.secrets."keycloak_db_pw".path; - }; - - settings = { - hostname = "sso.fuckwit.dev"; - http-host = "127.0.0.1"; - http-port = 8004; - proxy = "edge"; - }; - }; + # keycloak = { + # enable = true; + # + # database = { + # type = "postgresql"; + # createLocally = true; + # passwordFile = config.sops.secrets."keycloak_db_pw".path; + # }; + # + # settings = { + # hostname = "sso.fuckwit.dev"; + # http-host = "127.0.0.1"; + # http-port = 8004; + # proxy = "edge"; + # }; + # }; # drone-server = { # enable = true; diff --git a/nixos/primordial/mail.nix b/nixos/primordial/mail.nix index b11b6c6..192fdb8 100644 --- a/nixos/primordial/mail.nix +++ b/nixos/primordial/mail.nix @@ -5,6 +5,7 @@ }: { mailserver = { enable = true; + enableManageSieve = true; fqdn = "mail.fuckwit.dev"; domains = ["fuckwit.dev"];