From 0430e15d54ae5468fc8967b371e315601261f753 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Sun, 1 Sep 2024 20:55:06 +0100 Subject: [PATCH] update flake, add nixvim, disable librewolf as declarative addons are not currently available, add nextcloud-client --- flake.lock | 273 +++++++++++++++++++++++++++++++++++-- flake.nix | 8 ++ home-manager/home.nix | 4 +- home-manager/librewolf.nix | 2 +- home-manager/nextcloud.nix | 6 + home-manager/nixvim.nix | 2 +- home-manager/zsh.nix | 2 +- 7 files changed, 284 insertions(+), 13 deletions(-) create mode 100644 home-manager/nextcloud.nix diff --git a/flake.lock b/flake.lock index 63482b9..3a50a3e 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,41 @@ "type": "github" } }, + "devshell": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722113426, + "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "owner": "numtide", + "repo": "devshell", + "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "flake-compat": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -43,17 +78,56 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flatpaks": { "inputs": { "nixpkgs": "nixpkgs", "utils": "utils" }, "locked": { - "lastModified": 1724545401, - "narHash": "sha256-Or7WArPVTP50UD47OIiVMP/MzsveHBpVLgZO2Y2X+N8=", + "lastModified": 1725033858, + "narHash": "sha256-FMJMPOgPs01DbLcCzo1MK+j/H5Co131y82cwHICsU4I=", "owner": "GermanBread", "repo": "declarative-flatpak", - "rev": "5ac7c5329b18fc22f92ac6f414732c40fbb22143", + "rev": "b7dd60ef431215fe37726a816a22767e32d104dd", "type": "github" }, "original": { @@ -63,12 +137,85 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "nixvim", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724857454, + "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "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": [ "nixpkgs" ] }, + "locked": { + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, "locked": { "lastModified": 1724435763, "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", @@ -83,6 +230,27 @@ "type": "github" } }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", + "type": "github" + }, + "original": { + "owner": "lnl7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1724316499, @@ -101,11 +269,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { @@ -115,22 +283,73 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1725179481, + "narHash": "sha256-iezP8ORF5b/QWkApBExQFJQFhzZqs2WwRth6DYZfodE=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "5241c9f83ea1bcec9879585b7bd2da572924f5e1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724584782, + "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", + "owner": "NuschtOS", + "repo": "search", + "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "anyrun": "anyrun", "flatpaks": "flatpaks", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", + "nixvim": "nixvim", "stablepkgs": "stablepkgs" } }, "stablepkgs": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1725001927, + "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", "type": "github" }, "original": { @@ -170,6 +389,42 @@ "type": "github" } }, + "systems_3": { + "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", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724833132, + "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems_2" diff --git a/flake.nix b/flake.nix index 03b1e29..1dfc2c7 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,13 @@ # Declarative flatpak management, documentation states overriding nixpkgs is not supported flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3"; + + # Nixvim neovim distro for easier nixified configuration + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; outputs = { self, nixpkgs, stablepkgs, home-manager, ... } @ inputs: @@ -54,6 +61,7 @@ # ./home-manager/librewolf.nix inputs.anyrun.homeManagerModules.default inputs.flatpaks.homeManagerModules.default + inputs.nixvim.homeManagerModules.default ]; }; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index b16a77b..7481975 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -14,13 +14,14 @@ ./zsh.nix ./eza.nix ./nixvim.nix + ./nextcloud.nix ]; # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed home.stateVersion = "24.05"; # services.pass-secret-service.enable = true; # for use with protonmail-bridge - services.gnome-keyring.enable = true; # should be easier for protonmail-bridge + services.gnome-keyring.enable = true; # used for protonmail-bridge and nextcloud-client # Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault home.pointerCursor = @@ -50,6 +51,7 @@ # Add grimblast screenshot tool pkgs.grimblast pkgs.powerline-fonts + pkgs.nix-output-monitor ]; home.sessionVariables = { diff --git a/home-manager/librewolf.nix b/home-manager/librewolf.nix index 549cf80..07e418c 100644 --- a/home-manager/librewolf.nix +++ b/home-manager/librewolf.nix @@ -2,7 +2,7 @@ { programs.librewolf = { enable = true; - package = stablepkgs.librewolf; + package = pkgs.librewolf; settings = { "privacy.clearOnShutdown.history" = false; "privacy.clearOnShutdown.downloads" = false; diff --git a/home-manager/nextcloud.nix b/home-manager/nextcloud.nix new file mode 100644 index 0000000..6141c9d --- /dev/null +++ b/home-manager/nextcloud.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: { + services.nextcloud-client = { + enable = true; + startInBackground = true; + }; +} diff --git a/home-manager/nixvim.nix b/home-manager/nixvim.nix index 59ce20c..f721815 100644 --- a/home-manager/nixvim.nix +++ b/home-manager/nixvim.nix @@ -2,6 +2,6 @@ programs.nixvim = { enable = true; - plugins.neotree.enable = true; +# plugins.neotree.enable = true; }; } diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix index f3954e5..8f395f6 100644 --- a/home-manager/zsh.nix +++ b/home-manager/zsh.nix @@ -13,7 +13,7 @@ # Aliases for my nixos workflow, requires nh and home-manager switch = "nh os switch"; - homeswitch = "home-manager switch --flake /home/blue/nixos"; + homeswitch = "home-manager switch --flake /home/blue/nixos |& nom"; }; plugins = with pkgs; [