From bbcd40734d62e0cc8804e417c8c63c1a7c6b1255 Mon Sep 17 00:00:00 2001 From: fredrikr79 Date: Sat, 12 Oct 2024 21:00:52 +0200 Subject: [PATCH] add xournalpp with vi plugin --- flake.lock | 107 ++++++++++++++++++++++------------------------------- flake.nix | 47 ++++++++++++++--------- home.nix | 7 +++- 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 266d62f..18bd895 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -60,11 +59,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -73,24 +72,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -105,11 +86,11 @@ ] }, "locked": { - "lastModified": 1719259945, - "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", + "lastModified": 1728092656, + "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", + "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a", "type": "github" }, "original": { @@ -147,11 +128,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -169,11 +150,11 @@ ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -191,11 +172,11 @@ ] }, "locked": { - "lastModified": 1719128254, - "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=", + "lastModified": 1727999297, + "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "50581970f37f06a4719001735828519925ef8310", + "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", "type": "github" }, "original": { @@ -206,11 +187,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719253556, - "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", + "lastModified": 1728627514, + "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "type": "github" }, "original": { @@ -234,11 +215,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719379679, - "narHash": "sha256-Al7iFQD8rzU4X8wDKh7eAJfNcFmO3cVZt43oCVyYfoQ=", + "lastModified": 1728336862, + "narHash": "sha256-0rG55ZD1zvLLJ+WgiYdJBZGm1fkgRUlwpfx7aNUT5m4=", "owner": "nix-community", "repo": "nixvim", - "rev": "a8c99bc62848ad0c850f585f2fd7dae0041d2cb1", + "rev": "b041963c607d766c4b102b8b56244ad38731f549", "type": "github" }, "original": { @@ -252,22 +233,8 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixvim": "nixvim" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixvim": "nixvim", + "vi-xournalpp": "vi-xournalpp" } }, "treefmt-nix": { @@ -278,11 +245,11 @@ ] }, "locked": { - "lastModified": 1719243788, - "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -290,6 +257,22 @@ "repo": "treefmt-nix", "type": "github" } + }, + "vi-xournalpp": { + "flake": false, + "locked": { + "lastModified": 1705575782, + "narHash": "sha256-eob2sApbY8JJORarZaOjnbdZIejpCm67eQZBIWsFYGo=", + "owner": "raw-bacon", + "repo": "vi-xournalpp", + "rev": "7ed1e646280b345de0ea8ea5c5976f586c6fb8a9", + "type": "github" + }, + "original": { + "owner": "raw-bacon", + "repo": "vi-xournalpp", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 5058c92..98799c9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + vi-xournalpp = { + url = "github:raw-bacon/vi-xournalpp"; + flake = false; + }; + #nbfc-linux = { #url = "github:nbfc-linux/nbfc-linux"; #inputs.nixpkgs.follows = "nixpkgs"; @@ -40,24 +45,32 @@ #]; #}; - fredrikr = lib.nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./configuration.nix + fredrikr = lib.nixosSystem { + inherit system; + specialArgs = {inherit inputs;}; + modules = [ + ./configuration.nix - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.users.fredrikr = { - imports = [ ./home.nix - nixvim.homeManagerModules.nixvim - ]; - }; - } - ]; - }; + home-manager.nixosModules.home-manager + + ({ ... }: { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + backupFileExtension = "backup"; + users.fredrikr = { + imports = [ + ./home.nix + nixvim.homeManagerModules.nixvim + ]; + }; + extraSpecialArgs = { + inherit inputs; + }; + }; + }) + ]; + }; }; }; diff --git a/home.nix b/home.nix index 7aed420..739ea88 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: { home.username = "fredrikr"; @@ -23,6 +23,7 @@ anki-bin tldr ripgrep + xournalpp ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage @@ -41,6 +42,10 @@ ".config/alacritty".source = home/config/alacritty; ".config/xmonad".source = home/config/xmonad; ".xmobarrc".source = home/.xmobarrc; + ".config/xournalpp/plugins/vi-xournalpp" = { + source = "${inputs.vi-xournalpp}"; + recursive = true; + }; }; home.sessionVariables = {