From 91e09c461ba400807fa0d728af8395fd0417970c Mon Sep 17 00:00:00 2001 From: cnst Date: Mon, 15 Jul 2024 12:57:49 +0200 Subject: [PATCH] reorg --- flake.lock | 12 ++++++------ home/core/gui/gtk/default.nix | 5 +++++ home/extra/neovim/completion.nix | 2 -- home/extra/neovim/tsserver-wrapper.sh | 4 ---- home/users/cnst/imports.nix | 21 --------------------- nixos/hosts/cnix/imports.nix | 23 ++++++++++++++++++++++- 6 files changed, 33 insertions(+), 34 deletions(-) delete mode 100755 home/extra/neovim/tsserver-wrapper.sh diff --git a/flake.lock b/flake.lock index 759a12a8..8f71a38d 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1720960628, - "narHash": "sha256-PeV34jDie3qCng/NFtYKWyiS33emKA+3pCXCqdmP5ww=", + "lastModified": 1720999040, + "narHash": "sha256-8hOyF6dOnZ+xQpCdHPDMCJyq5KQsf5nIo6opWtxrJbw=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "6e805cba7c6fa8cf1fea868ac422ffbb31c080f7", + "rev": "e47759524ae72d8570323dcaad461263eb3400c0", "type": "github" }, "original": { @@ -522,11 +522,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720823163, - "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { diff --git a/home/core/gui/gtk/default.nix b/home/core/gui/gtk/default.nix index 7a282639..6b42ffc1 100644 --- a/home/core/gui/gtk/default.nix +++ b/home/core/gui/gtk/default.nix @@ -18,5 +18,10 @@ name = "Input Sans Narrow Light"; size = 10; }; + cursorTheme = { + name = "Adwaita"; + package = pkgs.adwaita-icon-theme; + size = 24; + }; }; } diff --git a/home/extra/neovim/completion.nix b/home/extra/neovim/completion.nix index 5539bbf1..498c7fda 100644 --- a/home/extra/neovim/completion.nix +++ b/home/extra/neovim/completion.nix @@ -16,7 +16,6 @@ path = "[path]"; luasnip = "[snip]"; buffer = "[buffer]"; - neorg = "[neorg]"; }; }; }; @@ -46,7 +45,6 @@ # Words from other open buffers can also be suggested. option.get_bufnrs.__raw = "vim.api.nvim_list_bufs"; } - {name = "neorg";} ]; }; }; diff --git a/home/extra/neovim/tsserver-wrapper.sh b/home/extra/neovim/tsserver-wrapper.sh deleted file mode 100755 index d414ee7e..00000000 --- a/home/extra/neovim/tsserver-wrapper.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export PATH="/etc/profiles/per-user/cnst/bin:$PATH" -echo "PATH=$PATH" > /tmp/tsserver-log.txt -exec /etc/profiles/per-user/cnst/bin/tsserver "$@" >> /tmp/tsserver-log.txt 2>&1 diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix index 7435efa3..15bb9d75 100644 --- a/home/users/cnst/imports.nix +++ b/home/users/cnst/imports.nix @@ -55,27 +55,6 @@ wpa_supplicant xfce.thunar-archive-plugin xfce.thunar-volman - - # misc.language_servers - typescript-language-server - typescript - nixd - nil - statix - hyprlang - alejandra - nixpkgs-fmt - pyright - isort - rustfmt - rust-analyzer - clippy - lua-language-server - stylua - nodePackages_latest.nodejs - nodePackages.prettier - prettierd - black ]; sessionVariables = { BROWSER = "firefox"; diff --git a/nixos/hosts/cnix/imports.nix b/nixos/hosts/cnix/imports.nix index 3660f818..bc32a7d3 100644 --- a/nixos/hosts/cnix/imports.nix +++ b/nixos/hosts/cnix/imports.nix @@ -73,12 +73,33 @@ gcc gnumake cmake - hyprlang python3 python312Packages.httplib2 python312Packages.oauth2 gtk3 gtk4 + + # misc.language_servers + typescript-language-server + typescript + nixd + nil + statix + hyprlang + alejandra + nixpkgs-fmt + pyright + isort + rustfmt + rust-analyzer + clippy + lua-language-server + stylua + nodePackages_latest.nodejs + nodePackages.prettier + prettierd + black + vimPlugins.nvim-treesitter-parsers.typescript ]; }; }