diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/apps.nix | 7 | ||||
| -rw-r--r-- | nixos/configuration.nix | 2 | ||||
| -rw-r--r-- | nixos/environment.nix | 10 | ||||
| -rw-r--r-- | nixos/home.nix | 12 | ||||
| -rw-r--r-- | nixos/languages/beam.nix | 9 | ||||
| -rw-r--r-- | nixos/languages/c.nix | 8 | ||||
| -rw-r--r-- | nixos/languages/go.nix | 7 | ||||
| -rw-r--r-- | nixos/languages/index.nix | 14 | ||||
| -rw-r--r-- | nixos/languages/javascript.nix | 8 | ||||
| -rw-r--r-- | nixos/languages/lua.nix | 9 | ||||
| -rw-r--r-- | nixos/languages/python.nix | 19 | ||||
| -rw-r--r-- | nixos/languages/rust.nix | 7 | ||||
| -rw-r--r-- | nixos/languages/zig.nix | 7 | ||||
| -rw-r--r-- | nixos/nvim.nix | 34 | ||||
| -rw-r--r-- | nixos/services.nix | 4 |
15 files changed, 97 insertions, 60 deletions
diff --git a/nixos/apps.nix b/nixos/apps.nix index 8f98fd2..f9585b5 100644 --- a/nixos/apps.nix +++ b/nixos/apps.nix @@ -12,21 +12,14 @@ wineWowPackages.stable sqlite libreoffice-qt6-fresh - kdePackages.dolphin yazi - # kio-extras - # ffmpegthumbs - # kdePackages.kdegraphics-thumbnailers - # kdePackages.kimageformats - android-tools scrcpy ]; xdg = { mime.enable = true; - mime.defaultApplications = { # don't use libreoffice draw for pdfs, use firefox "application/pdf" = [ "firefox.desktop" ]; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index dc79d99..4dd764c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -7,8 +7,10 @@ ./services.nix ./nvidia.nix ./home.nix + ./desktop-environment.nix ./environment.nix ./nvim.nix + ./languages/index.nix ./apps.nix ./tmux.nix <home-manager/nixos> diff --git a/nixos/environment.nix b/nixos/environment.nix index bf81cf9..6d59998 100644 --- a/nixos/environment.nix +++ b/nixos/environment.nix @@ -1,11 +1,15 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - gcc - # python312 # already added with nvim.nix + fastfetch + vim + wget + git + nmap + dust + home-manager zoxide starship - cmake git-lfs inetutils btop diff --git a/nixos/home.nix b/nixos/home.nix index e9760dd..c0af1b6 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -19,16 +19,4 @@ dates = "weekly"; options = "--delete-older-than 10d"; }; - - - environment.systemPackages = with pkgs; [ - fastfetch - vim - wget - git - nmap - dust - gnome-tweaks - home-manager - ]; } diff --git a/nixos/languages/beam.nix b/nixos/languages/beam.nix new file mode 100644 index 0000000..56d81b7 --- /dev/null +++ b/nixos/languages/beam.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + beamMinimal27Packages.elixir + beamMinimal27Packages.erlang + beamMinimal27Packages.elixir-ls + beamMinimal27Packages.erlang-ls + ]; +} diff --git a/nixos/languages/c.nix b/nixos/languages/c.nix new file mode 100644 index 0000000..10d11ea --- /dev/null +++ b/nixos/languages/c.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + gcc + cmake + clang-tools + ]; +} diff --git a/nixos/languages/go.nix b/nixos/languages/go.nix new file mode 100644 index 0000000..1fb923f --- /dev/null +++ b/nixos/languages/go.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + go + gopls + ]; +} diff --git a/nixos/languages/index.nix b/nixos/languages/index.nix new file mode 100644 index 0000000..a8601bc --- /dev/null +++ b/nixos/languages/index.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: +{ + imports = + [ + ./beam.nix + ./c.nix + ./go.nix + ./javascript.nix + ./lua.nix + ./python.nix + ./rust.nix + ./zig.nix + ]; +} diff --git a/nixos/languages/javascript.nix b/nixos/languages/javascript.nix new file mode 100644 index 0000000..68b7926 --- /dev/null +++ b/nixos/languages/javascript.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + nodejs_20 + typescript-language-server + javascript-typescript-langserver + ]; +} diff --git a/nixos/languages/lua.nix b/nixos/languages/lua.nix new file mode 100644 index 0000000..18f2840 --- /dev/null +++ b/nixos/languages/lua.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + lua + lua-language-server + lua53Packages.luarocks + lua53Packages.luafilesystem + ]; +} diff --git a/nixos/languages/python.nix b/nixos/languages/python.nix new file mode 100644 index 0000000..111111b --- /dev/null +++ b/nixos/languages/python.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + python312 + python312Packages.psutil + pyright + (pkgs.python3.withPackages (ps: with ps; [ + python-lsp-server + python-lsp-jsonrpc + python-lsp-black + python-lsp-ruff + pyls-isort + pyls-flake8 + ruff + black + isort + ])) + ]; +} diff --git a/nixos/languages/rust.nix b/nixos/languages/rust.nix new file mode 100644 index 0000000..96c94ea --- /dev/null +++ b/nixos/languages/rust.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + cargo + rust-analyzer + ]; +} diff --git a/nixos/languages/zig.nix b/nixos/languages/zig.nix new file mode 100644 index 0000000..23061c3 --- /dev/null +++ b/nixos/languages/zig.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: +in { + environment.systemPackages = with pkgs; [ + zig + zls + ]; +} diff --git a/nixos/nvim.nix b/nixos/nvim.nix index b9271bb..1a38a86 100644 --- a/nixos/nvim.nix +++ b/nixos/nvim.nix @@ -4,45 +4,11 @@ in { environment.systemPackages = with pkgs; [ unstable.neovim - go - gcc - cargo - python312 - python312Packages.psutil - nodejs_20 - lua - zig - lua53Packages.luarocks - lua53Packages.luafilesystem - beamMinimal27Packages.elixir - beamMinimal27Packages.erlang - unzip xsel ripgrep tree-sitter - gopls - clang-tools - lua-language-server vscode-langservers-extracted - rust-analyzer - zls - typescript-language-server - javascript-typescript-langserver - pyright - (pkgs.python3.withPackages (ps: with ps; [ - python-lsp-server - python-lsp-jsonrpc - python-lsp-black - python-lsp-ruff - pyls-isort - pyls-flake8 - ruff - black - isort - ])) - beamMinimal27Packages.elixir-ls - beamMinimal27Packages.erlang-ls ]; } diff --git a/nixos/services.nix b/nixos/services.nix index 1197d42..5705e9d 100644 --- a/nixos/services.nix +++ b/nixos/services.nix @@ -1,9 +1,5 @@ { config, pkgs, ... }: { - imports = - [ - ./desktop-environment.nix - ]; services.xserver.xkb = { layout = "us"; variant = ""; |