From e6c63e9c2eeda1966d687e2161e1e395c0f9ec28 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sat, 1 Jun 2024 07:09:38 -0400 Subject: [PATCH] Use stylix theme for nixvim --- flake.lock | 99 +++++++++++------------------------------------- flake.nix | 20 ++++++++-- home/default.nix | 8 ---- justfile | 1 + 4 files changed, 40 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 91c12d0..4ac5390 100644 --- a/flake.lock +++ b/flake.lock @@ -116,7 +116,9 @@ }, "darwin": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1716993688, @@ -338,7 +340,9 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1716736833, @@ -435,15 +439,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { @@ -462,70 +469,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1716542732, - "narHash": "sha256-0Y9fRr0CUqWT4KgBITmaGwlnNIGMYuydu2L8iLTfHU4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d12251ef6e8e6a46e05689eeccd595bdbd3c9e60", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1714912032, - "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -535,7 +478,9 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "treefmt-nix": "treefmt-nix" }, "locked": { @@ -557,7 +502,7 @@ "darwin": "darwin", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "stylix": "stylix" @@ -575,7 +520,9 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1717212835, diff --git a/flake.nix b/flake.nix index cfd0535..32de916 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,25 @@ description = "nixos and macos configurations"; inputs = { - darwin.url = "github:lnl7/nix-darwin"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; - nixvim.url = "github:nix-community/nixvim"; - stylix.url = "github:danth/stylix"; + darwin = { + url = "github:lnl7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { + url = "github:nix-community/home-manager/release-24.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + stylix = { + url = "github:danth/stylix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/default.nix b/home/default.nix index 55f26b3..3629cf8 100644 --- a/home/default.nix +++ b/home/default.nix @@ -13,7 +13,6 @@ in stylix = { base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; - targets.nixvim.enable = false; # tokyonight module missing? targets.vscode.enable = false; # overrides synced settings targets.tmux.enable = true; @@ -317,9 +316,6 @@ in wofi = { enable = stdenv.isLinux; - settings = { - location = "center"; - }; }; fzf = { @@ -330,10 +326,6 @@ in enable = true; viAlias = true; vimAlias = true; - colorschemes.tokyonight.settings.style = { - enable = true; - style = "night"; - }; keymaps = [ { key = ""; diff --git a/justfile b/justfile index 834f067..e1eabde 100644 --- a/justfile +++ b/justfile @@ -1,6 +1,7 @@ set export alias u := update +alias r := rebuild arch := `uname -s`