Revert "Switch to unstable by default"
This reverts commit 3c7877776e
.
Slack was broken when using the unstable version of nixpkgs.
This commit is contained in:
parent
54fdbd71d9
commit
b40e25dea0
5 changed files with 46 additions and 22 deletions
35
flake.lock
generated
35
flake.lock
generated
|
@ -24,32 +24,32 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702203126,
|
"lastModified": 1702195709,
|
||||||
"narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
|
"narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
|
"rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "master",
|
"ref": "release-23.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702151865,
|
"lastModified": 1702233072,
|
||||||
"narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
|
"narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
|
"rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-23.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -72,11 +72,28 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1702151865,
|
||||||
|
"narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs",
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
home-manager.url = "github:nix-community/home-manager/master";
|
home-manager.url = "github:nix-community/home-manager/release-23.11";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ flake-parts, self, ... }:
|
outputs = inputs@{ flake-parts, self, ... }:
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{ inputs, pkgs, system }:
|
{ inputs, pkgs, system }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${system}";
|
||||||
|
|
||||||
configure-gtk = pkgs.writeTextFile {
|
configure-gtk = pkgs.writeTextFile {
|
||||||
name = "configure-gtk";
|
name = "configure-gtk";
|
||||||
destination = "/bin/configure-gtk";
|
destination = "/bin/configure-gtk";
|
||||||
|
@ -174,8 +176,7 @@ in
|
||||||
monospace = [ "JetBrainsMono Nerd Font Mono" ];
|
monospace = [ "JetBrainsMono Nerd Font Mono" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
packages = with pkgsUnstable; [
|
||||||
packages = with pkgs; [
|
|
||||||
(nerdfonts.override {
|
(nerdfonts.override {
|
||||||
fonts = [
|
fonts = [
|
||||||
"AnonymousPro"
|
"AnonymousPro"
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
{ inputs, pkgs, ... }:
|
{ inputs, pkgs, ... }:
|
||||||
|
let
|
||||||
|
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
|
||||||
|
in
|
||||||
with pkgs; [
|
with pkgs; [
|
||||||
awscli2
|
awscli2
|
||||||
bottom
|
bottom
|
||||||
|
@ -24,9 +26,9 @@ with pkgs; [
|
||||||
lua
|
lua
|
||||||
mysql
|
mysql
|
||||||
neofetch
|
neofetch
|
||||||
|
pkgsUnstable.rustywind
|
||||||
pv
|
pv
|
||||||
ripgrep
|
ripgrep
|
||||||
rustywind
|
|
||||||
terraform
|
terraform
|
||||||
tldr
|
tldr
|
||||||
tree
|
tree
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
{ inputs, pkgs, self, ... }:
|
{ inputs, pkgs, self, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
|
||||||
|
|
||||||
customVim = with self; {
|
customVim = with self; {
|
||||||
toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin {
|
toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "toggle-checkbox-nvim";
|
name = "toggle-checkbox-nvim";
|
||||||
|
@ -73,7 +75,7 @@ in
|
||||||
customVim.vim-heritage
|
customVim.vim-heritage
|
||||||
customVim.vim-textobj-xmlattr
|
customVim.vim-textobj-xmlattr
|
||||||
customVim.vim-zoom
|
customVim.vim-zoom
|
||||||
vimPlugins.vim-astro
|
pkgsUnstable.vimPlugins.vim-astro
|
||||||
vimPlugins.vim-visual-star-search
|
vimPlugins.vim-visual-star-search
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -84,14 +86,13 @@ in
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pkgsUnstable.vimPlugins.harpoon
|
||||||
|
pkgsUnstable.vimPlugins.refactoring-nvim
|
||||||
vimPlugins.comment-nvim
|
vimPlugins.comment-nvim
|
||||||
vimPlugins.dial-nvim
|
vimPlugins.dial-nvim
|
||||||
vimPlugins.gitsigns-nvim
|
vimPlugins.gitsigns-nvim
|
||||||
vimPlugins.harpoon
|
|
||||||
vimPlugins.impatient-nvim
|
vimPlugins.impatient-nvim
|
||||||
vimPlugins.lualine-nvim
|
|
||||||
vimPlugins.nvim-web-devicons
|
vimPlugins.nvim-web-devicons
|
||||||
vimPlugins.refactoring-nvim
|
|
||||||
vimPlugins.rest-nvim
|
vimPlugins.rest-nvim
|
||||||
vimPlugins.undotree
|
vimPlugins.undotree
|
||||||
vimPlugins.vim-easy-align
|
vimPlugins.vim-easy-align
|
||||||
|
@ -110,6 +111,8 @@ in
|
||||||
vimPlugins.vim-tmux-navigator
|
vimPlugins.vim-tmux-navigator
|
||||||
vimPlugins.vim-unimpaired
|
vimPlugins.vim-unimpaired
|
||||||
|
|
||||||
|
vimPlugins.lualine-nvim
|
||||||
|
|
||||||
{
|
{
|
||||||
plugin = vimPlugins.vim-sort-motion;
|
plugin = vimPlugins.vim-sort-motion;
|
||||||
type = "lua";
|
type = "lua";
|
||||||
|
@ -151,8 +154,8 @@ in
|
||||||
vimPlugins.nvim-treesitter-textobjects
|
vimPlugins.nvim-treesitter-textobjects
|
||||||
|
|
||||||
# LSP, linting and formatting
|
# LSP, linting and formatting
|
||||||
vimPlugins.conform-nvim
|
pkgsUnstable.vimPlugins.conform-nvim
|
||||||
vimPlugins.none-ls-nvim
|
pkgsUnstable.vimPlugins.none-ls-nvim
|
||||||
vimPlugins.lsp-status-nvim
|
vimPlugins.lsp-status-nvim
|
||||||
vimPlugins.nvim-lspconfig
|
vimPlugins.nvim-lspconfig
|
||||||
|
|
||||||
|
@ -212,7 +215,6 @@ in
|
||||||
ansible-language-server
|
ansible-language-server
|
||||||
gopls
|
gopls
|
||||||
lua-language-server
|
lua-language-server
|
||||||
nixd
|
|
||||||
nodePackages.intelephense
|
nodePackages.intelephense
|
||||||
nodePackages."@astrojs/language-server"
|
nodePackages."@astrojs/language-server"
|
||||||
nodePackages."@tailwindcss/language-server"
|
nodePackages."@tailwindcss/language-server"
|
||||||
|
@ -225,6 +227,7 @@ in
|
||||||
nodePackages.vue-language-server
|
nodePackages.vue-language-server
|
||||||
nodePackages.yaml-language-server
|
nodePackages.yaml-language-server
|
||||||
phpactor
|
phpactor
|
||||||
|
pkgsUnstable.nixd
|
||||||
rnix-lsp
|
rnix-lsp
|
||||||
terraform-ls
|
terraform-ls
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue