jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

update #16

Merged
jalil merged 2 commits from update into main 2024-07-02 09:52:58 +02:00
Conversation 0 Commits 2 Files changed 7 +36 -28
4 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 351e042a7c - Show all commits

42
flake.lock
View file

@ -197,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1719745305,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -334,11 +334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718530513, "lastModified": 1719827385,
"narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,11 +407,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719681865, "lastModified": 1719895800,
"narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -422,11 +422,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719426051, "lastModified": 1719838683,
"narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -456,11 +456,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1719695745, "lastModified": 1719860300,
"narHash": "sha256-4i71R8xofnwmlhb84swOLQro63pHvC37NVIipbz1I04=", "narHash": "sha256-ZeF+zI+/53HeS567/mXS2Gw+w8k9FsjRC/TzoVQOpi4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c062b976eff9f13597c7c23d77a6b3ac677b7fd5", "rev": "079c2c479b5707adf0b03f817be30945c92c15cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,11 +541,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719243788, "lastModified": 1719749022,
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -556,11 +556,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1719506693, "lastModified": 1719690277,
"narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View file

@ -40,7 +40,6 @@
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs = { inputs = {
# Disable until fixed upstream: https://github.com/nix-community/nixvim/issues/1699
nixpkgs.follows = "unstable"; nixpkgs.follows = "unstable";
devshell.follows = "devshell"; devshell.follows = "devshell";
nix-darwin.follows = ""; # disable MacOS stuff nix-darwin.follows = ""; # disable MacOS stuff
@ -138,14 +137,21 @@
nixvim = nixvim.overlays.default; nixvim = nixvim.overlays.default;
jpassmenu = jpassmenu.overlays.default; jpassmenu = jpassmenu.overlays.default;
audiomenu = audiomenu.overlays.default; audiomenu = audiomenu.overlays.default;
unstable = final: prev: { unstable = final: prev: let
unstablePkgs = unstable.legacyPackages.${prev.system};
in {
# Get unstable packages
unstable = unstablePkgs;
# Update vim plugins with the versions from unstable
vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins;
# Get specific packages from unstable
inherit inherit
(unstable.legacyPackages.${prev.system}) (unstablePkgs)
gitoxide gitoxide
jujutsu jujutsu
wezterm wezterm
neovim-unwrapped
; ;
unstable = unstable.legacyPackages.${prev.system};
}; };
}; };

5
home/default.nix
View file

@ -29,8 +29,11 @@ in {
# Better cat (bat) # Better cat (bat)
bat = { bat = {
enable = true; enable = true;
config = {
# Disable headers and numbers # Disable headers and numbers
config.style = "plain"; style = "plain";
theme = lib.mkForce "gruvbox-dark";
};
}; };
# Direnv # Direnv
direnv = { direnv = {

1
nvim/standalone.nix
View file

@ -2,7 +2,6 @@
imports = [./options.nix ./plugins.nix ./mappings.nix ./augroups.nix]; imports = [./options.nix ./plugins.nix ./mappings.nix ./augroups.nix];
config = { config = {
package = pkgs.unstable.neovim-unwrapped;
globals.mapleader = " "; globals.mapleader = " ";
# Appearance # Appearance
colorschemes.gruvbox = { colorschemes.gruvbox = {