diff --git a/home/files/mimeapps.list b/home/files/mimeapps.list index 76184a0..45c96d2 100644 --- a/home/files/mimeapps.list +++ b/home/files/mimeapps.list @@ -1,10 +1,20 @@ [Default Applications] application/pdf=org.gnome.Evince.desktop +application/vnd.oasis.opendocument.presentation=impress.desktop +application/vnd.oasis.opendocument.spreadsheet=calc.desktop +application/vnd.oasis.opendocument.text=writer.desktop application/xml=code.desktop +audio/aac=mpv.desktop audio/flac=mpv.desktop -image/png=org.gnome.eog.desktop +audio/mpeg=mpv.desktop +audio/ogg=mpv.desktop image/jpeg=org.gnome.eog.desktop +image/png=org.gnome.eog.desktop text/html=firefox.desktop +video/mp4=mpv.desktop +video/mpeg=mpv.desktop +video/ogg=mpv.desktop +video/webm=mpv.desktop x-scheme-handler/about=firefox.desktop x-scheme-handler/discord-455712169795780630=discord-455712169795780630.desktop x-scheme-handler/http=firefox.desktop diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 4be3789..0ccf762 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -5,28 +5,26 @@ enable = true; vimAlias = true; withNodeJs = true; - configure = { - customRC = builtins.readFile ./init.vim; - packages.default.start = with pkgs.vimPlugins; [ - coc-nvim - editorconfig-vim - fzf-vim - vim-airline - vim-clang-format - vim-fish - vim-fetch - vim-nftables - vim-nix - vim-sensible - vim-toml - meson - gruvbox + extraConfig = builtins.readFile ./init.vim; + plugins = with pkgs.vimPlugins; [ + coc-nvim + editorconfig-vim + fzf-vim + vim-airline + vim-clang-format + vim-fish + vim-fetch + vim-nftables + vim-nix + vim-sensible + vim-toml + meson + gruvbox - coc-go - coc-json - coc-rust-analyzer - ]; - }; + coc-go + coc-json + coc-rust-analyzer + ]; }; home.sessionVariables.EDITOR = "nvim"; diff --git a/home/neovim/init.vim b/home/neovim/init.vim index e13ffcc..160aef4 100644 --- a/home/neovim/init.vim +++ b/home/neovim/init.vim @@ -51,5 +51,7 @@ nmap rn (coc-rename) xmap f (coc-format-selected) nmap f (coc-format-selected) +nmap a (coc-action) + command! -nargs=0 Format :call CocAction('format') command! -nargs=? Fold :call CocAction('fold', ) diff --git a/sets/printing.nix b/sets/printing.nix index 55b6a23..9b1d0fd 100644 --- a/sets/printing.nix +++ b/sets/printing.nix @@ -3,8 +3,16 @@ { services.printing = { enable = true; - drivers = [ - (pkgs.pkgsi686Linux.callPackage ../externals/packages/hll2300d { }) + drivers = with pkgs; [ + (pkgs.brlaser.overrideAttrs (old: { + patches = [ + (pkgs.fetchpatch { + name = "l2300d-fix.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pdewacht/brlaser/pull/68.patch"; + sha256 = "07iqv048q0iplghn0aamjslyixw1p5jbk004i20xnl1vs95nyqzy"; + }) + ]; + })) ]; }; } diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 25bbdb2..5dc6798 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -62,5 +62,12 @@ weechat ]; + + # Printing + services.printing = { + listenAddresses = [ "localhost:631" "10.69.0.2:631" "starlight.manehattan.artem.ist:631" ]; + allowFrom = [ "localhost" "10.69.0.*" ]; + }; + system.stateVersion = "19.09"; }