This commit is contained in:
Oliver Davies 2023-10-03 23:04:08 +01:00
parent 3057cde69e
commit 7b86cafc22
6 changed files with 48 additions and 47 deletions

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ inputs, pkgs, system }:
let
configure-gtk = pkgs.writeTextFile {
@ -120,7 +120,6 @@ in
brightnessctl
configure-gtk
ffmpegthumbnailer
google-chrome
shotwell
swaybg
xfce.thunar
@ -182,8 +181,7 @@ in
monospace = [ "JetBrainsMono Nerd Font Mono" ];
};
};
fonts = with pkgs; [
intel-one-mono
fonts = with inputs.nixpkgs-unstable.legacyPackages."${system}"; [
(nerdfonts.override {
fonts = [
"FiraCode"
@ -221,7 +219,7 @@ in
in
{
enable = true;
plugins = lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
plugins = pkgs.lib.mkForce [ pkgs.interception-tools-plugins.dual-function-keys ];
udevmonConfig = ''
- JOB: "${pkgs.interception-tools}/bin/intercept -g $DEVNODE | ${pkgs.interception-tools-plugins.dual-function-keys}/bin/dual-function-keys -c ${dfkConfig} | ${pkgs.interception-tools}/bin/uinput -d $DEVNODE"
DEVICE:

View file

@ -1,9 +1,11 @@
{ inputs, self, username }:
{ inputs, self, system, username }:
{ desktop }:
let
configuration = import ./configuration.nix;
pkgs = inputs.nixpkgs.legacyPackages."${system}";
configuration = import ./configuration.nix { inherit inputs pkgs system; };
hardware-configuration = import ./hardware-configuration.nix;
in
inputs.nixpkgs.lib.nixosSystem {

View file

@ -6,7 +6,7 @@ with pkgs; [
delta
dog
doppler
inputs.nixpkgs-2305.legacyPackages."${system}".exa
exa
fd
file
fzf
@ -18,6 +18,7 @@ with pkgs; [
go
htop
inotify-tools
inputs.nixpkgs-unstable.legacyPackages."${system}".rustywind
jq
just
lua
@ -25,7 +26,6 @@ with pkgs; [
neofetch
pv
ripgrep
rustywind
terraform
tldr
tree

View file

@ -1,4 +1,4 @@
{ inputs, pkgs, self, username }:
{ inputs, pkgs, username, self }:
let
customVim = with self; {
@ -566,6 +566,7 @@ in
'';
}
inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.refactoring-nvim
vimPlugins.comment-nvim
vimPlugins.dial-nvim
vimPlugins.gitsigns-nvim
@ -573,7 +574,6 @@ in
vimPlugins.impatient-nvim
vimPlugins.indent-blankline-nvim
vimPlugins.nvim-web-devicons
vimPlugins.refactoring-nvim
vimPlugins.rest-nvim
vimPlugins.splitjoin-vim
vimPlugins.todo-comments-nvim
@ -627,11 +627,11 @@ in
# LSP
customVim.none-ls-nvim
# inputs.nixpkgs-unstable.legacyPackages."${system}".vimPlugins.nvim-lspconfig
vimPlugins.lsp-status-nvim
vimPlugins.nvim-lspconfig
# Completion
inputs.nixpkgs-2305.legacyPackages."${system}".vimPlugins.phpactor
vimPlugins.cmp-buffer
vimPlugins.cmp-cmdline
vimPlugins.cmp-nvim-lsp
@ -643,6 +643,7 @@ in
vimPlugins.cmp_luasnip
vimPlugins.lspkind-nvim
vimPlugins.nvim-cmp
vimPlugins.phpactor
# Snippets
vimPlugins.friendly-snippets
@ -691,8 +692,8 @@ in
# Language servers
ansible-language-server
gopls
inputs.nixpkgs-unstable.legacyPackages."${system}".nixd
lua-language-server
nixd
nodePackages.intelephense
nodePackages."@astrojs/language-server"
nodePackages."@tailwindcss/language-server"