From 069fb08780a8a0b19e3239f9c447b388b2131da3 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Thu, 29 Feb 2024 18:29:04 +0100 Subject: [PATCH] Updates --- flake.lock | 109 ++++++++++++++++++-------------- modules/default.nix | 1 + modules/development/default.nix | 5 ++ modules/development/rust.nix | 14 ++++ modules/gui/firefox.nix | 8 --- modules/shell/direnv.nix | 1 + 6 files changed, 84 insertions(+), 54 deletions(-) create mode 100644 modules/development/default.nix create mode 100644 modules/development/rust.nix diff --git a/flake.lock b/flake.lock index 1858e58..996f82c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "competitest-nvim": { + "flake": false, + "locked": { + "lastModified": 1706007708, + "narHash": "sha256-ABxdZ98W5W6K0rz0z/1I5lXzLCBnth6ozUUQ1W1nvpo=", + "owner": "xeluxee", + "repo": "competitest.nvim", + "rev": "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5", + "type": "github" + }, + "original": { + "owner": "xeluxee", + "repo": "competitest.nvim", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -41,11 +57,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -84,11 +100,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -290,11 +306,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1708294481, + "narHash": "sha256-DZtxmeb4OR7iCaKUUuq05ADV2rX8WReZEF7Tq//W0+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "a54e05bc12d88ff2df941d0dc1183cb5235fa438", "type": "github" }, "original": { @@ -304,6 +320,7 @@ }, "neovim": { "inputs": { + "competitest-nvim": "competitest-nvim", "flake-utils": "flake-utils_2", "gopher-nvim": "gopher-nvim", "home-manager": "home-manager_2", @@ -311,11 +328,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1707242654, - "narHash": "sha256-RqJufqhfyKWAURH2GpKknbeftqSEm0hO1I15R3udM+0=", + "lastModified": 1709227340, + "narHash": "sha256-uzvnQOTiRA5varexAPU5pUhGIYTGj/z4Peyg/pIkkJk=", "ref": "refs/heads/master", - "rev": "d9a3d0673598c1d4fa71684490852fd4a76b5235", - "revCount": 13, + "rev": "491985a4a372b1236526a007d297976767a6b728", + "revCount": 18, "type": "git", "url": "ssh://gitea@pi1.odie.intranet/odie/neovim-flake" }, @@ -335,11 +352,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1706140641, - "narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", + "lastModified": 1708374065, + "narHash": "sha256-1g4X7Iztb3a6ILAGIZmfoNTpHc1FjTLrO+sFYrNllEI=", "owner": "neovim", "repo": "neovim", - "rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", + "rev": "8952a89db588db10a9dba16356f9bbd35ca5fabb", "type": "github" }, "original": { @@ -359,11 +376,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1706140641, - "narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", + "lastModified": 1708374065, + "narHash": "sha256-1g4X7Iztb3a6ILAGIZmfoNTpHc1FjTLrO+sFYrNllEI=", "owner": "neovim", "repo": "neovim", - "rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", + "rev": "8952a89db588db10a9dba16356f9bbd35ca5fabb", "type": "github" }, "original": { @@ -382,11 +399,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1706141075, - "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", + "lastModified": 1708387422, + "narHash": "sha256-gnqSo7XHPNPzl6RZmkFcW5dX7v4K+QYO2E7PMuBn7z8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", + "rev": "2977f72bfa978bcd77492225ad08a46a5a4c9dc0", "type": "github" }, "original": { @@ -404,11 +421,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1706141075, - "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", + "lastModified": 1708387422, + "narHash": "sha256-gnqSo7XHPNPzl6RZmkFcW5dX7v4K+QYO2E7PMuBn7z8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", + "rev": "2977f72bfa978bcd77492225ad08a46a5a4c9dc0", "type": "github" }, "original": { @@ -454,11 +471,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -470,11 +487,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706732774, - "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -486,11 +503,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706006310, - "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", + "lastModified": 1708341091, + "narHash": "sha256-3R7doGV1AoB5VKFifEd5elj8t4cld6VpJRpn9NaYr1Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43bb235efeab5324c5e486882ef46749188eee2", + "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803", "type": "github" }, "original": { @@ -502,11 +519,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", "type": "github" }, "original": { @@ -518,11 +535,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706006310, - "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", + "lastModified": 1708341091, + "narHash": "sha256-3R7doGV1AoB5VKFifEd5elj8t4cld6VpJRpn9NaYr1Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43bb235efeab5324c5e486882ef46749188eee2", + "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803", "type": "github" }, "original": { @@ -549,11 +566,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1707091808, - "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=", + "lastModified": 1708294118, + "narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e", + "rev": "e0da498ad77ac8909a980f07eff060862417ccf7", "type": "github" }, "original": { @@ -565,11 +582,11 @@ }, "nur": { "locked": { - "lastModified": 1707241543, - "narHash": "sha256-Q4wxwWiG1iT3Tu02K88dcQA4M/k2UBclkO3p87EgVmc=", + "lastModified": 1708422279, + "narHash": "sha256-WuBt+axaRt0vnUXeMcgPS9ePSvWc4Cv3Q2deYkFL17o=", "owner": "nix-community", "repo": "NUR", - "rev": "9534dd7152380c152b5a14e646a882de59ea51c2", + "rev": "034cf7dc073f5d18921016cf9bbfec436b97eff2", "type": "github" }, "original": { diff --git a/modules/default.nix b/modules/default.nix index 4b88aac..da8fd9c 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -12,6 +12,7 @@ ./shell ./gui ./mpd + ./development inputs.neovim.homeModules.default ]; diff --git a/modules/development/default.nix b/modules/development/default.nix new file mode 100644 index 0000000..719ece5 --- /dev/null +++ b/modules/development/default.nix @@ -0,0 +1,5 @@ +_: { + imports = [ + ./rust.nix + ]; +} diff --git a/modules/development/rust.nix b/modules/development/rust.nix new file mode 100644 index 0000000..f7326a4 --- /dev/null +++ b/modules/development/rust.nix @@ -0,0 +1,14 @@ +{ pkgs, config, lib, ... }: { + options = { + development.rust.enable = lib.mkEnableOption "rust development"; + }; + config = lib.mkIf config.development.rust.enable { + home.packages = with pkgs; [ + rustc + cargo + rust-analyzer + clippy + rustfmt + ]; + }; +} diff --git a/modules/gui/firefox.nix b/modules/gui/firefox.nix index 9b6a585..7e78a02 100644 --- a/modules/gui/firefox.nix +++ b/modules/gui/firefox.nix @@ -32,16 +32,8 @@ "browser.startup.homepage" = "https://duckduckgo.com"; "browser.search.region" = "DE"; "browser.search.isUS" = false; - "browser.search.default" = "DuckDuckGo"; "distribution.searchplugins.defaultLocale" = "de-DE"; "general.useragent.locale" = "de-DE"; - "browser.bookmarks.showMobileBookmarks" = false; - "browser.newtabpage.pinned" = [ - { - title = "NixOS"; - url = "https://nixos.org"; - } - ]; }; }; }; diff --git a/modules/shell/direnv.nix b/modules/shell/direnv.nix index 720f5e2..3d6020e 100644 --- a/modules/shell/direnv.nix +++ b/modules/shell/direnv.nix @@ -7,6 +7,7 @@ strict_env = true; }; }; + nix-direnv.enable = true; stdlib = builtins.readFile ../../configs/direnv/stdlib.sh; }; }