diff --git a/configuration.nix b/configuration.nix index 6afdcbb..31cc614 100644 --- a/configuration.nix +++ b/configuration.nix @@ -38,9 +38,12 @@ in { services.printing.drivers = with pkgs; [ epson-escpr2 epson-escpr + dcp9020cdwlpr ghostscript cups-filters ]; + services.mullvad-vpn.enable = true; + services.mullvad-vpn.package = pkgs.mullvad-vpn; # Set your time zone. @@ -62,6 +65,10 @@ in { }; programs.hyprland.enable = true; + services.xserver.enable = true; + # You may need to comment out "services.displayManager.gdm.enable = true;" + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; # Configure console keymap console.keyMap = "sv-latin1"; @@ -86,6 +93,13 @@ in { # Allow unfree packages nixpkgs.config.allowUnfree = true; + services.syncthing = { + enable = true; + user = "svante"; + dataDir = "/home/svante/Documents"; # Default folder for new synced folders + configDir = "/home/svante/Documents/.config/syncthing"; # Folder for Syncthing's settings and keys + }; + # virtualisation.docker.enable = true; # virtualisation.docker.rootless = { # enable = true; @@ -110,6 +124,7 @@ in { environment.systemPackages = with pkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. neovim + libsForQt5.lightly curl gsettings-desktop-schemas mlocate diff --git a/dotfiles/nvim/after/lsp.lua b/dotfiles/nvim/after/lsp.lua index e43503d..1ba21f7 100644 --- a/dotfiles/nvim/after/lsp.lua +++ b/dotfiles/nvim/after/lsp.lua @@ -68,3 +68,11 @@ require('lspconfig').cssls.setup { capabilities = capabilities } require('lspconfig').eslint.setup { capabilities = capabilities } require('lspconfig').bashls.setup { capabilities = capabilities } require('lspconfig').pyright.setup { capabilities = capabilities } +require('lspconfig').ccls.setup { + capabilities = capabilities, + init_options = { + index = { + blacklist = {"opt"} + } + } +} diff --git a/dotfiles/scripts/otp.sh b/dotfiles/scripts/otp.sh index 9836e83..68cb536 100755 --- a/dotfiles/scripts/otp.sh +++ b/dotfiles/scripts/otp.sh @@ -1,17 +1,17 @@ -#!/bin/bash +#!/bin/sh -folder="$(ls ~/.password-store/ | sed -e 's/\.gpg$//' | ~/.local/bin/dmenu -i)" +folder="$(ls ~/.password-store/ | sed -e 's/\.gpg$//' | fuzzel -d)" if [ -z $folder ]; then exit fi -choice="$(ls ~/.password-store/$folder | sed -e 's/\.gpg$//' | ~/.local/bin/dmenu -i)" +choice="$(ls ~/.password-store/$folder | sed -e 's/\.gpg$//' | fuzzel -d)" if [ -z $choice ]; then exit fi -xdotool type "$(pass otp $folder/$choice)" +wtype -d 10 "$(pass otp "$folder/$choice")" diff --git a/dotfiles/zshrc b/dotfiles/zshrc index a2800fd..7c5f3d1 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -15,7 +15,7 @@ compinit export TERM="xterm" # Shorthands -alias ls='ls --color=yes' +alias ls='ls --color=yes -h' alias l='ls -l' alias la='ls -a' alias ll='ls -la' diff --git a/home.nix b/home.nix index 002ee1b..8f1d6c1 100644 --- a/home.nix +++ b/home.nix @@ -8,13 +8,20 @@ home.packages = [ pkgs.fortune pkgs.mako + pkgs.kdePackages.kalgebra + pkgs.libreoffice pkgs.htop + pkgs.ripgrep pkgs.xwaylandvideobridge + pkgs.qtpass pkgs.pipewire + pkgs.jdk21 pkgs.wireplumber pkgs.xdg-desktop-portal-hyprland pkgs.qt6.qtwayland pkgs.libsForQt5.qt5.qtwayland + pkgs.ccls + pkgs.clang pkgs.obs-studio pkgs.prismlauncher pkgs.prusa-slicer @@ -39,7 +46,6 @@ pkgs.android-tools pkgs.steam pkgs.sidequest - pkgs.openjdk17 pkgs.libei ];